rum 0.0.1-x86-mingw32 → 0.0.3-x86-mingw32

data/lib/rum/windows/layouts.rb

@@ -7,7 +7,7 @@ module Rum
     def default_layout
       us
     end
-    
+
     def core
       # http://msdn.microsoft.com/en-us/library/dd375731%28VS.85%29.aspx
       core = Layout.new
@@ -133,12 +133,12 @@ module Rum
 
     def basic
       basic = core
-      
+
       basic.remap 'lcontrol', 'rcontrol', 'control'
       basic.remap 'rmenu', 'lmenu'
       basic.remap 'lshift', 'rshift', 'shift'
       basic.remap 'rwin', 'lwin'
-      
+
       basic.alias 'control', 'ctrl'
       basic.alias 'control', 'c'
       basic.rename 'lmenu', 'alt'
@@ -152,8 +152,8 @@ module Rum
       basic.rename 'prior', 'pageup'
       basic.rename 'next', 'pagedown'
       basic.rename 'snapshot', 'print'
-      
-      
+
+
       %w{shift control alt win}.each { |key| basic.core_modifier key }
 
       basic.action_modifier 'alt'
@@ -205,7 +205,7 @@ END
       german.rename 'oem_6', '´'
       german.rename 'oem_7', 'ä'
       german.rename 'oem_102', '<'
-      
+
       shift_translations = <<END.scan(/(\S) (\S)/)
 ° ^   $ 4   ( 8   ` ´    ; ,
 ! 1   % 5   ) 9   * +    : .

data/lib/rum/windows/system.rb

@@ -3,9 +3,13 @@ require_relative 'system_foreign_functions'
 module Rum
   module System
     extend self
-    
+
     def send_key_event key, down
-      extended, id = key.id.divmod 2**9
+      send_key_event_for_id key.id, down
+    end
+
+    def send_key_event_for_id id, down
+      extended, id = id.divmod 2**9
       extended = (extended == 1)
       keybd_event id, down, 0, extended
     end
@@ -15,6 +19,10 @@ module Rum
       send_key_event key, false
     end
 
+    def send_unicode_char char
+      send_unicode_char_internal(char.encode(Encoding::UTF_16LE))
+    end
+
     def active_window_handles
       Enumerator.new(self, :enum_windows)
     end
@@ -28,7 +36,7 @@ module Rum
     def active_window
       Window.new get_foreground_window
     end
-    
+
     def terminal_window
       Window.new get_console_window
     end
@@ -51,7 +59,7 @@ module Rum
     # returns a copy
     def c_string obj
       str = obj.to_s + "\0"
-      str.encode(Encoding::UTF_16LE) 
+      str.encode(Encoding::UTF_16LE)
     end
 
     def message_box message, title=''
@@ -81,11 +89,15 @@ module Rum
       Clipboard.preserve { Clipboard.get_selection }
     end
 
-    class Window
+    def kill_task exe_name
+      system("taskkill /F /IM #{exe_name}.exe")
+    end
+
+   class Window
       include System
-      
+
       attr_reader :handle
-      
+
       def initialize(handle)
         @handle = handle
       end
@@ -94,7 +106,7 @@ module Rum
         return false unless other.respond_to? :handle
         @handle == other.handle
       end
-      
+
       def active?
         self.handle == get_foreground_window
       end
@@ -118,7 +130,7 @@ module Rum
       def maximize
         post_message @handle, WM_SYSCOMMAND, SC_MAXIMIZE, 0
       end
-      
+
       def minimize
         post_message @handle, WM_SYSCOMMAND, SC_MINIMIZE, 0
       end
@@ -127,6 +139,15 @@ module Rum
         post_message @handle, WM_SYSCOMMAND, SC_RESTORE, 0
       end
 
+      # Don't underestimate the Force
+      def force_show
+        100.times do
+          show
+          sleep 0.02
+          return true if active_window == self
+        end
+      end
+
       def file_dialog?
         class_name == '#32770'
       end
@@ -150,7 +171,7 @@ module Rum
         restore if zoomed?
         move_window(@handle, x, y, width, height, 1)
       end
-      
+
       def title(max_length = 1024)
         buffer = "\0" * (max_length * 2)
         length = get_window_text_w(@handle, buffer, buffer.length)
@@ -158,13 +179,13 @@ module Rum
         result.force_encoding(Encoding::UTF_16LE)
         result.encode(Encoding::UTF_8, invalid: :replace)
       end
-      
+
       def class_name(max_length = 2048)
         buffer = "\0" * max_length
         length = get_class_name(@handle, buffer, buffer.length)
         length == 0 ? '' : buffer[0..length - 1]
       end
-      
+
       def text(max_length = 2048)
         buffer = '\0' * max_length
         length = send_with_buffer @handle, WM_GETTEXT, buffer.length, buffer
@@ -182,19 +203,44 @@ module Rum
                  else
                    0
                  end
-        
+
         raise "Control '#{id}' not found" if result == 0
         Window.new result
       end
 
+      def child_window class_name
+        if class_name.is_a? Regexp
+          child_windows.find { |child| child.class_name =~ class_name }
+        else
+          child_windows.find { |child| child.class_name == class_name }
+        end
+      end
+
+      def child_windows
+        Enumerator.new do |yielder|
+          enum_child_windows { |handle| yielder.yield Window.new(handle) }
+        end
+      end
+
       def kill_task
-        system("taskkill /F /IM #{exe_name}.exe")
+        System.kill_task exe_name
       end
-      
+
       def report
         "Title: #{title}\nClass: #{class_name}"
       end
 
+      def exe_path
+        exe_path_internal.
+          force_encoding(Encoding::UTF_16LE).
+          encode(Encoding::UTF_8).
+          gsub('\\', '/')
+      end
+
+      def exe_name
+        File.basename(exe_path, '.exe')
+      end
+
       def self.[] arg, class_name=nil
         if arg.is_a? Hash
           WindowMatcher.new(arg[:title], arg[:class_name])
@@ -207,7 +253,7 @@ module Rum
     class WindowMatcher
       include System
       attr_reader :specs
-      
+
       def initialize title=nil, class_name=nil
         @specs = { title: title, class_name: class_name }
         raise 'No specifications given.' unless @specs.values.any?
@@ -221,7 +267,7 @@ module Rum
       def comparison_method obj
         if obj.is_a? Regexp then :=~ else :== end
       end
-      
+
       def matches? window
         @specs.all? do |spec, value|
           not value or value.send(comparison_method(value), window.send(spec))
@@ -249,14 +295,18 @@ module Rum
         end
       end
     end
-    
+
     module Clipboard
       extend self
-      
+
       def get
         Win32::Clipboard.get
       end
-    
+
+      def get_html
+        Win32::Clipboard.get_html
+      end
+
       def set str
         Win32::Clipboard.set str
       end
@@ -268,12 +318,6 @@ module Rum
         set old_content
       end
 
-      # def copy
-      #   watcher = install_watcher
-      #   Keyboard.type '(ctrl c)'
-      #   evaluate_watcher(watcher, 400) # Timeout: 400 msec
-      # end
-
       def wait_for_change
         watcher = install_watcher
         begin
@@ -291,7 +335,7 @@ module Rum
       def paste
         Keyboard.type '(ctrl v)'
       end
-      
+
       def get_selection
         Clipboard.get if Clipboard.copy
       end
@@ -307,4 +351,3 @@ module Rum
     end
   end
 end
-

data/lib/rum/windows/system_foreign_functions.rb

@@ -41,14 +41,14 @@ module Rum
     def_api 'SendMessage',         'LLLP', 'L', :send_with_buffer
     def_api 'SendMessage',         'LLLL', 'L'
     def_api 'PostMessage',         'LLLL', 'L'
-    def_api 'GetDlgItem',          'LL', 'L' 
+    def_api 'GetDlgItem',          'LL', 'L'
     def_api 'GetWindowRect',       'LP', 'I'
-    def_api 'SetCursorPos',        'LL', 'I' 
+    def_api 'SetCursorPos',        'LL', 'I'
     def_api 'mouse_event',         'LLLLL', 'V'
     def_api 'IsWindow',            'L', 'L'
     def_api 'IsWindowVisible',     'L', 'L'
     def_api 'SetForegroundWindow', 'L', 'L'
-    
+
     def_api 'GetWindowLong',       'LI', 'L'
     def_api 'GetForegroundWindow', 'V', 'L'
     def_api 'GetClassName',        'LPI', 'I'
@@ -60,15 +60,17 @@ module Rum
     def_api 'IsZoomed',            'L', 'L'
     def_api 'SetWindowPos',        'LLIIIII', 'I'
     def_api 'MoveWindow',          'LIIIIB', 'L'
-    
+
     ShellExecute = Win32::API.new('ShellExecute', 'LPPPPI', 'L', 'shell32')
     def start command, parameters=0
+      command.encode!(Encoding::WINDOWS_1252)
+      parameters.encode!(Encoding::WINDOWS_1252) if parameters != 0
       ShellExecute.call(0, 'open', command, parameters, 0, 1)
     end
-    
-    WM_COMMAND    = 0x0111 
+
+    WM_COMMAND    = 0x0111
     WM_SYSCOMMAND = 0x0112
-    
+
     SC_CLOSE    = 0xF060
     SC_RESTORE  = 0xF120;
     SC_MAXIMIZE = 0xF030;
@@ -105,19 +107,17 @@ end
 module Win32
   class Clipboard
     def self.get
-      begin
-        self.open
-        return '' unless IsClipboardFormatAvailable(UNICODETEXT)
-        handle = GetClipboardData(UNICODETEXT)
-        clip_data = 0.chr * GlobalSize(handle)
-        memcpy(clip_data, handle, clip_data.size)
-        clip_data.force_encoding(Encoding::UTF_16LE)
-        clip_data.encode!(Encoding::UTF_8, invalid: :replace, replace: '', \
-                          universal_newline: true)
-        clip_data[ /^[^\0]*/ ]
-      ensure
-        self.close
-      end
+      self.open
+      return '' unless IsClipboardFormatAvailable(UNICODETEXT)
+      handle = GetClipboardData(UNICODETEXT)
+      clip_data = 0.chr * GlobalSize(handle)
+      memcpy(clip_data, handle, clip_data.size)
+      clip_data.force_encoding(Encoding::UTF_16LE)
+      clip_data.encode!(Encoding::UTF_8, invalid: :replace, replace: '', \
+                        universal_newline: true)
+      clip_data[ /^[^\0]*/ ]
+    ensure
+      self.close
     end
 
     def self.set str
@@ -125,5 +125,29 @@ module Win32
       data.force_encoding Encoding::BINARY
       set_data(data, UNICODETEXT)
     end
+
+    def self.html_format
+      @html_format ||= register_format('HTML Format')
+    end
+
+    def self.get_html
+      html = html_format
+      self.open
+      if IsClipboardFormatAvailable(html)
+        handle = GetClipboardData(html)
+        clip_data = 0.chr * GlobalSize(handle)
+        memcpy(clip_data, handle, clip_data.size)
+        clip_data.force_encoding(Encoding::UTF_8)
+        clip_data = clip_data[ /^[^\0]*/ ]
+      end
+    ensure
+      self.close
+    end
+
+    def self.set_html str
+      data = str + "\0"
+      data.force_encoding Encoding::BINARY
+      set_data(data, html_format)
+    end
   end
 end

data/rum.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'rum'
-  spec.version    = '0.0.1'
+  spec.version    = '0.0.3'
   spec.author     = 'nonsequitur'
   spec.license    = 'MIT'
   spec.homepage   = 'http://nonsequitur.github.com/rum'
@@ -10,5 +10,5 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.1'
 
   spec.executables << 'rum-client'
-  spec.extra_rdoc_files = ['README']
+  spec.extra_rdoc_files = ['README.md']
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rum
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-04 00:00:00.000000000 +02:00
-default_executable: 
+date: 2012-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &7846656 !ruby/object:Gem::Requirement
+  requirement: &19511712 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *7846656
+  version_requirements: *19511712
 - !ruby/object:Gem::Dependency
   name: win32-api
-  requirement: &7846080 !ruby/object:Gem::Requirement
+  requirement: &19510476 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: 1.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *7846080
+  version_requirements: *19510476
 - !ruby/object:Gem::Dependency
   name: win32-clipboard
-  requirement: &7845480 !ruby/object:Gem::Requirement
+  requirement: &19509204 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,17 +43,19 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *7845480
+  version_requirements: *19509204
 description: 
 email: 
 executables:
 - rum-client
 extensions: []
 extra_rdoc_files:
-- README
+- README.md
 files:
-- bin/rum-client
 - CHANGELOG
+- README.md
+- Rakefile
+- bin/rum-client
 - doc/basic.rb
 - doc/doc.html
 - doc/example.rb
@@ -78,8 +79,8 @@ files:
 - ext/mac/keyboard_hook/EventTap.h
 - ext/mac/keyboard_hook/EventTap.m
 - ext/mac/keyboard_hook/Info.plist
-- ext/mac/keyboard_hook/KeyboardHook.xcodeproj/project.pbxproj
 - ext/mac/keyboard_hook/KeyboardHook.xcodeproj/TemplateIcon.icns
+- ext/mac/keyboard_hook/KeyboardHook.xcodeproj/project.pbxproj
 - ext/mac/keyboard_hook/KeyboardHook_Prefix.pch
 - ext/mac/keyboard_hook/version.plist
 - ext/windows/keyboard_hook/extconf.rb
@@ -92,26 +93,28 @@ files:
 - ext/windows/system/input_box.c
 - ext/windows/system/input_box.h
 - ext/windows/system/system.c
+- lib/rum.rb
 - lib/rum/apps.rb
+- lib/rum/barrel.rb
 - lib/rum/barrel/emacs.rb
 - lib/rum/barrel/emacs_client.rb
-- lib/rum/barrel.rb
 - lib/rum/core.rb
 - lib/rum/dsl.rb
 - lib/rum/gui.rb
 - lib/rum/help.rb
 - lib/rum/hotkey_core.rb
+- lib/rum/mac.rb
 - lib/rum/mac/app.rb
 - lib/rum/mac/apps.rb
-- lib/rum/mac/gui/growl.rb
 - lib/rum/mac/gui.rb
+- lib/rum/mac/gui/growl.rb
 - lib/rum/mac/irb/completion.rb
 - lib/rum/mac/keyboard_hook.rb
 - lib/rum/mac/layouts.rb
 - lib/rum/mac/system.rb
-- lib/rum/mac.rb
 - lib/rum/remote.rb
 - lib/rum/server.rb
+- lib/rum/windows.rb
 - lib/rum/windows/app.rb
 - lib/rum/windows/apps.rb
 - lib/rum/windows/gui.rb
@@ -122,12 +125,7 @@ files:
 - lib/rum/windows/system.rb
 - lib/rum/windows/system.so
 - lib/rum/windows/system_foreign_functions.rb
-- lib/rum/windows.rb
-- lib/rum.rb
-- Rakefile
-- README
 - rum.gemspec
-has_rdoc: true
 homepage: http://nonsequitur.github.com/rum
 licenses:
 - MIT
@@ -149,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A cross-platform Hotkey and Macro utility, running on Windows and Mac OS.