uh 0.1.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcc44fc2385e50268d20f0a051066da0530f2ecd
-  data.tar.gz: 0c56a49e7e4a4716719b39b60df88ce83c0ef968
+  metadata.gz: 9999e12b354d336f1ce29125beee2449b14605a7
+  data.tar.gz: 49554e1f41407b9a7a80b2f620858668783fde85
 SHA512:
-  metadata.gz: 39baca396e76b1a771080ea03e75d40423bceb7343145eba7adc66a83599c6487443eba06acd12532aa50837dfc31d3d28cb595c15437e54d0e760bf2cea8c61
-  data.tar.gz: b92d40aa23835104a271c86ddeb2edb445bafa27884cb4d84d973b6bd164f4cf479c2b6e440a9b8da98b854be3cda6708c3ffc15d71c4b9e43af5dfa868b7cd2
+  metadata.gz: ee9bc0537a9451c13d48a68f1f3fea3ed4eeb1e881cfb6a9faf801285883425aaa94ebc2e94d79484939c6eef68b382a913d0fe356ef0f243c16cf5313538ceb
+  data.tar.gz: e967087ea493695022b163eb560905dd7ca74e6b6a1bf69d73b4422db9910a9cb403c03a1bca860861c3813c71008d26f04e1bf5171396fd3a17338c78f0a904

data/lib/uh/version.rb

@@ -1,3 +1,3 @@
 module Uh
-  VERSION = '0.1.8'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/uh/wm.rb

@@ -42,9 +42,9 @@ module Uh
     def_delegator :@logger, :info, :log
     def_delegator :@logger, :error, :log_error
 
-    attr_reader :keys, :rules
+    attr_reader :actions, :keys, :rules
 
-    def initialize(layout, &block)
+    def initialize(layout)
       @layout   = layout
       @display  = Display.new
       @logger   = Logger.new($stdout).tap do |o|
@@ -52,11 +52,9 @@ module Uh
         o.formatter = LOGGER_FORMATER
       end
       @manager  = Manager.new(@logger)
+      @actions  = ActionHandler.new(self, @manager, @layout)
       @keys     = {}
       @rules    = {}
-
-      return unless block_given?
-      if block.arity == 1 then yield self else instance_eval &block end
     end
 
     def modifier(mod = nil)
@@ -70,7 +68,7 @@ module Uh
       @keys[[key, mod_mask]] = block
     end
 
-    def rule(selectors, &block)
+    def rule(selectors = '', &block)
       [*selectors].each do |selector|
         @rules[/\A#{selector}/i] = block
       end
@@ -85,40 +83,13 @@ module Uh
     end
 
     def worker(*args, **options)
-      @worker ||= if args.any?
-        WORKERS[args.first].new(@display, @logger, options)
-      else
-        Workers::BlockingWorker.new(@display, @logger)
-      end
+      @worker = WORKERS[args.first].new(@display, @logger, options)
     end
 
     def request_quit!
       @quit_requested = true
     end
 
-    def run
-      connect
-      @on_init.call @display
-      grab_keys
-      @display.root.mask = ROOT_MASK
-      worker.setup.each_event do |e|
-        process_event e
-        break if quit_requested?
-      end
-      disconnect
-    end
-
-
-    private
-
-    def modifier_mask(mod)
-      KEY_MODIFIERS[mod]
-    end
-
-    def quit_requested?
-      !!@quit_requested
-    end
-
     def connect
       @display.open
       Display.on_error proc { fail OtherWMRunningError }
@@ -126,6 +97,9 @@ module Uh
       @display.sync false
       Display.on_error proc { |*args| handle_error(*args) }
       @display.sync false
+      @display.root.mask = ROOT_MASK
+      @worker.setup
+      @on_init.call @display if @on_init
     end
 
     def disconnect
@@ -138,6 +112,29 @@ module Uh
         key = key.to_s.gsub /\AXK_/, ''
         @display.grab_key key, mod
       end
+      @display.sync false
+    end
+
+    def run_until(&block)
+      @worker.each_event do |e|
+        process_event e
+        break if block.call
+      end
+    end
+
+    def run
+      run_until { quit_requested? }
+    end
+
+
+    private
+
+    def modifier_mask(mod)
+      KEY_MODIFIERS[mod]
+    end
+
+    def quit_requested?
+      !!@quit_requested
     end
 
     def process_event(event)
@@ -183,8 +180,7 @@ module Uh
     end
 
     def handle_key_press(event)
-      ActionHandler.new(self, @manager, @layout)
-        .call @keys[["XK_#{event.key}".to_sym, event.modifier_mask]]
+      actions.call @keys[["XK_#{event.key}".to_sym, event.modifier_mask]]
     end
 
     def handle_map_request(event)
@@ -192,7 +188,7 @@ module Uh
         @display.listen_events event.window, PROPERTY_CHANGE_MASK
         @rules.each do |selector, action|
           if client.wclass =~ selector
-            ActionHandler.new(self, @manager, @layout).call action
+            actions.call action
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uh
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake