xdrp 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60fef7cc9878649488946fd3ddb5ccc9f694f7da66bf02eae3cf1fcc68d7b1e2
-  data.tar.gz: 9dc84a8b21b189a8b2b46db61a59319e434a6f8e8cb19c0f3a1eafef2f873b5e
+  metadata.gz: 617fbc32a4b2adaf234769104583696286e5e9b76f4bf11a0f131e107362c6ca
+  data.tar.gz: 91f2f6c128055b9e895bfb64449d58e0869def96bccf288b81a872a919701119
 SHA512:
-  metadata.gz: 221037558fcef999cad7c8b90511037d65d46b9088d2a28ab7dbeb3ac843e9e36341e0124dd77014e8ed11295d3084ad51ee53b000c6bb69dede5d8f938b564d
-  data.tar.gz: a4594ddfbacd16feefc9ba1f6de2c51db7342394469f1a5476d38f06104a1f03fd8dbc38da4bf8d308a22d6b13d4a27456f826b3cd2c6c076b14ad6261a571bb
+  metadata.gz: 1eaec277d3c3929b9b1b978510e1357d63125f41ae3138f03f77f1793147df35efc8bfacfd66f19b7fadabf34c9982669e5b79334a9d925f182e92c6edf6f4ba
+  data.tar.gz: d58741546686f94390594a42a8ca0b11fc5e2bac1827392252ac2ca108df7f86e54ed610a0e7ba2ef525fefd0941e587cc74b018e17582bddcbfd6badd3bec8e

data/lib/xdrp.rb

@@ -5,13 +5,16 @@
 # description: A basic macro recorder for GNU/Linux which uses 
 #              program xinput to capture input events.
 
+require 'wmctrl'
 require 'rxfhelper'
+require 'keystroker'
 require "xdo/mouse"
 require "xdo/xwindow"
 require "xdo/keyboard"
 require 'xinput_wrapper'
 
 
+
 MOUSE = 1
 KEYBOARD = 2
 KEYBOARD_MOUSE = 3
@@ -22,18 +25,16 @@ module Xdrp
   class Recorder
 
     attr_reader :xml
-    
+
     # level:
     #    1 = mouse
     #    2 = keyboard
     #    3 = keyboard + mouse
 
     def initialize(levelx=KEYBOARD_MOUSE, level: levelx, debug: false)
-      
-      @xiw = XInputWrapper.new(verbose: true, debug: debug, callback: self)
 
       @mouse, @keyboard = false, false
-      
+
       case level
       when 1
         @mouse = true
@@ -42,9 +43,16 @@ module Xdrp
       when 3
         @mouse, @keyboard = true, true
       end
+
+
+      @xiw = XInputWrapper.new(verbose: true, debug: debug, callback: self)
+
+      @wm = WMCtrl.display
+      @win_title = ''
+
     end
 
-    def on_keypress(key, keycode, modifier=nil)      
+    def on_keypress(key, keycode, modifier=nil)
 
       if @debug then
         puts 'key: ' + key.inspect
@@ -53,21 +61,48 @@ module Xdrp
       end
 
       stop() if modifier and modifier[0] == :alt and key == :z
-      
-      return unless @keyboard      
+
+      return unless @keyboard
 
       add_sleep() if Time.now > (@t1 + 2)
-      
+
 
       if @a.length >= 1 and @a[-1][0] == :type then
 
         if modifier.nil? or (modifier and modifier.empty?) then
-          @a[-1][2] += key.to_s
+          @a[-1][2] += key.to_s.sub('{space}', ' ')
         else
-          @a << [modifier.first, {key: key}] if modifier.length < 2  
+
+          if modifier.length < 2  then
+
+            if modifier.first == :shift and (keycode.between?(10,21) \
+                                             or keycode.between?(24,35) \
+                                             or keycode.between?(38,48)) then
+
+              char = if key.to_s =~ /[a-z]/ then
+                key.to_s.upcase
+              elsif key.to_s =~ /[0-9]/
+                %w[) ! " £ $ % ^ & * ( ][key.to_s.to_i]
+              else
+
+                lsym = %i(` - = [ ] ; ' # \ , . /)
+
+                if lsym.include? key then
+
+                  usym = %w(¬ _ + { } : @ ~ | < > ?)
+                  lsym.zip(usym).to_h[key]
+
+                end
+
+              end
+
+              @a[-1][2] += char
+
+            else
+              @a << [modifier.first, {key: key}]
+            end
+          end
         end
-        
-        @a.last.last.gsub!('{space}',' ')
 
       else
 
@@ -77,7 +112,7 @@ module Xdrp
         when 'tab'
           [:tab]
         else
-          [:type, {}, key.to_s]
+          [:type, {}, key.to_s.sub(/\{space\}/, ' ')]
         end
 
         @a << a
@@ -89,7 +124,8 @@ module Xdrp
     def on_mousedown(button, x, y)
 
       return unless @mouse
-      
+      monitor_app()
+
       puts "mouse %s button down at %s, %s" % [button, x, y] if @debug
       add_sleep() if Time.now > (@t1 + 2)
       @a << [:mouse, {click: button, x: x, y: y}]
@@ -97,16 +133,15 @@ module Xdrp
     end
 
     def on_mouseup(button, x, y)
-      
+
       return unless @mouse
-      
       puts "mouse %s button up at %s, %s" % [button, x, y] if @debug
     end
 
     def on_mousemove(x, y)
 
       return unless @mouse
-      
+
       puts 'mouse is moving at ' + x.to_s + ' y ' + y.to_s if @debug
       add_sleep() if Time.now > (@t1 + 2)
       @a << [:mousemove, {x: x, y: y}]
@@ -116,7 +151,7 @@ module Xdrp
     def on_mouse_scrolldown()
 
       return unless @mouse
-      
+
       puts 'mouse is scrolling down' if @debug
       add_sleep() if Time.now > (@t1 + 2)
       @a << [:mousewheel, {scroll: 'down'}]
@@ -126,32 +161,32 @@ module Xdrp
     def on_mouse_scrollup()
 
       return unless @mouse
-      
+
       puts 'mouse is scrolling up ' if @debug
       add_sleep() if Time.now > (@t1 + 2)
       @a << [:mousewheel, {scroll: 'up'}]
 
     end
-    
+
     def save(filepath)
       File.write filepath, xml()
     end
 
     def start()
-      
+
       @a = []
       Thread.new { @xiw.listen }
       puts 'recording ...'
       @t1 = Time.now
-      
+
     end
 
     def stop()
-      
+
       @xiw.stop = true
       @doc = Rexle.new(['xdrp', {}, '', *@a])
       puts 'recording stopped'
-      
+
     end
 
     def xml()
@@ -165,22 +200,44 @@ module Xdrp
       @t1 = Time.now
     end
 
+    def monitor_app()
+
+      win = @wm.windows.find {|x| x.active}
+
+      if win.title != @win_title then
+        @win_title = win.title
+        @a << [:window, {activate: win.title}]
+      end
+
+    end
+
   end
 
   class Player
+    using ColouredText
 
     def initialize(src, debug: false)
 
       @debug = debug
-      @doc = Rexle.new(RXFHelper.read(src).first)
+      @doc = Keystroker.new(src, debug: debug).to_doc
+      puts '@doc.xml: ' + @doc.xml if @debug
 
     end
 
     def play()
 
       @doc.root.elements.each do |e|
-        puts 'e: ' + e.xml.inspect if @debug
-        method('xdo_' + e.name.to_s).call(e.text || e.attributes)
+
+        if @debug then
+          puts ('e: ' + e.xml.inspect).debug
+          puts 'e.class: ' + e.class.inspect.debug
+        end
+
+        if e.attributes.any? then
+          method('xdo_' + e.name.to_s).call(**(e.attributes))
+        else
+          method('xdo_' + e.name.to_s).call(e.text)
+        end
       end
 
     end
@@ -192,30 +249,44 @@ module Xdrp
     end
 
     def xdo_mouse(click: 'left', x: 0, y: 0)
-      XDo::Mouse.click(x.to_i, y.to_i, 
+      XDo::Mouse.click(x.to_i, y.to_i,
                        Object.const_get('XDo::Mouse::' + click.upcase))
     end
 
     def xdo_mousemove(x: 0, y: 0)
       XDo::Mouse.move(x.to_i, y.to_i)
     end
-                      
+
     def xdo_mousewheel(scroll: 'down')
       XDo::Mouse.wheel(Object.const_get('XDo::Mouse::' + scroll.upcase, 4))
-    end                      
+    end
 
     def xdo_sleep(duration: 0)
       sleep duration.to_f
     end
 
-    def xdo_tab(h={})
-      XDo::Keyboard.tab
+    def xdo_tab(times: 1)
+      times.to_i.times.each { XDo::Keyboard.tab }
     end
 
     def xdo_type(s)
       XDo::Keyboard.simulate(s.gsub('{enter}', "\n"))
     end
 
+    def xdo_window(activate: '')
+
+      if @debug then
+        puts 'inside xdo_window'
+        puts 'activate: ' + activate.inspect
+      end
+
+      wm = WMCtrl.display
+      window = wm.windows.find {|x| x.title == activate}
+      window.activate
+
+    end
+
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xdrp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwODA0MTkxNzIzWhcN
-  MjEwODA0MTkxNzIzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC+0Nf7
-  3r8/tK7O+C/D9z6Q8Dg8eMFjyC5LJIe1zsGoX3HaT7G6GHFlavar3XZ0UcEBOvdv
-  khojT/S2viTGUURzB3mQIVQnf2O9JDs9qXroyX6npMymN5XN4OlMiiriOdiFB9kk
-  y0L8S0Y+MUh0VOg5hN9vP9i2MrKIZKN3YD7G0eGku//a+nNYe3Q1Vq3+6fS4yvai
-  /N7GW8EmaldaOc7PpoehOKjMnLrWIwpcYKG+D24HIsXZP2+58a3xlIsk0fCcf7IO
-  a4uCOj2WbjlfGSJoLWFU7szqW/h1nnP8GGaFJTPLjC9mDaGlS+7LGrKEFl+cfhFE
-  FBI0ZpvWKuaf9IZaEYac8pKJPuzp3LsLAoK2HnhGln6w9dn82F2dFrFhewqPBOjZ
-  CWxhShTFYxBc2yo3H6oNvETRPO5/qNZblmeHUW24tWsZOsjABLJCBB0iJS61XaQm
-  n2zJqynV9y4u5/iHKN2+OZAXzG83d62MxU9SHiGP72H+XlPt5momLWQGH8UCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU6LzsKZ6w
-  GuZSIK6Opg6mWh9mB10wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMTAxMTkzMTE3WhcN
+  MjIxMTAxMTkzMTE3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDBq+SP
+  QnR1vcCQZVU95UyLJG4NSloLn7bvAzcv5dc6maUjxQNCK19lqmPFTov6kJ1v3Rse
+  EEoBygKVXYIghuZalPo3Iw4II4gyBulgnJYc12BE2eBY+fKKJMylE3IEShrMWMfZ
+  Cy6WXP/bYJWG2k3KcUIl6BkA1gxS/5jx4Isq50AGSlE63Bl7t/GG0/as9fm2Hx76
+  zn/DEl5TDblrjAANqagyc7AmtDV4Nr1O4t+8ZZRVGMROyVNB4RVBD2lSyXfyinnw
+  l3NqidqLvktNdvluJXRIP4vihntOIjYc6iYRkvNVj6LcGU+9sQS7PHVYj7FNCR83
+  2S80UKPUVQ0UZT2zO54CxkzXp42DtNbp8jQL6uvGZZVJfkwl26+U25u+haw6UXXz
+  +XF1uHn1XIeER5ZCkLb0346/pTStjTY+6s8ys04ZILPELXC8l+g/qJp5d1ijy1Ds
+  yF10RS6na/RsMrK/U1tI17m3wEN1zcqGF0WUjSnzgt0uuGAed2tV26VtbzUCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUWfLEMLPX
+  b1jli6LK6oO9gasVnhEwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAQQTOyG+mZBVdTXl9XhdBoBOP0JNOwjdav2OGDTsb
-  TGJexyhF4LMMoYZMX0gZOoJ0EfLwE/gJwPg8lc6kNla4KMXNfO881+LV4UKXpgB7
-  xIWLeYkM/yVOW01XgyoKcag9XI9hJxTCzY0ihbYaUI3CNSf0GQKQiV+DOgm2KLBP
-  4Q11hrXke22CfLH/cqEmjlaUDBYInOLYqCTLf08ssgFTd3+DLFpWhAzjBdksIQdA
-  MenyNICp3O9LfpXRSL4m8tF3d42IV0KxLtRHzO72YHyOCQJPWJ5nHXME9zFdYHyi
-  P8eBkrKjbJ1wPQnSXMhuxYnwUnKPImDUfwfJFx/xNXVAY9Y8F2T+HajpD6Tm+K9V
-  uYADR2lL52Rgbgbe3PCZ/oKTW1SjUgaC4MECdc3okdkxFWtysc0L+muLcjVFzUED
-  Cqn27EoN8MQ4Dix2yFfGGMZBeer8GVOTtrIixZnGr7bSWglZWNDDy/x2ZTBU0jYB
-  V66loB9HaeHxmtMl4Ylv2wvn
+  BgkqhkiG9w0BAQsFAAOCAYEAbmb/xDn+Tk7hG9j0sMNcRtS9F5TjTFCmoSGksHOw
+  WFGQwycJLPiS7N0djam52fOasrGw+WJS/CpoWaPL4SsSgXLqBwYKJx0efczzpIF0
+  i3gUx5vIp+NtMHsK+TbTeFN+xZRZa29BpBnJHShKDtXlAgyg5if9KGhs0yaRIw2o
+  NiV3epZmnh/l19xhvutTnVyKmLLIxMaYFiswTe3Ndz012OPssS1kBaIcvh6WGFTq
+  Yg5Hf1Ukm77+O5GQkPe2nide1wCC+4yxq0YN6dcKXo+cEy3ZsYHNHQcBdQSK5Z5O
+  7xhvTr5OgQ5Mzf7c/1MPvbuGHnQUD+NrlrL+qf912M7V/LvjGiekfdOKfLEDIQXh
+  oLYMTazde9OcTI1yEfy+9EKOYzh/ss/nB7F56mvNVZUdSzKPUD2Q57UxdZsnEHEE
+  TiejpssCygWf9HFO3IZRrjH3OzSduilBf7oorCJZqxI5d7KbuK6ceM00aCBJibQO
+  K2bW5QcTuyp9GEliuroid41b
   -----END CERTIFICATE-----
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xdo
@@ -61,44 +61,84 @@ dependencies:
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: xinput_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: ruby-wmctrl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.8
+- !ruby/object:Gem::Dependency
+  name: keystroker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -116,14 +156,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: A basic macro recorder for GNU/Linux which uses program xinput to capture