fusuma 0.9.2 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45e3e3c6fb9720c3ba2b9a5326654a14b2a2daa7
-  data.tar.gz: 86240a1c766363f3d028b46740aea8fbaaf8de8f
+  metadata.gz: 22f6d4a9eb59ada95b2021e8b76b589ec6897cad
+  data.tar.gz: 7a2bb9add47630c73242f701f0cf80c19315b9bf
 SHA512:
-  metadata.gz: c9d835c20d8ad97b03c9cac293961a10ee61fa8458d5b3e1ce79352896127cf81eb5cc3b3e3c5573b34774a17545106ef796c950e98c1418a4d97b85130c4799
-  data.tar.gz: 11699f299247c0bd80ec568189e040726d1785827aeb9ae756e9147d37eb04c982a689e67ea158fb1277f575a5fc4acdce66313f5a663f4f05ee26dcd01f43e6
+  metadata.gz: cff32b3422a740ce8c68cc87db2ac73698cabc01218cfb137d694db5a96cd0bae1b59cf0e362c149e0afa5048b10497dae9c9fae1ab7df5003d2f673e1f6fdd4
+  data.tar.gz: b8f42fdb9cb09d972914f43c0eb0dfaaa64f0516591303c3b6ea62c096783e98606888a22e57dbf113b9ab074161e7c5d5b8385473b9fd074624b4989d74e74b

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+<!--
+Before create a report, please check below, 
+* Read Documents. https://github.com/iberianpig/fusuma#installation
+* Checked that `libinput-debug-events` or `libinput debug-events` worked correctly.
+* Reproduced the problem in latest version. Update fusuma with `gem update fusuma`
+* Checked that your issue isn't already filed: https://github.com/iberianpig/fusuma/issues
+-->
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Versions**
+You can get this information from copy and paste the output of `fusuma --version` from the command line. Also, please include the OS and what version of the OS you're running.
+
+
+**Additional context**
+Any additional context, your `~/.config/fusuma/config.yml` or data that might be necessary to reproduce the issue.

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context about the feature request here.

data/.reek.yml

@@ -0,0 +1,48 @@
+---
+
+### Generic smell configuration
+
+detectors:
+#   # You can disable smells completely
+#   IrresponsibleModule:
+#     enabled: false
+  UncommunicativeVariableName:
+      enabled: false
+
+#
+#   # You can use filters to silence Reek warnings.
+#   # Either because you simply disagree with Reek (we are not the police) or
+#   # because you want to fix this at a later point in time.
+#   NestedIterators:
+#     exclude:
+#       - "MyWorker#self.class_method" # should be refactored
+#       - "AnotherWorker#instance_method" # should be refactored as well
+#
+#   # A lot of smells allow fine tuning their configuration. You can look up all available options
+#   # in the corresponding smell documentation in /docs. In most cases you probably can just go
+#   # with the defaults as documented in defaults.reek.yml.
+#   DataClump:
+#     max_copies: 3
+#     min_clump_size: 3
+
+
+# ### Directory specific configuration
+#
+# # You can configure smells on a per-directory base.
+# # E.g. the classic Rails case: controllers smell of NestedIterators (see /docs/Nested-Iterators.md) and
+# # helpers smell of UtilityFunction (see docs/Utility-Function.md)
+# # Note that we only allow configuration on a directory level, not a file level, so all paths have to point to directories.
+# directories:
+#   "web_app/app/controllers":
+#     NestedIterators:
+#       enabled: false
+#   "web_app/app/helpers":
+#     UtilityFunction:
+#       enabled: false
+
+# ### Excluding directories
+#
+# # Directories below will not be scanned at all
+# exclude_paths:
+#   - lib/legacy
+#   - lib/rake/legacy_tasks

data/README.md

@@ -69,7 +69,7 @@ $ mkdir -p ~/.config/fusuma        # create config directory
 $ nano ~/.config/fusuma/config.yml # edit config file.
 ```
 
-### Example (Gesture Mapping for Elementary OS)
+### Example (Gesture Mapping for elementary OS)
 
 ```yaml
 swipe:
@@ -80,8 +80,10 @@ swipe:
       command: 'xdotool key alt+Right'
     up: 
       command: 'xdotool key ctrl+t'
+      threshold: 1.5
     down: 
       command: 'xdotool key ctrl+w'
+      threshold: 1.5
   4:
     left: 
       command: 'xdotool key super+Left'
@@ -94,8 +96,10 @@ swipe:
 pinch:
   in:
     command: 'xdotool key ctrl+plus'
+    threshold: 0.1
   out:
     command: 'xdotool key ctrl+minus'
+    threshold: 0.1
 
 threshold:
   swipe: 1
@@ -106,7 +110,7 @@ interval:
   pinch: 1
 ```
 
-if `command: ` properties are blank, the swipe/pinch doesn't trigger command.
+if `command: ` properties are blank, the swipe/pinch doesn't execute command.
 
 `threshold:` is sensitivity to swipe/pinch. Default value is 1.
 If the swipe's threshold is `0.5`, shorten swipe-length by half.
@@ -147,6 +151,10 @@ swipe:
 2. Open `$ gnome-session-properties`
 3. Add Fusuma and input location where you checked above's path
 
+## Support
+
+[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/iberianpig)
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/iberianpig/fusuma. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/fusuma.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fusuma/version'
 

data/lib/fusuma.rb

@@ -1,7 +1,7 @@
 require_relative 'fusuma/version'
-require_relative 'fusuma/action_stack'
-require_relative 'fusuma/gesture_action'
-require_relative 'fusuma/event_trigger'
+require_relative 'fusuma/event_stack'
+require_relative 'fusuma/gesture_event'
+require_relative 'fusuma/command_executor'
 require_relative 'fusuma/swipe.rb'
 require_relative 'fusuma/pinch.rb'
 require_relative 'fusuma/multi_logger'
@@ -68,14 +68,16 @@ module Fusuma
       end
     end
 
+    def initialize
+      @event_stack = EventStack.new
+    end
+
     def run
       LibinputCommands.new.debug_events do |line|
-        gesture_action = GestureAction.initialize_by(line, Device.ids)
-        next if gesture_action.nil?
-        @action_stack ||= ActionStack.new
-        @action_stack << gesture_action
-        event_trigger = @action_stack.generate_event_trigger
-        event_trigger.exec_command unless event_trigger.nil?
+        gesture_event = GestureEvent.initialize_by(line, Device.ids)
+        next unless gesture_event
+        @event_stack << gesture_event
+        @event_stack.generate_command_executor.tap { |c| c.execute if c }
       end
     end
   end

data/lib/fusuma/command_executor.rb

@@ -0,0 +1,34 @@
+module Fusuma
+  # Execute Command
+  class CommandExecutor
+    def initialize(finger, vector)
+      @finger      = finger.to_i
+      @direction   = vector.direction
+      @event_type = vector.class::TYPE
+    end
+    attr_reader :finger, :direction, :event_type
+
+    def execute
+      `#{command_or_shortcut}`
+      MultiLogger.info("Execute: #{command_or_shortcut}")
+    end
+
+    private
+
+    def command_or_shortcut
+      @command_or_shortcut ||= command || shortcut || no_command
+    end
+
+    def command
+      Config.command(self)
+    end
+
+    def shortcut
+      Config.shortcut(self).tap { |s| return "xdotool key #{s}" if s }
+    end
+
+    def no_command
+      'echo "Command is not assigned"'
+    end
+  end
+end

data/lib/fusuma/config.rb

@@ -6,20 +6,20 @@ module Fusuma
     include Singleton
 
     class << self
-      def command(event_trigger)
-        instance.command(event_trigger)
+      def command(command_executor)
+        instance.command(command_executor)
       end
 
-      def shortcut(event_trigger)
-        instance.shortcut(event_trigger)
+      def shortcut(command_executor)
+        instance.shortcut(command_executor)
       end
 
-      def threshold(action_type)
-        instance.threshold(action_type)
+      def threshold(command_executor)
+        instance.threshold(command_executor)
       end
 
-      def interval(action_type)
-        instance.interval(action_type)
+      def interval(command_executor)
+        instance.interval(command_executor)
       end
 
       def reload
@@ -31,7 +31,7 @@ module Fusuma
     attr_accessor :custom_path
 
     def initialize
-      @custom_path = nil
+      self.custom_path = nil
       reload
     end
 
@@ -41,28 +41,36 @@ module Fusuma
       self
     end
 
-    def command(event_trigger)
-      seek_index = [*action_index(event_trigger), 'command']
-      cache(seek_index) { search_config(keymap, seek_index) }
+    def command(command_executor)
+      seek_index = [*event_index(command_executor), 'command']
+      search_config_cached(seek_index)
     end
 
-    def shortcut(event_trigger)
-      seek_index = [*action_index(event_trigger), 'shortcut']
-      cache(seek_index) { search_config(keymap, seek_index) }
+    def shortcut(command_executor)
+      seek_index = [*event_index(command_executor), 'shortcut']
+      search_config_cached(seek_index)
     end
 
-    def threshold(action_type)
-      seek_index = ['threshold', action_type]
-      cache(seek_index) { search_config(keymap, seek_index) } || 1
+    def threshold(command_executor)
+      seek_index_specific = [*event_index(command_executor), 'threshold']
+      seek_index_global = ['threshold', command_executor.event_type]
+      search_config_cached(seek_index_specific) ||
+        search_config_cached(seek_index_global) || 1
     end
 
-    def interval(action_type)
-      seek_index = ['interval', action_type]
-      cache(seek_index) { search_config(keymap, seek_index) } || 1
+    def interval(command_executor)
+      seek_index_specific = [*event_index(command_executor), 'interval']
+      seek_index_global = ['interval', command_executor.event_type]
+      search_config_cached(seek_index_specific) ||
+        search_config_cached(seek_index_global) || 1
     end
 
     private
 
+    def search_config_cached(seek_index)
+      cache(seek_index) { search_config(keymap, seek_index) }
+    end
+
     def search_config(keymap_node, seek_index)
       if seek_index == []
         return nil if keymap_node.is_a? Hash
@@ -98,11 +106,11 @@ module Fusuma
       File.expand_path "../../#{filename}", __FILE__
     end
 
-    def action_index(event_trigger)
-      action_type = event_trigger.action_type
-      finger      = event_trigger.finger
-      direction   = event_trigger.direction
-      [action_type, finger, direction]
+    def event_index(command_executor)
+      event_type = command_executor.event_type
+      finger      = command_executor.finger
+      direction   = command_executor.direction
+      [event_type, finger, direction]
     end
 
     def cache(key)

data/lib/fusuma/event_stack.rb

@@ -0,0 +1,87 @@
+module Fusuma
+  # manage events and generate command
+  class EventStack < Array
+    ELAPSED_TIME = 0.01
+
+    def initialize(*args)
+      super(*args)
+    end
+
+    # @return [CommandExecutor, nil]
+    def generate_command_executor
+      return unless enough_events?
+      vector = generate_vector(detect_event_type)
+      trigger = CommandExecutor.new(finger, vector)
+      return unless vector.enough?(trigger)
+      clear
+      trigger
+    end
+
+    # @params [GestureEvent]
+    def push(gesture_event)
+      super(gesture_event)
+      clear if event_end?
+    end
+    alias << push
+
+    private
+
+    def generate_vector(event_type)
+      case event_type
+      when 'swipe'
+        avg_swipe
+      when 'pinch'
+        avg_pinch
+      end
+    end
+
+    def finger
+      last.finger
+    end
+
+    def avg_swipe
+      move_x = avg_attrs(:move_x)
+      move_y = avg_attrs(:move_y)
+      Swipe.new(move_x, move_y)
+    end
+
+    def avg_pinch
+      diameter = avg_attrs(:zoom)
+      delta_diameter = diameter - first.zoom
+      Pinch.new(delta_diameter)
+    end
+
+    def sum_attrs(attr)
+      send('map') do |gesture_event|
+        gesture_event.send(attr.to_sym.to_s)
+      end.compact.inject(:+)
+    end
+
+    def avg_attrs(attr)
+      sum_attrs(attr) / length
+    end
+
+    def event_end?
+      last_event_name =~ /_END$/
+    end
+
+    def last_event_name
+      return false if last.class != GestureEvent
+      last.event
+    end
+
+    def enough_events?
+      length > 2
+    end
+
+    def enough_elapsed_time?
+      return false if length.zero?
+      (last.time - first.time) > ELAPSED_TIME
+    end
+
+    def detect_event_type
+      first.event =~ /GESTURE_(.*?)_/
+      Regexp.last_match(1).downcase
+    end
+  end
+end

data/lib/fusuma/{gesture_action.rb → gesture_event.rb}

@@ -1,15 +1,15 @@
 module Fusuma
-  # pinch or swipe action
-  class GestureAction
-    def initialize(time, action, finger, directions)
-      @time   = time.to_f
-      @action = action
+  # pinch or swipe or rotate event
+  class GestureEvent
+    def initialize(time, event, finger, directions)
+      @time = time.to_f
+      @event = event
       @finger = finger
       @move_x = directions[:move][:x].to_f
       @move_y = directions[:move][:y].to_f
       @zoom   = directions[:zoom].to_f
     end
-    attr_reader :time, :action, :finger,
+    attr_reader :time, :event, :finger,
                 :move_x, :move_y, :zoom
 
     class << self
@@ -19,25 +19,25 @@ module Fusuma
         end
         return if line.to_s =~ /_BEGIN/
         return unless line.to_s =~ /GESTURE_SWIPE|GESTURE_PINCH/
-        time, action, finger, directions = gesture_action_arguments(line)
-        MultiLogger.debug(time: time, action: action,
+        time, event, finger, directions = gesture_event_arguments(line)
+        MultiLogger.debug(time: time, event: event,
                           finger: finger, directions: directions)
-        GestureAction.new(time, action, finger, directions)
+        GestureEvent.new(time, event, finger, directions)
       end
 
       private
 
-      def gesture_action_arguments(libinput_line)
-        action, time, finger, other = parse_libinput(libinput_line)
+      def gesture_event_arguments(libinput_line)
+        event, time, finger, other = parse_libinput(libinput_line)
         move_x, move_y, zoom = parse_finger_directions(other)
         directions = { move: { x: move_x, y: move_y }, zoom: zoom }
-        [time, action, finger, directions]
+        [time, event, finger, directions]
       end
 
       def parse_libinput(line)
-        _device, action, time, other = line.strip.split(nil, 4)
+        _device, event, time, other = line.strip.split(nil, 4)
         finger, other = other.split(nil, 2)
-        [action, time, finger, other]
+        [event, time, finger, other]
       end
 
       def parse_finger_directions(line)

data/lib/fusuma/libinput_commands.rb

@@ -70,6 +70,7 @@ module Fusuma
     end
 
     private
+
     # use device option only if libinput detect only 1 device
     # @return [String]
     def device_option

data/lib/fusuma/pinch.rb

@@ -1,6 +1,8 @@
 module Fusuma
   # vector data
   class Pinch
+    TYPE = 'pinch'.freeze
+
     BASE_THERESHOLD = 0.3
     BASE_INTERVAL   = 0.05
 
@@ -15,33 +17,34 @@ module Fusuma
       'out'
     end
 
-    def enough?
+    def enough?(trigger)
       MultiLogger.debug(diameter: diameter)
-      enough_diameter? && enough_interval? && self.class.touch_last_time
+      enough_diameter?(trigger) && enough_interval?(trigger) &&
+        self.class.touch_last_time
     end
 
     private
 
-    def enough_diameter?
-      diameter.abs > threshold
+    def enough_diameter?(trigger)
+      diameter.abs > threshold(trigger)
     end
 
-    def enough_interval?
+    def enough_interval?(trigger)
       return true if first_time?
-      return true if (Time.now - self.class.last_time) > interval_time
+      return true if (Time.now - self.class.last_time) > interval_time(trigger)
       false
     end
 
     def first_time?
-      self.class.last_time.nil?
+      !self.class.last_time
     end
 
-    def threshold
-      @threshold ||= BASE_THERESHOLD * Config.threshold('pinch')
+    def threshold(trigger)
+      @threshold ||= BASE_THERESHOLD * Config.threshold(trigger)
     end
 
-    def interval_time
-      @interval_time ||= BASE_INTERVAL * Config.interval('pinch')
+    def interval_time(trigger)
+      @interval_time ||= BASE_INTERVAL * Config.interval(trigger)
     end
 
     class << self

data/lib/fusuma/swipe.rb

@@ -1,12 +1,14 @@
 module Fusuma
   # vector data
   class Swipe
+    TYPE = 'swipe'.freeze
+
     BASE_THERESHOLD = 20
     BASE_INTERVAL   = 0.5
 
-    def initialize(x, y)
-      @x = x
-      @y = y
+    def initialize(move_x, move_y)
+      @x = move_x
+      @y = move_y
     end
     attr_reader :x, :y
 
@@ -15,33 +17,35 @@ module Fusuma
       y > 0 ? 'down' : 'up'
     end
 
-    def enough?
+    def enough?(trigger)
       MultiLogger.debug(x: x, y: y)
-      enough_distance? && enough_interval? && self.class.touch_last_time
+      enough_distance?(trigger) && enough_interval?(trigger) &&
+        self.class.touch_last_time
     end
 
     private
 
-    def enough_distance?
+    def enough_distance?(trigger)
+      threshold = threshold(trigger)
       (x.abs > threshold) || (y.abs > threshold)
     end
 
-    def enough_interval?
+    def enough_interval?(trigger)
       return true if first_time?
-      return true if (Time.now - self.class.last_time) > interval_time
+      return true if (Time.now - self.class.last_time) > interval_time(trigger)
       false
     end
 
     def first_time?
-      self.class.last_time.nil?
+      !self.class.last_time
     end
 
-    def threshold
-      @threshold ||= BASE_THERESHOLD * Config.threshold('swipe')
+    def threshold(trigger)
+      @threshold ||= BASE_THERESHOLD * Config.threshold(trigger)
     end
 
-    def interval_time
-      @interval_time ||= BASE_INTERVAL * Config.interval('swipe')
+    def interval_time(trigger)
+      @interval_time ||= BASE_INTERVAL * Config.interval(trigger)
     end
 
     class << self

data/lib/fusuma/version.rb

@@ -1,3 +1,3 @@
 module Fusuma
-  VERSION = '0.9.2'.freeze
+  VERSION = '0.10.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.1
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,14 +118,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/stale.yml"
 - ".gitignore"
+- ".reek.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- ISSUE_TEMPLATE.md
 - LICENSE
 - README.md
 - Rakefile
@@ -134,12 +136,12 @@ files:
 - exe/fusuma
 - fusuma.gemspec
 - lib/fusuma.rb
-- lib/fusuma/action_stack.rb
+- lib/fusuma/command_executor.rb
 - lib/fusuma/config.rb
 - lib/fusuma/config.yml
 - lib/fusuma/device.rb
-- lib/fusuma/event_trigger.rb
-- lib/fusuma/gesture_action.rb
+- lib/fusuma/event_stack.rb
+- lib/fusuma/gesture_event.rb
 - lib/fusuma/libinput_commands.rb
 - lib/fusuma/multi_logger.rb
 - lib/fusuma/pinch.rb

data/ISSUE_TEMPLATE.md

@@ -1,37 +0,0 @@
-<!--
-
-Have you read Fusuma's CODE_OF_CONDUCT.md? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/iberianpig/fusuma/blob/master/CODE_OF_CONDUCT.md
-
--->
-
-### Prerequisites
-
-* [ ] Put an X between the brackets on this line if you have done all of the following:
-    * Read Documents. https://github.com/iberianpig/fusuma#installation
-    * Checked that `libinput-debug-events` worked correctly.
-    * Reproduced the problem in latest version. Update fusuma with `gem update fusuma`
-    * Checked that your issue isn't already filed: https://github.com/iberianpig/fusuma/issues
-
-### Description
-
-[Description of the issue]
-
-### Steps to Reproduce
-
-1. [First Step]
-2. [Second Step]
-3. [and so on...]
-
-**Expected behavior:** [What you expect to happen]
-
-**Actual behavior:** [What actually happens]
-
-**Reproduces how often:** [What percentage of the time does it reproduce?]
-
-### Versions
-
-You can get this information from copy and pasting the output of `fusuma --version` from the command line. Also, please include the OS and what version of the OS you're running.
-
-### Additional Information
-
-Any additional information, your `~/.config/fusuma/config.yml` or data that might be necessary to reproduce the issue.

data/lib/fusuma/action_stack.rb

@@ -1,97 +0,0 @@
-module Fusuma
-  # manage actions
-  class ActionStack < Array
-    ELAPSED_TIME = 0.01
-
-    def initialize(*args)
-      super(*args)
-    end
-
-    def generate_event_trigger
-      return unless enough_actions?
-      action_type = detect_action_type
-      direction = detect_direction(action_type)
-      return if direction.nil?
-      @last_triggered_time = last.time
-      finger = detect_finger
-      clear
-      EventTrigger.new(finger, direction, action_type)
-    end
-
-    def push(gesture_action)
-      super(gesture_action)
-      clear if action_end?
-    end
-    alias << push
-
-    private
-
-    def detect_direction(action_type)
-      vector = generate_vector(action_type)
-      return if vector && !vector.enough?
-      vector.direction
-    end
-
-    def generate_vector(action_type)
-      case action_type
-      when 'swipe'
-        avg_swipe
-      when 'pinch'
-        avg_pinch
-      end
-    end
-
-    def detect_finger
-      last.finger
-    end
-
-    def avg_swipe
-      move_x = avg_attrs(:move_x)
-      move_y = avg_attrs(:move_y)
-      Swipe.new(move_x, move_y)
-    end
-
-    def avg_pinch
-      diameter = avg_attrs(:zoom)
-      delta_diameter = diameter - first.zoom
-      Pinch.new(delta_diameter)
-    end
-
-    def sum_attrs(attr)
-      send('map') do |gesture_action|
-        gesture_action.send(attr.to_sym.to_s)
-      end.compact.inject(:+)
-    end
-
-    def avg_attrs(attr)
-      sum_attrs(attr) / length
-    end
-
-    def action_end?
-      last_action_name =~ /_END$/
-    end
-
-    def last_action_name
-      return false if last.class != GestureAction
-      last.action
-    end
-
-    def enough_actions?
-      length > 2
-    end
-
-    def enough_elapsed_time?
-      return false if length.zero?
-      (last.time - first.time) > ELAPSED_TIME
-    end
-
-    def last_triggered_time
-      @last_triggered_time ||= 0
-    end
-
-    def detect_action_type
-      first.action =~ /GESTURE_(.*?)_/
-      Regexp.last_match(1).downcase
-    end
-  end
-end

data/lib/fusuma/event_trigger.rb

@@ -1,24 +0,0 @@
-module Fusuma
-  # manage actions
-  class EventTrigger
-    def initialize(finger, direction, action_type)
-      @finger      = finger.to_i
-      @direction   = direction
-      @action_type = action_type
-    end
-    attr_reader :finger, :direction, :action_type
-
-    def exec_command
-      return if command.nil?
-      `#{command}`
-      MultiLogger.info("trigger event: #{command}")
-    end
-
-    private
-
-    def command
-      Config.command(self).tap { |c| return c if c }
-      Config.shortcut(self).tap { |s| return "xdotool key #{s}" if s }
-    end
-  end
-end