metasm 1.0.1 → 1.0.2

data/{lib/metasm → metasm}/gui/qt.rb

@@ -323,11 +323,21 @@ Execute Printer Play Sleep Zoom Cancel
 	end
 
 	# update @hl_word from a line & offset, return nil if unchanged
-	def update_hl_word(line, offset)
+	def update_hl_word(line, offset, mode=:asm)
 		return if not line
 		word = line[0...offset].to_s[/\w*$/] << line[offset..-1].to_s[/^\w*/]
 		word = nil if word == ''
-		@hl_word = word if @hl_word != word
+		if @hl_word != word
+			if word
+				if mode == :asm and defined?(@dasm) and @dasm
+					re = @dasm.gui_hilight_word_regexp(word)
+				else
+					re = Regexp.escape word
+				end
+				@hl_word_re = /^(.*?)(\b(?:#{re})\b)/
+			end
+			@hl_word = word
+		end
 	end
 
 	# invalidate the whole widget area

data/{lib/metasm → metasm}/gui/win32.rb

@@ -685,7 +685,7 @@ TrackMouseEvent(
 #define QS_ALLEVENTS       (QS_INPUT | QS_POSTMESSAGE | QS_TIMER | QS_PAINT | QS_HOTKEY)
 #define QS_ALLINPUT        (QS_ALLEVENTS | QS_SENDMESSAGE)
 
-#define WAIT_TIMEOUT        258L 
+#define WAIT_TIMEOUT        258L
 
 #define CF_TEXT             1
 #define CF_BITMAP           2
@@ -960,6 +960,33 @@ GetTextExtentPoint32A(
 	__in_ecount(c) LPCSTR lpString,
 	__in int c,
 	__out LPPOINT lpsz);
+
+typedef struct tagRECT {
+    LONG left;
+    LONG top;
+    LONG right;
+    LONG bottom;
+} RECT, *LPRECT;
+
+#define TPM_LEFTBUTTON  0x0000L
+#define TPM_RIGHTBUTTON 0x0002L
+#define TPM_LEFTALIGN   0x0000L
+#define TPM_CENTERALIGN 0x0004L
+#define TPM_RIGHTALIGN  0x0008L
+#define TPM_TOPALIGN        0x0000L
+#define TPM_VCENTERALIGN    0x0010L
+#define TPM_BOTTOMALIGN     0x0020L
+#define TPM_HORIZONTAL      0x0000L
+#define TPM_VERTICAL        0x0040L
+#define TPM_NONOTIFY        0x0080L
+#define TPM_RETURNCMD       0x0100L
+#define TPM_RECURSE         0x0001L
+#define TPM_HORPOSANIMATION 0x0400L
+#define TPM_HORNEGANIMATION 0x0800L
+#define TPM_VERPOSANIMATION 0x1000L
+#define TPM_VERNEGANIMATION 0x2000L
+#define TPM_NOANIMATION     0x4000L
+#define TPM_LAYOUTRTL       0x8000L
 WINUSERAPI
 BOOL
 WINAPI
@@ -980,6 +1007,17 @@ WINAPI
 DestroyMenu(
     __in HMENU hMenu);
 WINUSERAPI
+BOOL
+WINAPI
+TrackPopupMenu(
+    __in HMENU hMenu,
+    __in UINT uFlags,
+    __in int x,
+    __in int y,
+    __in int nReserved,
+    __in HWND hWnd,
+    __in_opt CONST RECT *prcRect);
+WINUSERAPI
 DWORD
 WINAPI
 CheckMenuItem(
@@ -999,13 +1037,6 @@ AppendMenuA(
 #define OPAQUE      2
 int WINAPI SetBkMode(__in HDC hdc, __in int mode);
 
-typedef struct tagRECT {
-    LONG left;
-    LONG top;
-    LONG right;
-    LONG bottom;
-} RECT, *LPRECT;
-
 WINUSERAPI
 int
 WINAPI
@@ -1086,6 +1117,18 @@ UpdateWindow(
 WINUSERAPI
 BOOL
 WINAPI
+ClientToScreen(
+    __in HWND hWnd,
+    __inout LPPOINT pt);
+WINUSERAPI
+BOOL
+WINAPI
+ScreenToClient(
+    __in HWND hWnd,
+    __inout LPPOINT pt);
+WINUSERAPI
+BOOL
+WINAPI
 GetClientRect(
     __in HWND hWnd,
     __out LPRECT lpRect);
@@ -1390,11 +1433,11 @@ class WinWidget
 		return if not @parent
 		@parent.set_focus(self) if @parent.respond_to? :set_focus
 	end
-	
+
 	def focus?
 		return true if not @parent
 		(@parent.respond_to?(:focus?) ? @parent.focus? : true) and
- 		(@parent.respond_to?(:has_focus?) ? @parent.has_focus?(self) : true)
+		(@parent.respond_to?(:has_focus?) ? @parent.has_focus?(self) : true)
 	end
 
 	def redraw
@@ -1484,6 +1527,7 @@ class ContainerChoiceWidget < WinWidget
 
 	def set_focus(c)
 		@curview = c
+		grab_focus
 		redraw
 	end
 end
@@ -1519,7 +1563,7 @@ class ContainerVBoxWidget < WinWidget
 		cy = 0
 		pv = []
 		@views.each_with_index { |v, i|
-			if y >= cy and y < cy + v.height
+			if y >= cy+1 and y < cy + v.height - 1
 				if @focus_idx != i
 					@focus_idx = i
 					redraw
@@ -1528,8 +1572,7 @@ class ContainerVBoxWidget < WinWidget
 				return
 			end
 			cy += v.height
-			if y >= cy and y < cy+@spacing
-				vsz = v
+			if y >= cy-1 and y < cy+@spacing+1
 				@resizing = v
 				@wantheight[@resizing] ||= v.height
 				@tmpwantheight = []
@@ -1665,12 +1708,13 @@ class ContainerVBoxWidget < WinWidget
 
 	def set_focus(c)
 		@focus_idx = @views.index(c)
+		grab_focus
 		redraw
 	end
 end
 
 module TextWidget
-	attr_accessor :caret_x, :caret_y, :hl_word, :font_width, :font_height
+	attr_accessor :caret_x, :caret_y, :hl_word, :hl_word_re, :font_width, :font_height
 
 	def initialize_text
 		@caret_x = @caret_y = 0		# text cursor position
@@ -1679,11 +1723,21 @@ module TextWidget
 		@hl_word = nil
 	end
 
-	def update_hl_word(line, offset)
+	def update_hl_word(line, offset, mode=:asm)
 		return if not line
 		word = line[0...offset].to_s[/\w*$/] << line[offset..-1].to_s[/^\w*/]
 		word = nil if word == ''
-		@hl_word = word if @hl_word != word
+		if @hl_word != word
+			if word
+				if mode == :asm and defined?(@dasm) and @dasm
+					re = @dasm.gui_hilight_word_regexp(word)
+				else
+					re = Regexp.escape(word)
+				end
+				@hl_word_re = /^(.*?)(\b(?:#{re})\b)/
+			end
+			@hl_word = word
+		end
 	end
 
 	def set_caret_from_click(x, y)
@@ -1737,7 +1791,15 @@ end
 class DrawableWidget < WinWidget
 	include TextWidget
 
-	attr_accessor :buttons
+	BasicColor = {	:white => 'fff', :palegrey => 'ddd', :black => '000', :grey => '444',
+			:red => 'f44', :darkred => '800', :palered => 'faa',
+			:green => '4f4', :darkgreen => '080', :palegreen => 'afa',
+			:blue => '44f', :darkblue => '008', :paleblue => 'aaf',
+			:yellow => 'ff4', :darkyellow => '440', :paleyellow => 'ffa',
+			:orange => 'fc8',
+	}
+	attr_accessor :buttons, :parent_widget
+	attr_accessor :default_color_association
 
 	def initialize(*a, &b)
 		@color = {}
@@ -1754,12 +1816,7 @@ class DrawableWidget < WinWidget
 	end
 
 	def initialize_visible_
-		{ :white => 'fff', :palegrey => 'ddd', :black => '000', :grey => '444',
-			:red => 'f00', :darkred => '800', :palered => 'fcc',
-			:green => '0f0', :darkgreen => '080', :palegreen => 'cfc',
-			:blue => '00f', :darkblue => '008', :paleblue => 'ccf',
-			:yellow => 'ff0', :darkyellow => '440', :paleyellow => 'ffc',
-		}.each { |tag, val|
+		BasicColor.each { |tag, val|
 			@color[tag] = color(val)
 		}
 		@color[:winbg] = Win32Gui.getsyscolor(Win32Gui::COLOR_BTNFACE)
@@ -1768,11 +1825,24 @@ class DrawableWidget < WinWidget
 		initialize_visible if respond_to? :initialize_visible
 	end
 
-	def set_color_association(h)
-		h.each { |k, v| @color[k] = color(v) }
+	def set_color_association(hash)
+		hord = Hash.new { |h, k| h[k] = (hash[k] ? h[hash[k]] + 1 : 0) }
+		hash.sort_by { |k, v| hord[k] }.each { |k, v| @color[k] = color(v) }
 		gui_update
 	end
 
+	def new_menu
+		toplevel.new_menu
+	end
+
+	def addsubmenu(*a, &b)
+		toplevel.addsubmenu(*a, &b)
+	end
+
+	def popupmenu(m, x, y)
+		toplevel.popupmenu(m, (x+@x).to_i, (y+@y).to_i)
+	end
+
 	def paint_(realhdc)
 		@hdc = Win32Gui.createcompatibledc(realhdc)
 		bmp = Win32Gui.createcompatiblebitmap(realhdc, @width, @height)
@@ -1813,7 +1883,7 @@ class DrawableWidget < WinWidget
 	end
 
 	def color(col)
-		@color[col] ||= col.sub(/^(\w)(\w)(\w)$/, '\\3\\3\\2\\2\\1\\1').to_i(16)
+		@color[col] ||= col.sub(/^(\w\w)(\w\w)(\w\w)$/, '\\3\\2\\1').sub(/^(\w)(\w)(\w)$/, '\\3\\3\\2\\2\\1\\1').to_i(16)
 	end
 
 	def draw_color(col)
@@ -1853,6 +1923,23 @@ class DrawableWidget < WinWidget
 		draw_string(x, y, text)
 	end
 
+	# same as draw_string_color + hilight @hl_word_re
+	def draw_string_hl(col, x, y, str)
+		if @hl_word
+			while str =~ @hl_word_re
+				s1, s2 = $1, $2
+				draw_string_color(col, x, y, s1)
+				x += s1.length*@font_width
+				hl_w = s2.length*@font_width
+				draw_rectangle_color(:hl_word_bg, x, y, hl_w, @font_height)
+				draw_string_color(:hl_word, x, y, s2)
+				x += hl_w
+				str = str[s1.length+s2.length..-1]
+			end
+		end
+		draw_string_color(col, x, y, str)
+	end
+
 	def keyboard_state(query=nil)
 		case query
 		when :control, :ctrl
@@ -1952,10 +2039,10 @@ class Window
 				:style => Win32Gui::CS_DBLCLKS,
 				:hcursor => Win32Gui.loadcursora(0, Win32Gui::IDC_ARROW),
 				:lpszclassname => cname,
-  				:lpfnwndproc => Win32Gui.callback_alloc_c('__stdcall int wndproc(int, int, int, int)') { |hwnd, msg, wp, lp| windowproc(hwnd, msg, wp, lp) }
+				:lpfnwndproc => Win32Gui.callback_alloc_c('__stdcall int wndproc(int, int, int, int)') { |hwnd, msg, wp, lp| windowproc(hwnd, msg, wp, lp) }
 
 		Win32Gui.registerclassexa(cls)
-		
+
 		@hwnd = Win32Gui.createwindowexa(win32styleex, cname, 'win32gui window', win32style, Win32Gui::CW_USEDEFAULT, Win32Gui::SW_HIDE, Win32Gui::CW_USEDEFAULT, 0, 0, 0, 0, 0)
 
 		initialize_window(*a, &b)
@@ -1997,7 +2084,8 @@ class Window
 		h.update v => {
 			:prior => :pgup, :next => :pgdown,
 			:escape => :esc, :return => :enter,
-			:back => :backspace,
+			:back => :backspace, :apps => :popupmenu,
+			:add => ?+, :subtract => ?-, :multiply => ?*, :divide => ?/,
 		}.fetch(key, key)
 	}
 
@@ -2053,7 +2141,9 @@ class Window
 		when Win32Gui::WM_KEYDOWN, Win32Gui::WM_SYSKEYDOWN
 			# SYSKEYDOWN for f10 (default = activate the menu bar)
 			if key = Keyboard_trad[wparam]
-				if keyboard_state(:control)
+				if [?+, ?-, ?/, ?*].include?(key)
+					# keypad keys generate wm_keydown + wm_char, ignore this one
+				elsif keyboard_state(:control)
 					@widget.keypress_ctrl_(key) if @widget
 				else
 					@widget.keypress_(key) if @widget
@@ -2064,15 +2154,15 @@ class Window
 			if keyboard_state(:control) and not keyboard_state(:alt)	# altgr+[ returns CTRL on..
 				if ?a.kind_of?(String)
 					wparam += (keyboard_state(:shift) ? ?A.ord : ?a.ord) - 1 if wparam < 0x1a
-					k = wparam.chr
+					key = wparam.chr
 				else
 					wparam += (keyboard_state(:shift) ? ?A : ?a) - 1 if wparam < 0x1a
-					k = wparam
+					key = wparam
 				end
-				@widget.keypress_ctrl_(k) if @widget
+				@widget.keypress_ctrl_(key) if @widget
 			else
-				k = (?a.kind_of?(String) ? wparam.chr : wparam)
-				@widget.keypress_(k) if @widget
+				key = (?a.kind_of?(String) ? wparam.chr : wparam)
+				@widget.keypress_(key) if @widget
 			end
 		when Win32Gui::WM_DESTROY
 			destroy_window
@@ -2214,12 +2304,39 @@ class Window
 
 	# make the window's MenuBar reflect the content of @menu
 	def update_menu
+		unuse_menu(@menu)
 		Win32Gui.destroymenu(@menuhwnd) if @menuhwnd != 0
 		@menuhwnd = Win32Gui.createmenu()
 		@menu.each { |e| create_menu_item(@menuhwnd, e) }
 		Win32Gui.setmenu(@hwnd, @menuhwnd)
 	end
 
+	def popupmenu(m, x, y)
+		hm = Win32Gui.createpopupmenu()
+		m.each { |e| create_menu_item(hm, e) }
+		pt = Win32Gui.alloc_c_struct('POINT', :x => x, :y => y)
+		Win32Gui.clienttoscreen(@hwnd, pt)
+		id = Win32Gui.trackpopupmenu(hm, Win32Gui::TPM_NONOTIFY | Win32Gui::TPM_RETURNCMD, pt.x, pt.y, 0, @hwnd, 0)
+		if p = @control_action[id]
+			# TrackPopup returns before WM_COMMAND is delivered, so if we
+			# want to cleanup @control_action we must call it now & clenup
+			p.call
+		end
+		unuse_menu(m)
+		Win32Gui.destroymenu(hm)
+	end
+
+	def unuse_menu(m)
+		m.flatten.grep(Proc).reverse_each { |c|
+			if @control_action[@controlid-1] == c
+				@controlid -= 1		# recycle IDs
+				@control_action.delete @controlid
+			elsif i = @control_action.index(c)
+				@control_action.delete i
+			end
+		}
+	end
+
 	def create_menu_item(menu, entry)
 		args = entry.dup
 
@@ -2270,6 +2387,7 @@ class Window
 					checked = action.call(!checked)
 					Win32Gui.checkmenuitem(menu, id, (checked ? Win32Gui::MF_CHECKED : Win32Gui::MF_UNCHECKED))
 				}
+				entry << @control_action[id]	# allow deletion in unuse_menu
 			end
 			@controlid += 1
 		end
@@ -2329,7 +2447,7 @@ class OpenFile
 		buf = [0].pack('C')*512
 		ofn = Win32Gui.alloc_c_struct 'OPENFILENAMEA',
 			:lstructsize => :size,
-  			#:hwndowner => win.hwnd,	# 0 for nonmodal
+			#:hwndowner => win.hwnd,	# 0 for nonmodal
 			:lpstrfilter => "All Files\0*.*\0\0",
 			:lpstrfile => buf,
 			:lpstrtitle => title,
@@ -2369,6 +2487,10 @@ class IBoxWidget < DrawableWidget
 		@oldsel_x = @caret_x_select = 0
 		@caret_x = @curline.length
 		@caret_x_start = 0
+		@@history ||= {}
+		histkey = opts[:history] || label[0, 10]
+		@history = (@@history[histkey] ||= [])
+		@history_off = @history.length
 
 		add_button('Ok', :btnc1, :btnc2) { keypress(:enter) }
 		add_button('Cancel', :btnc1, :btnc2) { keypress(:esc) }
@@ -2505,7 +2627,19 @@ class IBoxWidget < DrawableWidget
 			end
 			@caret_x = @curline.length
 			update_caret
+		when :up, :down
+			if @history_off < @history.length or @curline.strip != @history.last
+				@history[@history_off] = @curline.strip
+			end
+			@history_off += (key == :up ? -1 : 1)
+			@history_off %= @history.length
+			@curline = @history[@history_off].to_s
+			@caret_x = @curline.length if @caret_x > @curline.length
+			redraw
 		when :enter
+			@history << @curline.strip
+			@history.pop if @history.last == ''
+			@history.pop if @history.last == @history[-2]
 			destroy
 			Gui.main_iter
 			protect { @action.call(@curline.strip) }
@@ -2588,7 +2722,7 @@ class IBoxWidget < DrawableWidget
 		elsif mouserelease_buttons(x, y)
 		end
 	end
-	
+
 	def update_caret
 		return if @oldcaret_x == @caret_x and @oldsel_x == @caret_x_select
 		redraw
@@ -2664,7 +2798,7 @@ class LBoxWidget < DrawableWidget
 	def initial_size
 		@colw = @colwmax.map { |w| (w+1) * @font_width }
 		allw = @colw.inject(0) { |a, i| a+i }
-		[[allw, 80*@font_width].min, [@list.length+1, 30].min * @font_height+2]
+		[[allw+@font_width, 80*@font_width].min, [@list.length+2, 30].min * @font_height+2]
 	end
 
 	def resized(w, h)
@@ -2699,7 +2833,11 @@ class LBoxWidget < DrawableWidget
 	def paint
 		@btnx = []
 		@btny = 0
-		@btnheight = @font_height * 4/3
+		if @btnheight != @font_height * 4/3
+			# fix vscrollbar height on w7
+			@btnheight = @font_height * 4/3
+			resized(width, height)
+		end
 		x = 0
 		@colw.each { |w|
 			@btnx << x
@@ -2817,7 +2955,6 @@ class LBoxWidget < DrawableWidget
 			vscroll((@linehead-off)*@font_height)
 			redraw
 		when :down
-			n = @lineshown-1
 			off = [@lineshown, [@lineshown/2, 5].max].min
 			vscroll((@linehead+off)*@font_height)
 			redraw
@@ -2907,7 +3044,7 @@ class LBoxWidget < DrawableWidget
 			redraw
 		end
 	end
-	
+
 	def destroy
 		@parent.destroy
 	end
@@ -2943,7 +3080,7 @@ end
 			Win32Gui.getscrollinfo(@hwnd, Win32Gui::SB_VERT, sif)
 			case wparam & 0xffff
 			when Win32Gui::SB_THUMBPOSITION; val = sif.ntrackpos
-			when Win32Gui::SB_THUMBTRACK; val = sif.ntrackpos; nopos = true
+			when Win32Gui::SB_THUMBTRACK; val = sif.ntrackpos #; nopos = true
 			when Win32Gui::SB_LINEDOWN; val = sif.npos + 1
 			when Win32Gui::SB_LINEUP;   val = sif.npos - 1
 			when Win32Gui::SB_PAGEDOWN; val = sif.npos + sif.npage