metasm 1.0.0 → 1.0.5

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

@@ -9,7 +9,7 @@ class AsmOpcodeWidget < DrawableWidget
 	attr_accessor :dasm
 	# nr of raw data bytes to display next to decoded instructions
 	attr_accessor :raw_data_length
-	
+
 	def initialize_widget(dasm, parent_widget)
 		@dasm = dasm
 		@parent_widget = parent_widget
@@ -22,9 +22,7 @@ class AsmOpcodeWidget < DrawableWidget
 		@view_max = @dasm.sections.map { |s, e| s + e.length }.max rescue nil
 		@view_addr = @dasm.prog_binding['entrypoint'] || @view_min || 0
 
-		@default_color_association = { :comment => :darkblue, :label => :darkgreen, :text => :black,
-			:instruction => :black, :address => :blue, :caret => :black, :raw_data => :black,
-			:background => :white, :cursorline_bg => :paleyellow, :hl_word => :palered }
+		@default_color_association = ColorTheme.merge :raw_data => :black
 	end
 
 	def resized(w, h)
@@ -124,19 +122,7 @@ class AsmOpcodeWidget < DrawableWidget
 		# must not include newline
 		render = lambda { |str, color|
 			fullstr << str
-			if @hl_word
-				stmp = str
-				pre_x = 0
-				while stmp =~ /^(.*?)(\b#{Regexp.escape @hl_word}\b)/
-					s1, s2 = $1, $2
-					pre_x += s1.length * @font_width
-					hl_x = s2.length * @font_width
-					draw_rectangle_color(:hl_word, x+pre_x, y, hl_x, @font_height)
-					pre_x += hl_x
-					stmp = stmp[s1.length+s2.length..-1]
-				end
-			end
-			draw_string_color(color, x, y, str)
+			draw_string_hl(color, x, y, str)
 			x += str.length * @font_width
 		}
 
@@ -154,7 +140,7 @@ class AsmOpcodeWidget < DrawableWidget
 
 		# draw text until screen is full
 		while y < height
-			if label = invb[curaddr]
+			if invb[curaddr]
 				nl[]
 				@dasm.label_alias[curaddr].to_a.each { |name|
 					render["#{name}:", :label]
@@ -251,7 +237,7 @@ class AsmOpcodeWidget < DrawableWidget
 	# redraws the caret, change the hilighted word, redraw if needed
 	def update_caret
 		if update_hl_word(@line_text[@caret_y], @caret_x) or @caret_y != @oldcaret_y
-			redraw 
+			redraw
 		elsif @oldcaret_x != @caret_x
 			invalidate_caret(@oldcaret_x, @oldcaret_y)
 			invalidate_caret(@caret_x, @caret_y)

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

@@ -30,7 +30,7 @@ class DbgWidget < ContainerVBoxWidget
 		oldcb = @code.bg_color_callback
 		@code.bg_color_callback = lambda { |a|
 			if a == @dbg.pc
-				'f88'
+				:red_bg
 				# TODO breakpoints & stuff
 			elsif oldcb; oldcb[a]
 			end
@@ -48,8 +48,8 @@ class DbgWidget < ContainerVBoxWidget
 
 		pc = @dbg.resolve_expr(@watchpoint[@code])
 		graph = :graph if @dbg.disassembler.function_blocks(pc).to_a.length < 100
-		@code.focus_addr(pc, graph)
-		@mem.focus_addr(0, :hex)
+		@code.focus_addr(pc, graph, true)
+		@mem.focus_addr(0, :hex, true)
 	end
 
 	def swapin_tid
@@ -98,10 +98,16 @@ class DbgWidget < ContainerVBoxWidget
 
 	# TODO check_target always, incl when :stopped
 	def post_dbg_run
+		# focus currently stopped threads
+		if @dbg.state == :running and tt = @dbg.tid_stuff.find { |tid, tstuff| tstuff[:state] != :running }
+			@dbg.tid = tt[0]
+		end
+
 		want_redraw = true
 		return if @idle_checking ||= nil	# load only one bg proc
 		@idle_checking = true
 		Gui.idle_add {
+		    protect {
 			@dbg.check_target
 			if @dbg.state == :running
 				redraw if want_redraw	# redraw once if the target is running (less flicker with singlestep)
@@ -113,7 +119,7 @@ class DbgWidget < ContainerVBoxWidget
 			@dbg.dasm_invalidate
 			@mem.gui_update
 			@dbg.disassembler.sections.clear if @dbg.state == :dead
-			@dbg.disassembler.disassemble_fast(@dbg.pc)
+			@dbg.disassembler.disassemble_fast(@dbg.pc) if not @dbg.disassembler.di_at(@dbg.pc)
 			@children.each { |c|
 				if wp = @watchpoint[c]
 					c.focus_addr @dbg.resolve_expr(wp), nil, true
@@ -121,6 +127,7 @@ class DbgWidget < ContainerVBoxWidget
 			}
 			redraw
 			false
+		    }
 		}
 	end
 
@@ -147,7 +154,7 @@ class DbgWidget < ContainerVBoxWidget
 		@children.each { |c| c.gui_update }
 	end
 
-	def prompt_attach(caption='chose target')
+	def prompt_attach(caption='choose target')
 		l = nil
 		i = inputbox(caption) { |name|
 			i = nil ; l.destroy if l and not l.destroyed?
@@ -166,7 +173,10 @@ class DbgWidget < ContainerVBoxWidget
 				l = listwindow('running processes', list,
 					       :noshow => true,
 					       :color_callback => lambda { |le| [:grey, :palegrey] if le[0] == me }
-					      ) { |e| i.text = e[0] }
+					      ) { |e|
+						      i.text = e[0]
+						      i.keypress(:enter) if l.destroyed?
+					      }
 					      l.x += l.width
 					      l.show
 					      false
@@ -174,7 +184,7 @@ class DbgWidget < ContainerVBoxWidget
 		} if not list_pr.empty?
 	end
 
-	def prompt_createprocess(caption='chose path')
+	def prompt_createprocess(caption='choose path')
 		openfile(caption) { |path|
 			path = '"' + path + '"' if @dbg.shortname == 'windbg' and path =~ /\s/
 			inputbox('target args?', :text => path) { |pa|
@@ -198,10 +208,28 @@ class DbgWidget < ContainerVBoxWidget
 		case f
 		when /\.(c|h|cpp)$/; @dbg.disassembler.parse_c_file(f)
 		when /\.map$/; @dbg.load_map(f)
-		when /\.rb$/; @dbg.load_plugin(f)
+		when /\.rb$/; @dbg.load_plugin(f) ; @console.add_log "loaded plugin #{File.basename(f, '.rb')}"
 		else messagebox("unsupported file extension #{f}")
 		end
 	end
+
+	def extend_contextmenu(tg, menu, addr=nil)
+		if addr
+			bm = tg.new_menu
+			bl = @dbg.all_breakpoints(addr)
+			if not bl.empty?
+				tg.addsubmenu(bm, '_clear breakpoint') { bl.each { |b| @dbg.del_bp(b) } }
+			end
+			tg.addsubmenu(bm, '_go here') { @dbg.bpx(addr, true) ; dbg_continue }
+			tg.addsubmenu(bm, '_bpx') { @dbg.bpx(addr) }
+			tg.addsubmenu(bm, 'bpm _read') { @dbg.hwbp(addr, :r, 1) }
+			tg.addsubmenu(bm, 'bpm _write') { @dbg.hwbp(addr, :w, 1) }
+			tg.addsubmenu(menu, '_bp', bm)
+		end
+		if @parent_widget.respond_to?(:extend_contextmenu)
+			@parent_widget.extend_contextmenu(tg, menu, addr)
+		end
+	end
 end
 
 
@@ -221,10 +249,9 @@ class DbgRegWidget < DrawableWidget
 		swapin_tid
 
 		@reg_pos = []	# list of x y w h vx of the reg drawing on widget, vx is x of value
-	
-		@default_color_association = { :label => :black, :data => :blue, :write_pending => :darkred,
-				       	:changed => :darkgreen, :caret => :black, :background => :white,
-					:inactive => :palegrey }
+
+		@default_color_association = ColorTheme.merge :label => :text, :data => :blue, :write_pending => :darkred,
+				:changed => :darkgreen, :caret => :text, :inactive => :palegrey
 	end
 
 	def swapin_tid
@@ -262,7 +289,6 @@ class DbgRegWidget < DrawableWidget
 	end
 
 	def paint
-		curaddr = 0
 		x = 1
 		y = 0
 
@@ -287,7 +313,11 @@ class DbgRegWidget < DrawableWidget
 			render["#{reg}=".ljust(regstrlen), :label]
 			v = @write_pending[reg] || @reg_cache[reg]
 			col = running ? :inactive : @write_pending[reg] ? :write_pending : @reg_cache_old.fetch(reg, v) != v ? :changed : :data
-			render["%0#{@register_size[reg]}x " % v, col]
+			if v.kind_of?(::Integer)
+				render["%0#{@register_size[reg]}x " % v, col]
+			else
+				render[v.to_s, col]
+			end
 			x += @font_width	# space
 		}
 
@@ -384,8 +414,8 @@ class DbgRegWidget < DrawableWidget
 				case v = key
 				when ?\x20; v = nil
 				when ?0..?9; v -= ?0
-				when ?a..?f; v -= ?a-10
-				when ?A..?F; v -= ?A-10
+				when ?a..?f; v -= ?a - 10
+				when ?A..?F; v -= ?A - 10
 				else return false
 				end
 			end
@@ -402,7 +432,7 @@ class DbgRegWidget < DrawableWidget
 				@write_pending[reg] = v
 				rsz = 1
 			end
-			
+
 			if rsz == 1
 				@caret_reg += 1
 				@caret_reg = @registers.length if @caret_reg >= @registers.length + @flags.length
@@ -472,8 +502,8 @@ class DbgConsoleWidget < DrawableWidget
 
 		@dbg.set_log_proc { |l| add_log l }
 
-		@default_color_association = { :log => :palegrey, :curline => :white, :caret => :yellow,
-			:background => :black, :status => :black, :status_bg => '088' }
+		@default_color_association = ColorTheme.merge :log => :palegrey, :curline => :white, :caret => :yellow,
+			:background => :black, :status => :black, :status_bg => '088'
 
 		init_commands
 	end
@@ -513,6 +543,21 @@ class DbgConsoleWidget < DrawableWidget
 		clipboard_copy(txt)
 	end
 
+	# copy/paste word under cursor (paste when on last line)
+	def rightclick(x, y)
+		y -= height % @font_height
+		y = y.to_i / @font_height
+		hc = height / @font_height
+		x /= @font_width
+		if y >= hc - 2
+			keypress_ctrl ?v
+		else
+			txt = @log.reverse[@log_offset + hc - y - 3].to_s
+			word = txt[0...x].to_s[/\w*$/] << txt[x..-1].to_s[/^\w*/]
+			clipboard_copy(word)
+		end
+	end
+
 	def mouse_wheel(dir, x, y)
 		case dir
 		when :up; @log_offset += 3
@@ -531,12 +576,12 @@ class DbgConsoleWidget < DrawableWidget
 
 		w_w = width
 
-	       	y -= @font_height
+		y -= @font_height
 		draw_rectangle_color(:status_bg, 0, y, w_w, @font_height)
 		str = "#{@dbg.pid}:#{@dbg.tid} #{@dbg.state} #{@dbg.info}"
 		draw_string_color(:status, w_w-str.length*@font_width-1, y, str)
 		draw_string_color(:status, 1+@font_width, y, @statusline)
-	       	y -= @font_height
+		y -= @font_height
 
 		w_w_c = w_w/@font_width
 		@caret_y = y
@@ -744,7 +789,7 @@ class DbgConsoleWidget < DrawableWidget
 	def cmd_dd(addr, dlen=nil, len=nil)
 		if addr.kind_of? String
 			s = addr.strip
-			addr = solve_expr!(s)
+			addr = solve_expr!(s) || @parent_widget.mem.curaddr
 			if not s.empty?
 				s = s[1..-1] if s[0] == ?,
 				len ||= solve_expr(s)
@@ -757,7 +802,7 @@ class DbgConsoleWidget < DrawableWidget
 				le = (@dbg.cpu.endianness == :little)
 				data = '' if @dbg.memory.page_invalid?(addr)
 				case dlen
-				when nil; add_log "#{Expression[addr]}  #{data.unpack('C*').map { |c| '%02X' % c }.join(' ').ljust(2*16+15)}  #{data.tr("\0-\x1f\x7f-\xff", '.')}"
+				when nil; add_log "#{Expression[addr]}  #{data.unpack('C*').map { |c| '%02X' % c }.join(' ').ljust(2*16+15)}  #{data.tr("^\x20-\x7e", '.')}"
 				when 1;   add_log "#{Expression[addr]}  #{data.unpack('C*').map { |c| '%02X' % c }.join(' ')}"
 				when 2;   add_log "#{Expression[addr]}  #{data.unpack(le ? 'v*' : 'n*').map { |c| '%04X' % c }.join(' ')}"
 				when 4;   add_log "#{Expression[addr]}  #{data.unpack(le ? 'V*' : 'N*').map { |c| '%08X' % c }.join(' ')}"
@@ -767,8 +812,12 @@ class DbgConsoleWidget < DrawableWidget
 				len -= 16
 			end
 		else
-			@parent_widget.mem.view(:hex).data_size = dlen if dlen
-			@parent_widget.mem.focus_addr(solve_expr(addr)) if addr and addr != ''
+			if dlen
+				@parent_widget.mem.view(:hex).data_size = dlen
+				@parent_widget.mem.view(:hex).resized
+				@parent_widget.mem.showview(:hex)
+			end
+			@parent_widget.mem.focus_addr(solve_expr(addr))
 			@parent_widget.mem.gui_update
 		end
 	end
@@ -783,6 +832,18 @@ class DbgConsoleWidget < DrawableWidget
 		new_command('dw', 'dump/focus words in data window')  { |arg| cmd_dd(arg, 2) }
 		new_command('dd', 'dump/focus dwords in data window') { |arg| cmd_dd(arg, 4) }
 		new_command('dq', 'dump/focus qwords in data window') { |arg| cmd_dd(arg, 8) }
+		new_command('dc', 'focus C struct in data window: <name> <addr>') { |arg|
+			name, addr = arg.strip.split(/\s+/, 2)
+			addr = (addr ? solve_expr(addr) : @parent_widget.mem.curaddr)
+			@parent_widget.mem.focus_addr(addr, :cstruct, false, name)
+		}
+		new_command('dC', 'dump C struct: dC <name> <addr>') { |arg|
+			name, addr = arg.strip.split(/\s+/, 2)
+			addr = (addr ? solve_expr(addr) : @parent_widget.mem.curaddr)
+			if st = @dbg.disassembler.c_parser.decode_c_struct(name, @dbg.memory, addr)
+				add_log st.to_s.gsub("\t", '  ')
+			end
+		}
 		new_command('u', 'focus code window on an address') { |arg| p.code.focus_addr(solve_expr(arg)) }
 		new_command('.', 'focus code window on current address') { p.code.focus_addr(solve_expr(@dbg.register_pc.to_s)) }
 		new_command('wc', 'set code window height') { |arg|
@@ -828,12 +889,14 @@ class DbgConsoleWidget < DrawableWidget
 			cb = lambda { a.split(';').each { |aaa| run_command(aaa) } } if a
 			@dbg.bpx(solve_expr(e), o, cd, &cb)
 		}
-		new_command('hwbp', 'set a hardware breakpoint') { |arg|
-			arg =~ /^(.*?)(?: if (.*?))?(?: do (.*?))?(?: if (.*?))?$/i
-			e, c, a = $1, ($2 || $4), $3
+		new_command('hwbp', 'set a hardware breakpoint (hwbp 0x2345 w)') { |arg|
+			arg =~ /^(.*?)( once)?( [rwx])?(?: if (.*?))?(?: do (.*?))?(?: if (.*?))?$/i
+			e, o, t, c, a = $1, $2, $3, ($4 || $6), $5
+			o = o ? true : false
+			t = (t || 'x').strip.to_sym
 			cd = parse_expr(c) if c
 			cb = lambda { a.split(';').each { |aaa| run_command(aaa) } } if a
-			@dbg.hwbp(solve_expr(e), :x, 1, false, cd, &cb)
+			@dbg.hwbp(solve_expr(e), t, 1, o, cd, &cb)
 		}
 		new_command('bpm', 'set a hardware memory breakpoint: bpm r 0x4800ff 16') { |arg|
 			arg =~ /^(.*?)(?: if (.*?))?(?: do (.*?))?(?: if (.*?))?$/i
@@ -846,7 +909,7 @@ class DbgConsoleWidget < DrawableWidget
 			exp = solve_expr!(e)
 			len = solve_expr(e) if e != ''
 			len ||= 1
-			@dbg.hwbp(exp, mode, len, false, cd, &cb)
+			@dbg.bpm(exp, mode, len, false, cd, &cb)
 		}
 		new_command('g', 'wait until target reaches the specified address') { |arg|
 			arg =~ /^(.*?)(?: if (.*?))?(?: do (.*?))?(?: if (.*?))?$/i
@@ -915,7 +978,11 @@ class DbgConsoleWidget < DrawableWidget
 		}
 		new_command('?', 'display a value') { |arg|
 			next if not v = solve_expr(arg)
-			add_log "#{v} 0x#{v.to_s(16)} #{[v & 0xffff_ffff].pack('L').inspect} #{@dbg.addrname!(v)}"
+			if v.kind_of?(Expression)
+				add_log "#{v}"
+			else
+				add_log "#{v} 0x#{v.to_s(16)} #{[v & 0xffff_ffff].pack('L').inspect} #{@dbg.addrname!(v)}"
+			end
 		}
 		new_command('exit', 'quit', 'quit the debugger interface') { p.win.destroy }
 		new_command('ruby', 'execute arbitrary ruby code') { |arg|
@@ -1038,7 +1105,7 @@ class DbgConsoleWidget < DrawableWidget
 				add_log "#{t} #{stf[:state]} #{stf[:info]}"
 			}
 		}
-		
+
 		new_command('pid', 'select a pid') { |arg|
 			if pid = solve_expr(arg)
 				@dbg.pid = pid
@@ -1072,7 +1139,7 @@ class DbgConsoleWidget < DrawableWidget
 			@dbg.ignore_newthread = false
 			@dbg.ignore_endthread = false
 		}
-		new_command('thread_event_ignore', 'ignore thread creation/termination') {
+		new_command('thread_events_ignore', 'ignore thread creation/termination') {
 			@dbg.ignore_newthread = true
 			@dbg.ignore_endthread = true
 		}
@@ -1101,6 +1168,12 @@ class DbgConsoleWidget < DrawableWidget
 			@dbg.create_process(arg)
 		}
 
+		new_command('plugin', 'load', 'load a debugger plugin') { |arg|
+			@dbg.load_plugin arg
+			add_log "loaded plugin #{File.basename(arg, '.rb')}"
+		}
+
+
 		@dbg.ui_command_setup(self) if @dbg.respond_to? :ui_command_setup
 	end
 
@@ -1122,12 +1195,13 @@ class DbgConsoleWidget < DrawableWidget
 	end
 
 	def run_command(cmd)
+		cmd = cmd.sub(/^\s+/, '')
 		cn = cmd.split.first
 		if not @commands[cn]
 			a = @commands.keys.find_all { |k| k[0, cn.length] == cn }
 			cn = a.first if a.length == 1
 		end
-		if pc = @commands[cn] 
+		if pc = @commands[cn]
 			pc[cmd.split(/\s+/, 2)[1].to_s]
 		else
 			add_log 'unknown command'
@@ -1166,6 +1240,7 @@ end
 class DbgWindow < Window
 	attr_accessor :dbg_widget
 	def initialize_window(dbg = nil, title='metasm debugger')
+		dbg, title = title, dbg if dbg.kind_of?(::String) or title.kind_of?(Debugger)
 		self.title = title
 		display(dbg) if dbg
 	end

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

@@ -45,7 +45,7 @@ module Msgbox
 		InputBox.new(toplevel, *a) { |*ya| protect { yield(*ya) } }
 	end
 
-	# asks to chose a file to open, yields filename
+	# asks to choose a file to open, yields filename
 	# args: title, :path => path
 	def openfile(*a)
 		OpenFile.new(toplevel, *a) { |*ya| protect { yield(*ya) } }
@@ -128,13 +128,18 @@ class ContainerVBoxWidget < Gtk::VBox
 	def resize_child(cld, w, h)
 		pk = query_child_packing(cld)
 		if h <= 0
-			pk[0] = true
+			if pk[0] != true
+				pk[0] = true
+				set_child_packing(cld, *pk)
+			end
 			h = 1
 		else
-			pk[0] = false
+			if pk[0] == true
+				pk[0] = false
+				set_child_packing(cld, *pk)
+			end
 		end
 		return if h == cld.allocation.height
-		set_child_packing(cld, *pk)
 		cld.set_height_request(h)
 	end
 
@@ -145,7 +150,7 @@ end
 class DrawableWidget < Gtk::DrawingArea
 	include Msgbox
 
-	attr_accessor :parent_widget, :caret_x, :caret_y, :hl_word
+	attr_accessor :parent_widget, :caret_x, :caret_y, :hl_word, :hl_word_re
 	# this hash is used to determine the colors of the Gui elements (background, caret, ...)
 	# modifications to it are only useful before the widget is first rendered (IE before Gui.main)
 	attr_accessor :default_color_association
@@ -153,7 +158,7 @@ class DrawableWidget < Gtk::DrawingArea
 	# keypress event keyval traduction table
 	Keyboard_trad = Gdk::Keyval.constants.grep(/^GDK_/).inject({}) { |h, cst|
 		v = Gdk::Keyval.const_get(cst)
-		key = cst.to_s.sub(/^GDK_/, '').sub(/^KP_/, '')
+		key = cst.to_s.sub(/^GDK_/, '').sub(/^KEY_/, '').sub(/^KP_/, '')
 		if key.length == 1
 			key = key[0]	# ?a, ?b etc
 		else
@@ -161,7 +166,7 @@ class DrawableWidget < Gtk::DrawingArea
 			key = {
 			:page_up => :pgup, :page_down => :pgdown, :next => :pgdown,
 			:escape => :esc, :return => :enter, :l1 => :f11, :l2 => :f12,
-			:prior => :pgup,
+			:prior => :pgup, :menu => :popupmenu,
 
 			:space => ?\ ,
 			:asciitilde => ?~, :quoteleft => ?`,
@@ -189,6 +194,15 @@ class DrawableWidget < Gtk::DrawingArea
 		h.update v => key
 	}
 
+	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',
+
+	}
+
 	def initialize(*a, &b)
 		@parent_widget = nil
 
@@ -226,7 +240,6 @@ class DrawableWidget < Gtk::DrawingArea
 				grab_focus
 				case ev.button
 				when 1; protect { click(ev.x, ev.y) } if respond_to? :click
-				when 3; protect { rightclick(ev.x, ev.y) } if respond_to? :rightclick
 				end
 			when Gdk::Event::Type::BUTTON2_PRESS
 				case ev.button
@@ -245,8 +258,11 @@ class DrawableWidget < Gtk::DrawingArea
 		} if respond_to? :mousemove
 
 		signal_connect('button_release_event') { |w, ev|
-			protect { mouserelease(ev.x, ev.y) } if ev.button == 1
-		} if respond_to? :mouserelease
+			case ev.button
+			when 1; protect { mouserelease(ev.x, ev.y) } if respond_to? :mouserelease
+			when 3; protect { rightclick(ev.x, ev.y) } if respond_to? :rightclick
+			end
+		}
 
 		signal_connect('scroll_event') { |w, ev|
 			dir = case ev.direction
@@ -273,12 +289,7 @@ class DrawableWidget < Gtk::DrawingArea
 		}
 
 		signal_connect('realize') {
-			{ :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)
 			}
 
@@ -302,7 +313,11 @@ class DrawableWidget < Gtk::DrawingArea
 	# create a color from a 'rgb' description
 	def color(val)
 		if not @color[val]
-			@color[val] = Gdk::Color.new(*val.unpack('CCC').map { |c| (c.chr*4).hex })
+			v = case val.length
+			when 3; val.scan(/./).map { |c| (c*4).to_i(16) }
+			when 6; val.scan(/../).map { |c| (c+c).to_i(16) }
+			end
+			@color[val] = Gdk::Color.new(*v)
 			window.colormap.alloc_color(@color[val], true, true)
 		end
 		@color[val]
@@ -325,20 +340,48 @@ class DrawableWidget < Gtk::DrawingArea
 
 	# change the color association
 	# arg is a hash function symbol => color symbol
-	# color must be allocated
 	# check #initialize/sig('realize') for initial function/color list
+	# if called before the widget is first displayed onscreen, will register a hook to re-call itself later
 	def set_color_association(hash)
-		hash.each { |k, v| @color[k] = color(v) }
-		modify_bg Gtk::STATE_NORMAL, @color[:background]
-		gui_update
+		if not realized?
+			sid = signal_connect('realize') {
+				signal_handler_disconnect(sid)
+				set_color_association(hash)
+			}
+		else
+			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) }
+			modify_bg Gtk::STATE_NORMAL, @color[:background]
+			gui_update
+		end
+	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+allocation.x).to_i, (y+allocation.y).to_i)
 	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
 
 	def paint
@@ -385,6 +428,20 @@ class DrawableWidget < Gtk::DrawingArea
 	end
 
 	def draw_rectangle(x, y, w, h)
+		# GTK clips coords around 0x8000
+		return if x > 0x7000 or y > 0x7000
+		if x < -0x7000
+			w += x + 100
+			x = -100
+		end
+		if y < -0x7000
+			h += y + 100
+			y = -100
+		end
+		return if w <= 0 or h <= 0
+		w = 0x7000 if w > 0x7000
+		h = 0x7000 if h > 0x7000
+
 		@w.draw_rectangle(@gc, true, x, y, w, h)
 	end
 
@@ -394,6 +451,29 @@ class DrawableWidget < Gtk::DrawingArea
 	end
 
 	def draw_line(x, y, ex, ey)
+		if x.abs > 0x7000
+			return if ex.abs > 0x7000 and ((ex < 0) == (x < 0))
+			ox = x
+			x = ((x > 0) ? 0x7000 : -0x7000)
+			y = ey+(x-ex)*(y-ey)/(ox-ex)
+		end
+		if ex.abs > 0x7000
+			oex = ex
+			ex = ((ex > 0) ? 0x7000 : -0x7000)
+			ey = y+(ex-x)*(ey-y)/(oex-x)
+		end
+		if y.abs > 0x7000
+			return if ey.abs > 0x7000 and ((ey < 0) == (y < 0))
+			oy = y
+			y = ((y > 0) ? 0x7000 : -0x7000)
+			x = ex+(y-ey)*(x-ex)/(oy-ey)
+		end
+		if ey.abs > 0x7000
+			oey = ey
+			ey = ((ey > 0) ? 0x7000 : -0x7000)
+			ex = x+(ey-y)*(ex-x)/(oey-y)
+		end
+
 		@w.draw_line(@gc, x, y, ex, ey)
 	end
 
@@ -403,6 +483,7 @@ class DrawableWidget < Gtk::DrawingArea
 	end
 
 	def draw_string(x, y, str)
+		return if x.abs > 0x7000 or y.abs > 0x7000
 		@layout.text = str
 		@w.draw_layout(@gc, x, y, @layout)
 	end
@@ -412,6 +493,23 @@ class DrawableWidget < Gtk::DrawingArea
 		draw_string(x, y, str)
 	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 clipboard_copy(buf)
 		clipboard = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
 		clipboard.text = buf
@@ -477,15 +575,38 @@ class InputBox < Gtk::Dialog
 		@textwidget  = Gtk::TextView.new
 		if opts[:text]
 			@textwidget.buffer.text = opts[:text].to_s
-			@textwidget.buffer.move_mark('selection_bound', @textwidget.buffer.start_iter)
-			@textwidget.buffer.move_mark('insert', @textwidget.buffer.end_iter)
+			text_select_all
 		end
 
+		@@history ||= {}
+		histkey = opts[:history] || str[0, 10]
+		@history = (@@history[histkey] ||= [])
+		@history_off = @history.length
+
 		@textwidget.signal_connect('key_press_event') { |w, ev|
 			key = DrawableWidget::Keyboard_trad[ev.keyval]
 			case key
-			when :escape; response(RESPONSE_REJECT) ; true
-			when :enter; response(RESPONSE_ACCEPT) ; true
+			when :escape
+				@history_off = @history.length
+				response(RESPONSE_REJECT)
+				true
+			when :enter
+				@history.pop if @history.last == ''
+				@history << @textwidget.buffer.text.to_s
+				@history.pop if @history.last == ''
+				@history.pop if @history.last == @history[-2]
+				@history_off = @history.length
+				response(RESPONSE_ACCEPT)
+				true
+			when :up, :down
+				txt = @textwidget.buffer.text.to_s
+				if (@history_off < @history.length or @history.last != txt)
+					@history[@history_off] = txt
+				end
+				@history_off += (key == :up ? -1 : 1)
+				@history_off %= (@history.length > 0 ? @history.length : 1)
+				@textwidget.buffer.text = @history[@history_off].to_s
+				text_select_all
 			end
 		}
 
@@ -502,9 +623,9 @@ class InputBox < Gtk::Dialog
 		Gtk::Drag.dest_set(self,
 				   Gtk::Drag::DEST_DEFAULT_MOTION |
 				   Gtk::Drag::DEST_DEFAULT_DROP,
-   				   [['text/plain', 0, 0], ['text/uri-list', 0, 0]],
+				   [['text/plain', 0, 0], ['text/uri-list', 0, 0]],
 				   Gdk::DragContext::ACTION_COPY | Gdk::DragContext::ACTION_MOVE)
-		
+
 		signal_connect('drag_data_received') { |w, dc, x, y, data, info, time|
 			dc.targets.each { |target|
 				next if target.name != 'text/plain' and target.name != 'text/uri-list'
@@ -521,6 +642,11 @@ class InputBox < Gtk::Dialog
 		present
 	end
 
+	def text_select_all
+		@textwidget.buffer.move_mark('selection_bound', @textwidget.buffer.start_iter)
+		@textwidget.buffer.move_mark('insert', @textwidget.buffer.end_iter)
+	end
+
 	def text ; @textwidget.buffer.text ; end
 	def text=(nt) ; @textwidget.buffer.text = nt ; end
 end
@@ -604,7 +730,7 @@ class ListWindow < Gtk::Dialog
 			tvc = Gtk::TreeViewColumn.new(col, crt)
 			tvc.sort_column_id = i
 			tvc.set_cell_data_func(crt) { |_tvc, _crt, model, iter|
-			       	_crt.text = iter[i]
+				_crt.text = iter[i]
 				if @color_callback
 					fu = (0...cols.length).map { |ii| iter[ii] }
 					fg, bg = @color_callback[fu]
@@ -635,7 +761,7 @@ class ListWindow < Gtk::Dialog
 
 		remove vbox
 		add Gtk::ScrolledWindow.new.add(treeview)
-		toplevel.set_default_size cols.length*120, 400
+		toplevel.set_default_size cols.length*240, 400
 
 		show if not h[:noshow]
 
@@ -666,6 +792,7 @@ class Window < Gtk::Window
 		@menubar = Gtk::MenuBar.new
 		@accel_group = Gtk::AccelGroup.new
 
+		set_gravity Gdk::Window::GRAVITY_STATIC
 		@vbox.add @menubar, 'expand' => false
 		@child = nil
 		s = Gdk::Screen.default
@@ -678,14 +805,13 @@ class Window < Gtk::Window
 		initialize_window(*a, &b)
 		build_menu
 		update_menu
-		
-		
+
 		Gtk::Drag.dest_set(self,
 				   Gtk::Drag::DEST_DEFAULT_MOTION |
 				   Gtk::Drag::DEST_DEFAULT_DROP,
-   				   [['text/plain', 0, 0], ['text/uri-list', 0, 0]],
+				   [['text/plain', 0, 0], ['text/uri-list', 0, 0]],
 				   Gdk::DragContext::ACTION_COPY | Gdk::DragContext::ACTION_MOVE)
-		
+
 		signal_connect('drag_data_received') { |w, dc, x, y, data, info, time|
 			dc.targets.each { |target|
 				next if target.name != 'text/plain' and target.name != 'text/uri-list'
@@ -734,6 +860,13 @@ class Window < Gtk::Window
 		l.grep(::Array).first if l
 	end
 
+	def popupmenu(m, x, y)
+		mh = Gtk::Menu.new
+		m.each { |e| create_menu_item(mh, e) }
+		mh.show_all
+		mh.popup(nil, nil, 2, 0) { |_m, _x, _y, _p| [position[0]+x, position[1]+y, true] }
+	end
+
 	# append stuff to a menu
 	# arglist:
 	# empty = menu separator
@@ -801,13 +934,10 @@ class Window < Gtk::Window
 			key = accel[-1]
 			if key == ?>
 				key = accel[/<(.*)>/, 1]
-				key = case key
-				when 'enter'; Gdk::Keyval::GDK_Return
-				when 'esc'; Gdk::Keyval::GDK_Escape
-				when 'tab'; Gdk::Keyval::GDK_Tab
-				when /^f(\d\d?)$/i; Gdk::Keyval.const_get("GDK_#{key.upcase}")
-				else ??
-				end
+				key = DrawableWidget::Keyboard_trad.index(case key
+				  when 'enter', 'esc', 'tab', /^f(\d\d?)$/i; key.downcase.to_sym
+				  else ??
+				  end)
 			end
 			key = key.unpack('C')[0] if key.kind_of? String	# yay rb19
 			item.add_accelerator('activate', @accel_group, key, (accel[0] == ?^ ? Gdk::Window::CONTROL_MASK : 0), Gtk::ACCEL_VISIBLE)
@@ -815,7 +945,7 @@ class Window < Gtk::Window
 		if action
 			a = action
 			if check
-				a = lambda { item.active = action.call(item.active?) }
+				a = lambda { |it| it.active = action.call(it.active?) }
 			end
 			item.signal_connect('activate') { protect { a.call(item) } }
 		end
@@ -838,7 +968,7 @@ class ToolWindow < Gtk::Dialog
 		initialize_window(*a, &b)
 		show_all
 	end
-	
+
 	def widget=(w)
 		remove @child if @child
 		@child = w