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

data/lib/rum/mac.rb

@@ -6,7 +6,7 @@ require 'rum/mac/app'
 
 module Rum
   Platform = :mac
-  
+
   def self.restart_platform_specific
     Rum::Server.close_connections
     exec(RUBY_ENGINE, $PROGRAM_NAME)

data/lib/rum/mac/gui.rb

@@ -17,7 +17,7 @@ module Rum
       url = NSURL.URLWithString(url)
       NSWorkspace.sharedWorkspace.openURL(url)
     end
-    
+
     binary = File.join(File.dirname(__FILE__),
                        'gui/CocoaDialog.app/Contents/MacOS/CocoaDialog')
     CocoaDialog.setup binary

data/lib/rum/mac/gui/growl.rb

@@ -8,7 +8,7 @@ module Rum
           @callbacks = {}
           GrowlApplicationBridge.setGrowlDelegate(self)
         end
-        
+
         def registrationDictionaryForGrowl
           notifications = [@notification_name]
           { TicketVersion: 1,  AllNotifications: notifications,
@@ -42,9 +42,9 @@ module Rum
         framework File.join(File.dirname(__FILE__), 'Growl.framework')
         @@notifier = Notifier.new('Rum', 'Notification')
       end
-      
+
       private
-      
+
       def message_backend(text, title, sticky, callback)
         title ||= 'Rum' # Mac Growl needs a title
         @@notifier.notify(title, text, sticky, callback)

data/lib/rum/mac/irb/completion.rb

@@ -1,5 +1,5 @@
 #
-#   irb/completor.rb - 
+#   irb/completor.rb -
 #   	$Release Version: 0.9$
 #   	$Revision: 23233 $
 #   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
@@ -15,16 +15,16 @@ module IRB
 
     ReservedWords = [
       "BEGIN", "END",
-      "alias", "and", 
-      "begin", "break", 
+      "alias", "and",
+      "begin", "break",
       "case", "class",
       "def", "defined", "do",
       "else", "elsif", "end", "ensure",
-      "false", "for", 
-      "if", "in", 
-      "module", 
+      "false", "for",
+      "if", "in",
+      "module",
       "next", "nil", "not",
-      "or", 
+      "or",
       "redo", "rescue", "retry", "return",
       "self", "super",
       "then", "true",
@@ -32,10 +32,10 @@ module IRB
       "when", "while",
       "yield",
     ]
-      
+
     CompletionProc = proc { |input|
       bind = IRB.conf[:MAIN_CONTEXT].workspace.binding
-      
+
 #      puts "input: #{input}"
 
       case input
@@ -63,7 +63,7 @@ module IRB
 	candidates = Proc.instance_methods.collect{|m| m.to_s}
 	candidates |= Hash.instance_methods.collect{|m| m.to_s}
 	select_message(receiver, message, candidates)
-	
+
       when /^(:[^:.]*)$/
  	# Symbol
 	if Symbol.respond_to?(:all_symbols)
@@ -137,7 +137,7 @@ module IRB
 	gv = eval("global_variables", bind).collect{|m| m.to_s}
 	lv = eval("local_variables", bind).collect{|m| m.to_s}
 	cv = eval("self.class.constants", bind).collect{|m| m.to_s}
-	
+
 	if (gv | lv | cv).include?(receiver)
 	  # foo.func and foo is local var.
 	  candidates = eval("#{receiver}.methods", bind).collect{|m| m.to_s}
@@ -157,7 +157,7 @@ module IRB
 	    rescue Exception
 	      name = ""
 	    end
-	    next if name != "IRB::Context" and 
+	    next if name != "IRB::Context" and
 	      /^(IRB|SLex|RubyLex|RubyToken)/ =~ name
 	    candidates.concat m.instance_methods(false).collect{|x| x.to_s}
 	  }
@@ -177,7 +177,7 @@ module IRB
 
       else
 	candidates = eval("methods | private_methods | local_variables | self.class.constants", bind).collect{|m| m.to_s}
-			  
+
 	(candidates|ReservedWords).grep(/^#{Regexp.quote(input)}/)
       end
     }

data/lib/rum/mac/keyboard_hook.rb

@@ -1,4 +1,8 @@
-framework "ApplicationServices"
+framework 'CoreGraphics' # OS X 10.8 location for kCGKeyboardEventKeycode and related symbols
+unless defined? KCGKeyboardEventKeycode
+  framework 'ApplicationServices' # 10.7 location
+end
+
 framework "#{File.dirname(__FILE__)}/keyboard_hook/KeyboardHook.framework"
 framework 'Cocoa'
 
@@ -16,7 +20,7 @@ module KeyboardHook
 end
 
 class EventTap
-  def handleEvent(event)
+  def handleKeyEvent(event)
     event if @proc.call(event)
   end
 
@@ -41,7 +45,7 @@ class Event
   def keycode
     get_integer_value_field(KCGKeyboardEventKeycode)
   end
-  
+
   def id
     get_integer_value_field(KCGKeyboardEventKeycode)
   end
@@ -63,11 +67,10 @@ class Event
   end
 
   def get_flags
-    CGEventGetFlags(eventRef)  
+    CGEventGetFlags(eventRef)
   end
 
   def set_flags(flags)
     CGEventSetFlags(eventRef, flags)
   end
 end
-

data/lib/rum/mac/keyboard_hook/KeyboardHook.framework/Versions/A/Resources/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>BuildMachineOSBuild</key>
+	<string>12C54</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -18,5 +20,19 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
+	<key>DTCompiler</key>
+	<string></string>
+	<key>DTPlatformBuild</key>
+	<string>4G2008a</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>11E52</string>
+	<key>DTSDKName</key>
+	<string>macosx10.7</string>
+	<key>DTXcode</key>
+	<string>0452</string>
+	<key>DTXcodeBuild</key>
+	<string>4G2008a</string>
 </dict>
 </plist>

data/lib/rum/mac/layouts.rb

@@ -3,7 +3,7 @@
 module Rum
   module Layouts
     module_function
-    
+
     def default_layout
       us
     end
@@ -11,7 +11,7 @@ module Rum
     # /System/Library/Frameworks/Carbon.framework/.../Events.h
     def core
       core = Layout.new
-      
+
       [['return', "\n", 36],
        ['tab', 48],
        ['space', ' ', 49],
@@ -60,7 +60,7 @@ module Rum
        ['rightarrow', 124],
        ['downarrow', 125],
        ['uparrow', 126]].each { |key| core.add *key }
-      
+
       core
     end
 
@@ -123,7 +123,7 @@ module Rum
          5 = 9 7 - 8 0 ] o u [ i p _ l j _ k ; _ , / n m .}.each_with_index do |key, id|
         us.add key, id unless key == '_'
       end
-      
+
       us.add "'", 39
       us.add '\\', 42
       us.add '`', 50

data/lib/rum/mac/system.rb

@@ -5,9 +5,9 @@ module Rum
     def applescript src
       pointer = Pointer.new_with_type("@")
       as = NSAppleScript.alloc.initWithSource(src)
-      as.executeAndReturnError(pointer)  
+      as.executeAndReturnError(pointer)
     end
-    
+
     def start *args
       system 'open', *args
     end

data/lib/rum/remote.rb

@@ -31,15 +31,15 @@ module Rum
           msg.force_encoding Encoding::BINARY
           write([msg.length].pack('N') + msg)
         end
-        
+
         def receive
           if message_size = read(4) # sizeof (N)
-            message_size = message_size.unpack('N')[0]	
+            message_size = message_size.unpack('N')[0]
             read(message_size).force_encoding(Encoding::UTF_8)
           end
         end
       end
-      
+
       def Connection.new(stream)
         stream.extend Messaging
       end

data/lib/rum/server.rb

@@ -3,7 +3,7 @@ require 'rum/remote'
 module Rum
   module Server
     module_function
-    
+
     # This makes it easier for code to check if it runs inside the server thread.
     def thread
       @thread
@@ -15,7 +15,6 @@ module Rum
         @server = TCPServer.new('127.0.0.1', Remote.default_port)
         puts "Server started."
         begin
-          @connection = nil
           loop do
             @connection = Remote::Connection.new(@server.accept)
             handle(@connection)
@@ -71,7 +70,7 @@ module Rum
               workspace = Struct.new(:binding).new(binding)
               context = Struct.new(:workspace).new(workspace)
               @CONF = { MAIN_CONTEXT: context }
-              
+
               def IRB.conf
                 @CONF
               end'

data/lib/rum/windows.rb

@@ -7,7 +7,7 @@ require 'rum/windows/layouts'
 
 module Rum
   Platform = :windows
-  
+
   def self.restart_platform_specific
     Rum::Server.stop
     System.spawn_in_terminal('ruby', $PROGRAM_NAME)
@@ -21,3 +21,4 @@ module Rum
     end
   end
 end
+

data/lib/rum/windows/app.rb

@@ -3,11 +3,11 @@ module Rum
     include System
 
     @@apps = {}
-    
+
     def self.add(app)
       @@apps[app.binary] = app
     end
-    
+
     def self.remove(app)
       @@apps.delete(app.binary)
     end
@@ -22,16 +22,21 @@ module Rum
 
     attr_accessor :path, :binary, :matcher
 
-    def initialize(path, *matcher)
-      @path = append_path_to_programfiles_if_relative(path)
+    def initialize(path, *args)
+      x64 = args.delete :x64
+      @path = append_path_to_programfiles_if_relative(path, x64)
       @binary = File.basename(@path).sub(/\.exe$/, '').downcase
-      @matcher = WindowMatcher.new(*matcher)
+      @matcher = WindowMatcher.new(*args)
       App.add(self)
     end
 
-    def append_path_to_programfiles_if_relative(path)
+    PROGRAM_FILES     = ENV['PROGRAMFILES'].gsub('\\', '/')
+    PROGRAM_FILES_X64 = ENV['ProgramW6432'].gsub('\\', '/')
+
+    def append_path_to_programfiles_if_relative(path, x64)
       if path !~ /^\w:|^%/
-        path = File.join(ENV['PROGRAMFILES'].gsub("\\", '/'), path)
+        program_files = x64 ? PROGRAM_FILES_X64 : PROGRAM_FILES
+        path = File.join(program_files, path)
       end
       path
     end

data/lib/rum/windows/apps.rb

@@ -8,18 +8,13 @@ def Firefox.activate_and_focus_address_bar
   Keyboard.type '(ctrl l)' if activate
 end
 
-Photoshop = App.new('Adobe/Adobe Photoshop CS5/Photoshop', nil, 'Photoshop')
+Photoshop = App.new('Adobe/Adobe Photoshop CS6 (64 Bit)/Photoshop', nil, 'Photoshop', :x64)
 class << Photoshop
   def next_blend_mode
-    if Rum.layout['ö'] # german layout
-      type '(shift 0)'
-    else
-      type '(shift +)'
-    end
+    type '(shift (add))'
   end
 
   def previous_blend_mode
-    type '(shift -)'
+    type '(shift (subtract))'
   end
 end
-

data/lib/rum/windows/gui.rb

@@ -7,7 +7,7 @@ module Rum
         Gui.message "Can't visit a file in Windows Explorer."
       end
     end
-    
+
     def open_file file, line=nil
       System.start file
     end
@@ -23,7 +23,7 @@ module Rum
       def alert_backend text, title
         System.message_box text, title
       end
-      
+
       def message_backend text, title, sticky, callback
         alert text, title
       end
@@ -39,7 +39,7 @@ module Rum
       Message = 'message'
 
       private
-      
+
       def message_backend(text, title, sticky, callback)
         unless title
           title = text
@@ -50,13 +50,13 @@ module Rum
         if callback
           on_click = lambda { |event| callback.call if event[:callback_result] == "CLICK" }
         end
-        
+
         Growl.client.notify(name: Message, title: title,
                             text: text, sticky: sticky, &on_click)
       end
-      
+
       module_function
-      
+
       def auto_setup
         require 'ruby_gntp'
         @growl = GNTP.new("Rum")
@@ -73,10 +73,10 @@ module Rum
 
     module EmacsInteraction
       private
-      
+
       def interaction(*args)
         emacs = Emacs.window
-        return '' unless emacs
+        return unless emacs
         unless (emacs_already_active = emacs.active?)
           old = System.active_window
           emacs.move(400, 400, 800, 300)

data/lib/rum/windows/keyboard.rb

@@ -3,21 +3,24 @@ require 'strscan'
 module Rum
   module Keyboard
     extend self
-    
+
     def type(key_sequence, *args)
       release_core_modifiers unless args.include? :blind
       type_sequence(key_sequence, args.include?(:slow))
     end
-    
+
     def type!(key_sequence, *args)
       release_core_modifiers unless args.include? :blind
       type_sequence_literally(key_sequence, args.include?(:slow))
     end
 
+    def type_unicode(key_sequence, *args)
+      release_core_modifiers unless args.include? :blind
+      type_sequence_unicode(key_sequence, args.include?(:slow))
+    end
+
     def release_core_modifiers
-      pressed = Rum.hotkey_processor.pressed_modifiers
-      to_release = Rum.layout.core_modifiers.keys.select { |mod| pressed[mod] }
-      to_release.each { |key| System.send_key_event key, false }
+      Rum.hotkey_processor.release_core_modifiers
     end
 
     private
@@ -39,7 +42,7 @@ module Rum
       while (char = s.getch)
         case char
         when '\\'
-          down_and_up(s.getch, slow)
+          (char = s.getch) and down_and_up(char, slow)
         when '('
           key = s.scan(/[^() ]+/)
           s.skip /\ /
@@ -55,10 +58,26 @@ module Rum
       pressed_keys.reverse_each { |key| up key }
     end
 
-    def send_key(key, down)
-      if id = Rum.layout[key]
-        System.send_key_event id, down
+    def type_sequence_unicode(key_sequence, slow)
+      s = StringScanner.new(key_sequence)
+      pressed_keys = []
+      while (char = s.getch)
+        case char
+        when '\\'
+          (char = s.getch) and System.send_unicode_char(char)
+        when '('
+          key = s.scan(/[^() ]+/)
+          s.skip /\ /
+          down key
+          pressed_keys << key
+        when ')'
+          up pressed_keys.pop
+        else
+          System.send_unicode_char(char)
+        end
+        sleep 0.01 if slow
       end
+      pressed_keys.reverse_each { |key| up key }
     end
 
     def down(key)
@@ -76,5 +95,11 @@ module Rum
         type_sequence(key_sequence, slow)
       end
     end
+
+    def send_key(key_alias, down)
+      if key = Rum.layout[key_alias]
+        System.send_key_event key, down
+      end
+    end
   end
 end