fingerpoken 0.2.20110101195735 → 0.2.20110102034531

data/lib/fingerpoken/target.rb

@@ -15,6 +15,8 @@ class FingerPoken::Target
       response = case request["action"]
         when "mousemove_relative"
           mousemove_relative(request["rel_x"], request["rel_y"])
+        when "mousemove_absolute"
+          mousemove_absolute(request["percent_x"], request["percent_y"])
         when "move_end"
           move_end()
         when "click"

data/lib/fingerpoken/vnc.rb

@@ -5,6 +5,8 @@ require "fingerpoken/target"
 class FingerPoken::Target::VNC < FingerPoken::Target
   attr_accessor :x
   attr_accessor :y
+  attr_accessor :screen_x
+  attr_accessor :screen_y
   attr_accessor :buttonmask
 
   def initialize(config)
@@ -48,6 +50,16 @@ class FingerPoken::Target::VNC < FingerPoken::Target
     return nil
   end
 
+  def mousemove_absolute(px, py)
+    # Edges may be hard to hit on some devices, so inflate things a bit.
+    xbuf = @screen_x * 0.1
+    ybuf = @screen_y * 0.1
+    @x = (((@screen_x + xbuf) * px) - (xbuf / 2)).to_i
+    @y = (((@screen_y + ybuf) * py) - (ybuf / 2)).to_i
+    update
+    return nil
+  end
+
   def mousedown(button)
     button = (1 << (button.to_i - 1))
     return if @buttonmask & button != 0
@@ -72,10 +84,12 @@ class FingerPoken::Target::VNC < FingerPoken::Target
     end
     
     def ready
-      @target.register
+      @target.screen_x = @screen_width
+      @target.screen_y = @screen_height
+      @target.buttonmask = 0
       @target.x = (@screen_width / 2).to_i
       @target.y = (@screen_height / 2).to_i
-      @target.buttonmask = 0
+      @target.register
     end
   end # class VNCClient
 end

data/lib/fingerpoken/xdo.rb

@@ -17,20 +17,64 @@ class FingerPoken::Target::Xdo < FingerPoken::Target
     attach_function :xdo_mouseup, [:pointer, :long, :int], :int
     attach_function :xdo_type, [:pointer, :long, :string, :long], :int
     attach_function :xdo_keysequence, [:pointer, :long, :string, :long], :int
+    attach_function :xdo_get_window_size, [:pointer, :long, :pointer, :pointer], :int
+    attach_function :xdo_window_search, [:pointer, :pointer, :pointer, :pointer], :int
   end
 
+  class XdoSearch < FFI::Struct
+    layout :title, :pointer,
+           :winclass, :pointer,
+           :winclassname, :pointer,
+           :winname, :pointer,
+           :pid, :int,
+           :max_depth, :long,
+           :only_visible, :int,
+           :screen, :int,
+           :require, :int,
+           :searchmask, :uint,
+           :desktop, :long
+  end # class XdoSearch
+
   def initialize(config)
     super(config)
     @xdo = LibXdo::xdo_new(nil)
     if @xdo.null?
        raise "xdo_new failed"
     end
+
+    search = XdoSearch.new
+    search[:searchmask] = 1 << 2 # SEARCH_NAME, from xdo.h
+    search[:max_depth] = 0
+    search[:winname] = FFI::MemoryPointer.new(:char, 3)
+    search[:winname].put_string(0, ".*")
+    ptr_nwindows = FFI::MemoryPointer.new(:ulong, 1)
+    ptr_winlist = FFI::MemoryPointer.new(:pointer, 1)
+    LibXdo::xdo_window_search(@xdo, search, ptr_winlist, ptr_nwindows)
+    nwindows = ptr_nwindows.read_long
+    @rootwin = ptr_winlist.read_pointer.read_array_of_long(nwindows)[0]
+
+    ptr_x = FFI::MemoryPointer.new(:int, 1)
+    ptr_y = FFI::MemoryPointer.new(:int, 1)
+
+    LibXdo::xdo_get_window_size(@xdo, @rootwin, ptr_x, ptr_y)
+    @screen_x = ptr_x.read_int
+    @screen_y = ptr_y.read_int
   end
 
   def mousemove_relative(x, y)
     return LibXdo::xdo_mousemove_relative(@xdo, x, y)
   end
 
+  def mousemove_absolute(px, py)
+    # Edges may be hard to hit on some devices, so inflate things a bit.
+    xbuf = @screen_x * 0.1
+    ybuf = @screen_y * 0.1
+    x = (((@screen_x + xbuf) * px) - (xbuf / 2)).to_i
+    y = (((@screen_y + ybuf) * py) - (ybuf / 2)).to_i
+
+    return LibXdo::xdo_mousemove(@xdo, x, y, 0)
+  end
+
   def click(button)
     return LibXdo::xdo_click(@xdo, 0, button.to_i)
   end

data/public/js/fingerpoken.js

@@ -3,6 +3,90 @@
 
   $(document).ready(function() {
     var status = $("#status");
+    var keyboard = $('#keyboard');
+    var keyboard_button = keyboard.prev('a');
+    keyboard.width(keyboard_button.width());
+    keyboard.height(keyboard_button.height());
+    /* TODO(sissel): get the computed width (margin, padding, width) */
+    keyboard.css('margin-left', '-' + keyboard_button.width() + 'px');
+    keyboard.show();
+
+    keyboard.bind("focus", function() {
+      /* move the textarea away so we don't see the caret */
+      keyboard.css('margin-left', '-10000px');
+      state.keyboard = true;
+      $(window).triggerHandler("resize");
+    });
+    keyboard.bind("blur", function(){
+      keyboard.css('margin-left', '-' + keyboard_button.width() + 'px');
+      state.keyboard = false;
+      $(window).triggerHandler("resize");
+    });
+    keyboard.bind("keypress", function(event) {
+      var e = event.originalEvent;
+      var key = e.charCode;
+      if (!key) {
+        key = (e.keyCode ? e.keyCode : e.which);
+      }
+      state.websocket.send(JSON.stringify({ 
+        action: "log",
+        shift: e.shiftKey,
+        char: e.charCode,
+        ctrl: e.ctrlKey,
+        meta: e.ctrlKey,
+      }));
+      state.websocket.send(JSON.stringify({ 
+        action: "keypress",
+        key: key,
+        shift: e.shiftKey,
+      }));
+
+      /* Only prevent default if we're not backspace,
+       * this lets 'backspace' do keyrepeat. */
+      if (key != 8) { 
+        event.preventDefault();
+      }
+    }).bind("change", function(event) {
+      /* Skip empty changes */
+      if (keyboard.val() == "") {
+        return;
+      }
+
+      state.websocket.send(JSON.stringify({ 
+        action: "type",
+        string: keyboard.val(),
+      }));
+
+      /* Clear the field */
+      keyboard.val("");
+    });
+
+    keyboard.bind("keyup", function(event) {
+      var e = event.originalEvent;
+      state.websocket.send(JSON.stringify({ 
+        action: "log",
+        shift: e.shiftKey,
+        char: e.charCode,
+        key: e.which,
+        ctrl: e.ctrlKey,
+        meta: e.ctrlKey,
+      }));
+
+      var key = (e.keyCode ? e.keyCode : e.which);
+      if (key >= 32 && key <= 127) {
+        /* skip printable keys (a-z, etc) */
+        return;
+      }
+
+      state.websocket.send(JSON.stringify({ 
+        action: "keypress",
+        key: key,
+        shift: e.shiftKey,
+      }));
+
+      event.preventDefault();
+    });
+
     var config = function (key, value, default_value) {
       if (value) {
         status.html("config[" + key + "] = " + value);
@@ -22,7 +106,9 @@
       dragging: false,
       width: window.innerWidth,
       height: window.innerHeight,
-      key: undefined,
+      key: undefined, /* TODO(sissel): unused? */
+      keyboard: false,
+      touchpad_active: false,
       mouse: { },
       scroll: {
         y: 0,
@@ -55,7 +141,6 @@
     $("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
@@ -63,7 +148,6 @@
      * Also, we want to make the content size full height. */
     $(window).bind("orientationchange resize pageshow", function(event) {
       scroll(0, 0);
-      console.log(window.orientation);
 
       var header = $(".header:visible");
       var footer = $(".footer:visible");
@@ -74,6 +158,20 @@
 
       /* Trim margin/border/padding height */
       content_height -= (content.outerHeight() - content.height());
+
+      /* TODO(sissel): Make this special handling only for iphones.
+       * http://developer.apple.com/library/safari/#documentation/appleapplications/reference/safariwebcontent/UsingtheViewport/UsingtheViewport.html
+       */
+      if (state.keyboard) {
+        if (window.orientation == 90 || window.orientation == -90) {
+          content_height -= 162; /* landscape orientation keyboard */
+          content_height -= 32; /* "form assistant" aka FormFill, this height is undocumented. */
+        } else {
+          content_height -= 216; /* portrait orientation keyboard */
+          content_height -= 44; /* "form assistant" aka FormFill */
+        }
+      }
+      status.html("Resize / " + window.orientation + " / " + state.keyboard + " / " + content_height);
       content.height(content_height);
     });
 
@@ -121,11 +219,11 @@
     
 
     /* TODO(sissel): add mousedown/mousemove/mouseup support */
-    console.log($("#touchpad-surface"));
-    $("#area").bind("touchstart", function(event) {
-      event.preventDefault();
+    $("#area").bind("touchstart mousedown", function(event) {
       var e = event.originalEvent;
-      var touches = e.touches;
+      state.touchpad_active = true;
+      /* if no 'touches', use the event itself, one finger/mouse */
+      var touches = e.touches || [ e ];
       var output = "Start: " + touches[0].clientX + "," + touches[0].clientY + "\n";
       output += "Fingers: " + touches.length + "\n";
       status.html(output);
@@ -147,9 +245,10 @@
         }))
         state.dragging = true;
       }
-    }).bind("touchend", function(event) { /* $("#touchpadsurface").bind("touchend" ...  */
+      event.preventDefault();
+    }).bind("touchend mouseup", function(event) { /* $("#touchpadsurface").bind("touchend" ...  */
       var e = event.originalEvent;
-      var touches = e.touches;
+      var touches = e.touches || [ e ];
 
       if (state.mouse.vectorTimer) {
         clearInterval(state.mouse.vectorTimer);
@@ -171,83 +270,6 @@
           }
 
           status.html(r);
-          if (r > 75 && r < 105) {
-            /* 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%");
-            status.html("");
-            keyboard.appendTo(status).focus();
-            keyboard.bind("keypress", function(event) {
-              var e = event.originalEvent;
-              var key = e.charCode;
-              console.log(key);
-              if (!key) {
-                key = (e.keyCode ? e.keyCode : e.which);
-              }
-              state.websocket.send(JSON.stringify({ 
-                action: "log",
-                shift: e.shiftKey,
-                char: e.charCode,
-                ctrl: e.ctrlKey,
-                meta: e.ctrlKey,
-              }));
-              state.websocket.send(JSON.stringify({ 
-                action: "keypress",
-                key: key,
-                shift: e.shiftKey,
-              }));
-
-              e.preventDefault();
-            }).bind("change", function(event) {
-              /* Skip empty changes */
-              if (keyboard.val() == "") {
-                return;
-              }
-
-              state.websocket.send(JSON.stringify({ 
-                action: "type",
-                string: keyboard.val(),
-              }));
-
-              /* Clear the field */
-              keyboard.val("");
-            });
-
-            keyboard.bind("keyup", function(event) {
-              var e = event.originalEvent;
-              state.websocket.send(JSON.stringify({ 
-                action: "log",
-                shift: e.shiftKey,
-                char: e.charCode,
-                key: e.which,
-                ctrl: e.ctrlKey,
-                meta: e.ctrlKey,
-              }));
-
-              console.log(key);
-              var key = (e.keyCode ? e.keyCode : e.which);
-              if (key >= 32 && key <= 127) {
-                /* skip printable keys (a-z, etc) */
-                return;
-              }
-
-              state.websocket.send(JSON.stringify({ 
-                action: "keypress",
-                key: key,
-                shift: e.shiftKey,
-              }));
-
-              e.preventDefault();
-            });
-            //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 {
@@ -260,15 +282,21 @@
           state.last_click = (new Date()).getTime();
         }
       }
-      if (touches.length == 0) {
+      if (touches.length == 0 || !e.touches) {
         state.moving = false;
         state.scrolling = false;
+        state.touchpad_active = false;
       }
       event.preventDefault();
-    }).bind("touchmove", function(event) { /* $("#touchpadsurface").bind("touchmove" ... */
+    }).bind("touchmove mousemove", function(event) { /* $("#touchpadsurface").bind("touchmove" ... */
       var e = event.originalEvent;
-      var touches = e.touches;
-      event.preventDefault();
+      var touches = e.touches || [ e ];
+
+      //if (!state.touchpad_active) {
+        //event.preventDefault();
+        //return;
+      //}
+
       if (!state.moving) {
         /* Start calculating delta offsets now */
         state.moving = true;
@@ -348,12 +376,19 @@
         /* 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 == "absolute") {
+          /* Send absolute in terms of percentages. */
+          var content = $(".content:visible");
+          state.websocket.send(JSON.stringify({
+            action: "mousemove_absolute",
+            percent_x: x / content.innerWidth(),
+            percent_y: y / content.innerHeight(),
+          }));
         } else if (movement == "vector") {
           if (!state.mouse.vectorTimer) {
             state.mouse.vectorTimer = setInterval(function() {
@@ -371,7 +406,6 @@
               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",
@@ -381,6 +415,7 @@
             }, 15);
           } /* if (!state.mouse.vectorTimer) */
         } /* mouse vector movement */
+        status.html(output)
       } /* finger movement */
     }); /*  $("#touchpadsurface").bind( ... )*/
 

data/views/index.haml

@@ -24,11 +24,13 @@
         %a{:href => "javascript:window.location.reload()", "data-role" => "button", "data-inline" => true} Reload
       %div.content{"data-role" => "content"}
         #area
-          /%pre#status
+          %pre#status
 
       %div.footer{"data-role" => "footer"}
         %span.left
           %a{:href => "#commands", "data-role" => "button", "data-rel" => "dialog", "data-transition" => "pop"} Commands
+          %a{:href => "#keyboard", "data-role" => "button", "data-action" => "keyboard"} Keyboard
+          %textarea#keyboard{:autocapitalize => "off", :autocorrect => "off"}
         %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

data/views/style.sass

@@ -20,6 +20,7 @@ html, body
     color: orange
 
 .content
+  -webkit-transition: height 0.1s linear
   h1.status
     font-size: 200%
     color: white
@@ -37,8 +38,11 @@ html, body
   padding: 10px
 
 #keyboard
-  width: 100%
-  height: 100%
+  border: 0
+  background: transparent 
   margin: 0
   padding: 0
-  
+  position: absolute
+  outline: none
+  resize: none
+  display: none

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fingerpoken
 version: !ruby/object:Gem::Version 
-  hash: 40220202391481
+  hash: 40220204069073
   prerelease: false
   segments: 
   - 0
   - 2
-  - 20110101195735
-  version: 0.2.20110101195735
+  - 20110102034531
+  version: 0.2.20110102034531
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-01 00:00:00 -08:00
+date: 2011-01-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency