gyruby 0.1.1 → 0.1.3

data/bin/gyration_remote

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'gyruby'
+
+class RemoteRunner
+  @@class_to_run = MplayerController
+  def self.class_to_run=(c)
+    @@class_to_run = c
+  end
+  def self.gyration_pids
+    `pidof -x #{File.basename($0)}`.split.select do |pid|
+      pid.to_s != $$.to_s
+    end
+  end
+  def self.start
+    if gyration_pids.empty?
+      child_pid = fork do
+        grandchild_pid = fork do
+          c = @@class_to_run.new
+          c.listen
+        end
+      end
+      Process.wait(child_pid)
+      return 0
+    else
+      return 1
+    end
+  end
+  def self.stop
+    pids = gyration_pids
+    if pids.empty?
+      return 1
+    else
+      gyration_pids.each do |pid|
+        `kill #{pid}`
+      end
+      return 0
+    end
+  end
+  def self.go!
+    if ARGV.size != 1 || !["start", "stop"].include?(ARGV.first)
+      STDERR.puts("Usage: #{$0} start|stop")
+      exit 1
+    end
+    self.send(ARGV.first)
+  end
+end
+
+if File.basename($0) == File.basename(__FILE__)
+  exit RemoteRunner.go!
+end

data/ext/gyruby_ext.c

@@ -375,6 +375,73 @@ rb_remote_get_grabbed_mouse(VALUE self) {
     return Qtrue;
 }
 
+static VALUE
+rb_remote_send_key(VALUE self, VALUE state, VALUE keycode) {
+  c_remote *this;
+  gboolean grabbed_display = FALSE;
+  XEvent event;
+  Window focus;
+  int focus_return;
+
+  Check_Type(keycode, T_FIXNUM);
+  C_REMOTE(self, this);
+  if (this->display == NULL) {
+    this->display = XOpenDisplay(NULL);
+    grabbed_display = TRUE;
+  }
+  XGetInputFocus(this->display, &focus, &focus_return);
+
+  event.xkey.type = KeyPress;
+  event.xkey.root = XDefaultRootWindow(this->display);
+  event.xkey.window = focus;
+  event.xkey.subwindow = None;
+  event.xkey.keycode = NUM2INT(keycode);
+  event.xkey.same_screen = True;
+  event.xkey.time = CurrentTime;
+  event.xkey.x = 1;
+  event.xkey.y = 1;
+  event.xkey.x_root = 1;
+  event.xkey.y_root = 1;
+  event.xkey.state = NUM2INT(state);
+  XSendEvent(this->display, InputFocus, True, KeyPressMask, &event);
+  event.xkey.type = KeyRelease;
+  XSendEvent(this->display, InputFocus, True, KeyReleaseMask, &event);
+  if (grabbed_display) {
+    XCloseDisplay(this->display);
+    this->display = NULL;
+  }  
+  return self;
+}
+
+static VALUE
+rb_remote_close_active(VALUE self) {
+  c_remote *this;
+  Window active;
+  gint revert_to_return;
+  gboolean grabbed_display = FALSE;
+
+  C_REMOTE(self, this);
+
+  if (this->display == NULL) {
+    this->display = XOpenDisplay(NULL);
+    grabbed_display = TRUE;
+  }
+
+  XGetInputFocus(this->display, &active, &revert_to_return);
+  if (active != XDefaultRootWindow(this->display)) {
+    XSync(this->display, 0);
+    XDestroyWindow(this->display, active);
+    XSync(this->display, 0);
+  }
+
+  if (grabbed_display) {
+    XCloseDisplay(this->display);
+    this->display = NULL;
+  }  
+
+  return self;
+}
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -401,6 +468,8 @@ extern "C" {
     rb_define_private_method(rb_remote, "fetch_mouse_event", rb_remote_fetch_mouse_event, 0);
     rb_define_private_method(rb_remote, "claimed_device?", rb_remote_get_claimed_device, 0);
     rb_define_private_method(rb_remote, "grabbed_mouse?", rb_remote_get_grabbed_mouse, 0);
+    rb_define_private_method(rb_remote, "send_key", rb_remote_send_key, 2);
+    rb_define_private_method(rb_remote, "close_active", rb_remote_close_active, 0);
   }
 #ifdef __cplusplus
 }

data/lib/gyruby/mplayer_controller.rb

@@ -18,8 +18,10 @@
 require 'pathname'
 
 class MplayerController < Gyruby::Remote
+
+  MAX_SKIP = 16.0
   
-  def initialize(user)
+  def initialize
     super()
     subscribe("\b%\377\351\000\000") do |s|
       volume_up
@@ -34,26 +36,67 @@ class MplayerController < Gyruby::Remote
       osd_down
     end
     subscribe("\b%\377\313\000\000", "\b%\377\000\000\000") do |key, options|
-      seek(options[:x].to_f/ options[:xmax].to_f)
+      seek(options[:x].to_f / options[:xmax].to_f)
+    end
+    subscribe("\b%\377\314\000\000") do |s|
+      start_skip
+    end
+    subscribe("\b%\377\000\000\000") do |s|
+      stop_skip
+    end
+    subscribe("\b%\377\314\000\000", "\b%\377\000\000\000") do |key, options|
+      @skip_speed = (((options[:x] * 2.0) / options[:xmax]) - 1.0) * MAX_SKIP
+    end
+    subscribe("\b%\377\315\000\000", "\b%\377\000\000\000") do |key, options|
+      volume(options[:x].to_f / options[:xmax].to_f)
     end
     @osd = 0
-    @user = user
+    @skip_thread = nil
+    @skip_speed = 0.0
   end
 
   private
 
+  def start_skip
+    @skip_thread ||= Thread.new do
+      begin
+        sleep_started = Time.now
+        loop do
+          if @skip_speed != 0
+            if Time.now - sleep_started > (1.0 / @skip_speed.abs)
+              send_command("seek #{@skip_speed > 0 ? 1 : -1}")
+              sleep_started = Time.now
+            end
+          end
+          sleep 0.01
+        end
+      rescue Exception => e
+        STDERR.puts e
+        STDERR.puts e.backtrace.join("\n")
+      end
+    end
+  end
+
+  def stop_skip
+    @skip_thread.kill if @skip_thread.respond_to?(:alive?) && @skip_thread.alive?
+    @skip_thread = nil
+  end
+
   def send_command(cmd)
-    ctrl_path = Pathname.new(File.join("/home", @user, ".mplayer", "fifo"))
+    ctrl_path = Pathname.new(File.join(ENV["HOME"], ".mplayer", "fifo"))
     ctrl_path.open("a") do |ctrl|
       ctrl.puts(cmd)
     end if ctrl_path.exist? && mplayer_running?
   end
 
   def seek(f)
-    puts f.inspect
     send_command("seek #{f * 100} 1")
   end
 
+  def volume(f)
+    send_command("volume #{f * 100} 1")
+  end
+
   def osd_up
     @osd += 1 if @osd < 3
     send_command("osd #{@osd}")
@@ -77,7 +120,7 @@ class MplayerController < Gyruby::Remote
       STDOUT.reopen(open("/dev/null", "w"))
       args = ["/usr/bin/env",
               "pgrep",
-              "-U", @user,
+              "-U", ENV["USER"],
               "mplayer"]
       exec(*args)
     end

data/lib/gyruby/remote.rb

@@ -15,10 +15,28 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'set'
+
 module Gyruby
 
   class Remote
 
+    class MouseButton
+      attr_accessor :action, :block, :frequency, :last, :event, :press
+      def initialize(options)
+        @event, @block, @frequency = options.delete(:event), options.delete(:block), options.delete(:frequency)
+        @last = nil
+        @action = :press
+        @press = self
+      end
+      def release(event)
+        rval = self.clone
+        rval.action = :release
+        rval.event = event
+        return rval
+      end
+    end
+
     def initialize
       @subscribed_buttons = {}
       @pressed_buttons = {}
@@ -26,17 +44,16 @@ module Gyruby
       @listening = false
     end
 
-    def subscribe(button, release = false, frequency = 10, &block)
+    def subscribe(press, release = false, frequency = 10, &block)
       if release
-        @mouse_buttons[button] = {
-          :action => :press, 
-          :block => block, 
-          :frequency => frequency,
-          :last => nil
-        }
-        @mouse_buttons[release] = {:action => :release, :press => button}
+        button = MouseButton.new(:block => block, :frequency => frequency, :event => press)
+        @mouse_buttons[press] ||= []
+        @mouse_buttons[press] << button
+        @mouse_buttons[release] ||= []
+        @mouse_buttons[release] << button.release(release)
       else
-        @subscribed_buttons[button] = block
+        @subscribed_buttons[press] ||= []
+        @subscribed_buttons[press] << block
       end
     end
 
@@ -62,27 +79,39 @@ module Gyruby
 
     def handle_usb_event
       event = fetch_usb_event
-      if block = @subscribed_buttons[event]
-        block.call(event)
+      if blocks = @subscribed_buttons[event]
+        blocks.each do |block|
+          block.call(event)
+        end
       end
-      if button_status = @mouse_buttons[event]
-        if button_status[:action] == :press
-          @pressed_buttons[event] = button_status
-          grab_mouse unless grabbed_mouse?
-        elsif button_status[:action] == :release
-          @pressed_buttons.delete(button_status[:press])
-          ungrab_mouse if grabbed_mouse? && @pressed_buttons.empty?
+      if mouse_buttons = @mouse_buttons[event]
+        mouse_buttons.each do |button|
+          if button.action == :press
+            @pressed_buttons[button.event] ||= Set.new
+            @pressed_buttons[button.event] << button
+            grab_mouse unless grabbed_mouse?
+          elsif button.action == :release
+            if buttons = @pressed_buttons[button.press.event]
+              buttons.delete(button.press)
+              if buttons.empty?
+                @pressed_buttons.delete(button.press.event) 
+              end
+            end
+            ungrab_mouse if grabbed_mouse? && @pressed_buttons.empty?
+          end
         end
       end
     end
 
     def handle_mouse_event
       mouse_event = fetch_mouse_event
-      @pressed_buttons.each do |key_event, button_status|
-        button_status[:last] ||= Time.now
-        if (Time.now - button_status[:last]) > 1.0 / button_status[:frequency]
-          @mouse_buttons[key_event][:block].call(key_event, mouse_event)
-          button_status[:last] = Time.now
+      @pressed_buttons.each do |key_event, buttons|
+        buttons.each do |button|
+          button.last ||= Time.now
+          if (Time.now - button.last) > 1.0 / button.frequency
+            button.block.call(key_event, mouse_event)
+            button.last = Time.now
+          end
         end
       end unless mouse_event.nil?
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gyruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors: 
 - Martin Kihlgren
@@ -9,22 +9,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-26 00:00:00 +02:00
+date: 2008-06-06 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
 description: 
 email: gyruby at troja dot ath dot cx
-executables: []
-
+executables: 
+- gyration_remote
 extensions: 
 - ext/extconf.rb
 extra_rdoc_files: []
 
 files: 
-- lib/gyruby.rb
-- lib/gyruby/remote.rb
 - lib/gyruby/mplayer_controller.rb
+- lib/gyruby/remote.rb
+- lib/gyruby.rb
+- bin/gyration_remote
 - ext/extconf.rb
 - ext/gyruby_ext.c
 has_rdoc: true
@@ -50,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.1.1
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: A ruby binding for the Gyration FiireChief remote control for LinuxMCE.