fusuma 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce8f9acb74d456ca14afae7b7cf83fa70e2c52adc81902e2e0eb7f1ff1d1c6aa
-  data.tar.gz: 121e54c98da13699bae297fea522f8004a73de33e438ffb9fd6161fb7b6df069
+  metadata.gz: 65e85c17ee616861de23dfda299da1de324ebc4dd26aad155d6154641b81e332
+  data.tar.gz: f8516a7ac078ee2d600e23ebcfb2420a36a12810ded08538ee5ed178baa05283
 SHA512:
-  metadata.gz: ce1727335f611a3d9ee099b8189bbf4e80d7f446173b696f46c1cada8b7185d19811a4227c73d3216e7e5a949bdfd838c7a5e1757351417642906b885cba383a
-  data.tar.gz: 0347fc47ef4ababac2b591156523c933fad9b045d8d76889d627ced6be0720a8719f69a4d02c2fff0ac94cb46eed5a77a16a117486cc0e9764ab4ee833f99f7f
+  metadata.gz: fac1ec6baaeb39f8e9ecd2c883b4db02cda3b2afb3f16b832ec6b5a8219dc902a0c8df68f432aa2f78b240d588f2f2734fd92e7368c7372394ab9432251ee7f7
+  data.tar.gz: 24d8e5d474fcbd318d2b8027110291585dfa71878f5e329b97d2e4f935edb1f37ae0a11d3d7bb330fdd2458d001f1da1e27022ea416bddaf96cb78a33a01cfe9

data/README.md

@@ -68,7 +68,7 @@ $ sudo gem update fusuma
 
 ## Customize Gesture Mapping
 
-You can customize the settings for gestures to put and edit `~/.config/fusuma/config.yml`.
+You can customize the settings for gestures to put and edit `~/.config/fusuma/config.yml`.  
 **NOTE: You will need to create the `~/.config/fusuma` directory if it doesn't exist yet.**
 
 ```bash
@@ -191,13 +191,23 @@ swipe:
 
 ### About xdotool
 
+
 * xdotool manual (https://github.com/jordansissel/xdotool/blob/master/xdotool.pod)
 * Available keys' hint (https://github.com/jordansissel/xdotool/issues/212#issuecomment-406156157)
 
-* `xte` command is alternative of xdotool
-  * Low delay with multiple keyboard layout
-  * install with `sudo apt xautomation`
-  * manual https://linux.die.net/man/1/xte
+**NOTE: xdotool has some issues**
+
+* Gestures take a few seconds to react(https://github.com/iberianpig/fusuma/issues/113)
+
+#### Alternatives to xdotool
+
+  * [fusuma-plugin-sendkey](https://github.com/iberianpig/fusuma-plugin-sendkey) 
+    * Emulates keyboard events
+    * Wayland compatible
+
+  * `xte`
+    * [xte(1) - Linux man page](https://linux.die.net/man/1/xte)
+    * install with `sudo apt xautomation`
 
 ## Options
 
@@ -218,9 +228,8 @@ swipe:
 
 Following features are provided as plugins.
 
- * Experimental features
- * Features for specific Linux distributions
  * Adding new gestures or combinations
+ * Features for specific Linux distributions
  * Setting different gestures per applications
 
 ### Installation of fusuma plugins
@@ -231,10 +240,11 @@ Fusuma plugins are provided with the `fusuma-plugin-XXXXX` naming convention and
 
 ### Available plugins
 
-| Name                                                                           | Author     | About                                  |
-|--------------------------------------------------------------------------------|------------|----------------------------------------|
-| [fusuma-plugin-wmctrl](https://github.com/iberianpig/fusuma-plugin-wmctrl)     | iberianpig | Window Manager plugin for Fusuma       |
-| [fusuma-plugin-keypress](https://github.com/iberianpig/fusuma-plugin-keypress) | iberianpig | Keypress combination plugin for Fusuma |
+| Name                                                                           | About                                         |
+|--------------------------------------------------------------------------------|-----------------------------------------------|
+| [fusuma-plugin-sendkey](https://github.com/iberianpig/fusuma-plugin-sendkey)   | Emulates keyboard events                      |
+| [fusuma-plugin-wmctrl](https://github.com/iberianpig/fusuma-plugin-wmctrl)     | Manages Window and Workspace                  |
+| [fusuma-plugin-keypress](https://github.com/iberianpig/fusuma-plugin-keypress) | Detects gestures while pressing multiple keys |
 
 ## Support
 

data/lib/fusuma.rb

@@ -31,7 +31,6 @@ module Fusuma
         load_custom_config(option[:config_path])
 
         Plugin::Manager.require_plugins_from_relative
-        Plugin::Manager.require_plugins_from_config
 
         MultiLogger.info '---------------------------------------------'
         print_version
@@ -87,10 +86,10 @@ module Fusuma
       # TODO: run with multi thread
       @inputs.first.run do |event|
         clear_expired
-        filtered = filter(event)
-        parsed = parse(filtered)
-        buffered = buffer(parsed)
-        detected = detect(buffered)
+        filtered = filter(event) || next
+        parsed = parse(filtered) || next
+        buffered = buffer(parsed) || next
+        detected = detect(buffered) || next
         merged = merge(detected)
         execute(merged)
       end
@@ -105,7 +104,7 @@ module Fusuma
     end
 
     def buffer(event)
-      @buffers.each { |b| b.buffer(event) }
+      @buffers.any? { |b| b.buffer(event) } && @buffers
     end
 
     # @param buffers [Array<Buffer>]

data/lib/fusuma/plugin/buffers/gesture_buffer.rb

@@ -18,6 +18,7 @@ module Fusuma
         end
 
         # @param event [Event]
+        # @return [Buffer, false]
         def buffer(event)
           # TODO: buffering events into buffer plugins
           # - gesture event buffer
@@ -25,8 +26,13 @@ module Fusuma
           # - other event buffer
           return if event&.tag != source
 
-          @events.push(event)
-          clear unless updating?
+          if bufferable?(event)
+            @events.push(event)
+            self
+          else
+            clear
+            false
+          end
         end
 
         def clear_expired(current_time: Time.now)
@@ -77,10 +83,13 @@ module Fusuma
           self.class.new events
         end
 
-        private
-
-        def updating?
-          return true unless @events.last.record.status =~ /begin|end/
+        def bufferable?(event)
+          case event.record.status
+          when 'begin', 'end'
+            false
+          else
+            true
+          end
         end
       end
     end

data/lib/fusuma/plugin/manager.rb

@@ -11,7 +11,7 @@ module Fusuma
         @plugin_class = plugin_class
       end
 
-      def require_siblings_from_local
+      def require_siblings_from_plugin_dir
         search_key = File.join('../../', plugin_dir_name, '*.rb')
         Dir.glob(File.expand_path("#{__dir__}/#{search_key}")).sort.each do |siblings_plugin|
           require siblings_plugin
@@ -53,7 +53,7 @@ module Fusuma
           load_paths << plugin_path
 
           manager = Manager.new(plugin_class)
-          manager.require_siblings_from_local
+          manager.require_siblings_from_plugin_dir
           manager.require_siblings_from_gems
         end
 
@@ -68,15 +68,6 @@ module Fusuma
           require_relative './executors/executor.rb'
         end
 
-        def require_plugins_from_config
-          local_plugin_paths = Config.search(Config::Index.new('local_plugin_paths'))
-          return unless local_plugin_paths
-
-          Array.new(local_plugin_paths).each do |plugin_path|
-            require plugin_path
-          end
-        end
-
         def plugins
           @plugins ||= {}
         end

data/lib/fusuma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fusuma
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Multitouch gestures with libinput dirver on X11, Linux