uh-wm 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9e65ddc3d9f3e3f406b624138ef47c86531380e
-  data.tar.gz: 095aac6361586080213412cb40d1ba6a7393150a
+  metadata.gz: d964f7fa9ddc317e9e179e07a20cd462457a7a80
+  data.tar.gz: 93baa823c8b9fbc18fef96b37ad79416daa7059e
 SHA512:
-  metadata.gz: 3d3733270d72b481d05fded4c6bd0a66dcbdce5be277c639a6aba35ef613128276251f1795d70aa876ec375f85e7adc9d9da5ccf6a40576b6ff1aa1d38fa69da
-  data.tar.gz: ec55836544feb58833aae7168adc823640a1dc5d27531a3d1af2b6d71442f6847b7aba9fc4906b78f06382eb178ee65a891813c14b9c267386953701d2478c8b
+  metadata.gz: 613887c13875de0901994d0dad1ff57ff4ba45f175fb149e0e6e6ef85ec1c7d9fc6d4faceb00e199ef40ec8c571f80c77bff4ef02bc355389dba9e6dd0b19936
+  data.tar.gz: 9182b6a47768f16bfe5e0fae1db0e8d3dc1f6f75b3213ba267842025a3cabb7e39144f7f8173f8e805389e8cf01ec8b614a5c5eb15e29d0811b4d10bce240e02

data/lib/uh/wm.rb

@@ -1,7 +1,7 @@
 require 'forwardable'
 require 'logger'
 require 'optparse'
-require 'rb-kqueue'
+require 'rbconfig'
 require 'uh'
 
 require 'uh/wm/env_logging'
@@ -20,7 +20,7 @@ require 'uh/wm/version'
 require 'uh/wm/workers'
 require 'uh/wm/workers/base'
 require 'uh/wm/workers/blocking'
-require 'uh/wm/workers/kqueue'
+require 'uh/wm/workers/kqueue' unless RbConfig::CONFIG['host_os'] =~ /linux/i
 require 'uh/wm/workers/mux'
 
 module Uh

data/lib/uh/wm/env.rb

@@ -23,15 +23,16 @@ module Uh
 
       attr_reader   :output, :keybinds
       attr_accessor :verbose, :debug, :rc_path, :modifier, :worker,
-                    :layout, :layout_class, :rules, :launch
+                    :layout, :layout_class, :layout_options, :rules, :launch
 
       def initialize output
-        @output   = output
-        @rc_path  = RC_PATH
-        @modifier = MODIFIER
-        @keybinds = KEYBINDS.dup
-        @worker   = :block
-        @rules    = {}
+        @output         = output
+        @rc_path        = RC_PATH
+        @modifier       = MODIFIER
+        @keybinds       = KEYBINDS.dup
+        @layout_options = {}
+        @worker         = :block
+        @rules          = {}
       end
 
       def verbose?
@@ -44,10 +45,10 @@ module Uh
 
       def layout
         @layout ||= if layout_class
-          layout_class.new
+          layout_class.new @layout_options
         else
           require 'uh/layout'
-          ::Uh::Layout.new
+          ::Uh::Layout.new(@layout_options)
         end
       end
 

data/lib/uh/wm/run_control.rb

@@ -35,12 +35,15 @@ module Uh
       end
 
       def layout arg, **options
-        if arg.is_a? Class
+        case arg
+        when Class
           if options.any?
             @env.layout = arg.new options
           else
             @env.layout_class = arg
           end
+        when Hash
+          @env.layout_options = arg
         else
           @env.layout = arg
         end

data/lib/uh/wm/runner.rb

@@ -57,11 +57,12 @@ module Uh
 
       def worker
         @worker ||= Workers.build(*(@env.worker)).tap do |w|
-          w.before_watch  { @manager.handle_pending_events }
+          w.before_watch  { @manager.flush }
           w.on_read       { @manager.handle_pending_events }
           w.on_read_next  { @manager.handle_next_event }
-          w.on_timeout do |*args|
-            log_debug "Worker timeout: #{args.inspect}"
+          w.on_timeout do
+            log_debug "Worker timeout, ticking..."
+            @events.emit :tick
             log_debug 'Flushing X output buffer'
             @manager.flush
           end
@@ -129,6 +130,7 @@ module Uh
           log "Exposing window: #{window}"
           layout.expose window
         end
+        @events.on(:tick) { layout.update }
       end
 
       def register_keybinds_hooks

data/lib/uh/wm/version.rb

@@ -1,5 +1,5 @@
 module Uh
   module WM
-    VERSION = '0.0.8'
+    VERSION = '0.0.9'
   end
 end

data/lib/uh/wm/workers/kqueue.rb

@@ -1,3 +1,5 @@
+require 'rb-kqueue'
+
 module Uh
   module WM
     module Workers
@@ -6,24 +8,30 @@ module Uh
 
         def initialize timeout: TIMEOUT_DEFAULT
           super
-          @queue = ::KQueue::Queue.new
+          @timeout = timeout * 1000
         end
 
-        def watch io
-          @queue.watch_stream_for_read io.to_io do
-            @on_read.call
-          end
+        def work_events
+          @before_watch.call if @before_watch
+          queue.run
         end
 
-        def on_timeout &block
-          ::KQueue::Watcher.new(@queue, 1, :timer, [], 1000, proc do |event|
-            block.call
-          end)
-        end
 
-        def work_events
-          @before_watch.call if @before_watch
-          events = @queue.process
+        private
+
+        def queue
+          @queue ||= ::KQueue::Queue.new.tap do |q|
+            @ios.each do |io|
+              ::KQueue::Watcher.new(q, io.fileno, :read, [], nil, proc do |_|
+                q.stop
+                @on_read.call
+              end)
+            end
+            ::KQueue::Watcher.new(q, 1, :timer, [], @timeout, proc do |_|
+              q.stop
+              @on_timeout.call
+            end)
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uh-wm
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-kqueue
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement