uh 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aab3d0e275ff50fdfa5f47250089dd20697f559
-  data.tar.gz: 39853f92956681040368032c73c6a1bc0b71e011
+  metadata.gz: fcc44fc2385e50268d20f0a051066da0530f2ecd
+  data.tar.gz: 0c56a49e7e4a4716719b39b60df88ce83c0ef968
 SHA512:
-  metadata.gz: 4d7de87048027b604563a94af2772d77b1b843f8779205e45894a255706ef200b8a09abf7b0a831d02d7dadae8f0616d738a0c4f3d1b519c54f872ca961743a8
-  data.tar.gz: df157ac6be33b4a588c35b3966ed2a3fe0e598b56835df5e88746b86d8e86f90d93a0211e4b67fe0cb7e830ff247ad5c16e8d38f9372153372023c1a04cfc38a
+  metadata.gz: 39baca396e76b1a771080ea03e75d40423bceb7343145eba7adc66a83599c6487443eba06acd12532aa50837dfc31d3d28cb595c15437e54d0e760bf2cea8c61
+  data.tar.gz: b92d40aa23835104a271c86ddeb2edb445bafa27884cb4d84d973b6bd164f4cf479c2b6e440a9b8da98b854be3cda6708c3ffc15d71c4b9e43af5dfa868b7cd2

data/lib/uh/version.rb

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

data/lib/uh/wm.rb

@@ -42,6 +42,8 @@ module Uh
     def_delegator :@logger, :info, :log
     def_delegator :@logger, :error, :log_error
 
+    attr_reader :keys, :rules
+
     def initialize(layout, &block)
       @layout   = layout
       @display  = Display.new
@@ -51,10 +53,7 @@ module Uh
       end
       @manager  = Manager.new(@logger)
       @keys     = {}
-
-      @manager.on_manage do |client|
-        @display.listen_events client.window, PROPERTY_CHANGE_MASK
-      end
+      @rules    = {}
 
       return unless block_given?
       if block.arity == 1 then yield self else instance_eval &block end
@@ -71,6 +70,12 @@ module Uh
       @keys[[key, mod_mask]] = block
     end
 
+    def rule(selectors, &block)
+      [*selectors].each do |selector|
+        @rules[/\A#{selector}/i] = block
+      end
+    end
+
     def on_init(&block)
       @on_init = block
     end
@@ -183,7 +188,14 @@ module Uh
     end
 
     def handle_map_request(event)
-      @manager.map event.window
+      if client = @manager.map(event.window)
+        @display.listen_events event.window, PROPERTY_CHANGE_MASK
+        @rules.each do |selector, action|
+          if client.wclass =~ selector
+            ActionHandler.new(self, @manager, @layout).call action
+          end
+        end
+      end
     end
 
     def handle_property_notify(event)

data/lib/uh/wm/manager.rb

@@ -9,7 +9,6 @@ module Uh
       def initialize(logger)
         @logger     = logger
         @clients    = []
-        @on_manage  = []
       end
 
       def to_s
@@ -21,7 +20,7 @@ module Uh
       end
 
       def on_manage(&block)
-        @on_manage << block
+        @on_manage = block
       end
 
       def on_unmanage(&block)
@@ -46,14 +45,15 @@ module Uh
 
       def map(window)
         if window.override_redirect?
-          log "#{self.class.name}#map window.override_redirect, skipping"
+          log "#{self.class.name}#map #{window}.override_redirect, skipping"
           return
         end
 
         if client = client_for(window)
           log "#{self.class.name}#map #{client}, already managed"
+          nil
         else
-          manage Client.new(window)
+          Client.new(window).tap { |o| manage o }
         end
       end
 
@@ -85,7 +85,7 @@ module Uh
       def manage(client)
         log "#{self.class.name}#manage #{client}"
         @clients << client
-        @on_manage.each { |e| e.call client }
+        @on_manage.call client if @on_manage
       end
 
       def unmanage(client)

data/test/uh/test_wm.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+require 'uh/wm'
+
+module Uh
+  describe WM do
+    subject { WM.new(Object.new) }
+
+    it 'has no rules' do
+      assert_empty subject.rules
+    end
+
+    describe '#rule' do
+      let(:block) { proc { } }
+
+      it 'registers a new rule' do
+        subject.rule 'client', &block
+        assert_equal 1, subject.rules.size
+      end
+
+      it 'transforms the given selector as a regexp' do
+        subject.rule 'client', &block
+        assert_equal /\Aclient/i, subject.rules.keys[0]
+      end
+
+      it 'assigns the given block' do
+        subject.rule 'client', &block
+        assert_includes subject.rules.values, block
+      end
+
+      it 'accepts an array of selectors' do
+        subject.rule %w[foo bar], &block
+        assert_equal [/\Afoo/i, /\Abar/i], subject.rules.keys
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uh
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Thibault Jouan
@@ -108,6 +108,7 @@ files:
 - lib/uh/wm/workers/multiplexing_worker.rb
 - test/test_helper.rb
 - test/uh/test_geo.rb
+- test/uh/test_wm.rb
 - uh.gemspec
 homepage: https://rubygems.org/gems/uh
 licenses: []
@@ -135,4 +136,5 @@ summary: Xlib simplified toolkit
 test_files:
 - test/test_helper.rb
 - test/uh/test_geo.rb
+- test/uh/test_wm.rb
 has_rdoc: