uh 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e23c0e6ca2adc65543ea88a899d518a66f6ba87d
-  data.tar.gz: ecda150aaa445463377e82efa6ff16c260fb4cab
+  metadata.gz: 0efbb3383d315de3572ecf957001d7dfa7324c03
+  data.tar.gz: ceaee1387cb5664f702c675a8009986a88e54eb0
 SHA512:
-  metadata.gz: 38c121dd15a0616f48b32aec6f2961e2e2393d7a4216e1d9ae712a0cd354b77e48ff602a631746e1b44695669cb113e57dc8f2c580b47a3ce593a656ac97fee4
-  data.tar.gz: 0363cabe4cab460b7a94d29ec85f2c04fb93a523f6e615771f5d360438bfc6058dc2a92b13abd3c5175e6a8ff04ee00072fe3227aed8a4fe99270f6980d11d98
+  metadata.gz: d4f92d07c0f1356951d45e44544ca4b113f3f0e4efa5f8db2728b86d4db9f197e868786cd25a6b0eb027fbb1dbc9458dd2fbe372bf8d4a2820ffcaea3bf1d30b
+  data.tar.gz: 9d09c9409e9c83a65ad950c151fd0ee832effd5537a0c47506381de23f5ff9c1f4727d4a3e742c22812a7d4062ef125a67060baa7b06949a34452763d8249d7e

data/lib/uh/version.rb

@@ -1,3 +1,3 @@
 module Uh
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

data/lib/uh/wm/action_handler.rb

@@ -1,44 +1,55 @@
 module Uh
   class WM
     class ActionHandler
+      extend Forwardable
+      def_delegators :@wm, :log, :log_error
+
+      attr_reader :layout
+
       def initialize(wm, manager, layout)
         @wm, @manager, @layout = wm, manager, layout
       end
 
       def call(action)
         instance_exec &action
+      rescue LocalJumpError => e
+        log_error "Action: #{e}"
       end
 
       def quit
-        @wm.log 'Exiting...'
+        log 'Exiting...'
         @wm.request_quit!
       end
 
       def execute(command)
-        @wm.log "Spawn `#{command}`"
+        log "Spawn `#{command}`"
         pid = spawn command, pgroup: true
         Process.detach pid
       rescue Errno::ENOENT => e
-        @wm.log_error "Spawn: #{e}"
+        log_error "Spawn: #{e}"
       end
 
       def log_layout
-        @wm.log "Layout:\n#{@layout.to_s.lines.map { |e| "  #{e}" }.join.chomp}"
+        log "Layout:\n#{@layout.to_s.lines.map { |e| "  #{e}" }.join.chomp}"
       end
 
       def log_clients
-        @wm.log "Clients:\n#{@manager.to_s.lines.map { |e| "  #{e}" }.join.chomp}"
+        log "Clients:\n#{@manager.to_s.lines.map { |e| "  #{e}" }.join.chomp}"
       end
 
       def log_separator
-        @wm.log '- ' * 24
+        log '- ' * 24
       end
 
       def method_missing(m, *args, &block)
         if respond_to? m
           meth = layout_method m
-          @wm.log "#{@layout.class.name}##{meth} #{args.inspect}"
-          @layout.send(meth, *args)
+          log "#{@layout.class.name}##{meth} #{args.inspect}"
+          begin
+            @layout.send(meth, *args)
+          rescue NoMethodError
+            log_error "Layout does not implement `#{meth}'"
+          end
         else
           super
         end

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

@@ -4,23 +4,27 @@ module Uh
       class MultiplexingWorker < BaseWorker
         DEFAULT_TIMEOUT = 4
 
-        def configure(timeout: DEFAULT_TIMEOUT)
-          @timeout = timeout
+        def configure(timeout: DEFAULT_TIMEOUT, on_timeout: nil)
+          @timeout    = timeout
+          @on_timeout = on_timeout
         end
 
         def setup
           @display_io = IO.new(@display.fileno)
-          @display.flush
           self
         end
 
         def each_event
           loop do
+            @display.flush
             @logger.debug "select [#{@display_io.fileno}], _, _, #{@timeout}"
             rs, _ = IO.select [@display_io], [], [], @timeout
             @logger.debug " => #{rs.inspect}"
-            next if rs.nil? || rs.empty?
-            yield @display.next_event while @display.pending?
+            if rs.nil? || rs.empty?
+              @on_timeout.call if @on_timeout
+            else
+              yield @display.next_event while @display.pending?
+            end
           end
         end
       end

data/lib/uh/wm.rb

@@ -149,7 +149,7 @@ module Uh
 
     def log_event(event)
       complement = case event.type
-      when :destroy_notify, :expose, :key_press, :map_request, :property_notify
+      when :destroy_notify, :expose, :map_request, :property_notify
         "window: #{event.window}"
       when :configure_request
         '%s, above: #%d, detail: #%d, value_mask: #%d' % [
@@ -158,6 +158,8 @@ module Uh
           event.detail,
           event.value_mask
         ]
+      when :key_press
+        "window: #{event.window}, key: #{event.key}, mask: #{event.modifier_mask}"
       when :unmap_notify
         "window: #{event.window}, event_window: #{event.event_window}"
       end

metadata

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