fusuma-plugin-appmatcher 0.1.0.pre → 0.1.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeb9cfe042862f7392b652a15b08b740642f825e1bc38b6bda069cd8656c6e90
-  data.tar.gz: a0edcc9bb643eec52dc29a2b47b7aac42d13ade082ac56125db2956d8a4120ea
+  metadata.gz: c82fbaea367e1b416873bfda4fd07e6c33ca726403a7d1200dfd6351a1f92f70
+  data.tar.gz: e22437189f3f762f636507fc5eeba5304f28e8e59168a81fb12ec6e18da82589
 SHA512:
-  metadata.gz: 66486ba4e8dd2490181eb39b601be0e0240abc580536128f77e92e8644f9e0b1d0f9164635d616f15fa0418a9ca2507808309d703cef6dbeeb3f8f3faf4c2695
-  data.tar.gz: c4496554408febea8bcf250033594db3f7ebe65d85cd514a85f7ee85dfc0ea8edef0d632547c7b7c38f5fe5378f5bf31e7265d4dcebb8703f600e50f853f915e
+  metadata.gz: b4f83d6928f08ecd382a6beda34478e83912e4fe964e9578fc3f531595c175c90ae116b087e5288ecf65bbdab805faee6b938830a29d4f6555df903098a44639
+  data.tar.gz: c518fabd2584b692448225179ed2808eb9b91b989b8bf937902f6c4a80ebb1deeaf56ce51c88b48799910656a8f6644b61a577cc9e58ee50538fe75689521c36

data/fusuma-plugin-appmatcher.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'iniparse'
   spec.add_runtime_dependency 'ruby-dbus'
 
-  spec.add_dependency 'fusuma', '~> 2.0.0.pre'
+  spec.add_dependency 'fusuma', '~> 2.0.0.pre2'
 end

data/lib/fusuma/plugin/appmatcher.rb

@@ -2,8 +2,8 @@
 
 require 'fusuma/plugin/appmatcher/version'
 
-require_relative 'appmatcher/x11.rb'
-require_relative 'appmatcher/gnome.rb'
+require_relative 'appmatcher/x11'
+require_relative 'appmatcher/gnome'
 
 module Fusuma
   module Plugin
@@ -13,9 +13,9 @@ module Fusuma
       # @return [Class]
       def backend_klass
         if ENV['DESKTOP_SESSION'] == 'ubuntu-wayland'
-          Fusuma::Plugin::Appmatcher::Gnome
+          Gnome
         else
-          Fusuma::Plugin::Appmatcher::X11
+          X11
         end
       end
     end

data/lib/fusuma/plugin/appmatcher/gnome.rb

@@ -2,7 +2,7 @@
 
 require 'json'
 require 'dbus'
-require_relative './user_switcher.rb'
+require_relative './user_switcher'
 require 'posix/spawn'
 
 module Fusuma
@@ -10,9 +10,8 @@ module Fusuma
     module Appmatcher
       # Search Active Window's Name
       class Gnome
-        attr_reader :matcher
-        attr_reader :reader
-        attr_reader :writer
+        attr_reader :matcher, :reader, :writer
+
         def initialize
           @reader, @writer = IO.pipe
         end
@@ -21,14 +20,14 @@ module Fusuma
         # @return [Integer] Process id
         def watch_start
           @watch_start ||= begin
-                     pid = UserSwitcher.new.as_user do |user|
-                       @reader.close
-                       ENV['DBUS_SESSION_BUS_ADDRESS'] = "unix:path=/run/user/#{user.uid}/bus"
-                       register_on_application_changed(Matcher.new)
-                     end
-                     Process.detach(pid)
-                     pid
-                   end
+            pid = UserSwitcher.new.as_user do |user|
+              @reader.close
+              ENV['DBUS_SESSION_BUS_ADDRESS'] = "unix:path=/run/user/#{user.uid}/bus"
+              register_on_application_changed(Matcher.new)
+            end
+            Process.detach(pid)
+            pid
+          end
         end
 
         private
@@ -81,15 +80,31 @@ module Fusuma
             )
           end
 
+          # TODO
+          # def window_title
+          # # const index = global.get_window_actors()
+          # #                   .findIndex(a=>a.meta_window.has_focus()===true);
+          # # global.get_window_actors()[index].get_meta_window().get_title();
+          #   gnome_shell_eval(
+          #     # <<~GJS
+          #     #   global.get_window_actors().map((current) => {
+          #     #     const wm_class = current.get_meta_window().get_wm_class();
+          #     #     const title = current.get_meta_window().get_title();
+          #     #     return { application: wm_class, window_title: title }
+          #     #   })
+          #     # GJS
+          #   )
+          # end
+
           def gnome_shell_eval(string)
             success, body = @interface.Eval(string)
 
             if success
               response = begin
-                           JSON.parse(body)
-                         rescue StandardError
-                           nil
-                         end
+                JSON.parse(body)
+              rescue StandardError
+                nil
+              end
               return response
             end
 

data/lib/fusuma/plugin/appmatcher/user_switcher.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
+require 'fusuma/custom_process'
 require 'etc'
+
 module Fusuma
   module Plugin
     module Appmatcher
       class UserSwitcher
+        include CustomProcess
         User = Struct.new(:username, :uid, :gid)
         def initialize
           username = ENV['SUDO_USER'] || Etc.getlogin

data/lib/fusuma/plugin/appmatcher/version.rb

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Appmatcher
-      VERSION = '0.1.0.pre'
+      VERSION = '0.1.0.pre2'
     end
   end
 end

data/lib/fusuma/plugin/appmatcher/x11.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-require_relative './user_switcher.rb'
+require_relative './user_switcher'
+require 'fusuma/multi_logger'
+require 'fusuma/custom_process'
 require 'posix/spawn'
 
 module Fusuma
@@ -8,9 +10,8 @@ module Fusuma
     module Appmatcher
       # Search Active Window's Name
       class X11
-        attr_reader :matcher
-        attr_reader :reader
-        attr_reader :writer
+        attr_reader :matcher, :reader, :writer
+
         def initialize
           @reader, @writer = IO.pipe
         end
@@ -19,13 +20,13 @@ module Fusuma
         # @return [Integer] Process id
         def watch_start
           @watch_start ||= begin
-                     pid = UserSwitcher.new.as_user do |_user|
-                       @reader.close
-                       register_on_application_changed(Matcher.new)
-                     end
-                     Process.detach(pid)
-                     pid
-                   end
+            pid = UserSwitcher.new.as_user do |_user|
+              @reader.close
+              register_on_application_changed(Matcher.new)
+            end
+            Process.detach(pid)
+            pid
+          end
         end
 
         private
@@ -59,10 +60,10 @@ module Fusuma
           def active_application(id = active_window_id)
             @cache ||= {}
             @cache[id] ||= begin
-                             return if id.nil?
+              return if id.nil?
 
-                             `xprop -id #{id} WM_CLASS | cut -d "=" -f 2 | tr -d '"'`.strip.split(', ').last
-                           end
+              `xprop -id #{id} WM_CLASS | cut -d "=" -f 2 | tr -d '"'`.strip.split(', ').last
+            end
           end
 
           def on_active_application_changed
@@ -73,8 +74,8 @@ module Fusuma
 
           private
 
-          def active_window_id(watch: false)
-            _p, i, o, _e = POSIX::Spawn.popen4(xprop_active_window_id(watch))
+          def active_window_id(watch: false, &block)
+            _p, i, o, e = POSIX::Spawn.popen4(xprop_active_window_id(watch))
             i.close
             o.each do |line|
               id = line.match(/0x[\da-z]{2,}/)&.to_s
@@ -83,6 +84,15 @@ module Fusuma
 
               yield(id)
             end
+            MultiLogger.error e.read if o.eof?
+            e.close
+            o.close
+
+            return nil unless block_given?
+            sleep 1
+            active_window_id(watch: watch, &block)
+          rescue StandardError => e
+            MultiLogger.error e.message
           end
 
           # @param spy [TrueClass, FalseClass]

data/lib/fusuma/plugin/detectors/appmatcher_detector.rb

@@ -5,10 +5,15 @@ module Fusuma
     module Detectors
       # Detect KeypressEvent from KeypressBuffer
       class AppmatcherDetector < Detector
+        SOURCES = ['appmatcher']
         BUFFER_TYPE = 'appmatcher'
-
         DEFAULT_NAME = 'global'
 
+        # Always watch buffers and detect them.
+        def watch?
+          true
+        end
+
         # @param buffers [Array<Event>]
         # @return [Event] if event is detected
         # @return [NilClass] if event is NOT detected
@@ -19,23 +24,12 @@ module Fusuma
 
           record = buffer.events.last.record
 
-          index_record = Events::Records::IndexRecord.new(
-            index: create_index(record: record),
-            position: :prefix
+          context_record = Events::Records::ContextRecord.new(
+            name: 'application',
+            value: record.name
           )
 
-          create_event(record: index_record)
-        end
-
-        # @param record [Events::Records::KeypressRecord]
-        # @return [Config::Index]
-        def create_index(record:)
-          Config::Index.new(
-            [
-              Config::Index::Key.new('application'),
-              Config::Index::Key.new(record.name, fallback: DEFAULT_NAME)
-            ]
-          )
+          create_event(record: context_record)
         end
       end
     end

data/lib/fusuma/plugin/inputs/appmatcher_input.rb

@@ -7,6 +7,8 @@ module Fusuma
     module Inputs
       # Get active application's name
       class AppmatcherInput < Input
+        attr_reader :pid
+
         def io
           @backend ||= Appmatcher.backend_klass.new
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-appmatcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.1.0.pre2
 platform: ruby
 authors:
 - iberianpig
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iniparse
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre
+        version: 2.0.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre
+        version: 2.0.0.pre2
 description: fusuma-plugin-appmatcher is Fusuma plugin for assigning gesture mapping
   per application.
 email: