fusuma 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e54f849efbfb11bcf56c129f310e9b12b34e6ee
-  data.tar.gz: 79fff6396e15de51fa7427b21cc92e58ab10aefd
+  metadata.gz: 3978122d47e2294dd5d8391e76a0507c1e21b8de
+  data.tar.gz: aa5df2c6707a715577a43e43e4a5ea7e9482a084
 SHA512:
-  metadata.gz: 060dc7031139ae57d334b0d1824f96620361244b53ce62753c511225537bb6d68730b2cd235b297bea037ef59cc32571254f62444d9d60ea847002ce5208be06
-  data.tar.gz: 3ae2d1a41001e113f57f398000892c67518910485a90520514ed5bbc0f7fd379f59aefc07f9aa0a7e29001145c81a20fb89d0ab9d8f6e6c453920a8a31796422
+  metadata.gz: 124a58da4e05ae6f4cf9881a0678942eb639728e326651106a4bc6938b1397a7db36bb50efa7fbca8d99e92fe513449291ba03ee5fa906b4e0b87df06e6134ad
+  data.tar.gz: 44cec21490f90665063ebbd3c7567dd595ade069efc583076ffb8842b42bcd9304b55c544f072c4a3be75a1ab6398179eb6bae247574e867d215d02743d2160c

data/lib/fusuma.rb

@@ -42,8 +42,9 @@ module Fusuma
     private
 
     def libinput_command
+      # NOTE: --enable-dwt means "disable while typing"
       @libinput_command ||= "stdbuf -oL -- libinput-debug-events --device \
-    /dev/input/#{device_name}"
+      /dev/input/#{device_name} --enable-dwt"
       MultiLogger.debug(libinput_command: @libinput_command)
       @libinput_command
     end
@@ -72,11 +73,11 @@ module Fusuma
     end
 
     def trigger_keyevent(gesture_info)
-      case gesture_info.action
+      case gesture_info.action_type
       when 'swipe'
-        swipe(gesture_info.finger, gesture_info.direction.move)
+        swipe(gesture_info.finger, gesture_info.direction)
       when 'pinch'
-        pinch(gesture_info.direction.pinch)
+        pinch(gesture_info.direction)
       end
     end
 
@@ -85,8 +86,8 @@ module Fusuma
       `xdotool key #{shortcut}` unless shortcut.nil?
     end
 
-    def pinch(zoom)
-      shortcut = event_map['pinch'][zoom]['shortcut']
+    def pinch(direction)
+      shortcut = event_map['pinch'][direction]['shortcut']
       `xdotool key #{shortcut}` unless shortcut.nil?
     end
 

data/lib/fusuma/action_stack.rb

@@ -7,14 +7,16 @@ module Fusuma
 
     # return { finger:, direction:, action: } or nil
     def gesture_info
-      return unless enough_actions?
-      MultiLogger.debug(enough_actions?: enough_actions?)
-      direction = detect_direction
-      finger    = detect_finger
-      action    = detect_action
+      return unless enough_actions? && enough_time_passed?
+      action_type = detect_action_type
+      direction = detect_direction(action_type)
+      return if direction.nil?
+      @last_triggered_time = last.time
+      finger = detect_finger
       clear
-      MultiLogger.debug(finger: finger, direction: direction, action: action)
-      GestureInfo.new(finger, direction, action)
+      MultiLogger.debug(finger: finger, direction: direction,
+                        action_type: action_type)
+      GestureInfo.new(finger, direction, action_type)
     end
 
     def push(gesture_action)
@@ -25,36 +27,56 @@ module Fusuma
 
     private
 
-    GestureInfo = Struct.new(:finger, :direction, :action)
-    Direction = Struct.new(:move, :pinch)
+    GestureInfo = Struct.new(:finger, :direction, :action_type)
 
-    def detect_direction
-      direction_hash = sum_direction
-      move = detect_move(direction_hash)
-      pinch = detect_pinch(direction_hash)
-      Direction.new(move, pinch)
+    def elapsed_time
+      return 0 if length == 0
+      last.time - first.time
     end
 
-    def detect_move(direction_hash)
-      if direction_hash[:move][:x].abs > direction_hash[:move][:y].abs
-        return direction_hash[:move][:x] > 0 ? 'right' : 'left'
+    def detect_direction(action_type)
+      case action_type
+      when 'swipe'
+        detect_move
+      when 'pinch'
+        detect_zoom
       end
-      direction_hash[:move][:y] > 0 ? 'down' : 'up'
     end
 
-    def detect_pinch(direction_hash)
-      direction_hash[:pinch] > 1 ? 'in' : 'out'
+    def detect_move
+      moves = sum_moves
+      return nil if moves[:x].zero? && moves[:y].zero?
+      # MultiLogger.debug(moves: moves)
+      return nil if (moves[:x].abs < 200) && (moves[:y].abs < 200)
+      if moves[:x].abs > moves[:y].abs
+        return moves[:x] > 0 ? 'right' : 'left'
+      else
+        moves[:y] > 0 ? 'down' : 'up'
+      end
+    end
+
+    def detect_zoom
+      diameter = mul_diameter
+      # TODO: change threshold from config files
+      if diameter > 10
+        'in'
+      elsif diameter < 0.1
+        'out'
+      end
     end
 
     def detect_finger
       last.finger
     end
 
-    def sum_direction
+    def sum_moves
       move_x = sum_attrs(:move_x)
       move_y = sum_attrs(:move_y)
-      pinch  = mul_attrs(:pinch)
-      { move: { x: move_x, y: move_y }, pinch: pinch }
+      { x: move_x, y: move_y }
+    end
+
+    def mul_diameter
+      mul_attrs(:zoom)
     end
 
     def sum_attrs(attr)
@@ -81,10 +103,18 @@ module Fusuma
     end
 
     def enough_actions?
-      length > 7 # TODO: should be detected by move per time
+      (length > 1) && (elapsed_time > 0.1)
+    end
+
+    def enough_time_passed?
+      (last.time - last_triggerd_time) > 0.5
+    end
+
+    def last_triggerd_time
+      @last_triggered_time || 0
     end
 
-    def detect_action
+    def detect_action_type
       first.action =~ /GESTURE_(.*?)_/
       Regexp.last_match(1).downcase
     end

data/lib/fusuma/gesture_action.rb

@@ -2,15 +2,15 @@ module Fusuma
   # pinch or swipe action
   class GestureAction
     def initialize(time, action, finger, directions)
-      @time   = time
+      @time   = time.to_f
       @action = action
       @finger = finger
       @move_x = directions[:move][:x].to_f
       @move_y = directions[:move][:y].to_f
-      @pinch  = directions[:pinch].to_f
+      @zoom   = directions[:zoom].to_f
     end
     attr_reader :time, :action, :finger,
-                :move_x, :move_y, :pinch
+                :move_x, :move_y, :zoom
 
     class << self
       def initialize_by(line, device_name)
@@ -27,9 +27,9 @@ module Fusuma
 
       def gesture_action_arguments(libinput_line)
         action, time, finger_directions = parse_libinput(libinput_line)
-        finger, move_x, move_y, pinch =
+        finger, move_x, move_y, zoom =
           parse_finger_directions(finger_directions)
-        directions = { move: { x: move_x, y: move_y }, pinch: pinch }
+        directions = { move: { x: move_x, y: move_y }, zoom: zoom }
         [time, action, finger, directions]
       end
 
@@ -40,9 +40,9 @@ module Fusuma
       end
 
       def parse_finger_directions(finger_directions_line)
-        finger_num, move_x, move_y, _, _, _, pinch =
+        finger_num, move_x, move_y, _, _, _, zoom =
           finger_directions_line.tr('/', ' ').split
-        [finger_num, move_x, move_y, pinch]
+        [finger_num, move_x, move_y, zoom]
       end
     end
   end

data/lib/fusuma/version.rb

@@ -1,3 +1,3 @@
 module Fusuma
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.1.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - iberianpig