fingerpoken 0.2.20101216024109 → 0.2.20101217123250

data/bin/fingerpoken.rb

@@ -63,7 +63,10 @@ def main(args)
       ws.onmessage do |message|
         request = JSON.parse(message)
         puts "Request: #{request.inspect}"
-        channel.push(request)
+        channel.push(
+          :request => request,
+          :callback => proc { |message| ws.send(JSON.dump(message)) }
+        )
       end # ws.onmessage
     end # WebSocket
     

data/lib/fingerpoken/target.rb

@@ -7,25 +7,30 @@ class FingerPoken::Target
   end
 
   def register
-    @channel.subscribe do |request|
-      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"
-        mousedown(request["button"])
-      when "mouseup"
-        mouseup(request["button"])
-      when "type"
-        type(request["string"])
-      when "keypress"
-        keypress(request["key"])
-      else
-        p ["Unsupported action", request]
+    @channel.subscribe do |obj|
+      request = obj[:request]
+      callback = obj[:callback]
+      response = 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"
+          mousedown(request["button"])
+        when "mouseup"
+          mouseup(request["button"])
+        when "type"
+          type(request["string"])
+        when "keypress"
+          keypress(request["key"])
+        else
+          p ["Unsupported action", request]
       end
+
+      p [callback, response]
+      callback.call(response)
     end
   end
 

data/lib/fingerpoken/tivo.rb

@@ -41,24 +41,36 @@ class FingerPoken::Target::Tivo < FingerPoken::Target
       # decrease to it
     end
     @state.speed = want_speed
+
+    if @state.speed > 0
+      char = "\\u23E9" * @state.speed
+    else
+      char = "\\u23EA" * @state.speed.abs
+    end
+    return { "action" => "status", "status" => char }
   end
 
   def move_end
     @tivo.send_data("IRCODE PLAY\r\n")
+    return { "action" => "status", "status" => "\\u25b6" }
   end
 
   def click(button)
     case button.to_i
     when 1
       @tivo.send_data("IRCODE PAUSE\r\n")
+      return { "action" => "status", "status" => "Pause" }
     when 2 # 'middle' click (three fingers)
       @tivo.send_data("IRCODE SELECT\r\n")
+      return { "action" => "status", "status" => "Select" }
     #when 2 # 'middle' click (three fingers)
       #@tivo.send_data("IRCODE TIVO\r\n")
     when 4 # scroll up
       @tivo.send_data("IRCODE UP\r\n")
+      return { "action" => "status", "status" => "Up" }
     when 5 # scroll down
       @tivo.send_data("IRCODE DOWN\r\n")
+      return { "action" => "status", "status" => "Down" }
     end
   end
 

data/public/js/fingerpoken.js

@@ -29,6 +29,17 @@
       }
     };
 
+    state.message_callback = function(request) {
+      action = request["action"];
+      switch (action) {
+        case "status":
+          //$("#area").html("<h1 class='status'>" + request["status"] + "</h1>");
+          /* Use eval to do unicode escaping */
+          $("#area").html("<h1 class='status'>" + eval("\"" + request["status"] + "\"") + "</h1>");
+          break;
+      }
+    };
+
     /* Sync configuration elements */
 
     /* Mouse movement */
@@ -78,6 +89,11 @@
         }, 1000);
       }
 
+      websocket.onmessage = function(event) {
+        var request = JSON.parse(event.data);
+        state.message_callback(request)
+      }
+
       state.websocket = websocket;
     }
 

data/views/index.haml

@@ -24,7 +24,7 @@
         %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

data/views/style.sass

@@ -20,6 +20,9 @@ html, body
     color: orange
 
 .content
+  h1.status
+    font-size: 400%
+    color: white
 .header
 .footer
   font-size: 120%

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fingerpoken
 version: !ruby/object:Gem::Version 
-  hash: 40202432048205
+  hash: 40202434246515
   prerelease: false
   segments: 
   - 0
   - 2
-  - 20101216024109
-  version: 0.2.20101216024109
+  - 20101217123250
+  version: 0.2.20101217123250
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 -08:00
+date: 2010-12-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency