uh 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ef1227406e129065ec58d3ccbef8e530c74050f
-  data.tar.gz: 3fb7f59ba3e5c3853a0e5c0f488b031b0ce5362f
+  metadata.gz: e23c0e6ca2adc65543ea88a899d518a66f6ba87d
+  data.tar.gz: ecda150aaa445463377e82efa6ff16c260fb4cab
 SHA512:
-  metadata.gz: 5898495c89370be4a3e77478bf49fc944051677aae34e38d653afe7a7012a9fc2276298de8ee77052b89566d1759724c16c4082582128d6be34ba305f53fd72c
-  data.tar.gz: 942d61b82d905b2bef029bd551db2709770b58a9ef4a308068d186a2e3b1aedadcf1bdecf3767be911c97bd7c83ba210734ac91313c18b4425b9d0d654fb84a8
+  metadata.gz: 38c121dd15a0616f48b32aec6f2961e2e2393d7a4216e1d9ae712a0cd354b77e48ff602a631746e1b44695669cb113e57dc8f2c580b47a3ce593a656ac97fee4
+  data.tar.gz: 0363cabe4cab460b7a94d29ec85f2c04fb93a523f6e615771f5d360438bfc6058dc2a92b13abd3c5175e6a8ff04ee00072fe3227aed8a4fe99270f6980d11d98

data/ext/uh/event.c

@@ -87,6 +87,8 @@ VALUE event_make_event(VALUE klass, XEvent *xev) {
   event = Data_Wrap_Struct(klass, 0, 0, xev);
   rb_ivar_set(event, rb_intern("@type"),
     ID2SYM(rb_intern(type_descs[xev->type])));
+  rb_ivar_set(event, rb_intern("@send_event"),
+    xev->xany.send_event ? Qtrue : Qfalse);
 
   return event;
 }
@@ -152,6 +154,8 @@ void event_make_win_any(VALUE self) {
       window = xev->xproperty.window;
       break;
     case UnmapNotify:
+      rb_ivar_set(self, rb_intern("@event_window"),
+        window_make(xev->xany.display, xev->xunmap.event));
       window = xev->xunmap.window;
       break;
     default:

data/lib/uh.rb

@@ -2,6 +2,7 @@ require 'uh/uh'
 require 'uh/display'
 require 'uh/drawable'
 require 'uh/events'
+require 'uh/events/event'
 require 'uh/font'
 require 'uh/geo'
 require 'uh/pixmap'

data/lib/uh/events/event.rb

@@ -0,0 +1,7 @@
+module Uh
+  module Events
+    class Event
+      attr_reader :send_event, :event_window
+    end
+  end
+end

data/lib/uh/version.rb

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

data/lib/uh/wm.rb

@@ -51,7 +51,7 @@ module Uh
         o.level     = ENV.key?(LOGGER_DEBUG_ENV) ? Logger::DEBUG : LOGGER_LEVEL
         o.formatter = LOGGER_FORMATER
       end
-      @manager  = Manager.new(@logger)
+      @manager  = Manager.new
       @actions  = ActionHandler.new(self, @manager, @layout)
       @keys     = {}
       @rules    = {}
@@ -148,10 +148,8 @@ module Uh
     end
 
     def log_event(event)
-      fmt         = '> Event %s'
-      complement  = case event.type
-      when :destroy_notify, :expose, :key_press, :map_request, :property_notify,
-        :unmap_notify
+      complement = case event.type
+      when :destroy_notify, :expose, :key_press, :map_request, :property_notify
         "window: #{event.window}"
       when :configure_request
         '%s, above: #%d, detail: #%d, value_mask: #%d' % [
@@ -160,11 +158,15 @@ module Uh
           event.detail,
           event.value_mask
         ]
-      else
-        nil
+      when :unmap_notify
+        "window: #{event.window}, event_window: #{event.event_window}"
       end
 
-      log 'XEvent %s' % [event.type, complement].compact.join(' ')
+      log [
+        'XEvent', event.type,
+        event.send_event ? 'SENT' : nil,
+        complement
+      ].compact.join(' ')
     end
 
     def handle_configure_request(event)

data/lib/uh/wm/client.rb

@@ -6,23 +6,25 @@ module Uh
       include GeoAccessors
 
       attr_reader   :window
-      attr_accessor :geo
+      attr_accessor :geo, :unmap_count
 
       def initialize(window)
-        @window = window
-        @hide   = true
+        @window       = window
+        @hide         = true
+        @unmap_count  = 0
       end
 
       def to_s
-        '<%s> (%s) window: %s, geo: %s' % [name, wclass, window, geo]
+        '<%s> (%s) %s win: %s unmaps: %d' %
+          [name, wclass, @geo, @window, @unmap_count]
       end
 
       def name
-        @name ||= window.name
+        @name ||= @window.name
       end
 
       def wclass
-        @wclass ||= window.wclass
+        @wclass ||= @window.wclass
       end
 
       def hidden?
@@ -35,44 +37,45 @@ module Uh
       end
 
       def configure
-        window.configure geo
+        @window.configure @geo
         self
       end
 
       def moveresize
-        window.moveresize geo
+        @window.moveresize @geo
         self
       end
 
       def show
-        window.map
+        @window.map
         @hide = false
         self
       end
 
       def hide
-        window.unmap
+        @window.unmap
         @hide = true
+        @unmap_count += 1
         self
       end
 
       def focus
-        window.raise
-        window.focus
+        @window.raise
+        @window.focus
         self
       end
 
       def kill
-        if window.icccm_wm_protocols.include? :WM_DELETE_WINDOW
-          window.icccm_wm_delete
+        if @window.icccm_wm_protocols.include? :WM_DELETE_WINDOW
+          @window.icccm_wm_delete
         else
-          window.kill
+          @window.kill
         end
         self
       end
 
       def kill!
-        window.kill
+        @window.kill
         self
       end
     end

data/lib/uh/wm/manager.rb

@@ -3,12 +3,10 @@ module Uh
     class Manager
       DEFAULT_GEO = Geo.new(0, 0, 320, 240).freeze
 
-      extend Forwardable
-      def_delegator :@logger, :info, :log
+      attr_reader :clients
 
-      def initialize(logger)
-        @logger     = logger
-        @clients    = []
+      def initialize
+        @clients = []
       end
 
       def to_s
@@ -33,35 +31,30 @@ module Uh
 
       def configure(window)
         if client = client_for(window)
-          log "#{self.class.name}#configure #{client} already managed"
           client.configure
         else
           geo = @on_configure ? @on_configure.call(window) : DEFAULT_GEO
-          log "#{self.class.name}#configure window: #{window}, not managed"
-          log "#{window.class.name}#configure #{geo}"
           window.configure_event geo
         end
       end
 
       def map(window)
-        if window.override_redirect?
-          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
-          Client.new(window).tap { |o| manage o }
-        end
+        return if window.override_redirect? || client_for(window)
+        Client.new(window).tap { |o| manage o }
       end
 
       def unmap(window)
+        return unless client = client_for(window)
+        if client.unmap_count > 0
+          client.unmap_count -= 1
+        else
+          unmanage client
+        end
       end
 
       def destroy(window)
-        remove_client_for window
+        return unless client = client_for(window)
+        unmanage client
       end
 
       def update_properties(window)
@@ -77,19 +70,12 @@ module Uh
         @clients.find { |e| e.window == window }
       end
 
-      def remove_client_for(window)
-        return unless client = client_for(window)
-        unmanage client
-      end
-
       def manage(client)
-        log "#{self.class.name}#manage #{client}"
         @clients << client
         @on_manage.call client if @on_manage
       end
 
       def unmanage(client)
-        log "#{self.class.name}#unmanage #{client}"
         @clients.reject! { |e| e == client }
         @on_unmanage.call client if @on_unmanage
       end

data/test/uh/wm/test_client.rb

@@ -15,6 +15,10 @@ module Uh
         assert subject.hidden?
       end
 
+      it 'has an unmap count of 0' do
+        assert_equal 0, subject.unmap_count
+      end
+
       describe '#name' do
         it 'returns the window name' do
           assert_equal 'win name', subject.name
@@ -98,11 +102,16 @@ module Uh
           window.verify
         end
 
-        it 'is stays hidden' do
+        it 'stays hidden' do
           subject.hide
           assert subject.hidden?
         end
 
+        it 'increments the unmap count' do
+          subject.hide
+          assert_equal 1, subject.unmap_count
+        end
+
         it 'returns self' do
           assert_same subject, subject.hide
         end

data/test/uh/wm/test_manager.rb

@@ -0,0 +1,164 @@
+require 'test_helper'
+require 'uh/wm'
+
+module Uh
+  class WM
+    describe Manager do
+      let(:output)  { StringIO.new }
+      let(:window)  { Minitest::Mock.new }
+      subject       { Manager.new }
+
+      it 'has no clients' do
+        assert subject.clients.empty?
+      end
+
+      describe '#configure' do
+        context 'with new window' do
+          it 'sends a default configure event to the window' do
+            window.expect :configure_event, window, [Geo.new(0, 0, 320, 240)]
+            subject.configure window
+            window.verify
+          end
+
+          context 'with a registered callback' do
+            it 'sends configure event with geo returned by callback' do
+              subject.on_configure { Geo.new(0, 0, 42, 42) }
+              window.expect :configure_event, window, [Geo.new(0, 0, 42, 42)]
+              subject.configure window
+              window.verify
+            end
+          end
+        end
+
+        context 'with known window' do
+          let(:client) { Minitest::Mock.new }
+
+          before do
+            subject.clients << client
+            client.expect :window, window
+          end
+
+          it 'sends a configure message to the client for given window' do
+            window.expect :==, true, [Object]
+            client.expect :configure, client
+            subject.configure window
+            client.verify
+          end
+        end
+      end
+
+      describe '#map' do
+        before do
+          window.expect :override_redirect?, false
+        end
+
+        it 'registers a new client' do
+          subject.map window
+          assert_equal 1, subject.clients.size
+        end
+
+        it 'calls the manage callback' do
+          subject.on_manage do |client|
+            assert_equal subject.clients[0], client
+            throw :manage
+          end
+          assert_throws(:manage) { subject.map window }
+        end
+      end
+
+      describe '#unmap' do
+        let(:client) { Client.new(window) }
+
+        before do
+          subject.clients << client
+          window.expect :==, true, [Object]
+        end
+
+        context 'when client unmap count is 0 or less' do
+          it 'preserves the unmap count' do
+            subject.unmap window
+            assert_equal 0, client.unmap_count
+          end
+
+          it 'unmanages the client' do
+            subject.unmap window
+            refute_includes subject.clients, client
+          end
+
+          it 'calls the unmanage callback' do
+            subject.on_unmanage do |c|
+              assert_equal client, c
+              throw :unmanage
+            end
+            assert_throws(:unmanage) { subject.unmap window }
+          end
+        end
+
+        context 'when client unmap count is strictly positive' do
+          before { client.unmap_count += 1 }
+
+          it 'decrements the unmap count' do
+            subject.unmap window
+            assert_equal 0, client.unmap_count
+          end
+
+          it 'does not unmanage the client' do
+            subject.unmap window
+            assert_includes subject.clients, client
+          end
+        end
+      end
+
+      describe '#destroy' do
+        let(:client) { Client.new(window) }
+
+        before do
+          subject.clients << client
+          window.expect :==, true, [Object]
+        end
+
+        it 'unmanages the client' do
+          subject.destroy window
+          refute_includes subject.clients, client
+        end
+
+        it 'calls the unmanage callback' do
+          subject.on_unmanage do |c|
+            assert_equal client, c
+            throw :unmanage
+          end
+          assert_throws(:unmanage) { subject.destroy window }
+        end
+      end
+
+      describe '#update_properties' do
+        context 'with known window' do
+          before do
+            window.expect :==, true, [Object]
+            window.expect :name, 'window'
+            window.expect :wclass, 'window class'
+          end
+
+          it 'updates client window properties' do
+            client = Minitest::Mock.new
+            client.expect :window, window
+            subject.clients << client
+            client.expect :update_window_properties, client
+            subject.update_properties window
+            client.verify
+          end
+
+          it 'calls the change callback' do
+            client = Client.new(window)
+            subject.clients << client
+            subject.on_change do |c|
+              assert_same client, c
+              throw :change
+            end
+            assert_throws(:change) { subject.update_properties window }
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uh
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,6 +92,7 @@ files:
 - lib/uh/display.rb
 - lib/uh/drawable.rb
 - lib/uh/events.rb
+- lib/uh/events/event.rb
 - lib/uh/font.rb
 - lib/uh/geo.rb
 - lib/uh/geo_accessors.rb
@@ -110,6 +111,7 @@ files:
 - test/uh/test_geo.rb
 - test/uh/test_wm.rb
 - test/uh/wm/test_client.rb
+- test/uh/wm/test_manager.rb
 - uh.gemspec
 homepage: https://rubygems.org/gems/uh
 licenses: []
@@ -139,4 +141,5 @@ test_files:
 - test/uh/test_geo.rb
 - test/uh/test_wm.rb
 - test/uh/wm/test_client.rb
+- test/uh/wm/test_manager.rb
 has_rdoc: