uh-wm 0.0.1 → 0.0.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fae76224987cc1f74c7a5f18c7b8d06eaee509b
-  data.tar.gz: 8f1aab69ba46466bc7e98200eaec588a9c14ca2f
+  metadata.gz: 74533b8c4aea78f1fd611ad9a66f9003c7a70c78
+  data.tar.gz: 31ab453643a6c06b22fc7182344564976c622a5a
 SHA512:
-  metadata.gz: a018d975a3061f73d6412dd06d4d980b1259a9ddc02ba9c95a4a08e86fb8a89d07fdc21931b1eb213e28923964cc000e7de5853e7a501e8a5b4f805787763398
-  data.tar.gz: 344f2278196204a869cdd2943d88b389d257550c297e85bb451d3cf42008a762c114ce11953339b09a693b8d40ab324441fe9585424556dc94b9ad9235d3b5b6
+  metadata.gz: 32e9cdad0aecb15955af5dcebba0cdcb0424cc4cb7263e659dc96936c845cfba38de6007a972325b3e0e2b8e3ab16ebe6a611391f74c05009dcdd680d97f5f56
+  data.tar.gz: e1d903145b302e5a6ec00c00fd3e4c4bde795565a3ce5d969a8875704ff700f197c86afdf184b775a882bfa95e5aea32c4aa4be51777b6cb3841dbb0567e5566

data/lib/uh/wm/actions_handler.rb

@@ -0,0 +1,17 @@
+module Uh
+  module WM
+    class ActionsHandler
+      def initialize env, events
+        @env, @events = env, events
+      end
+
+      def evaluate code
+        instance_eval &code
+      end
+
+      def quit
+        @events.emit :quit
+      end
+    end
+  end
+end

data/lib/uh/wm/cli.rb

@@ -0,0 +1,84 @@
+module Uh
+  module WM
+    class CLI
+      ArgumentError = Class.new(ArgumentError)
+
+      USAGE = "Usage: #{File.basename $0} [options]".freeze
+
+      EX_USAGE    = 64
+      EX_SOFTWARE = 70
+
+      class << self
+        def run arguments, stdout: $stdout, stderr: $stderr
+          cli = new arguments, stdout: stdout
+          cli.parse_arguments!
+          cli.run
+        rescue ArgumentError => e
+          stderr.puts e
+          exit EX_USAGE
+        rescue RuntimeError => e
+          stderr.puts "#{e.class.name}: #{e.message}"
+          stderr.puts e.backtrace.map { |e| '  %s' % e } if cli.env.debug?
+          exit EX_SOFTWARE
+        end
+      end
+
+      attr_reader :env
+
+      def initialize args, stdout: $stdout
+        @arguments  = args
+        @env        = Env.new(stdout.tap { |o| o.sync = true })
+      end
+
+      def parse_arguments!
+        option_parser.parse! @arguments
+      rescue OptionParser::InvalidOption => e
+        fail ArgumentError, option_parser
+      end
+
+      def run
+        Runner.run env
+      end
+
+
+      private
+
+      def option_parser
+        OptionParser.new do |opts|
+          opts.banner = USAGE
+          opts.separator ''
+          opts.separator 'options:'
+
+          opts.on '-h', '--help', 'print this message' do
+            @env.print opts
+            exit
+          end
+
+          opts.on '-v', '--version', 'enable verbose mode' do
+            @env.verbose = true
+            @env.log_logger_level
+          end
+
+          opts.on '-d', '--debug', 'enable debug mode' do
+            @env.debug = true
+            @env.log_logger_level
+          end
+
+          opts.on '-f', '--run-control PATH',
+            'specify alternate run control file' do |e|
+            @env.rc_path = e
+          end
+
+          opts.on '-r', '--require PATH', 'require ruby feature' do |feature|
+            require feature
+            @env.log "Loaded `#{feature}' ruby feature"
+          end
+
+          opts.on '-l', '--layout LAYOUT', 'specify layout' do |layout|
+            @env.layout_class = self.class.const_get layout.to_sym
+          end
+        end
+      end
+    end
+  end
+end

data/lib/uh/wm/dispatcher.rb

@@ -0,0 +1,30 @@
+module Uh
+  module WM
+    class Dispatcher
+      attr_reader :hooks
+
+      def initialize
+        @hooks = Hash.new { |h, k| h[k] = [] }
+      end
+
+      def [] *key
+        @hooks[translate_key key]
+      end
+
+      def on *key, &block
+        @hooks[translate_key key] << block
+      end
+
+      def emit *key, args: []
+        @hooks[translate_key key].each { |e| e.call *args }
+      end
+
+
+      private
+
+      def translate_key key
+        key.one? ? key[0] : key
+      end
+    end
+  end
+end

data/lib/uh/wm/env.rb

@@ -0,0 +1,60 @@
+module Uh
+  module WM
+    class Env
+      RC_PATH = '~/.uhwmrc.rb'.freeze
+
+      MODIFIER = :mod1
+      KEYBINDS = {
+        q: proc { quit }
+      }.freeze
+
+      LOGGER_LEVEL          = Logger::WARN
+      LOGGER_LEVEL_VERBOSE  = Logger::INFO
+      LOGGER_LEVEL_DEBUG    = Logger::DEBUG
+      LOGGER_LEVEL_STRINGS  = %w[DEBUG INFO WARN ERROR FATAL UNKNOWN]
+
+      extend Forwardable
+      def_delegator :logger, :info, :log
+      def_delegator :logger, :debug, :log_debug
+      def_delegator :@output, :print
+
+      attr_reader   :output, :keybinds
+      attr_accessor :verbose, :debug, :rc_path, :layout_class, :modifier
+
+      def initialize output
+        @output   = output
+        @rc_path  = RC_PATH
+        @modifier = MODIFIER
+        @keybinds = KEYBINDS.dup
+      end
+
+      def verbose?
+        !!@verbose
+      end
+
+      def debug?
+        !!@debug
+      end
+
+      def layout
+        @layout ||= if layout_class
+          layout_class.new
+        else
+          require 'uh/layout'
+          ::Uh::Layout.new
+        end
+      end
+
+      def logger
+        @logger ||= Logger.new(@output).tap do |o|
+          o.level = debug? ? LOGGER_LEVEL_DEBUG :
+            verbose? ? LOGGER_LEVEL_VERBOSE : LOGGER_LEVEL
+        end
+      end
+
+      def log_logger_level
+        log "Logging at #{LOGGER_LEVEL_STRINGS[logger.level]} level"
+      end
+    end
+  end
+end

data/lib/uh/wm/manager.rb

@@ -0,0 +1,53 @@
+module Uh
+  module WM
+    class Manager
+      INPUT_MASK = Events::SUBSTRUCTURE_REDIRECT_MASK
+
+      attr_reader :modifier, :display
+
+      def initialize events, modifier, display = Display.new
+        @events   = events
+        @modifier = modifier
+        @display  = display
+      end
+
+      def connect
+        @events.emit :connecting, args: @display
+        @display.open
+        Display.on_error { fail OtherWMRunningError }
+        @display.listen_events INPUT_MASK
+        @display.sync false
+        Display.on_error { |*args| handle_error *args }
+        @display.sync false
+        @events.emit :connected, args: @display
+      end
+
+      def grab_key keysym, mod = nil
+        mod_mask = KEY_MODIFIERS[@modifier]
+        mod_mask |= KEY_MODIFIERS[mod] if mod
+        @display.grab_key keysym.to_s, mod_mask
+      end
+
+      def handle_pending_events
+        handle @display.next_event while @display.pending?
+      end
+
+      def handle event
+        case event.type
+        when :key_press
+          key_selector = event.modifier_mask & KEY_MODIFIERS[:shift] == 1 ?
+            [event.key.to_sym, :shift] :
+            event.key.to_sym
+          @events.emit :key, *key_selector
+        end
+      end
+
+
+      private
+
+      def handle_error *args
+        @dispatcher.emit :error, args: args
+      end
+    end
+  end
+end

data/lib/uh/wm/run_control.rb

@@ -0,0 +1,47 @@
+module Uh
+  module WM
+    class RunControl
+      KEYSYM_TRANSLATIONS = {
+        backspace:  :BackSpace,
+        enter:      :Return,
+        return:     :Return,
+        tab:        :Tab
+      }.freeze
+
+      class << self
+        def evaluate env
+          rc_path = File.expand_path(env.rc_path)
+          rc = new env
+          rc.evaluate File.read(rc_path), rc_path if File.exist?(rc_path)
+        end
+      end
+
+      def initialize env
+        @env = env
+      end
+
+      def evaluate code, path
+        instance_eval code, path
+      end
+
+      def modifier mod
+        @env.modifier = mod
+      end
+
+      def key keysym, &block
+        @env.keybinds[translate_keysym keysym] = block
+      end
+
+
+      private
+
+      def translate_keysym keysym
+        translate_key = keysym.to_s.downcase.to_sym
+        translated_keysym = KEYSYM_TRANSLATIONS.key?(translate_key) ?
+          KEYSYM_TRANSLATIONS[translate_key] :
+          translate_key
+        keysym =~ /[A-Z]/ ? [translated_keysym, :shift] : translated_keysym
+      end
+    end
+  end
+end

data/lib/uh/wm/runner.rb

@@ -0,0 +1,92 @@
+module Uh
+  module WM
+    class Runner
+      class << self
+        def run env, **options
+          runner = new env, **options
+          runner.evaluate_run_control
+          runner.register_event_hooks
+          runner.connect_manager
+          runner.run_until { runner.stopped? }
+        end
+      end
+
+      extend Forwardable
+      def_delegator :@env, :layout
+
+      attr_reader :env, :events, :actions
+
+      def initialize env, manager: nil, stopped: false
+        @env      = env
+        @events   = Dispatcher.new
+        @manager  = manager
+        @actions  = ActionsHandler.new(@env, @events)
+        @stopped  = stopped
+      end
+
+      def stopped?
+        !!@stopped
+      end
+
+      def stop!
+        @stopped = true
+      end
+
+      def manager
+        @manager ||= Manager.new(@events, @env.modifier)
+      end
+
+      def evaluate_run_control
+        RunControl.evaluate(env)
+      end
+
+      def register_event_hooks
+        register_runner_hooks
+        register_manager_hooks
+        register_layout_event_hooks
+        register_key_bindings_hooks
+      end
+
+      def connect_manager
+        manager.connect
+        @env.keybinds.each do |keysym, _|
+          manager.grab_key *keysym
+        end
+      end
+
+      def run_until &block
+        manager.handle_pending_events until block.call
+      end
+
+
+      private
+
+      def register_runner_hooks
+        @events.on(:quit) { stop! }
+      end
+
+      def register_manager_hooks
+        @events.on(:connecting) do |display|
+          @env.log_debug "Connecting to X server on `#{display}'"
+        end
+        @events.on(:connected) do |display|
+          @env.log "Connected to X server on `#{display}'"
+        end
+      end
+
+      def register_layout_event_hooks
+        @events.on(:connected) do |display|
+          layout.register display
+        end
+      end
+
+      def register_key_bindings_hooks
+        @env.keybinds.each do |keysym, code|
+          @events.on :key, *keysym do
+            @actions.evaluate code
+          end
+        end
+      end
+    end
+  end
+end

data/lib/uh/wm/testing/acceptance_helpers.rb

@@ -0,0 +1,72 @@
+module Uh
+  module WM
+    module Testing
+      module AcceptanceHelpers
+        def uhwm_run options = '-v'
+          command = %w[uhwm]
+          command << options if options
+          @interactive = @process = run command.join ' '
+        end
+
+        def uhwm_ensure_stop
+          @process and @process.terminate
+        end
+
+        def uhwm_pid
+          @process.pid
+        end
+
+        def uhwm_output
+          @process.stdout
+        end
+
+        def uhwm_wait_output message, timeout: 1
+          Timeout.timeout(timeout) do
+            loop do
+              break if case message
+                when Regexp then @process.stdout + @process.stderr =~ message
+                when String then assert_partial_output_interactive message
+              end
+              sleep 0.1
+            end
+          end
+        rescue Timeout::Error
+          output = (@process.stdout + @process.stderr).lines
+            .map { |e| "  #{e}" }
+            .join
+          fail [
+            "expected `#{message}' not seen after #{timeout} seconds in:",
+            "  ```\n#{output}  ```"
+          ].join "\n"
+        end
+
+        def uhwm_run_wait_ready
+          uhwm_run
+          uhwm_wait_output 'Connected to'
+        end
+
+        def with_other_wm
+          @other_wm = ChildProcess.build('twm').tap { |o| o.start }
+          @other_wm.stop
+        end
+
+        def other_wm
+          @other_wm
+        end
+
+        def x_key key
+          fail "cannot simulate X key `#{key}'" unless system "xdotool key #{key}"
+        end
+
+        def x_socket_check pid
+          case RbConfig::CONFIG['host_os']
+          when /linux/
+            `netstat -xp 2> /dev/null`.lines.grep /\s+#{pid}\/ruby/
+          else
+            `sockstat -u`.lines.grep /\s+ruby.+\s+#{pid}/
+          end.any?
+        end
+      end
+    end
+  end
+end

data/lib/uh/wm/version.rb

@@ -1,5 +1,5 @@
 module Uh
   module WM
-    VERSION = '0.0.1'
+    VERSION = '0.0.2.pre'
   end
 end

data/lib/uh/wm.rb

@@ -0,0 +1,26 @@
+require 'forwardable'
+require 'logger'
+require 'optparse'
+require 'uh'
+
+require 'uh/wm/actions_handler'
+require 'uh/wm/cli'
+require 'uh/wm/dispatcher'
+require 'uh/wm/env'
+require 'uh/wm/manager'
+require 'uh/wm/run_control'
+require 'uh/wm/runner'
+
+module Uh
+  module WM
+    Error               = Class.new(StandardError)
+    RuntimeError        = Class.new(RuntimeError)
+    ArgumentError       = Class.new(Error)
+
+    class OtherWMRunningError < RuntimeError
+      def message
+        'another window manager is already running'
+      end
+    end
+  end
+end

metadata

@@ -1,25 +1,129 @@
 --- !ruby/object:Gem::Specification
 name: uh-wm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2.pre
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
-dependencies: []
+date: 2015-04-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: uh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.pre
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.pre
+- !ruby/object:Gem::Dependency
+  name: uh-layout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0.pre
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0.pre
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: headless
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: uh-wm
 email: tj@a13.fr
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- LICENSE
+- lib/uh/wm.rb
+- lib/uh/wm/actions_handler.rb
+- lib/uh/wm/cli.rb
+- lib/uh/wm/dispatcher.rb
+- lib/uh/wm/env.rb
+- lib/uh/wm/manager.rb
+- lib/uh/wm/run_control.rb
+- lib/uh/wm/runner.rb
+- lib/uh/wm/testing/acceptance_helpers.rb
 - lib/uh/wm/version.rb
-- uh-wm.gemspec
 homepage: https://rubygems.org/gems/uh-wm
 licenses: []
 metadata: {}
@@ -34,9 +138,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

data/LICENSE

@@ -1,30 +0,0 @@
-Copyright 2015 Thibault Jouan. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of the software nor the names of its contributors
-    may be used to endorse or promote products derived from this
-    software without specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/uh-wm.gemspec

@@ -1,16 +0,0 @@
-require File.expand_path('../lib/uh/wm/version', __FILE__)
-
-Gem::Specification.new do |s|
-  s.name    = 'uh-wm'
-  s.version = Uh::WM::VERSION.dup
-  s.summary = 'uh window manager'
-  s.description = s.name
-  s.homepage = 'https://rubygems.org/gems/uh-wm'
-
-  s.authors = 'Thibault Jouan'
-  s.email   = 'tj@a13.fr'
-
-  s.files       = `git ls-files`.split $/
-  s.test_files  = s.files.grep /\A(spec|features)\//
-  s.executables = s.files.grep(/\Abin\//) { |f| File.basename(f) }
-end