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

data/ext/windows/system/clipboard_watcher.c

@@ -20,8 +20,8 @@ static BOOL observe_messages() {
 static LRESULT APIENTRY
 clipboard_hook(HWND hwnd, UINT umsg, WPARAM wparam, LPARAM lparam) {
   HWND next_viewer = (HWND)GetWindowLongPtr(hwnd, GWL_USERDATA);
-  switch (umsg) 
-    { 
+  switch (umsg)
+    {
     case WM_DRAWCLIPBOARD:
       /* A stop signal for observe_messages() */
       PostMessage(hwnd, WM_APP, 0, 0);

data/ext/windows/system/extconf.rb

@@ -1,3 +1,4 @@
 require 'mkmf'
 $LIBS << ' gdi32.lib' # needed for input_box.c
+$LIBS << ' Psapi.lib' # for GetProcessImageFileName
 create_makefile("system")

data/ext/windows/system/input_box.c

@@ -28,7 +28,7 @@ static void input_box_populate_window(InputBox *box, HWND blank_window)
 {
   NONCLIENTMETRICS metrics;
   HFONT	font;
-  
+
   box->main_window = blank_window;
 
   box->text = CreateWindow(L"Static", L"",
@@ -61,7 +61,7 @@ static void input_box_populate_window(InputBox *box, HWND blank_window)
                              box->instance, NULL);
 
   font = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
-  
+
   SendMessage(box->text,WM_SETFONT,(WPARAM)font,FALSE);
   SendMessage(box->edit_control,WM_SETFONT,(WPARAM)font,FALSE);
   SendMessage(box->ok,WM_SETFONT,(WPARAM)font,FALSE);
@@ -77,7 +77,7 @@ static void input_box_submit(InputBox *box)
 {
   int input_length = (int)SendMessage(box->edit_control, EM_LINELENGTH, 0, 0);
   if (input_length){
-    // Provide the max number of chars to be copied as a word in the buffer.
+    // Provide the max number of chars to be copied to the buffer.
     *((LPWORD)box->result_text) = box->max_chars;
     // Although undocumented, the copied string is null-terminated.
     input_length = (WORD)SendMessage(box->edit_control, EM_GETLINE, 0,
@@ -89,7 +89,7 @@ static void input_box_submit(InputBox *box)
 LRESULT CALLBACK window_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
   InputBox *box = (InputBox*)GetWindowLong(hwnd, GWL_USERDATA);
-  
+
   switch(msg)
     {
     case WM_CREATE:
@@ -170,7 +170,7 @@ static void input_box_create(InputBox *box, HINSTANCE instance)
   RECT rect;
 
   GetWindowRect(GetDesktopWindow(), &rect);
-  
+
   box->instance    = instance;
   box->main_window = CreateWindowEx(WS_EX_TOPMOST,
                                     IB_CLASS_NAME, L"",
@@ -201,9 +201,9 @@ int input_box(LPCTSTR text, LPCTSTR title,
 {
   MSG msg;
   InputBox box;
-  
+
   input_box_create(&box, global_instance);
-  
+
   input_box_show(&box, title, text, result_text, max_chars);
 
   while(GetMessage(&msg, NULL, 0, 0) > 0)
@@ -221,11 +221,11 @@ int input_box(LPCTSTR text, LPCTSTR title,
       } else {
         TranslateMessage(&msg);
       }
-      DispatchMessage(&msg);	
+      DispatchMessage(&msg);
     }
 
   input_box_destroy(&box);
-  
+
   return(box.result);
 }
 

data/ext/windows/system/system.c

@@ -2,6 +2,7 @@
 #include <windows.h>
 #include <winuser.h>
 #include <tlhelp32.h>
+#include <Psapi.h>
 #include "autohotkey_stuff.h"
 #include "input_box.h"
 #include "clipboard_watcher.h"
@@ -36,11 +37,23 @@ static BOOL CALLBACK enum_windows_proc(HWND hwnd, LPARAM lParam)
   return TRUE;
 }
 
+static BOOL CALLBACK enum_child_windows_proc(HWND hwnd, LPARAM lParam)
+{
+    rb_yield(LONG2NUM((DWORD)hwnd));
+    return TRUE;
+}
+
 static VALUE enum_windows(VALUE self) {
   EnumWindows(enum_windows_proc, 0);
   return Qnil;
 }
 
+static VALUE enum_child_windows(VALUE self) {
+    HWND window_handle = (HWND)NUM2ULONG(rb_iv_get(self, "@handle"));
+    EnumChildWindows(window_handle, enum_child_windows_proc, 0);
+    return Qnil;
+}
+
 static void call_keybd_event(struct KeybdEventParams *event) {
   #ifdef DEBUG
   printf("Sending key: vkcode: %d, scancode: %d\n", event.vkcode, event.scancode);
@@ -66,6 +79,19 @@ static VALUE f_keybd_event(int argc, VALUE* argv, VALUE self)
   return Qnil;
 }
 
+static VALUE f_send_unicode_char_internal(VALUE self, VALUE character)
+{
+  INPUT inp[2];
+  memset(inp,0,sizeof(INPUT));
+  inp[0].type = INPUT_KEYBOARD;
+  inp[0].ki.dwFlags = KEYEVENTF_UNICODE;
+  inp[0].ki.wScan = *(LPCWSTR)RSTRING_PTR(character);
+  inp[1] = inp[0];
+  inp[1].ki.dwFlags |= KEYEVENTF_KEYUP;
+
+  return SendInput(2, inp, sizeof(INPUT)) ? Qtrue : Qfalse;
+}
+
 /* Returns 'true' if successful, 'false' if not. */
 static VALUE ForceWindowToFront(VALUE self)
 {
@@ -80,50 +106,28 @@ static DWORD process_id(VALUE window)
 {
   VALUE handle = rb_iv_get(window, "@handle");
   HWND window_handle = (HWND)NUM2ULONG(handle);
-  
+
   DWORD process_id = 0;
   GetWindowThreadProcessId(window_handle, &process_id);
   return process_id;
 }
 
-static void process_module(VALUE window, MODULEENTRY32 *module) {
-  DWORD processID = process_id(window);
-  
-  // Take a snapshot of the modules of this process
-  HANDLE moduleSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, processID);
-
-  //Get the first module
-  module->dwSize = sizeof(MODULEENTRY32);
-  Module32First(moduleSnapshot, module);
-}
-
-static void get_exe_path(MODULEENTRY32 *module, char *buffer) {
-  strcpy(buffer, module->szExePath);
-}
-
-static void get_exe_name(MODULEENTRY32 *module, char *buffer) {
-  strcpy(buffer, module->szModule);
-  buffer[strlen(buffer) - 4] = '\0'; /* Remove .exe suffix */
-}
-
-static void access_window_process_data(VALUE window, void fn(MODULEENTRY32 *module, char *buffer), char *buffer) {
-  MODULEENTRY32 module = {0};
-  process_module(window, &module);
-  (*fn)(&module, buffer);
-}
-
-static VALUE exe_name(VALUE self)
+static VALUE exe_path_internal(VALUE self)
 {
-  char buffer[MAX_MODULE_NAME32 + 1];
-  access_window_process_data(self, &get_exe_name, buffer);
-  return rb_str_new2(buffer);
-}
-
-static VALUE exe_path(VALUE self)
-{
-  char buffer[MAX_PATH];
-  access_window_process_data(self, &get_exe_path, buffer);
-  return rb_str_new2(buffer);
+    DWORD window_process_id = process_id(self);
+    HANDLE process = OpenProcess(PROCESS_QUERY_INFORMATION,
+                                 FALSE,
+                                 window_process_id);
+    #define BUFFER_LENGTH 512
+    WCHAR buffer[BUFFER_LENGTH];
+    DWORD num_chars = GetProcessImageFileNameW(process,
+                                                 buffer,
+                                                 BUFFER_LENGTH);
+    if (num_chars) {
+      return rb_str_new(buffer, sizeof(WCHAR) * num_chars);
+    } else {
+      return Qnil;
+    }
 }
 
 static LPRECT get_window_rect(VALUE window, LPRECT rect)
@@ -239,35 +243,36 @@ static VALUE input_box_internal(VALUE self, VALUE text, VALUE title,
 void Init_system() {
   input_box_initialize(GetModuleHandle(NULL));
   autohotkey_stuff_initialize(GetCurrentThreadId());
-  
-  mSystem        = rb_define_module_under(rb_define_module("Rum"), "System");
+
+  mSystem    = rb_define_module_under(rb_define_module("Rum"), "System");
   mDesktop   = rb_define_module_under(mSystem, "Desktop");
   mScreen    = rb_define_module_under(mSystem, "Screen");
   mClipboard = rb_define_module_under(mSystem, "Clipboard");
   cWindow    = rb_define_class_under(mSystem, "Window", rb_cObject);
-  
+
   rb_define_method(mSystem, "enum_windows", enum_windows, 0);
   rb_define_method(mSystem, "keybd_event", f_keybd_event, -1);
+  rb_define_method(mSystem, "send_unicode_char_internal", f_send_unicode_char_internal, 1);
   rb_define_method(mSystem, "get_console_window", get_console_window, 0);
   rb_define_method(mSystem, "message_box_internal", message_box_internal, 2);
   rb_define_method(mSystem, "input_box_internal", input_box_internal, 3);
 
   rb_define_method(cWindow, "show", ForceWindowToFront, 0);
-  rb_define_method(cWindow, "exe_path", exe_path, 0);
-  rb_define_method(cWindow, "exe_name", exe_name, 0);
+  rb_define_method(cWindow, "enum_child_windows", enum_child_windows, 0);
+  rb_define_method(cWindow, "exe_path_internal", exe_path_internal, 0);
   rb_define_method(cWindow, "left", left, 0);
   rb_define_method(cWindow, "right", right, 0);
   rb_define_method(cWindow, "top", top, 0);
   rb_define_method(cWindow, "bottom", bottom, 0);
-  
+
   rb_define_module_function(mDesktop, "top", desktop_top, 0);
   rb_define_module_function(mDesktop, "left", desktop_left, 0);
   rb_define_module_function(mDesktop, "bottom", desktop_bottom, 0);
   rb_define_module_function(mDesktop, "right", desktop_right, 0);
-  
+
   rb_define_module_function(mScreen, "width", screen_width, 0);
   rb_define_module_function(mScreen, "height", screen_height, 0);
-  
+
   rb_define_method(mClipboard, "install_watcher", install_watcher, 0);
   rb_define_method(mClipboard, "evaluate_watcher", evaluate_watcher, 2);
 }

data/lib/rum/barrel.rb

@@ -13,14 +13,18 @@ module Rum
       end
       paths
     end
-    
+
     def self.select dir
       path = Gui.choose(nil, contents(dir))
       (File.join(dir, path)) if path
     end
-    
+
     def self.run path
-      start path
+      if File.extname(path) == '.rb'
+        eval(IO.read(path))
+      else
+        start path
+      end
     end
 
     def self.select_and_run dir
@@ -36,15 +40,15 @@ module Rum
       path.gsub('\\', '/')
     end
   end
-  
+
   module AppDir
     class << self
       attr_accessor :base_dir
-      
+
       def get(exe)
         File.join(@base_dir, exe, '')
       end
-      
+
       def get_or_create(exe)
         dir = get(exe)
         if File.exists? dir
@@ -64,7 +68,7 @@ module Rum
 
       def visit
         dir = current
-        Dopus.go dir if dir
+        Gui.goto dir if dir
       end
 
       def select
@@ -76,9 +80,10 @@ module Rum
 
   module Commands
     class Command
-      def initialize(name, proc)
+      def initialize(name, proc, location)
         @name = name
         @proc = proc
+        @location = location
       end
 
       def to_s
@@ -88,8 +93,12 @@ module Rum
       def run
         @proc.call
       end
+
+      def visit
+        @location.visit if @location
+      end
     end
-    
+
     class << self
       attr_accessor :default_tag
       attr_accessor :commands
@@ -102,15 +111,20 @@ module Rum
         tags << tag if tag
         tags << default_tag
         tags.uniq!
-        
+
+        location = FileLocation.from_stack_frame(caller.first)
+
         if args and (hotkey = args[:hotkey])
           apps = tags.select { |tag| tag.is_a? App }
-          apps.each { |app| hotkey.do(app, &block) }
+          apps.each do |app|
+            action = hotkey.do(app, &block)
+            action.location = location
+          end
         end
-        
-        cmd = Command.new(name, block)
+
+        cmd = Command.new(name, block, location)
         tags.each do |tag|
-          commands_for_tag = (commands[tag] ||= {})
+          commands_for_tag = (@commands[tag] ||= {})
           commands_for_tag[name] = cmd
         end
       end
@@ -124,10 +138,26 @@ module Rum
       end
 
       def select(tag=nil)
-        cmd = Gui.choose(nil, self[tag])
+        cmd = select_command(self[tag])
         cmd.run if cmd
       end
 
+      TIMER_DURATION = 10
+      def select_command(commands)
+        cmd = Gui.choose(nil, commands)
+        if @visit_timer
+          timer_active = (Time.now-@visit_timer) <= TIMER_DURATION
+          cmd.visit if cmd and timer_active
+          @visit_timer = nil
+        else
+          cmd
+        end
+      end
+
+      def visit_next_command
+        @visit_timer = Time.now
+      end
+
       def for_active_window
         cmds = []
         exe = active_window.exe_name
@@ -136,7 +166,7 @@ module Rum
         if (dir = AppDir.get(exe))
           cmds.concat Path.contents(dir)
         end
-        if (chosen = Gui.choose(nil, cmds))
+        if (chosen = select_command(cmds))
           case chosen
           when String
             Path.run(dir + chosen)

data/lib/rum/barrel/emacs.rb

@@ -6,9 +6,9 @@ class << Emacs
   Emacs.client = EmacsClient.new
 
   def eval(elisp)
+    elisp = "(with-current-buffer (window-buffer) #{elisp})" if @eval_in_user_buffer
     # MacRuby hack
     # @client.eval fails
-    elisp = "(with-current-buffer (window-buffer) #{elisp})" if @eval_in_user_buffer
     Emacs.client.eval(elisp)
   end
 

data/lib/rum/barrel/emacs_client.rb

@@ -4,16 +4,43 @@ require 'socket'
 # emacs_source/lib-src/emacsclient.c
 
 class EmacsClient
+
+  SERVER_MSG_SIZE = 1024 # defined in server.el on Emacs 24
+
   def eval(elisp)
     socket = connect
+    $socket = socket
     socket.puts "-eval #{quote(elisp)}"
-    result = unquote(socket.read)
+
+    messages = []
+    # On Emacs 24, the first message always has type '-emacs-pid'
+    # On Emacs 23, only one message is returned after sending '-eval'.
+    # It has type '-print' or '-error' and can be arbitrarily long.
+    msg = socket.gets
+    loop do
+      break if handle_message(msg, messages) == :abort
+      msg = socket.recv(SERVER_MSG_SIZE)
+    end
     socket.close
-    format(result)
+    unquote(messages.join)
   end
 
-  def format(str)
-    str[/.*? (.*)/, 1]
+  def handle_message(msg, messages)
+    return :abort if not msg or msg.empty?
+
+    if (match = msg.match(/(.*?) (.*)/))
+      type, body = match.captures
+      case type
+      when '-print', '-print-nonl'
+        messages << body
+      when '-error'
+        messages << body
+        return :abort
+      end
+    else
+      messages << "Error: Unknown message: #{msg}"
+      return :abort
+    end
   end
 
   def quote str
@@ -37,7 +64,7 @@ class EmacsClient
       @server_file = File.join(ENV['HOME'], '.emacs.d', 'server', 'server')
       read_config
     end
-    
+
     def read_config
       @server_active = File.exists? @server_file
       return unless @server_active