lib/fusuma.rb in fusuma-0.7.1 vs lib/fusuma.rb in fusuma-0.7.2

@@ -5,10 +5,11 @@
 require_relative 'fusuma/swipe.rb'
 require_relative 'fusuma/pinch.rb'
 require_relative 'fusuma/multi_logger'
 require_relative 'fusuma/config.rb'
 require_relative 'fusuma/device.rb'
+require_relative 'fusuma/libinput_commands.rb'
 require 'logger'
 require 'open3'
 require 'yaml'
 
 # this is top level module
@@ -18,27 +19,28 @@
     class << self
       def run(option = {})
         set_trap
         read_options(option)
         instance = new
-        instance.read_libinput
+        instance.run
       end
 
       private
 
       def set_trap
         Signal.trap('INT') { puts exit } # Trap ^C
         Signal.trap('TERM') { puts exit } # Trap `Kill `
       end
 
       def print_version
-        puts "---------------------------------------------"
+        puts '---------------------------------------------'
         puts "Fusuma: #{Fusuma::VERSION}"
+        puts "libinput: #{LibinputCommands.new.version}"
         puts "OS: #{`uname -rsv`}"
         puts "Distribution: #{`cat /etc/issue`}"
         puts "Desktop session: #{`echo $DESKTOP_SESSION`}"
-        puts "---------------------------------------------"
+        puts '---------------------------------------------'
       end
 
       def reload_custom_config(config_path)
         MultiLogger.info "use custom path: #{config_path}"
         Config.instance.custom_path = config_path
@@ -51,33 +53,17 @@
         MultiLogger.instance.debug_mode = true if option[:verbose]
         Process.daemon if option[:daemon]
       end
     end
 
-    def read_libinput
-      Open3.popen3(libinput_command) do |_i, o, _e, _w|
-        o.each do |line|
-          gesture_action = GestureAction.initialize_by(line, Device.names)
-          next if gesture_action.nil?
-          @action_stack ||= ActionStack.new
-          @action_stack << gesture_action
-          event_trigger = @action_stack.generate_event_trigger
-          event_trigger.send_command unless event_trigger.nil?
-        end
+    def run
+      LibinputCommands.new.debug_events do |line|
+        gesture_action = GestureAction.initialize_by(line, Device.names)
+        next if gesture_action.nil?
+        @action_stack ||= ActionStack.new
+        @action_stack << gesture_action
+        event_trigger = @action_stack.generate_event_trigger
+        event_trigger.send_command unless event_trigger.nil?
       end
-    end
-
-    private
-
-    def libinput_command
-      return @libinput_command if @libinput_command
-      prefix = 'stdbuf -oL --'
-      command = 'libinput-debug-events'
-      device_option = if Device.names.size == 1
-                        "--device /dev/input/#{Device.names.first}"
-                      end
-      @libinput_command = [prefix, command, device_option].join(' ')
-      MultiLogger.debug(libinput_command: @libinput_command)
-      @libinput_command
     end
   end
 end