uh 1.2.3 → 2.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d15f9c10043e73d9891e0e63ee0242b979ce6aac
-  data.tar.gz: bf8dd289b1c4b88f6ea8f9749c14e0b5d6ff7ae2
+  metadata.gz: 1fac46367eac28fe3f697da45b08ed7250a5f8ac
+  data.tar.gz: 6d68b1ac9b0627154a98715662a3dd686b4d91b7
 SHA512:
-  metadata.gz: 3f2d7a2e3f5c157d33d40c69cd8bdec77ab1052241676479606014391925cbcc72c29c5510af874f936bf5769f15b215ca597170761cec2d4b2a59a764fdedb0
-  data.tar.gz: f13f6fd116766445cb26531b5b5523c0a76f10f122af011a11163d7a83559b21151cfafd90fca81f30aa1aed086241174d7256e1d8c9107ce183dd0a8cda8005
+  metadata.gz: 1009fe21fd3c74988921ae694ea8aff50c953d6777a5ba629dc5a256789aa12b097ec8879099032c4879470bb248dd70dbe9950cf81c146bac9beae2bc951387
+  data.tar.gz: 0ff9b73c6acc2475c794f25e05c01626a20859f74da948af929865062b28512bdd975d6de9b0c41ac59653170c21ee5fd92565d5b96572d7abe8377b5f565bc1

data/ext/uh/display.c

@@ -13,8 +13,12 @@ VALUE rdisplay_error_handler = Qnil;
 int display_x_error_handler(Display *dpy, XErrorEvent *e);
 
 
-VALUE display_s_on_error(VALUE klass, VALUE handler) {
-  rdisplay_error_handler = handler;
+VALUE display_s_on_error(VALUE klass) {
+  if (!rb_block_given_p()) {
+    rb_raise(rb_eArgError, "no block given");
+  }
+
+  rdisplay_error_handler = rb_block_proc();
   rb_global_variable(&rdisplay_error_handler);
 
   return Qnil;

data/ext/uh/uh.c

@@ -33,7 +33,7 @@ void uh_color() {
 
 void uh_display() {
   cDisplay = rb_define_class_under(mUh, "Display", rb_cObject);
-  rb_define_singleton_method(cDisplay, "on_error", display_s_on_error, 1);
+  rb_define_singleton_method(cDisplay, "on_error", display_s_on_error, 0);
   rb_define_alloc_func(cDisplay, display_alloc);
   rb_define_attr(cDisplay, "name", 1, 0);
   rb_define_method(cDisplay, "close", display_close, 0);
@@ -120,14 +120,11 @@ void uh_screen() {
 void uh_window() {
   cWindow = rb_define_class_under(mUh, "Window", rb_cObject);
   rb_define_attr(cWindow, "id", 1, 0);
-  rb_define_method(cWindow, "destroy", window_destroy, 0);
   rb_define_method(cWindow, "focus", window_focus, 0);
   rb_define_method(cWindow, "kill", window_kill, 0);
   rb_define_method(cWindow, "map", window_map, 0);
-  rb_define_method(cWindow, "mask", window_mask, 0);
   rb_define_method(cWindow, "mask=", window_mask_set, 1);
   rb_define_method(cWindow, "name", window_name, 0);
-  rb_define_method(cWindow, "name=", window_name_set, 1);
   rb_define_method(cWindow, "override_redirect?", window_override_redirect, 0);
   rb_define_method(cWindow, "raise", window_raise, 0);
   rb_define_method(cWindow, "unmap", window_unmap, 0);
@@ -137,7 +134,6 @@ void uh_window() {
   rb_define_private_method(cWindow, "_configure", window__configure, 4);
   rb_define_private_method(cWindow, "_configure_event",
     window__configure_event, 4);
-  rb_define_private_method(cWindow, "_create", window__create, 4);
   rb_define_private_method(cWindow, "_create_sub", window__create_sub, 4);
   rb_define_private_method(cWindow, "_moveresize", window__moveresize, 4);
 }

data/ext/uh/uh.h

@@ -47,7 +47,7 @@ VALUE mUh, mEvents,
 
 VALUE color_make(unsigned long pixel);
 
-VALUE display_s_on_error(VALUE klass, VALUE handler);
+VALUE display_s_on_error(VALUE klass);
 VALUE display_alloc(VALUE klass);
 VALUE display_close(VALUE self);
 VALUE display_color_by_name(VALUE self, VALUE rcolor);
@@ -80,23 +80,19 @@ VALUE pixmap_make(Display *display, Pixmap xpixmap, VALUE width, VALUE height);
 
 VALUE screen_init(VALUE self, VALUE id, VALUE x, VALUE y, VALUE w, VALUE h);
 
-VALUE window_destroy(VALUE self);
 VALUE window_focus(VALUE self);
 VALUE window_icccm_wm_delete(VALUE self);
 VALUE window_icccm_wm_protocols(VALUE self);
 VALUE window_kill(VALUE self);
 VALUE window_map(VALUE self);
-VALUE window_mask(VALUE self);
 VALUE window_mask_set(VALUE self, VALUE mask);
 VALUE window_name(VALUE self);
-VALUE window_name_set(VALUE self, VALUE name);
 VALUE window_override_redirect(VALUE self);
 VALUE window_raise(VALUE self);
 VALUE window_unmap(VALUE self);
 VALUE window_wclass(VALUE self);
 VALUE window__configure(VALUE self, VALUE rx, VALUE ry, VALUE rw, VALUE rh);
 VALUE window__configure_event(VALUE self, VALUE rx, VALUE ry, VALUE rw, VALUE rh);
-VALUE window__create(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h);
 VALUE window__create_sub(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h);
 VALUE window__moveresize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height);
 int window_id(VALUE window);

data/ext/uh/window.c

@@ -9,14 +9,6 @@
 #define WINDOW  window->id
 
 
-VALUE window_destroy(VALUE self) {
-  SET_WINDOW(self);
-
-  XDestroyWindow(DPY, WINDOW);
-
-  return Qnil;
-}
-
 VALUE window_focus(VALUE self) {
   SET_WINDOW(self);
 
@@ -76,17 +68,6 @@ VALUE window_map(VALUE self) {
   return Qnil;
 }
 
-VALUE window_mask(VALUE self) {
-  XWindowAttributes wa;
-  SET_WINDOW(self);
-
-  if (!XGetWindowAttributes(DPY, WINDOW, &wa)) {
-    rb_raise(rb_eArgError, "cannot get window attributes for `0x%08lx'", WINDOW);
-  }
-
-  return LONG2FIX(wa.your_event_mask);
-}
-
 VALUE window_mask_set(VALUE self, VALUE mask) {
   XSetWindowAttributes attrs;
   SET_WINDOW(self);
@@ -111,14 +92,6 @@ VALUE window_name(VALUE self) {
   return wname;
 }
 
-VALUE window_name_set(VALUE self, VALUE name) {
-  SET_WINDOW(self);
-
-  XStoreName(DPY, WINDOW, RSTRING_PTR(name));
-
-  return Qnil;
-}
-
 VALUE window_override_redirect(VALUE self) {
   XWindowAttributes wa;
   SET_WINDOW(self);
@@ -198,18 +171,6 @@ VALUE window__configure_event(VALUE self, VALUE rx, VALUE ry, VALUE rw, VALUE rh
   return Qnil;
 }
 
-VALUE window__create(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h) {
-  Window win;
-  SET_WINDOW(self);
-
-  win = XCreateSimpleWindow(DPY, WINDOW,
-    FIX2INT(x), FIX2INT(y), FIX2INT(w), FIX2INT(h),
-    0, BlackPixel(DPY, SCREEN_DEFAULT), BlackPixel(DPY, SCREEN_DEFAULT)
-  );
-
-  return window_make(DPY, win);
-}
-
 VALUE window__create_sub(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h) {
   XSetWindowAttributes  wa;
   Window                sub_win;

data/lib/uh.rb

@@ -15,7 +15,6 @@ module Uh
   Error               = Class.new(StandardError)
   RuntimeError        = Class.new(RuntimeError)
   ArgumentError       = Class.new(Error)
-  OtherWMRunningError = Class.new(RuntimeError)
 
   KEY_MODIFIERS = {
     shift:  1 << 0,

data/lib/uh/display.rb

@@ -4,10 +4,6 @@ module Uh
       ENV['DISPLAY']
     end
 
-    def create_window(geo)
-      root.create geo
-    end
-
     def create_subwindow(geo)
       root.create_sub geo
     end

data/lib/uh/version.rb

@@ -1,3 +1,3 @@
 module Uh
-  VERSION = '1.2.3'.freeze
+  VERSION = '2.0.0.pre'.freeze
 end

data/lib/uh/window.rb

@@ -18,10 +18,6 @@ module Uh
       self
     end
 
-    def create(geo)
-      _create geo.x, geo.y, geo.width, geo.height
-    end
-
     def create_sub(geo)
       _create_sub geo.x, geo.y, geo.width, geo.height
     end

data/uh.gemspec

@@ -5,7 +5,6 @@ Gem::Specification.new do |s|
   s.version = Uh::VERSION.dup
   s.summary = 'Xlib simplified toolkit'
   s.description = s.name
-  s.license = 'BSD-3-Clause'
   s.homepage = 'https://rubygems.org/gems/uh'
 
   s.authors = 'Thibault Jouan'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uh
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 2.0.0.pre
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -101,22 +101,11 @@ files:
 - lib/uh/screen.rb
 - lib/uh/version.rb
 - lib/uh/window.rb
-- lib/uh/wm.rb
-- lib/uh/wm/action_handler.rb
-- lib/uh/wm/client.rb
-- lib/uh/wm/manager.rb
-- lib/uh/wm/workers/base_worker.rb
-- lib/uh/wm/workers/blocking_worker.rb
-- lib/uh/wm/workers/multiplexing_worker.rb
 - test/test_helper.rb
 - 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:
-- BSD-3-Clause
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -129,9 +118,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -141,6 +130,4 @@ summary: Xlib simplified toolkit
 test_files:
 - test/test_helper.rb
 - test/uh/test_geo.rb
-- test/uh/test_wm.rb
-- test/uh/wm/test_client.rb
-- test/uh/wm/test_manager.rb
+has_rdoc: 

data/lib/uh/wm.rb

@@ -1,213 +0,0 @@
-require 'forwardable'
-require 'logger'
-
-require 'uh/wm/action_handler'
-require 'uh/wm/client'
-require 'uh/wm/manager'
-require 'uh/wm/workers/base_worker'
-require 'uh/wm/workers/blocking_worker'
-require 'uh/wm/workers/multiplexing_worker'
-
-module Uh
-  class WM
-    include Events
-
-    LOGGER_FORMAT_STR = "%s.%03i %s: %s\n".freeze
-    LOGGER_FORMATER   = proc do |severity, datetime, progname, message|
-      LOGGER_FORMAT_STR % [
-        datetime.strftime('%FT%T'),
-        datetime.usec / 1000,
-        severity[0..0],
-        message
-      ]
-    end
-    LOGGER_LEVEL      = Logger::INFO
-    LOGGER_DEBUG_ENV  = 'UH_DEBUG'.freeze
-
-    WORKERS           = {
-      blocking:     Workers::BlockingWorker,
-      multiplexing: Workers::MultiplexingWorker
-    }.freeze
-
-    DEFAULT_MODIFIER  = :mod1
-    INPUT_MASK        = SUBSTRUCTURE_REDIRECT_MASK
-    ROOT_MASK         = PROPERTY_CHANGE_MASK |
-                        SUBSTRUCTURE_REDIRECT_MASK |
-                        SUBSTRUCTURE_NOTIFY_MASK |
-                        STRUCTURE_NOTIFY_MASK
-
-    extend Forwardable
-    def_delegators :@manager, :on_configure, :on_manage, :on_unmanage,
-      :on_change
-    def_delegator :@logger, :info, :log
-    def_delegator :@logger, :error, :log_error
-
-    attr_reader :actions, :keys, :rules
-
-    def initialize(layout)
-      @layout   = layout
-      @display  = Display.new
-      @logger   = Logger.new($stdout).tap do |o|
-        o.level     = ENV.key?(LOGGER_DEBUG_ENV) ? Logger::DEBUG : LOGGER_LEVEL
-        o.formatter = LOGGER_FORMATER
-      end
-      @manager  = Manager.new
-      @actions  = ActionHandler.new(self, @manager, @layout)
-      @keys     = {}
-      @rules    = {}
-    end
-
-    def modifier(mod = nil)
-      return (@modifier or DEFAULT_MODIFIER) unless mod
-      @modifier = mod
-    end
-
-    def key(key, mod = nil, &block)
-      mod_mask = KEY_MODIFIERS[modifier]
-      mod_mask |= KEY_MODIFIERS[mod] if mod
-      @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
-
-    def on_expose(&block)
-      @on_expose = block
-    end
-
-    def worker(*args, **options)
-      @worker = WORKERS[args.first].new(@display, @logger, options)
-    end
-
-    def request_quit!
-      @quit_requested = true
-    end
-
-    def connect
-      @display.open
-      Display.on_error proc { fail OtherWMRunningError }
-      @display.listen_events INPUT_MASK
-      @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
-      @display.close
-    end
-
-    def grab_keys
-      @keys.each do |k, v|
-        key, mod = *k
-        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)
-      return unless respond_to? handler = event_handler_method(event), true
-      log_event event
-      send handler, event
-    end
-
-    def event_handler_method(event)
-      ('handle_%s' % event.type).to_sym
-    end
-
-    def log_event(event)
-      complement = case event.type
-      when :destroy_notify, :expose, :map_request, :property_notify
-        "window: #{event.window}"
-      when :configure_request
-        '%s, above: #%d, detail: #%d, value_mask: #%d' % [
-          Geo.format_xgeometry(event.x, event.y, event.width, event.height),
-          event.above_window_id,
-          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
-
-      log [
-        'XEvent', event.type,
-        event.send_event ? 'SENT' : nil,
-        complement
-      ].compact.join(' ')
-    end
-
-    def handle_configure_request(event)
-      @manager.configure event.window
-    end
-
-    def handle_destroy_notify(event)
-      @manager.destroy event.window
-    end
-
-    def handle_expose(event)
-      @on_expose.call event.window if @on_expose
-    end
-
-    def handle_key_press(event)
-      actions.call @keys[["XK_#{event.key}".to_sym, event.modifier_mask]]
-    end
-
-    def handle_map_request(event)
-      if client = @manager.map(event.window)
-        @display.listen_events event.window, PROPERTY_CHANGE_MASK
-        @rules.each do |selector, action|
-          if client.wclass =~ selector
-            actions.call action
-          end
-        end
-      end
-    end
-
-    def handle_property_notify(event)
-      @manager.update_properties event.window
-    end
-
-    def handle_unmap_notify(event)
-      @manager.unmap event.window
-    end
-
-    def handle_error(req, resource_id, msg)
-      @logger.error "XERROR: #{resource_id} #{req} #{msg}"
-    end
-  end
-end

data/lib/uh/wm/action_handler.rb

@@ -1,77 +0,0 @@
-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
-        log 'Exiting...'
-        @wm.request_quit!
-      end
-
-      def execute(command)
-        log "Spawn `#{command}`"
-        pid = fork do
-          fork do
-            Process.setsid
-            begin
-              exec command
-            rescue Errno::ENOENT => e
-              log_error "Spawn: #{e}"
-            end
-          end
-        end
-        Process.waitpid pid
-      end
-
-      def log_layout
-        log "Layout:\n#{@layout.to_s.lines.map { |e| "  #{e}" }.join.chomp}"
-      end
-
-      def log_clients
-        log "Clients:\n#{@manager.to_s.lines.map { |e| "  #{e}" }.join.chomp}"
-      end
-
-      def log_separator
-        log '- ' * 24
-      end
-
-      def method_missing(m, *args, &block)
-        if respond_to? m
-          meth = layout_method m
-          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
-      end
-
-      def respond_to_missing?(m, *)
-        m.to_s =~ /\Alayout_/ || super
-      end
-
-
-      private
-
-      def layout_method(m)
-        m.to_s.gsub(/\Alayout_/, 'handle_').to_sym
-      end
-    end
-  end
-end

data/lib/uh/wm/client.rb

@@ -1,83 +0,0 @@
-require 'uh/geo_accessors'
-
-module Uh
-  class WM
-    class Client
-      include GeoAccessors
-
-      attr_reader   :window
-      attr_accessor :geo, :unmap_count
-
-      def initialize(window)
-        @window       = window
-        @hide         = true
-        @unmap_count  = 0
-      end
-
-      def to_s
-        '<%s> (%s) %s win: %s unmaps: %d' %
-          [name, wclass, @geo, @window, @unmap_count]
-      end
-
-      def name
-        @name ||= @window.name
-      end
-
-      def wclass
-        @wclass ||= @window.wclass
-      end
-
-      def hidden?
-        @hide
-      end
-
-      def update_window_properties
-        @name   = @window.name
-        @wclass = @window.wclass
-      end
-
-      def configure
-        @window.configure @geo
-        self
-      end
-
-      def moveresize
-        @window.moveresize @geo
-        self
-      end
-
-      def show
-        @window.map
-        @hide = false
-        self
-      end
-
-      def hide
-        @window.unmap
-        @hide = true
-        @unmap_count += 1
-        self
-      end
-
-      def focus
-        @window.raise
-        @window.focus
-        self
-      end
-
-      def kill
-        if @window.icccm_wm_protocols.include? :WM_DELETE_WINDOW
-          @window.icccm_wm_delete
-        else
-          @window.kill
-        end
-        self
-      end
-
-      def kill!
-        @window.kill
-        self
-      end
-    end
-  end
-end

data/lib/uh/wm/manager.rb

@@ -1,84 +0,0 @@
-module Uh
-  class WM
-    class Manager
-      DEFAULT_GEO = Geo.new(0, 0, 320, 240).freeze
-
-      attr_reader :clients
-
-      def initialize
-        @clients = []
-      end
-
-      def to_s
-        @clients.join $/
-      end
-
-      def on_configure(&block)
-        @on_configure = block
-      end
-
-      def on_manage(&block)
-        @on_manage = block
-      end
-
-      def on_unmanage(&block)
-        @on_unmanage = block
-      end
-
-      def on_change(&block)
-        @on_change = block
-      end
-
-      def configure(window)
-        if client = client_for(window)
-          client.configure
-        else
-          geo = @on_configure ? @on_configure.call(window) : DEFAULT_GEO
-          window.configure_event geo
-        end
-      end
-
-      def map(window)
-        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)
-        return unless client = client_for(window)
-        unmanage client
-      end
-
-      def update_properties(window)
-        return unless client = client_for(window)
-        client.update_window_properties
-        @on_change.call client if @on_change
-      end
-
-
-      private
-
-      def client_for(window)
-        @clients.find { |e| e.window == window }
-      end
-
-      def manage(client)
-        @clients << client
-        @on_manage.call client if @on_manage
-      end
-
-      def unmanage(client)
-        @clients.reject! { |e| e == client }
-        @on_unmanage.call client if @on_unmanage
-      end
-    end
-  end
-end

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

@@ -1,20 +0,0 @@
-module Uh
-  class WM
-    module Workers
-      class BaseWorker
-        def initialize(display, logger, **options)
-          @display  = display
-          @logger   = logger
-          configure **options
-        end
-
-        def configure(**options)
-        end
-
-        def setup
-          self
-        end
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module Uh
-  class WM
-    module Workers
-      class BlockingWorker < BaseWorker
-        def each_event
-          @display.each_event { |e| yield e }
-        end
-      end
-    end
-  end
-end

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

@@ -1,33 +0,0 @@
-module Uh
-  class WM
-    module Workers
-      class MultiplexingWorker < BaseWorker
-        DEFAULT_TIMEOUT = 4
-
-        def configure(timeout: DEFAULT_TIMEOUT, on_timeout: nil)
-          @timeout    = timeout
-          @on_timeout = on_timeout
-        end
-
-        def setup
-          @display_io = IO.new(@display.fileno)
-          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}"
-            if rs.nil? || rs.empty?
-              @on_timeout.call if @on_timeout
-            else
-              yield @display.next_event while @display.pending?
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/test/uh/test_wm.rb

@@ -1,36 +0,0 @@
-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

data/test/uh/wm/test_client.rb

@@ -1,182 +0,0 @@
-require 'ostruct'
-require 'test_helper'
-require 'uh/wm'
-
-module Uh
-  class WM
-    describe Client do
-      let(:geo)     { Geo.new(0, 0, 1024, 768) }
-      let(:window)  { OpenStruct.new(name: 'win name', wclass: 'win class') }
-      subject       { Client.new(window) }
-
-      before { subject.geo = geo }
-
-      it 'is hidden' do
-        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
-        end
-      end
-
-      describe '#wclass' do
-        it 'returns the window class' do
-          assert_equal 'win class', subject.wclass
-        end
-      end
-
-      describe '#update_window_properties' do
-        it 'updates the window name' do
-          window.name = 'new name'
-          assert_equal 'new name', subject.name
-        end
-
-        it 'updates the window class' do
-          window.wclass = 'new class'
-          assert_equal 'new class', subject.wclass
-        end
-      end
-
-      describe '#configure' do
-        let(:window) { Minitest::Mock.new }
-
-        before { window.expect :configure, window, [geo] }
-
-        it 'configures the window with client geo' do
-          subject.configure
-          window.verify
-        end
-
-        it 'returns self' do
-          assert_same subject, subject.configure
-        end
-      end
-
-      describe '#moveresize' do
-        let(:window) { Minitest::Mock.new }
-
-        before { window.expect :moveresize, window, [geo] }
-        it 'moveresizes the window with client geo' do
-          subject.moveresize
-          window.verify
-        end
-
-        it 'returns self' do
-          assert_same subject, subject.moveresize
-        end
-      end
-
-      describe '#show' do
-        let(:window) { Minitest::Mock.new }
-
-        before { window.expect :map, window }
-
-        it 'maps the window' do
-          subject.show
-          window.verify
-        end
-
-        it 'is not hidden anymore' do
-          subject.show
-          refute subject.hidden?
-        end
-
-        it 'returns self' do
-          assert_same subject, subject.show
-        end
-      end
-
-      describe '#hide' do
-        let(:window) { Minitest::Mock.new }
-
-        before { window.expect :unmap, window }
-
-        it 'unmaps the window' do
-          subject.hide
-          window.verify
-        end
-
-        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
-      end
-
-      describe '#focus' do
-        let(:window) { Minitest::Mock.new }
-
-        before do
-          window.expect :raise, window
-          window.expect :focus, window
-        end
-
-        it 'raises and focuses the window' do
-          subject.focus
-          window.verify
-        end
-
-        it 'returns self' do
-          assert_same subject, subject.focus
-        end
-      end
-
-      describe '#kill' do
-        let(:window)    { Minitest::Mock.new }
-        let(:protocols) { [] }
-
-        before { window.expect :icccm_wm_protocols, protocols }
-
-        it 'kills the window' do
-          window.expect :kill, window
-          subject.kill
-          window.verify
-        end
-
-        it 'returns self' do
-          window.expect :kill, window
-          assert_same subject, subject.kill
-        end
-
-        context 'when window supports icccm wm delete' do
-          let(:protocols) { [:WM_DELETE_WINDOW] }
-
-          it 'icccm deletes the window' do
-            window.expect :icccm_wm_delete, window
-            subject.kill
-            window.verify
-          end
-        end
-      end
-
-      describe '#kill!' do
-        let(:window) { Minitest::Mock.new }
-
-        before { window.expect :kill, window }
-
-        it 'kills the window' do
-          subject.kill!
-          window.verify
-        end
-
-        it 'returns self' do
-          assert_same subject, subject.kill!
-        end
-      end
-    end
-  end
-end

data/test/uh/wm/test_manager.rb

@@ -1,164 +0,0 @@
-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