watobo 0.9.16 → 0.9.17

data/CHANGELOG.md

@@ -1,8 +1,35 @@
+Version 0.9.17
+===
+News
+---
+
+**General**
+
+ * changed parameter parsing for better handling
+ * Boolean-SQL check now also takes xml parameters for testing
+ * new appearance of CA certificates
+ 
+**Manual Request Editor**
+
+ * XML parser, xml-request parameters available in table
+ 
+Fixes
+---
+**General**
+
+ * request line removed on `remove_header` regex match 
+ * double insert of Content-Length header
+ * bad markdown format of CHANGELOG
+ * wrong parameter parsing if value contains '=' sign
+ * new custom response viewer; now you can code your own handler, e.g. `lambda{ |response| return response.content_type }`
+ * added table view on request viewer
+ 
 Version 0.9.16
 ===
 Fixes
 ---
 **General**
+
  * double insert of Content-Length header
  * bad markdown format of CHANGELOG
  
@@ -11,6 +38,7 @@ Version 0.9.15
 Fixes
 ---
 **General**
+
  * improved socket handling
  * fixed some UTF-8 issues in passive modules
  * added application/octet-stream to pass-through content-types
@@ -18,12 +46,15 @@ Fixes
  * setting/replacing http-headers is now case-in-sensitive
 
 **Passive Modules**
+
  * fixed `Disclosure_ipaddr`; now all IPs inside body are reported
  
 **Active Modules**
+
  * Domino DB enumeration will now run on all requests
  
 **Crawler Plugin**
+
  * extended allowed/excluded URL checks on full url path /w query
 
 News

data/lib/watobo.rb

@@ -47,16 +47,14 @@ require 'watobo/utils'
 require 'watobo/mixins'
 require 'watobo/config'
 require 'watobo/defaults'
+require 'watobo/http'
 require 'watobo/core'
 require 'watobo/externals'
 require 'watobo/adapters'
 require 'watobo/framework'
-require 'watobo/http/data/data'
-require 'watobo/http/url/url'
-require 'watobo/http/cookies/cookies'
 require 'watobo/parser'
 require 'watobo/interceptor'
-require 'watobo/http_socket'
+require 'watobo/sockets'
 
 # WORKAROUND FOR LINUX :(
 dont_know_why_REQUIRE_hangs = Mechanize.new
@@ -64,7 +62,7 @@ dont_know_why_REQUIRE_hangs = Mechanize.new
 # @private 
 module Watobo#:nodoc: all #:nodoc: all
 
-  VERSION = "0.9.16"
+  VERSION = "0.9.17"
 
   def self.base_directory
     @base_directory ||= ""

data/lib/watobo/core/ca.rb

@@ -27,6 +27,20 @@ module Watobo#:nodoc: all
     @hostname = %x('hostname').strip
     @hostname = "watobo" if @hostname.empty?
     @domain = "#{@hostname}.watobo.local"
+    
+    def self.dh_key
+      dh_filename = File.join(@ca_config[:CA_dir], "watobo_dh.key")
+      unless File.exist? dh_filename
+        #puts "* no dh key file found"
+        File.open(dh_filename,"w") do |fh|
+          print "* creating SSL key (DH 1024) ... "
+          fh.write OpenSSL::PKey::DH.new(1024).to_pem
+          print " DONE\r\n"
+        end
+      end
+      OpenSSL::PKey::DH.new(File.read(dh_filename))
+    end
+    
     def self.ca_ready?
       return false unless File.exists? @ca_config[:CA_dir]
       return false unless File.exists? @ca_config[:private_dir]
@@ -63,8 +77,10 @@ module Watobo#:nodoc: all
       :crl_days => 14,
       :name => [
         ['C', 'DE', OpenSSL::ASN1::PRINTABLESTRING],
-        ['O', @domain, OpenSSL::ASN1::UTF8STRING],
-        ['OU', @hostname, OpenSSL::ASN1::UTF8STRING],
+        #['O', @domain, OpenSSL::ASN1::UTF8STRING],
+        ['O', "WATOBO", OpenSSL::ASN1::UTF8STRING],
+       # ['OU', @hostname, OpenSSL::ASN1::UTF8STRING],
+        ['OU', "WATOBO CA", OpenSSL::ASN1::UTF8STRING]
       ]
     }
 
@@ -85,10 +101,10 @@ module Watobo#:nodoc: all
       #print "Create Certificate ..."
       cert = OpenSSL::X509::Certificate.new
       #puts "done!"
-      name = @ca_config[:name].dup << ['CN', 'CA']
+      name = @ca_config[:name].dup << ['CN', 'Watobo']
 
       cert.subject = cert.issuer = OpenSSL::X509::Name.new(name)
-      cert.not_before = Time.now
+      cert.not_before = Time.now - 24 * 60 * 60
       cert.not_after = Time.now + @ca_config[:ca_cert_days] * 24 * 60 * 60
       cert.public_key = keypair.public_key
       cert.serial = 0x0
@@ -130,6 +146,8 @@ module Watobo#:nodoc: all
       end
 
       puts "Done generating certificate for #{cert.subject}"
+      puts ">> create DH key ..."
+      dh_key
     else
       #puts "Open Cert File ..."
       raw = File.read @ca_config[:cert_file] # DER- or PEM-encoded
@@ -326,7 +344,7 @@ module Watobo#:nodoc: all
         ex << ef.create_extension("authorityInfoAccess",
         "OCSP;" << @ca_config[:ocsp_location])
       end
-      cert.extensions = ex
+     # cert.extensions = ex
       cert.sign ca_keypair, OpenSSL::Digest::SHA1.new
 
       #  backup_cert_file = @ca_config[:backup_certs_dir] + "/cert_#{cert.serial}.pem"
@@ -360,8 +378,9 @@ module Watobo#:nodoc: all
       name = @ca_config[:name].dup
       case cert_config[:type]
       when 'server' then
-        name << ['OU', 'CA']
-        name << ['CN', cert_config[:hostname]]
+       # name << ['OU', 'Watobo CA']
+       name << ['CN', cert_config[:hostname]]
+        #name << ['CN', "WATOBO"]
       when 'client' then
         name << ['CN', cert_config[:user]]
         name << ['emailAddress', cert_config[:email]]
@@ -396,17 +415,6 @@ module Watobo#:nodoc: all
       return csr_file
     end
 
-    def self.dh_key
-      dh_filename = File.join(@ca_config[:CA_dir], "watobo_dh.key")
-      unless File.exist? dh_filename
-        #puts "* no dh key file found"
-        File.open(dh_filename,"w") do |fh|
-          puts "* creating SSL key (DH 1024) ... "
-          fh.write OpenSSL::PKey::DH.new(1024).to_pem
-          print " DONE\r\n"
-        end
-      end
-      OpenSSL::PKey::DH.new(File.read(dh_filename))
-    end
+    
   end
 end

data/lib/watobo/core/cookie.rb

@@ -30,15 +30,16 @@ module Watobo#:nodoc: all
     attr :path
     attr :secure
     attr :http_only
-    def name_value
+    
+    def to_s
       "#{@name}=#{@value}"
-    end
+    end    
 
-    def initialize(cookie_prefs)
+    def initialize(prefs)
       @secure = false
       @http_only = false
       
-      if cookie_prefs.respond_to? :has_key?
+      if prefs.respond_to? :has_key?
         @secure = prefs.has_key?(:secure) ? prefs[:secure] : false
         @http_only = prefs.has_key?(:http_only) ? prefs[:http_only] : false
         @location = :cookie
@@ -46,11 +47,14 @@ module Watobo#:nodoc: all
         @name = prefs[:name]
         @value = prefs[:value]
       else
-        chunks = cookie_prefs.split(";")
+        puts "= NEW COOKIE ="
+        puts prefs
+        puts prefs.class
+        chunks = prefs.split(";")
         # first chunk
         @name, @value = chunks.first.split(":").last.split("=")
         
-        m = cookie_prefs.match(/path=([^;]*)/)
+        m = prefs.match(/path=([^;]*)/)
         @path = m.nil? ? "" : m[1].strip
         @secure = true if chunks.select{|c| c =~ /Secure/i }
         @http_only = true if chunks.select{|c| c =~ /HttpOnly/i }

data/lib/watobo/core/parameter.rb

@@ -38,7 +38,8 @@ module Watobo#:nodoc: all
     def initialize(prefs)
       @location = nil
       @name = prefs[:name]
-      @value = prefs[:value]      
+      @value = prefs[:value]
+      @prefs = prefs      
     end
   end
   
@@ -63,4 +64,15 @@ module Watobo#:nodoc: all
       @location = :cookie
     end
   end
+  
+  class XmlParameter < Parameter
+    attr :parent
+    attr :namespace
+    def initialize(prefs)
+      super prefs
+      @location = :xml
+      @parent = prefs.has_key?(:parent) ? prefs[:parent] : ""
+      @namespace = prefs.has_key?(:namespace) ? prefs[:namespace] : nil
+    end
+  end
 end

data/lib/watobo/core/request.rb

@@ -40,7 +40,10 @@ module Watobo#:nodoc: all
     attr :data
     attr :url
     attr :header
-    attr :cookies
+   # attr :cookies
+   
+   include Watobo::HTTP::Cookies::Mixin
+   include Watobo::HTTP::Xml::Mixin
     
     def self.create request
       request.extend Watobo::Mixin::Parser::Url
@@ -79,10 +82,23 @@ module Watobo#:nodoc: all
       end
     end
     
-    def parameters(*locations)
+    def parameters(*locations, &block)
+      param_locations = [ :url, :data, :wwwform, :xml, :cookies ]
+      unless locations.empty?
+        param_locations.select!{ |loc| locations.include? loc }
+      end
+      
       parms = []
-      parms.concat @data.parameters
-      parms.concat @url.parameters
+      parms.concat @url.parameters if param_locations.include?(:url)
+      parms.concat cookies.parameters if param_locations.include?(:cookies)
+      parms.concat @data.parameters if self.is_wwwform? and ( param_locations.include?(:data) or param_locations.include?(:wwwform) )
+      
+      parms.concat xml.parameters if self.is_xml? and param_locations.include?(:xml)
+      if block_given?
+        parms.each do |p|
+          yield p
+        end
+      end
       parms
     end
     
@@ -94,6 +110,10 @@ module Watobo#:nodoc: all
        @data.set parm
       when :url
         @url.set parm
+      when :xml
+        xml.set parm
+      when :cookie
+        cookies.set parm
       end
       true
     end

data/lib/watobo/gui/chatviewer_frame.rb

@@ -358,6 +358,10 @@ module Watobo#:nodoc: all
         tab_frame = FXVerticalFrame.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
         @hexViewer = HexViewer.new(tab_frame)
         @viewers.push @hexViewer
+        
+        FXTabItem.new(@tabBook, "Table", nil)
+        tab_frame = FXVerticalFrame.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
+        @viewers << Watobo::Gui::TableEditorFrame.new(tab_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding => 0)
       end
 
     end
@@ -442,10 +446,13 @@ module Watobo#:nodoc: all
         @hexViewer = HexViewer.new(tab_frame)
         @viewers << @hexViewer
         
-         FXTabItem.new(@tabBook, "HTML", nil)
-       
+        FXTabItem.new(@tabBook, "HTML", nil)       
         @html_viewer = HTMLViewerFrame.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
         @viewers << @html_viewer
+        
+        FXTabItem.new(@tabBook, "Custom", nil)       
+        @viewers << CustomViewer.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
+        
       end
 
     end

data/lib/watobo/gui/conversation_table_ctrl2.rb

@@ -303,8 +303,23 @@ module Watobo#:nodoc: all
        update_text
        # l = FXLabel.new(@filter_info, "Test")
        
-        @table_option_autoscroll = FXCheckButton.new(f, "autoscroll", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
+       bframe = FXVerticalFrame.new(f, :opts => LAYOUT_FILL_Y, :padding => 0)
+        @table_option_autoscroll = FXCheckButton.new(bframe, "autoscroll", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
         @table_option_autoscroll.setCheck(true)
+        
+        iframe = FXHorizontalFrame.new(bframe, :opts => LAYOUT_FILL_X, :padding => 0 )
+        
+        FXButton.new(iframe, "", ICON_BTN_DOWN, nil, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT).connect(SEL_COMMAND) {
+          @table.scrollDown() unless @table.nil?
+        }
+        
+        FXButton.new(iframe, "", ICON_BTN_UP, nil, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT).connect(SEL_COMMAND) {
+          @table.scrollUp() unless @table.nil?
+        }
+
+        
+        
+         
 
         
         

data/lib/watobo/gui/custom_viewer.rb

@@ -0,0 +1,368 @@
+# .
+# custom_viewer.rb
+# 
+# Copyright 2013 by siberas, http://www.siberas.de
+# 
+# This file is part of WATOBO (Web Application Tool Box)
+#        http://watobo.sourceforge.com
+# 
+# WATOBO is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation version 2 of the License.
+# 
+# WATOBO is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with WATOBO; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# .
+# @private 
+module Watobo#:nodoc: all
+  module Gui
+
+   
+    class CustomViewer < FXVerticalFrame
+ SEL_TYPE_GREP = 0
+    SEL_TYPE_HIGHLIGHT = 1
+      attr_accessor :max_len
+      def style=(new_style)
+        @simple_text_view.style = new_style
+      end
+
+      def editable=(value)
+        @simple_text_view.editable = value
+      end
+
+      def setText(text, prefs={})
+        
+        normalized_text = text
+        if text.is_a? Watobo::Request or text.is_a? Watobo::Response          
+           return false unless @handler.respond_to? :call
+           result = call_handler(text)
+           normalized_text =  result
+        else
+          return false
+        end
+        
+        @text = normalized_text
+        #@text = text
+        @simple_text_view.max_len = -1
+        @simple_text_view.setText(normalized_text, prefs)
+        @match_pos_label.text = "0/0"
+        @match_pos_label.textColor = 'grey'
+
+        applyFilter() if @auto_apply_cbtn.checked?
+      end
+
+      def highlight(pattern)
+        highlightPattern(pattern)
+      end
+
+      def setFont(font_type=nil, size=nil)
+        @simple_text_view.setFont(font_type, size)
+      end
+
+      def getText
+        @simple_text_view.textbox.to_s
+      end
+
+      def initialize(owner, opts)
+        super(owner, opts)
+
+        @text_matches = []
+
+        @style = 2 # default style
+        @text = ''
+        @max_len = 5000
+        @filter_mode = SEL_TYPE_HIGHLIGHT
+        @cur_match_pos = 0
+        @text_dt = FXDataTarget.new('')
+        @filter_dt = FXDataTarget.new('')
+        
+        @handler = nil
+        @handler_file = nil
+        @handler_path = nil
+        
+        handler_ctrl_frame = FXHorizontalFrame.new(self, :opts => LAYOUT_FILL_X, :padding => 0)
+        @handler_status_lbl = FXLabel.new(handler_ctrl_frame, "No handler!")
+         @handler_status_lbl.textColor = "red"
+        add_handler_btn = FXButton.new(handler_ctrl_frame, "add", nil, nil, 0, FRAME_RAISED|LAYOUT_FILL_Y|LAYOUT_RIGHT)
+        add_handler_btn.connect(SEL_COMMAND){ add_handler }
+        reload_handler_btn = FXButton.new(handler_ctrl_frame, "reload", nil, nil, 0, FRAME_RAISED|LAYOUT_FILL_Y|LAYOUT_RIGHT)
+        reload_handler_btn.connect(SEL_COMMAND){ load_handler(@handler_file) }
+        reset_handler_btn = FXButton.new(handler_ctrl_frame, "reset", nil, nil, 0, FRAME_RAISED|LAYOUT_FILL_Y|LAYOUT_RIGHT)
+        reset_handler_btn.connect(SEL_COMMAND){
+          @handler = nil
+          @handler_file = nil
+          @handler_status_lbl = FXLabel.new(handler_ctrl_frame, "No handler!")
+          @handler_status_lbl.textColor = "red"
+        }
+
+        text_view_header = FXHorizontalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_SIDE_BOTTOM|LAYOUT_FIX_HEIGHT,:height => 24, :padding => 0)
+
+        #@auto_apply_cbtn.connect(SEL_COMMAND, method(:onInterceptChanged))
+
+        pmatch_btn = FXButton.new(text_view_header, "<", nil, nil, 0, FRAME_RAISED|LAYOUT_FILL_Y)
+        @match_pos_label = FXLabel.new(text_view_header, "0/0", :opts => LAYOUT_FILL_Y)
+        @match_pos_label.textColor = 'grey'
+        pmatch_btn.connect(SEL_COMMAND) { gotoPrevMatch() }
+        nmatch_btn = FXButton.new(text_view_header, ">", nil, nil, 0, FRAME_RAISED|LAYOUT_FILL_Y)
+        nmatch_btn.connect(SEL_COMMAND) { gotoNextMatch() }
+
+        #  @filter_text = FXTextField.new(text_view_header, 10,
+        #  :target => @filter_dt, :selector => FXDataTarget::ID_VALUE,
+        #  :opts => FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+
+        @filter_text = FXComboBox.new(text_view_header, 20, @filter_dt, 0, FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
+        @filter_text.connect(SEL_COMMAND){
+          applyFilter()
+          addFilterHistory()
+        }
+
+        @filter_text.connect(SEL_CHANGED) {
+          applyFilter()
+        }
+
+        menu = FXMenuPane.new(self)
+        FXMenuCommand.new(menu, "&Highlight").connect(SEL_COMMAND){
+          @filter_mode = SEL_TYPE_HIGHLIGHT
+          applyFilter()
+          @mode_btn.text = "Highlight"
+        }#, method(:switchMethod))
+        FXMenuCommand.new(menu, "&Grep").connect(SEL_COMMAND){
+          @filter_mode = SEL_TYPE_GREP
+          applyFilter()
+          @mode_btn.text = "Grep"
+        }#, method(:switchMethod))
+
+        @auto_apply_cbtn = FXCheckButton.new(text_view_header, "auto-apply", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP|LAYOUT_RIGHT|LAYOUT_FILL_Y)
+        @mode_btn = FXMenuButton.new(text_view_header, "Highlight", nil, menu,
+        :opts=> MENUBUTTON_DOWN|FRAME_RAISED|FRAME_THICK|ICON_AFTER_TEXT|LAYOUT_RIGHT|LAYOUT_FILL_Y)
+
+        reset_button = FXButton.new(text_view_header, "&Reset", nil, nil, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_Y)
+        reset_button.connect(SEL_COMMAND){ resetFilter() }
+
+        text_box_frame = FXVerticalFrame.new(self, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding => 0)
+
+        @simple_text_view = SimpleTextView.new(text_box_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y,:padding => 0)
+        @simple_text_view.style = 1
+        @simple_text_view.editable = false
+        @simple_text_view.textStyle -= TEXT_WORDWRAP
+
+        addHotkeyHandler(@simple_text_view.textbox)
+        addHotkeyHandler(@filter_text)
+
+        @filter_dt.connect(SEL_COMMAND) { applyFilter() }
+
+      end
+
+      def applyFilter
+        pattern = @filter_text.text
+        @match_pos_label.text = "0/0"
+        @simple_text_view.resetMatches()
+        @simple_text_view.setText(@text)
+        @match_pos_label.textColor = 'grey'
+        return true if pattern == ''
+        case @filter_mode
+        when SEL_TYPE_GREP
+          grepPattern(pattern)
+        when SEL_TYPE_HIGHLIGHT
+          highlightPattern(pattern)
+        end
+      end
+
+      private
+      
+      def add_handler
+        
+         handler_filename = FXFileDialog.getOpenFilename(self, "Select handler file", @handler_path, "*.rb\n*")
+          if handler_filename != "" then
+            if File.exists?(handler_filename) then
+              @handler_file = handler_filename
+              @handler_path = File.dirname(handler_filename) + "/"
+              load_handler(handler_filename)
+            end
+          end
+        
+      end
+      
+      def load_handler(file)
+        @handler = nil
+        return false if file.nil?
+        return false unless File.exist? file
+        begin
+          source = File.read(file)
+          #puts source
+          result = eval(source)
+          if result.respond_to? :call
+            @handler = result
+            @handler_status_lbl.text = "Handler ready!"
+            @handler_status_lbl.textColor = "green"
+          end
+          return true
+                     
+         rescue SyntaxError, LocalJumpError, NameError => e
+           out = e.to_s
+           out << e.backtrace.join("\n")
+         rescue => bang
+           out = bang
+           out << bang.backtrace.join("\n")
+         end
+         puts out
+         return false
+      end
+      
+      def call_handler(object)
+        begin
+          result = @handler.call(object)
+          return result       
+        rescue => bang
+          result = bang.to_s
+          result << bang.backtrace.join("\n")
+          return result
+        end
+        
+      end
+
+      def gotoNextMatch()
+        @cur_match_pos += 1 if @cur_match_pos < @simple_text_view.numMatches-1
+        @simple_text_view.makeMatchVisible(@cur_match_pos)
+        @match_pos_label.text = "#{@cur_match_pos+1}/#{@simple_text_view.numMatches}" if @simple_text_view.numMatches > 0
+      end
+
+      def gotoPrevMatch()
+        @cur_match_pos -= 1 if @cur_match_pos > 0
+        @simple_text_view.makeMatchVisible(@cur_match_pos)
+        @match_pos_label.text = "#{@cur_match_pos+1}/#{@simple_text_view.numMatches}" if @simple_text_view.numMatches > 0
+      end
+
+      def addFilterHistory()
+        text = @filter_text.text
+        return true if text == ''
+        has_item = false
+        @filter_text.each do |item, data|
+          has_item = true if data == text
+        end
+        @filter_text.appendItem(text, text) unless has_item == true
+        @filter_text.numVisible = @filter_text.numItems
+      end
+
+      def resetFilter
+        @simple_text_view.max_len = 0
+        @simple_text_view.setText(@text)
+        @match_pos_label.text = "0/0"
+        @match_pos_label.textColor = 'grey'
+        @filter_text.text = ''
+      end
+
+      def highlightPattern(pattern)
+        @cur_match_pos = 0
+        @simple_text_view.max_len = 0
+
+        @match_pos_label.textColor = 'black'
+
+        @simple_text_view.setText(@text)
+        @simple_text_view.highlight(pattern)
+        @match_pos_label.text = "0/#{@simple_text_view.numMatches()}"
+
+        @simple_text_view.makeMatchVisible(0)
+
+        @match_pos_label.text = "1/#{@simple_text_view.numMatches()}" if @simple_text_view.numMatches() > 0
+
+      end
+
+      def grepPattern(pattern)
+        @cur_match_pos = 0
+        @simple_text_view.max_len = 0
+
+        @match_pos_label.textColor = 'black'
+
+        @simple_text_view.setText(@text)
+
+        @simple_text_view.filter(pattern)
+        @match_pos_label.text = "0/#{@simple_text_view.numMatches()}"
+        @simple_text_view.highlight(pattern)
+        @simple_text_view.makeMatchVisible(0)
+
+        @filter_mode = SEL_TYPE_GREP
+
+        @match_pos_label.text = "1/#{@simple_text_view.numMatches()}" if @simple_text_view.numMatches() > 0
+
+      end
+
+      def addHotkeyHandler(widget)
+        @ctrl_pressed = false
+
+        widget.connect(SEL_KEYPRESS) { |sender, sel, event|
+        # puts event.code
+          @ctrl_pressed = true if event.code == KEY_Control_L or event.code == KEY_Control_R
+          #  @shift_pressed = true if @ctrl_pressed and ( event.code == KEY_Shift_L or event.code == KEY_Shift_R )
+          if event.code == KEY_Return
+            highlight(@filter_text.text)
+          true # special handling of KEY_Return, because we don't want a linebreak in textbox.
+          end
+
+          if event.code == KEY_F1
+
+            unless event.moved?
+              FXMenuPane.new(self) do |menu_pane|
+                FXMenuCaption.new(menu_pane, "Hotkeys:")
+                FXMenuSeparator.new(menu_pane)
+                [ "<ctrl-r> - Reset Filter",
+                  "<ctrl-g> - Grep",
+                  "<ctrl-h> - Highlight",
+                  "<ctrl-n> - Goto Next",
+                  "<ctrl-shift-n> - Goto Prev",
+                  "<ctrl-w> - Switch Wordwrap"
+                ].each do |hk|
+                  FXMenuCaption.new(menu_pane, hk).backColor = 'yellow'
+                end
+
+                menu_pane.create
+                menu_pane.popup(nil, event.root_x, event.root_y)
+                app.runModalWhileShown(menu_pane)
+              end
+
+            end
+          end
+
+          if @ctrl_pressed
+            case event.code
+            when KEY_n
+              gotoNextMatch()
+              addFilterHistory()
+            when KEY_N
+              gotoPrevMatch()
+              addFilterHistory()
+            when KEY_w
+              @simple_text_view.textbox.textStyle ^= TEXT_WORDWRAP
+            when KEY_h
+              @mode_btn.text = "Highlight"
+              @filter_mode = SEL_TYPE_HIGHLIGHT
+              addFilterHistory()
+              applyFilter()
+            when KEY_g
+              @mode_btn.text = "Grep"
+              @filter_mode = SEL_TYPE_GREP
+              addFilterHistory()
+              applyFilter()
+            when KEY_r
+              resetFilter()
+
+            end
+          end
+          false
+        }
+
+        widget.connect(SEL_KEYRELEASE) { |sender, sel, event|
+          @ctrl_pressed = false if event.code == KEY_Control_L or event.code == KEY_Control_R
+          false
+        }
+      end
+
+    end
+end
+end