mac-event-monitor 0.0.3 → 0.1.0

data/ext/event_monitor/event_monitor.h

@@ -2,12 +2,10 @@
 #import <AppKit/AppKit.h>
 
 @interface EventMonitorAppDelegate : NSObject <NSApplicationDelegate> {
-  id eventMonitor;
 }
 
 -(void)onTimeout:(NSTimer *) timer;
 
-@property (assign) VALUE rb_monitor;
-
 @end
 
+NSEventMask mask;

data/ext/event_monitor/event_monitor.m

@@ -1,42 +1,37 @@
 #import "event_monitor.h"
 
-@implementation EventMonitorAppDelegate
+NSEventMask mask =
+  NSLeftMouseUpMask
+  | NSRightMouseUpMask
+  | NSOtherMouseUpMask
+  | NSLeftMouseDownMask
+  | NSRightMouseDownMask
+  | NSOtherMouseDownMask
+  | NSLeftMouseDraggedMask
+  | NSRightMouseDraggedMask
+  | NSOtherMouseDraggedMask
+  | NSMouseMovedMask
+  | NSKeyDownMask
+  | NSKeyUpMask
+  // | NSScrollWheelMask
+  // | NSTabletPointMask
+  // | NSTabletProximityMask
+  ;
 
-@synthesize rb_monitor;
+@implementation EventMonitorAppDelegate
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
-  NSEventMask mask;
-
-  mask =
-      NSLeftMouseUpMask
-    | NSRightMouseUpMask
-    | NSOtherMouseUpMask
-    | NSLeftMouseDownMask
-    | NSRightMouseDownMask
-    | NSOtherMouseDownMask
-    | NSLeftMouseDraggedMask
-    | NSRightMouseDraggedMask
-    | NSOtherMouseDraggedMask
-    | NSMouseMovedMask
-    // | NSScrollWheelMask
-    // | NSTabletPointMask
-    // | NSTabletProximityMask
-    // | NSKeyDownMask
-    ;
-
-  eventMonitor = [NSEvent addGlobalMonitorForEventsMatchingMask:mask
-                                                        handler:^(NSEvent *incomingEvent) {
-      rb_funcall(rb_monitor, rb_intern("receive_event"), 1, rb_str_new2([[incomingEvent description] UTF8String]));
-    }];
+  [NSEvent addGlobalMonitorForEventsMatchingMask:mask
+                                         handler:^(NSEvent *incomingEvent) {}];
 }
 
 - (void)onTimeout:(NSTimer *)timer {
   NSEvent *event;
 
+  [NSEvent removeMonitor:[timer userInfo]];
   [timer release];
 
   [[NSApplication sharedApplication] stop:nil];
-  //[NSEvent removeMonitor:eventMonitor];
 
   // http://www.cocoabuilder.com/archive/cocoa/219842-nsapp-stop.html
   event = [NSEvent otherEventWithType: NSApplicationDefined
@@ -60,20 +55,25 @@ static VALUE cMonitor_run_app(int argc, VALUE *argv, VALUE self)
 {
   EventMonitorAppDelegate *delegate;
   VALUE stopAfter;
+  id eventMonitor;
 
   rb_scan_args(argc, argv, "1", &stopAfter);
 
   if(!(delegate = [[NSApplication sharedApplication] delegate])) {
     delegate = [[EventMonitorAppDelegate alloc] init];
-    delegate.rb_monitor = self;
     [NSApp setDelegate: delegate];
   }
 
+  eventMonitor = [NSEvent addGlobalMonitorForEventsMatchingMask:mask
+                                                        handler:^(NSEvent *incomingEvent) {
+      rb_funcall(self, rb_intern("receive_event"), 1, rb_str_new2([[incomingEvent description] UTF8String]));
+    }];
+
   if(stopAfter != Qnil) {
     [NSTimer scheduledTimerWithTimeInterval:(NSTimeInterval)NUM2INT(stopAfter)
                                      target:delegate
                                    selector:@selector(onTimeout:)
-                                   userInfo:nil
+                                   userInfo:eventMonitor
                                     repeats:NO];
   }
 

data/ext/event_monitor/extconf.rb

@@ -12,5 +12,11 @@ dir_config(extension_name)
 
 $LDFLAGS += ' -framework AppKit'
 
+begin
+  MACRUBY_VERSION # Only MacRuby has this constant.
+  $CFLAGS += ' -fobjc-gc' # Enable MacOSX's GC for MacRuby
+rescue
+end
+
 # Do the work
 create_makefile(extension_name)

data/lib/mac-event-monitor/event/keyboard_event.rb

@@ -0,0 +1,48 @@
+module Mac
+  module EventMonitor
+    class KeyboardEvent < Event
+      attr_reader :keycode, :flags
+
+      def initialize(type, keycode, flags)
+        super(type)
+
+        @keycode = keycode.to_i
+        @flags   = flags.to_i(16)
+      end
+
+      def shift_key?
+        check_flag(16) || check_flag(17)
+      end
+
+      def ctrl_key?
+        check_flag(18)
+      end
+
+      def alt_key?
+        check_flag(19)
+      end
+
+      def command_key?
+        check_flag(20)
+      end
+
+      def num_pad_key?
+        check_flag(21)
+      end
+
+      def help_key?
+        check_flag(22)
+      end
+
+      def function_key?
+        check_flag(23)
+      end
+
+      private
+
+      def check_flag(shift)
+        !(flags & (1 << shift)).zero?
+      end
+    end
+  end
+end

data/lib/mac-event-monitor/event.rb

@@ -5,10 +5,10 @@ module Mac
 
       class << self
         def create_from_description(description)
-          _, *atts_as_string = description.split(/\s+/)
+          _, *atts_as_string = description.split(/ +/)
 
-          attrs = atts_as_string.inject({}) do |result, attr_as_string|
-            name, value = attr_as_string.scan(/^([^=]+)=(.+)$/)[0]
+          attrs = (atts_as_string.join(' ') + ' ').scan(/([^=]+)=([^=]+) (?=\w?)/).inject({}) do |result, pair|
+            name, value = pair
             result[name.to_sym] = value
             result
           end
@@ -34,6 +34,10 @@ module Mac
             MouseEvent.new(:mouse_drag, attrs[:loc], :right)
           when 'OMouseDragged'
             MouseEvent.new(:mouse_drag, attrs[:loc], :other)
+          when 'KeyDown'
+            KeyboardEvent.new(:key_down, attrs[:keyCode], attrs[:flags])
+          when 'KeyUp'
+            KeyboardEvent.new(:key_up, attrs[:keyCode], attrs[:flags])
           end
         end
       end

data/lib/mac-event-monitor/version.rb

@@ -1,5 +1,5 @@
 module Mac
   module EventMonitor
-    VERSION = "0.0.3"
+    VERSION = "0.1.0"
   end
 end

data/lib/mac-event-monitor.rb

@@ -9,3 +9,4 @@ require 'event_monitor'
 require 'mac-event-monitor/monitor.rb'
 require 'mac-event-monitor/event.rb'
 require 'mac-event-monitor/event/mouse_event.rb'
+require 'mac-event-monitor/event/keyboard_event.rb'

data/spec/mac-event-monitor/event_spec.rb

@@ -12,4 +12,13 @@ describe Event do
     event.location.x.should be_an_instance_of(Float)
     event.location.y.should be_an_instance_of(Float)
   end
+
+  it 'should create event from description with space' do
+    event = Event.create_from_description('NSEvent: type=KeyDown loc=(184,646) time=68067.5 flags=0x20104 win=0x0 winNum=0 ctxt=0x0 chars=" " unmodchars=" " repeat=0 keyCode=49')
+
+    event.should be_an_instance_of(KeyboardEvent)
+    event.type.should equal(:key_down)
+    event.keycode.should equal(49)
+    event.shift_key?.should be_true
+  end
 end

data/spec/mac-event-monitor/monitor_spec.rb

@@ -3,16 +3,15 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 include Mac::EventMonitor
 
 describe Monitor do
-  subject do
-    Monitor.new
+  before do
+    @monitor = Monitor.new
   end
 
   it 'should monitor mouse down events' do
     result = 0
     robot = Mac::Robot.new
 
-    monitor = subject
-    monitor.add_listener(:mouse_down) do |event|
+    @monitor.add_listener(:mouse_down) do |event|
       result += 1
     end
 
@@ -30,7 +29,37 @@ describe Monitor do
       end
 
       EM.add_periodic_timer(0.1) do
-        monitor.run(0.1)
+        @monitor.run(0.1)
+      end
+    end
+
+    result.should be >= 2
+  end
+
+  it 'should monitor key down events' do
+    result = 0
+    robot = Mac::Robot.new
+
+    @monitor.add_listener(:key_down) do |event|
+      result += 1
+    end
+
+    result.should be_zero
+
+    EM.run do
+      [1, 1.5].each do |t|
+        EM.add_timer(t) do
+          robot.key_press(0x04)
+          #robot.key_release(0x04)
+        end
+      end
+
+      EM.add_timer(2) do
+        EM.stop
+      end
+
+      EM.add_periodic_timer(0.1) do
+        @monitor.run(0.1)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mac-event-monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70325557283420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70325557283420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: mac-robot
-  requirement: &70325557283000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70325557283000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70325557282540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70325557282540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Library to Monitor User Interactions
 email:
 - youpy@buycheapviagraonlinenow.com
@@ -64,6 +79,7 @@ files:
 - ext/lib/mkmf.rb
 - lib/mac-event-monitor.rb
 - lib/mac-event-monitor/event.rb
+- lib/mac-event-monitor/event/keyboard_event.rb
 - lib/mac-event-monitor/event/mouse_event.rb
 - lib/mac-event-monitor/monitor.rb
 - lib/mac-event-monitor/version.rb
@@ -85,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3251763459567005321
+      hash: -3347223318557235811
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,10 +110,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3251763459567005321
+      hash: -3347223318557235811
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Library to Monitor User Interactions