rum 0.0.1-universal-darwin-10 → 0.0.3-universal-darwin-10

data/lib/rum/core.rb

@@ -14,7 +14,7 @@ Encoding.default_external = Encoding::UTF_8
 
 module Rum
   autoload :Server, 'rum/server'
-  
+
   class << self
     attr_writer :layout
     attr_reader :hotkey_set, :hotkey_processor, \
@@ -23,7 +23,7 @@ module Rum
     def layout
       @layout ||= Layouts.default_layout
     end
-    
+
     def setup
       return if setup_completed?
       @hotkey_set = HotkeySet.new(layout)
@@ -60,8 +60,8 @@ module Rum
     end
 
     def display_exception(exception)
-      error_message = ["#{exception.class}:", exception,
-                       '', *exception.backtrace].join("\n")
+      error_message = ["#{exception.class}:\n#{exception}",
+                       *exception.backtrace].join("\n\n")
 
       file, line = parse_stack_frame(exception.backtrace.first)
       if file
@@ -73,21 +73,8 @@ module Rum
           end
         end
       end
-      
-      Gui.message error_message, :sticky, &callback
-    end
 
-    def parse_stack_frame(frame)
-      if match = frame.match(/^(.+?):(\d+)/)
-        file, line = match.captures
-        # Different file names in IRB stackframes:
-        # Ruby 1.9.1: (eval)
-        # Ruby 1.9.2: <main>
-        # MacRuby 0.10: /working_directory/(eval)
-        if file !~ /\(eval\)$/ and file != '<main>'
-          [file, line.to_i]
-        end
-      end
+      Gui.message error_message, :sticky, &callback
     end
 
     def switch_worker_thread
@@ -98,12 +85,27 @@ module Rum
       @worker_thread = start_worker_thread(new)
       old.enq nil # Signal the worker thread to stop
     end
+
+    def parse_stack_frame(frame)
+      if match = frame.match(/^(.+?):(\d+)/)
+        file, line = match.captures
+        [file, line.to_i] if physical_file? file
+      end
+    end
+
+    def physical_file? file
+      # Different file names in IRB stackframes:
+      # Ruby 1.9.1: (eval)
+      # Ruby 1.9.2: <main>
+      # MacRuby 0.10: /working_directory/(eval)
+      file !~ /\(eval\)$/ and file != '<main>'
+    end
   end
 
-  WorkingDir = Dir.pwd
-  
+  InitialWorkingDir = Dir.pwd
+
   def restart
-    Dir.chdir WorkingDir
+    Dir.chdir InitialWorkingDir
     if Thread.current == Rum::Server.thread
       Thread.new do
         sleep 0.01 # Allow server to respond. Slightly hacky.
@@ -114,7 +116,7 @@ module Rum
       restart_platform_specific
     end
   end
-  
+
   def show
     System.terminal_window.show
   end

data/lib/rum/dsl.rb

@@ -1,13 +1,13 @@
 include Rum
-include System
-include Keyboard
+include Rum::System
+include Rum::Keyboard
 
 module Rum
   class Action
     def register
       Rum.hotkey_set.register(self)
     end
-    
+
     def unregister
       Rum.hotkey_set.unregister(self)
     end
@@ -27,25 +27,26 @@ module Rum
       end
     end
 
-    def show
+    def visit
       Gui.open_file(@file, @line)
       true
     end
   end
-end
 
-module GuiMixin
-  # Delegating to Gui instead of directly including Gui avoids dealing
-  # with module hierarchy corner cases that appear when other modules
-  # are later dynamically included into Gui via Gui.use.
-  [:message, :alert, :read, :choose, :open_file, :browse, :goto].each do |method_name|
-    define_method(method_name) do |*args, &block|
-      Gui.send(method_name, *args, &block)
+  module GuiMixin
+    # Delegating to Gui instead of directly including Gui avoids dealing
+    # with module hierarchy corner cases that appear when other modules
+    # are later dynamically included into Gui via Gui.use.
+    [:message, :alert, :read, :choose, :open_file, :browse, :goto].each do |method_name|
+      define_method(method_name) do |*args, &block|
+        Gui.send(method_name, *args, &block)
+      end
+      private method_name
     end
-    private method_name
   end
 end
-include GuiMixin
+
+include Rum::GuiMixin
 
 def wait(timeout=5, interval=0.01)
   start = Time.new
@@ -87,9 +88,7 @@ class String
     Rum.hotkey_set.add_translation(self, to, condition,
                                    FileLocation.from_stack_frame(caller.first))
   end
-end
 
-class String
   # Prepare a special version of #do that is only active when the user
   # calls #do for the first time.
   # After running Rum.setup it calls and restores the default version of #do.

data/lib/rum/gui.rb

@@ -1,7 +1,7 @@
 module Rum
   module Gui
     extend self
-    
+
     def self.use gui_module, *methods
       if methods.empty?
         include gui_module
@@ -56,7 +56,7 @@ module Rum
       private
 
       def alert_backend prompt, title
-        result = dialog('ok-msgbox', '--text', prompt.to_s, '--title', title.to_s) 
+        result = dialog('ok-msgbox', '--text', prompt.to_s, '--title', title.to_s)
         result.first == '1'
       end
 
@@ -77,7 +77,7 @@ module Rum
         result = dialog('standard-dropdown', '--items', *choices.map(&:to_s), *prompt)
         choices[result[1].to_i] if result.first == '1'
       end
-      
+
       def dialog *args
         IO.popen([@@binary, *args]) { |p| p.read }.split
       end

data/lib/rum/help.rb

@@ -4,16 +4,17 @@ module Rum
                           'doc', 'reference.rb')
     Gui.open_file reference
   end
-  
+
   def self.read_key &proc
     KeyReader.start(hotkey_processor, proc)
   end
 
-  def self.show_hotkey
+  def self.visit_hotkey
     read_key { |hotkey| Gui.message "'#{hotkey}' not active" }
     Action.hook = lambda do |action|
       KeyReader.remove_hooks
-      action.show_definition or Gui.message "Definition location unkown."
+      action.visit_definition or Gui.message "Can't visit definition.\n"\
+                                             "Hotkey was not defined in a file."
       # Must return true for the key that triggered the action to be
       # retained by the processor.
       true
@@ -36,7 +37,7 @@ module Rum
   module KeyReader
     extend self
     attr_accessor :pressed_modifiers
-    
+
     Hook = proc do
       @pass_key = false
       if @key.modifier?
@@ -44,7 +45,7 @@ module Rum
           KeyReader.pressed_modifiers << @key
         elsif seen_key = KeyReader.pressed_modifiers.delete(@key)
           if @key == @last_key
-            KeyReader.stop(@key, @pressed_modifiers) 
+            KeyReader.stop(@key, @pressed_modifiers)
           elsif @pressed_modifiers.values.compact.empty?
             KeyReader.stop
           end
@@ -55,7 +56,7 @@ module Rum
         KeyReader.stop(@key, @pressed_modifiers)
       end
     end
-    
+
     def start(hotkey_processor, proc)
       @hotkey_processor = hotkey_processor
       @proc = proc
@@ -85,7 +86,7 @@ module Rum
 
   module WindowInfo
     module_function
-    
+
     def start
       return if @thread
       register_stop_key
@@ -96,7 +97,8 @@ module Rum
           break if @stop
           new = active_window
           if new != old
-            Gui.message new.report
+            window_report = new.report
+            Gui.message(window_report) { System::Clipboard.set window_report }
             old = new
           end
           sleep 0.1

data/lib/rum/hotkey_core.rb

@@ -1,14 +1,14 @@
 module Rum
   class Key
     attr_accessor :name, :id, :aliases, :modifier
-    
+
     def initialize name, aliases, id
       @name = name
       @id = id
       @aliases = aliases
       @modifier = false
     end
-    
+
     def modifier?
       @modifier
     end
@@ -21,7 +21,7 @@ module Rum
   class Layout
     attr_accessor :ids, :names, :aliases, :modifiers, :core_modifiers, \
                   :action_modifiers, :translations
-    
+
     def initialize
       @ids = {}
       @names = {}
@@ -37,7 +37,7 @@ module Rum
       @ids.values.uniq
     end
 
-    def lookup_id id
+    def lookup_key id
       @ids[id]
     end
 
@@ -60,10 +60,11 @@ module Rum
       name = args.shift
       aliases = args
       key = Key.new(name, aliases, id)
-      
+
       @ids[id] = key
       @names[name] = key
       aliases.each { |key_alias| @aliases[key_alias] = key }
+      key
     end
 
     def alias key, key_alias
@@ -109,7 +110,7 @@ module Rum
 
   class Hotkey
     attr_accessor :key, :modifiers, :actions, :direction # todo: unveränderlich machen
-    
+
     def initialize key, modifiers=[], fuzzy=false, actions=[]
       @key = key
       @modifiers = modifiers
@@ -136,7 +137,7 @@ module Rum
     attr_accessor :action, :condition, :hotkey, :location
 
     @@hook = nil
-    
+
     def self.work_queue= queue
       @@work_queue = queue
     end
@@ -148,7 +149,7 @@ module Rum
     def self.hook
       @@hook
     end
-    
+
     def initialize(action, condition, repeated, location)
       @action = action
       @condition = condition
@@ -168,8 +169,8 @@ module Rum
       end
     end
 
-    def show_definition
-      @location.show if @location
+    def visit_definition
+      @location.visit if @location
     end
   end
 
@@ -211,7 +212,7 @@ module Rum
       down_hotkey.direction = :down
       up_hotkey.direction   = :up
       to_key = @layout[to]
-      
+
       catch_modifier_up = proc do
         if down_hotkey.modifiers.include? @key
           send_key_event(to_key, false)
@@ -248,11 +249,11 @@ module Rum
         end
       end
       modifiers = modifiers.sort_by &:id
-      
+
       # Lookup key
       key = @layout[key_alias]
       raise "#{key_alias} is no valid key." unless key
-      
+
       Hotkey.new(key, modifiers, fuzzy)
     end
 
@@ -269,7 +270,7 @@ module Rum
       end
       action
     end
-    
+
     def unregister action
       if hotkey = action.hotkey
         hotkey.actions.delete(action)
@@ -304,7 +305,7 @@ module Rum
       end
       [dict, dict_key]
     end
-    
+
     def key_signature hotkey
       hotkey.modifiers.dup << hotkey.key
     end
@@ -317,7 +318,7 @@ module Rum
     def register_hotkey hotkey
       dict, dict_key = get_dict(hotkey)
       existing_hotkey = dict[dict_key] and return existing_hotkey
-      
+
       dict[dict_key] = hotkey
       if hotkey.key.modifier? # Modifier hotkeys aren't allowed to be fuzzy.
         @modifier_hotkeys[dict_key] = hotkey
@@ -393,11 +394,12 @@ module Rum
       @modifiers = @hotkey_set.modifiers
       @layout = @hotkey_set.layout
       @pressed_modifiers = {}
+      @pressed_core_modifier_ids = {}
       @was_executed = {}
       @key_signature = nil
       @hooks = []
       @pass_key = true
-      
+
       @key = nil
       @last_key = nil
       @down = nil
@@ -409,12 +411,12 @@ module Rum
       @hooks.unshift hook
       hook
     end
-    
+
     # Return removed hook.
     def remove_hook(hook)
       @hooks.delete hook
     end
-    
+
     def key_signature key
       @modifiers.select { |modifier| @pressed_modifiers[modifier] } << key
     end
@@ -428,7 +430,7 @@ module Rum
 
     def process_event event
       puts event
-      @key = @layout.lookup_id(event.id)
+      @key = @layout.lookup_key(event.id)
       @down = event.down?
       unless @key
         puts "Unknown Key\n"
@@ -441,10 +443,10 @@ module Rum
         @key_signature = key_signature(@key)
       end
       @last_event_up = !@down
-      
+
       print "[#{@key_signature.map { |key| key.name.capitalize }.join(', ')}]"
       print ' (again)' if @key == @last_key; puts
-      
+
       if @down
         repeated = @was_executed[@key]
         eat = @was_executed[@key] = true if execute(true, repeated)
@@ -452,11 +454,13 @@ module Rum
           eat = true
         elsif modifier # if repeated, the modifier has already been added to pressed_modifiers
           @pressed_modifiers[@key] = true
+          @pressed_core_modifier_ids[event.id] = true if @layout.core_modifiers[@key]
         end
       else #up
         @was_executed[@key] = true if execute(false, false)
         if modifier
-          @pressed_modifiers[@key] = nil 
+          @pressed_modifiers[@key] = nil
+          @pressed_core_modifier_ids[event.id] = nil if @layout.core_modifiers[@key]
           if @layout.action_modifiers[@key] and \
             (!@pass_key or @was_executed[@key])
             inhibit_modifier_action
@@ -464,7 +468,7 @@ module Rum
         end
         eat = @was_executed.delete(@key)
       end
-      
+
       @pass_key = if modifier
                     @layout.core_modifiers[@key]
                   else
@@ -473,7 +477,13 @@ module Rum
       @hooks.dup.each { |hook| instance_eval &hook }
       @last_key = @key
       puts
-      @pass_key    
+      @pass_key
+    end
+
+    def release_core_modifiers
+      @pressed_core_modifier_ids.each do |id, pressed|
+        send_key_event_for_id id, false if pressed
+      end
     end
   end
 end