xdrp 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 877d673daa2960b793ced8a05fe174b7c5b314bcf87731b4a117f4e2440daf27
-  data.tar.gz: '09449b766c010a1dc6fd3412101cd4fee9fa4b935d680ec7c0d1c3ea8a3040b2'
+  metadata.gz: 737ab10b27c806f92b76fd5c622e913df7ae8b97d3027a30c2d37cf27714ca33
+  data.tar.gz: 1145d42168fddfb29b70c8339d4a80717873160d261a93cfced4ea17186bf2c4
 SHA512:
-  metadata.gz: f6c4fb1c63da4598afaf563f7493830fae943c38e0cd885e3460ec6e4dc8ccc2f75b36e5e6d291840d191ff6bc9ce24cfb8148c795b5e4cdc565392bc4ebd4f0
-  data.tar.gz: ea8cafca863a30340179a4f8666d1d3684f64ee89a89716c1ef551cd95961060c9735b3ebe44b30ddcd919fca85a7395e8f8def615440d45cac335ac3e1e7a56
+  metadata.gz: 7de5de83cfae5ff60214a93ec8ffab23f5d0429656c8c86273dcb54c330fa99059ac4a9d1d5fbf5787d9fde50d065c63c18c7d2ea4e26241c0ead56b1ca603f3
+  data.tar.gz: 6fc90d8cb24aafde37c44895563b17b585bf50eb9d3794f387c6cd62d32a4dc386cfd3ab3e0104b308965085915f667da604fe4f32f9b74ad5d8a95a47df04d8

data/lib/xdrp.rb

@@ -33,8 +33,6 @@ module Xdrp
 
     def initialize(levelx=KEYBOARD_MOUSE, level: levelx, debug: false)
       
-      @xiw = XInputWrapper.new(verbose: true, debug: debug, callback: self)
-
       @mouse, @keyboard = false, false
       
       case level
@@ -45,6 +43,13 @@ 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)      
@@ -80,12 +85,12 @@ module Xdrp
                 %w[) ! " £ $ % ^ & * ( ][key.to_s.to_i]
               else
                                 
-                lsym = %w(` - = [ ] ; ' # \ , . /)
+                lsym = %i(` - = [ ] ; ' # \ , . /)
                 
-                if lsym.include? key.to_s then
+                if lsym.include? key then
 
                   usym = %w(¬ _ + { } : @ ~ | < > ?)
-                  lsym.zip(usym).to_h[key.to_s]
+                  lsym.zip(usym).to_h[key]
 
                 end
 
@@ -118,7 +123,8 @@ module Xdrp
 
     def on_mousedown(button, x, y)
 
-      return unless @mouse
+      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)
@@ -129,7 +135,6 @@ module Xdrp
     def on_mouseup(button, x, y)
       
       return unless @mouse
-      
       puts "mouse %s button up at %s, %s" % [button, x, y] if @debug
     end
 
@@ -194,6 +199,17 @@ module Xdrp
       @a << [:sleep, {duration: (Time.now - @t1).round}]
       @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
 
@@ -202,7 +218,8 @@ module Xdrp
     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
 
@@ -238,13 +255,22 @@ module Xdrp
       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: '')
+      
+      wm = WMCtrl.display
+      window = wm.windows.find {|x| x.title == activate}
+      window.activate
+      
+    end
+    
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xdrp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson