fingerpoken 0.2.20101209171641 → 0.2.20101216024109

data/bin/fingerpoken.rb

@@ -26,19 +26,38 @@ class FingerPoken < Sinatra::Base
 end
 
 def main(args)
+  targets = []
   opts = OptionParser.new do |opts|
+    opts.banner = "Usage: #{$0} [options]"
+
+    opts.on("-t TARGET", "--target TARGET",
+            "Target a url. Can be given multiple times to target multiple things.") do |url|
+      target = URI.parse(url)
+      case target.scheme
+      when "xdo"
+        require "fingerpoken/#{target.scheme}"
+        targets << [:Xdo, {}]
+      when "vnc"
+        require "fingerpoken/#{target.scheme}"
+        targets << [:VNC, {}]
+      when "tivo"
+        require "fingerpoken/#{target.scheme}"
+        targets << [:Tivo, { :host => "192.168.0.134" }]
+      end
+    end
   end
+  opts.parse(args)
+
+  puts targets
+
   EventMachine::run do
     $:.unshift(File.dirname(__FILE__) + "/lib")
     channel = EventMachine::Channel.new
 
-    # TODO(sissel): Pick up here and make command flags to choose the 
-    # target (vnc, xdo, etc)
-    require "fingerpoken/xdo"
-    target = FingerPoken::Target::Xdo.new :channel => channel
-    
-    #require "fingerpoken/vnc"
-    #target = FingerPoken::Target::VNC.new :channel => channel
+    targets.each do |klass, args|
+      args.merge!({ :channel => channel })
+      puts FingerPoken::Target.const_get(klass).new(args)
+    end
 
     EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 5001) do |ws|
       ws.onmessage do |message|

data/lib/fingerpoken/target.rb

@@ -11,6 +11,8 @@ class FingerPoken::Target
       case request["action"]
       when "mousemove_relative"
         mousemove_relative(request["rel_x"], request["rel_y"])
+      when "move_end"
+        move_end()
       when "click"
         click(request["button"])
       when "mousedown"
@@ -60,4 +62,8 @@ class FingerPoken::Target
   def keyup(key)
     @logger.info("keyup not supported")
   end
+
+  def move_end()
+    @logger.info("move_end not supported")
+  end
 end # class FingerPoken::Target

data/lib/fingerpoken/tivo.rb

@@ -0,0 +1,95 @@
+#!/usr/bin/env ruby
+
+# TODO(sissel): Refactor the protocol into an EM::Tivo module.
+
+require "rubygems"
+require "fingerpoken/target"
+require "ostruct"
+
+class FingerPoken::Target::Tivo < FingerPoken::Target
+  def initialize(config)
+    super(config)
+    # TODO(sissel): Make this a config
+    @host = config[:host]
+    @tivo = EventMachine::connect(@host, 31339, TivoClient, self)
+
+    @state = OpenStruct.new # TODO(sissel): Make this not an open struct...
+    
+    @state.speed = 0
+  end
+
+  def mousemove_relative(x, y)
+    direction = x < 0 ? -1 : 1
+    want_speed = [(x.abs / 30).to_i, 3].min
+
+    want_speed *= direction
+    if want_speed != @state.speed
+      p [want_speed]
+    end
+
+    if want_speed > @state.speed
+      # increase to it
+      1.upto(want_speed - @state.speed).each do
+        puts "UP"
+        @tivo.send_data("IRCODE FORWARD\r\n")
+      end
+    elsif (want_speed < @state.speed) 
+      1.upto( (want_speed - @state.speed).abs ).each do
+        @tivo.send_data("IRCODE REVERSE\r\n")
+        puts "DOWN"
+      end
+      # decrease to it
+    end
+    @state.speed = want_speed
+  end
+
+  def move_end
+    @tivo.send_data("IRCODE PLAY\r\n")
+  end
+
+  def click(button)
+    case button.to_i
+    when 1
+      @tivo.send_data("IRCODE PAUSE\r\n")
+    when 2 # 'middle' click (three fingers)
+      @tivo.send_data("IRCODE SELECT\r\n")
+    #when 2 # 'middle' click (three fingers)
+      #@tivo.send_data("IRCODE TIVO\r\n")
+    when 4 # scroll up
+      @tivo.send_data("IRCODE UP\r\n")
+    when 5 # scroll down
+      @tivo.send_data("IRCODE DOWN\r\n")
+    end
+  end
+
+  # Hack for now
+  def keypress(key)
+    case key
+    when "Home"
+      @tivo.send_data("IRCODE TIVO\r\n")
+    when "Return"
+      @tivo.send_data("IRCODE SELECT\r\n")
+    end
+  end
+
+  class TivoClient < EventMachine::Connection
+    def initialize(target)
+      puts "init #{self} / #{target}"
+      @target = target
+    end
+
+    def connection_completed
+      @target.register
+      puts "Ready"
+    end
+
+    def receive_data(data)
+      p "Tivo says: #{data}"
+    end
+
+    def send_data(data)
+      puts "Sending: #{data}"
+      super(data)
+    end
+  end # class TivoClient
+end # class FingerPoken::Target::Tivo 

data/lib/fingerpoken/vnc.rb

@@ -33,7 +33,6 @@ class FingerPoken::Target::VNC < FingerPoken::Target
     end
   end
 
-
   def mousemove_relative(x, y)
     @x += x
     @y += y
@@ -41,14 +40,14 @@ class FingerPoken::Target::VNC < FingerPoken::Target
   end
 
   def mousedown(button)
-    button = (1 << (button - 1))
+    button = (1 << (button.to_i - 1))
     return if @buttonmask & button != 0
     @buttonmask |= button
     update
   end
 
   def mouseup(button)
-    button = (1 << (button - 1))
+    button = (1 << (button.to_i - 1))
     return if @buttonmask & button == 0
     @buttonmask &= (~button)
     update

data/lib/fingerpoken/xdo.rb

@@ -62,7 +62,7 @@ class FingerPoken::Target::Xdo < FingerPoken::Target
     else
       # type printables, key others.
       if 32.upto(127).include?(key)
-        LibXdo::xdo_type(@xdo, 0, request["key"].chr, 12000)
+        LibXdo::xdo_type(@xdo, 0, key.chr, 12000)
       else
         case key
           when 8 

data/public/js/fingerpoken.js

@@ -2,6 +2,19 @@
   /* TODO(sissel): This could use some serious refactoring. */
 
   $(document).ready(function() {
+    var status = $("#status");
+    var config = function (key, value, default_value) {
+      if (value) {
+        status.html("config[" + key + "] = " + value);
+        //alert(key + " => " + value);
+        
+        window.localStorage[key] = value
+        return value
+      } else {
+        return window.localStorage[key] || default_value
+      }
+    };
+
     var state = {
       x: -1,
       y: -1,
@@ -10,8 +23,27 @@
       width: window.innerWidth,
       height: window.innerHeight,
       key: undefined,
-    }
-    var status = $("#status");
+      mouse: { },
+      scroll: {
+        y: 0,
+      }
+    };
+
+    /* Sync configuration elements */
+
+    /* Mouse movement */
+    console.log(config("fingerpoken/mouse/movement"));
+    $("input[name = \"mouse-config\"]")
+      .bind("change", function(event) {
+        config("fingerpoken/mouse/movement", event.target.value);
+      }).filter("[value = \"" + config("fingerpoken/mouse/movement") + "\"]")
+      .attr("checked", "checked").click()
+    
+    $("input[name = \"mouse-acceleration\"]")
+      .bind("change", function(event) {
+        config("fingerpoken/mouse/acceleration", parseInt(event.target.value));
+        //status.html(event.target.value);
+      }).val(config("fingerpoken/mouse/acceleration")).change();
 
     /* Changing orientation sometimes leaves the viewport
      * not starting at 0,0. Fix it with this hack.
@@ -70,6 +102,8 @@
     //});
     
 
+    /* TODO(sissel): add mousedown/mousemove/mouseup support */
+    console.log($("#touchpad-surface"));
     $("#area").bind("touchstart", function(event) {
       event.preventDefault();
       var e = event.originalEvent;
@@ -95,9 +129,15 @@
         }))
         state.dragging = true;
       }
-    }).bind("touchend", function(event) { /* $("#area").bind("touchend" ...  */
+    }).bind("touchend", function(event) { /* $("#touchpadsurface").bind("touchend" ...  */
       var e = event.originalEvent;
       var touches = e.touches;
+
+      if (state.mouse.vectorTimer) {
+        clearInterval(state.mouse.vectorTimer);
+        state.mouse.vectorTimer = null;
+      }
+
       if (state.dragging) {
         state.websocket.send(JSON.stringify({
           action: "mouseup",
@@ -105,7 +145,7 @@
         }));
         state.dragging = false;
       } else {
-        if (state.moving) {
+        if (state.moving && !state.scrolling) {
           var e = state.last_move;
           var r = e.rotation;
           if (r < 0) {
@@ -114,7 +154,7 @@
 
           status.html(r);
           if (r > 75 && r < 105) {
-            /* Activate the keyboard when there's a 90-dgree rotation*/
+            /* Activate the keyboard when there's a ~90-degree rotation*/
             var keyboard = $("<textarea id='keyboard' rows='10'></textarea>");
             keyboard.css("width", "100%");
             keyboard.css("height", "100%");
@@ -184,7 +224,14 @@
             });
             //status.html("<textarea id='keyboard'></textarea>");
             //$("#keyboard").focus();
+          } else { /* Otherwise, we didn't rotate */
+            state.websocket.send(JSON.stringify({ 
+              action: "move_end",
+              now: (new Date()),
+            }));
           }
+        } else if (state.scrolling) {
+          /* nothing for now */
         } else {
           /* No movement, click! */
           status.html("Click!");
@@ -196,16 +243,17 @@
         }
       }
       state.moving = false;
+      state.scrolling = false;
       event.preventDefault();
-    }).bind("touchmove", function(event) { /* $("#area").bind("touchmove" ... */
+    }).bind("touchmove", function(event) { /* $("#touchpadsurface").bind("touchmove" ... */
       var e = event.originalEvent;
       var touches = e.touches;
       event.preventDefault();
       if (!state.moving) {
         /* Start calculating delta offsets now */
         state.moving = true;
-        state.x = touches[0].clientX;
-        state.y = touches[0].clientY;
+        state.start_x = state.x = touches[0].clientX;
+        state.start_y = state.y = touches[0].clientY;
         /* Skip this event */
         return;
       }
@@ -224,28 +272,33 @@
       output += "rotation: " + r + "\n";
       output += "scale: " + e.scale + "\n";
 
-      x = touches[0].clientX;
-      y = touches[0].clientY;
-      delta_x = (x - state.x);
-      delta_y = (y - state.y);
+      var x = touches[0].clientX;
+      var y = touches[0].clientY;
+      var delta_x = (x - state.x);
+      var delta_y = (y - state.y);
 
       /* Apply acceleration */
-      sign_x = (delta_x < 0 ? -1 : 1);
-      sign_y = (delta_y < 0 ? -1 : 1);
-      delta_x = Math.ceil(Math.pow(Math.abs(delta_x), 1.5) * sign_x);
-      delta_y = Math.ceil(Math.pow(Math.abs(delta_y), 1.5) * sign_y);
+      var sign_x = (delta_x < 0 ? -1 : 1);
+      var sign_y = (delta_y < 0 ? -1 : 1);
 
+      /* jQuery Mobile or HTML 'range' inputs don't support floating point.
+       * Hack around it by using larger numbers and compensating. */
+      var accel = config("fingerpoken/mouse/acceleration", null, 150) / 100.0;
+      output += "Accel: " + accel + "\n";
 
+      var delta_x = Math.ceil(Math.pow(Math.abs(delta_x), accel) * sign_x);
+      var delta_y = Math.ceil(Math.pow(Math.abs(delta_y), accel) * sign_y);
       output += "Delta: " + delta_x + ", " + delta_y + "\n";
-      status.html(output);
 
       state.x = x;
       state.y = y;
 
+      /* TODO(sissel): Make this a config option */
       if (e.rotation < -10 || e.rotation > 10) {
         /* Skip rotations that are probably not mouse-cursor-wanting movements */
         return;
       }
+      /* TODO(sissel): Make this a config option */
       if (e.scale < 0.9 || e.scale > 1.1) {
         /* Skip scales that are probably not mouse-cursor-wanting movements */
         return;
@@ -253,22 +306,63 @@
 
       if (touches.length > 1 && !state.dragging) {
         /* Multifinger movement, probably should scroll? */
-        if (delta_y < 0 || delta_y > 0) {
+        if (Math.abs(delta_y) > 0) {
           /* Scroll */
-          state.websocket.send(JSON.stringify({
-            action: "click",
-            button: (delta_y < 0) ? 4 : 5,
-          }))
-        }
-        
+          state.scroll.y += delta_y;
+
+          /* Don't scroll every time we move, wait until we move enough
+           * that it is more than 10 pixels. */
+          /* TODO(sissel): Make this a config option */
+          if (Math.abs(state.scroll.y) > 10) {
+            state.scrolling = true;
+            state.moving = false;
+            state.scroll.y  = 0;
+            state.websocket.send(JSON.stringify({
+              action: "click",
+              button: (delta_y < 0) ? 4 : 5,
+            }))
+          }
+        } /* if (Math.abs(delta_y) > 0) */
       } else {
-        state.websocket.send(JSON.stringify({
-          action: "mousemove_relative",
-          rel_x: delta_x,
-          rel_y: delta_y
-        }));
-      }
-    }); /*  $("#area").bind( ... )*/
+        /* Only 1 finger, and we aren't dragging. So let's move! */
+        /* TODO(sissel): Refactor these in to fumctions */
+        var movement = config("fingerpoken/mouse/movement");
+        if (movement == "relative") {
+          status.html(output);
+          state.websocket.send(JSON.stringify({
+            action: "mousemove_relative",
+            rel_x: delta_x,
+            rel_y: delta_y
+          }));
+        } else if (movement == "vector") {
+          if (!state.mouse.vectorTimer) {
+            state.mouse.vectorTimer = setInterval(function() {
+              var rx = state.x - state.start_x;
+              var ry = state.y - state.start_y;
+              if (rx == 0 || ry == 0) {
+                return;
+              }
+
+              var sign_rx = (rx < 0 ? -1 : 1);
+              var sign_ry = (ry < 0 ? -1 : 1);
+              var vector_accel = accel / 1.7 /* feels like the right ratio */
+
+              output = "rx,ry = " + rx + ", " + ry + "\n";
+              rx = Math.ceil(Math.pow(Math.abs(rx), vector_accel) * sign_rx);
+              ry = Math.ceil(Math.pow(Math.abs(ry), vector_accel) * sign_ry);
+              output += "rx2,ry2 = " + rx + ", " + ry + "\n"; 
+              status.html(output)
+
+              state.websocket.send(JSON.stringify({
+                action: "mousemove_relative",
+                rel_x: rx,
+                rel_y: ry
+              }));
+            }, 15);
+          } /* if (!state.mouse.vectorTimer) */
+        } /* mouse vector movement */
+      } /* finger movement */
+    }); /*  $("#touchpadsurface").bind( ... )*/
 
 
     /* Take commands like this:
@@ -280,22 +374,21 @@
      * <a class="command" data-action="click" data-button="button to click">
      */
     $("a.command").bind("touchstart", function(event) {
-      //event.preventDefault();
       state.touchelement = this;
-    }).bind("touchmove", function(event) {
+    }).bind("mousedown", function(event) {
+      state.touchelement = this;
+      event.preventDefault();
+    }).bind("touchmove mousemove", function(event) {
       event.preventDefault();
-    }).bind("touchend", function(event) {
-      //event.preventDefault();
-      console.log(this)
+    }).bind("touchend mouseup", function(event) {
       if (state.touchelement == this) {
-        console.log(this)
         state.websocket.send(JSON.stringify({ 
           action: $(this).attr("data-action"),
           key: $(this).attr("data-key"),
-          button: $(this).attr("data-button"),
+          button: parseInt($(this).attr("data-button")),
         }));
       }
     });
-    
+
   }); /* $(document).ready */
 })();

data/views/index.haml

@@ -16,10 +16,11 @@
              :type => "text/javascript" }
 
   %body
+    / touchpad
     %div{"data-role" => "page", "data-theme" => "a", "id" => "touchpad"}
       %div.header{"data-role" => "header"}
         %h1 fingerpoken
-        %a{:href => "config", "data-role" => "button", "data-inline" => true} Config
+        %a{:href => "#config", "data-role" => "button", "data-rel" => "dialog", "data-transition" => "pop"} Config
         %a{:href => "javascript:window.location.reload()", "data-role" => "button", "data-inline" => true} Reload
       %div.content{"data-role" => "content"}
         #area
@@ -27,7 +28,7 @@
 
       %div.footer{"data-role" => "footer"}
         %span.left
-          %a#extras{:href => "#commands", "data-role" => "button", "data-rel" => "dialog", "data-transition" => "pop"} Commands
+          %a{:href => "#commands", "data-role" => "button", "data-rel" => "dialog", "data-transition" => "pop"} Commands
         %span.right
           %a.command{:href => "#", "data-role" => "button", "data-action" => "click", "data-button" => "1"} Left
           %a.command{:href => "#", "data-role" => "button", "data-action" => "click", "data-button" => "3"} Right
@@ -35,6 +36,7 @@
     %div{"data-role" => "page", "data-theme" => "a", "id" => "commands"}
       %div{"data-role" => "header"}
         %h1 Commands
+        %a{:href => "#touchpad", "data-role" => "button"} Touchpad
       %div{"data-role" => "content"}
         %a.command{:href => "#", "data-role" => "button", "data-action" => "keypress", "data-key" => "Right"} Next Slide
         %a.command{:href => "#", "data-role" => "button", "data-action" => "keypress", "data-key" => "Left"} Prev Slide
@@ -42,7 +44,30 @@
         %a.command{:href => "#", "data-role" => "button", "data-action" => "keypress", "data-key" => "ctrl+plus"} Zoom In
         %a.command{:href => "#", "data-role" => "button", "data-action" => "keypress", "data-key" => "ctrl+minus"} Zoom Out
         %a.command{:href => "#", "data-role" => "button", "data-action" => "keypress", "data-key" => "ctrl+0"} Zoom Zero
-      %div{"data-role" => "footer"}
+        %hr
+        %a.command{:href => "#", "data-role" => "button", "data-action" => "keypress", "data-key" => "alt+Return"} Full Screen
+        %a.command{:href => "#", "data-role" => "button", "data-action" => "keypress", "data-key" => "End"} End
+        %a.command{:href => "#", "data-role" => "button", "data-action" => "keypress", "data-key" => "Home"} Home
+        %a.command{:href => "#", "data-role" => "button", "data-action" => "keypress", "data-key" => "Return"} Return
+
+    %div{"data-role" => "page", "data-theme" => "a", "id" => "config"}
+      %div{"data-role" => "header"}
         %a{:href => "#touchpad", "data-role" => "button"} Touchpad
+        %h1 Configuration
+      %div{"data-role" => "content"}
+        Mouse movement
+        
+        / Mouse movement type
+        %fieldset{"data-role" => "controlgroup"}
+          %input{:type => :radio, :name => "mouse-config", :id => "mouse-relative", :value => "relative"}
+          %label{:for => "mouse-relative"} relative
+          %input{:type => :radio, :name => "mouse-config", :id => "mouse-absolute", :value => "absolute"}
+          %label{:for => "mouse-absolute"} absolute
+          %input{:type => :radio, :name => "mouse-config", :id => "mouse-vector", :value => "vector"}
+          %label{:for => "mouse-vector"} vector
+
+        / Mouse acceleration
+        %label{:for => "mouse-acceleration"} Acceleration
+        %input{:type => "range", :name => "mouse-acceleration", :id => "mouse-acceleration", :min => 1, :max => 300, :step => "any"}
 
     %script{ :src => "/js/fingerpoken.js" }

data/views/style.sass

@@ -19,34 +19,14 @@ html, body
   h1
     color: orange
 
-#menu
-  width: 100%
-  color: white
-  font-family: sans-serif
-  font-weight: bold
-  text-align: center
-  vertical-align: middle
-  padding: 0
-  padding-bottom: 5px
-  margin: 0
-
-  .item:last-child
-    border-right: 2px solid lightgreen
-  .item
-    font-size: 250%
-    border: 2px solid lightgreen
-    border-right: 0px
-    height: 40px
-    padding: 10px
-    margin: 0
-    text-align: center
-    vertical-align: middle
 .content
 .header
 .footer
   font-size: 120%
   .right
     float: right
+//.content > #area
+  //padding: 0px !important
 #area
   width: 100%
   height: 100%

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fingerpoken
 version: !ruby/object:Gem::Version 
-  hash: 40202418343269
+  hash: 40202432048205
   prerelease: false
   segments: 
   - 0
   - 2
-  - 20101209171641
-  version: 0.2.20101209171641
+  - 20101216024109
+  version: 0.2.20101216024109
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 -08:00
+date: 2010-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,11 +71,22 @@ extra_rdoc_files: []
 files: 
 - lib/fingerpoken/xdo.rb
 - lib/fingerpoken/target.rb
+- lib/fingerpoken/tivo.rb
 - lib/fingerpoken/vnc.rb
 - public/reset.css
 - public/js/fingerpoken.js
 - public/js/jquery.min.js
 - public/js/jquery.mobile-1.0a2.min.js
+- public/images/form-radio-on.png
+- public/images/form-check-on.png
+- public/images/icons-36-white.png
+- public/images/icons-36-black.png
+- public/images/icon-search-black.png
+- public/images/icons-18-white.png
+- public/images/ajax-loader.png
+- public/images/form-radio-off.png
+- public/images/icons-18-black.png
+- public/images/form-check-off.png
 - public/jquery.mobile-1.0a2.min.css
 - views/style.sass
 - views/index.haml