Merge branch 'action-handler'
* Introduce a DSL to evaluate code associated to key bindings (ActionsHandler class); * Provides default key bindings (quit) in the env, and remove hard coded handling in Runner; * Handle quit with an event.
This commit is contained in:
commit
c50345af8b
@ -1,6 +1,9 @@
|
|||||||
Feature: quit action
|
Feature: `quit' action keyword
|
||||||
|
|
||||||
Scenario: quits on alt+q keys press
|
Scenario: requests quit when invoked
|
||||||
Given uhwm is running
|
Given uhwm is running with this run control file:
|
||||||
When I press the alt+q keys
|
"""
|
||||||
Then uhwm should terminate successfully
|
key(:f) { quit }
|
||||||
|
"""
|
||||||
|
When I press the alt+f keys
|
||||||
|
Then uhwm must terminate successfully
|
||||||
|
@ -7,3 +7,12 @@ Feature: run control file evaluation
|
|||||||
"""
|
"""
|
||||||
When I start uhwm
|
When I start uhwm
|
||||||
Then the output must contain "run control evaluation"
|
Then the output must contain "run control evaluation"
|
||||||
|
|
||||||
|
Scenario: reports run control code in backtrace on errors
|
||||||
|
Given a run control file with:
|
||||||
|
"""
|
||||||
|
'no error on first line'
|
||||||
|
fail 'fails on second line'
|
||||||
|
"""
|
||||||
|
When I start uhwm
|
||||||
|
Then the output must match /\.uhwmrc\.rb:2:.+fails on second line/
|
||||||
|
6
features/session/termination.feature
Normal file
6
features/session/termination.feature
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
Feature: program termination
|
||||||
|
|
||||||
|
Scenario: terminates when requested to quit
|
||||||
|
Given uhwm is running
|
||||||
|
When I tell uhwm to quit
|
||||||
|
Then uhwm must terminate successfully
|
@ -19,10 +19,14 @@ When /^I run uhwm with options? (-.+)$/ do |options|
|
|||||||
uhwm_run options
|
uhwm_run options
|
||||||
end
|
end
|
||||||
|
|
||||||
|
When /^I tell uhwm to quit$/ do
|
||||||
|
x_key 'alt+q'
|
||||||
|
end
|
||||||
|
|
||||||
Then /^the exit status must be (\d+)$/ do |exit_status|
|
Then /^the exit status must be (\d+)$/ do |exit_status|
|
||||||
assert_exit_status exit_status.to_i
|
assert_exit_status exit_status.to_i
|
||||||
end
|
end
|
||||||
|
|
||||||
Then /^uhwm should terminate successfully$/ do
|
Then /^uhwm must terminate successfully$/ do
|
||||||
assert_exit_status 0
|
assert_exit_status 0
|
||||||
end
|
end
|
||||||
|
@ -3,6 +3,7 @@ require 'logger'
|
|||||||
require 'optparse'
|
require 'optparse'
|
||||||
require 'uh'
|
require 'uh'
|
||||||
|
|
||||||
|
require 'uh/wm/actions_handler'
|
||||||
require 'uh/wm/cli'
|
require 'uh/wm/cli'
|
||||||
require 'uh/wm/dispatcher'
|
require 'uh/wm/dispatcher'
|
||||||
require 'uh/wm/env'
|
require 'uh/wm/env'
|
||||||
|
17
lib/uh/wm/actions_handler.rb
Normal file
17
lib/uh/wm/actions_handler.rb
Normal file
@ -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
|
@ -19,7 +19,9 @@ module Uh
|
|||||||
def initialize output
|
def initialize output
|
||||||
@output = output
|
@output = output
|
||||||
@rc_path = RC_PATH
|
@rc_path = RC_PATH
|
||||||
@keybinds = {}
|
@keybinds = {
|
||||||
|
q: proc { quit }
|
||||||
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
def verbose?
|
def verbose?
|
||||||
|
@ -12,7 +12,7 @@ module Uh
|
|||||||
def evaluate env
|
def evaluate env
|
||||||
rc_path = File.expand_path(env.rc_path)
|
rc_path = File.expand_path(env.rc_path)
|
||||||
rc = new env
|
rc = new env
|
||||||
rc.evaluate File.read(rc_path) if File.exist?(rc_path)
|
rc.evaluate File.read(rc_path), rc_path if File.exist?(rc_path)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -20,8 +20,8 @@ module Uh
|
|||||||
@env = env
|
@env = env
|
||||||
end
|
end
|
||||||
|
|
||||||
def evaluate code
|
def evaluate code, path
|
||||||
instance_eval code
|
instance_eval code, path
|
||||||
end
|
end
|
||||||
|
|
||||||
def key keysym, &block
|
def key keysym, &block
|
||||||
|
@ -14,12 +14,13 @@ module Uh
|
|||||||
extend Forwardable
|
extend Forwardable
|
||||||
def_delegator :@env, :layout
|
def_delegator :@env, :layout
|
||||||
|
|
||||||
attr_reader :env, :events, :manager
|
attr_reader :env, :events, :manager, :actions
|
||||||
|
|
||||||
def initialize env, manager: nil, stopped: false
|
def initialize env, manager: nil, stopped: false
|
||||||
@env = env
|
@env = env
|
||||||
@events = Dispatcher.new
|
@events = Dispatcher.new
|
||||||
@manager = manager || Manager.new(@events)
|
@manager = manager || Manager.new(@events)
|
||||||
|
@actions = ActionsHandler.new(@env, @events)
|
||||||
@stopped = stopped
|
@stopped = stopped
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -36,6 +37,7 @@ module Uh
|
|||||||
end
|
end
|
||||||
|
|
||||||
def register_event_hooks
|
def register_event_hooks
|
||||||
|
register_runner_hooks
|
||||||
register_manager_hooks
|
register_manager_hooks
|
||||||
register_layout_event_hooks
|
register_layout_event_hooks
|
||||||
register_key_bindings_hooks
|
register_key_bindings_hooks
|
||||||
@ -43,7 +45,6 @@ module Uh
|
|||||||
|
|
||||||
def connect_manager
|
def connect_manager
|
||||||
@manager.connect
|
@manager.connect
|
||||||
@manager.grab_key :q
|
|
||||||
@env.keybinds.each do |keysym, _|
|
@env.keybinds.each do |keysym, _|
|
||||||
@manager.grab_key *keysym
|
@manager.grab_key *keysym
|
||||||
end
|
end
|
||||||
@ -56,6 +57,10 @@ module Uh
|
|||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
def register_runner_hooks
|
||||||
|
@events.on(:quit) { stop! }
|
||||||
|
end
|
||||||
|
|
||||||
def register_manager_hooks
|
def register_manager_hooks
|
||||||
@events.on(:connecting) do |display|
|
@events.on(:connecting) do |display|
|
||||||
@env.log_debug "Connecting to X server on `#{display}'"
|
@env.log_debug "Connecting to X server on `#{display}'"
|
||||||
@ -72,9 +77,10 @@ module Uh
|
|||||||
end
|
end
|
||||||
|
|
||||||
def register_key_bindings_hooks
|
def register_key_bindings_hooks
|
||||||
@events.on(:key, :q) { stop! }
|
|
||||||
@env.keybinds.each do |keysym, code|
|
@env.keybinds.each do |keysym, code|
|
||||||
@events.on :key, *keysym, &code
|
@events.on :key, *keysym do
|
||||||
|
@actions.evaluate code
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
23
spec/uh/wm/actions_handler_spec.rb
Normal file
23
spec/uh/wm/actions_handler_spec.rb
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
module Uh
|
||||||
|
module WM
|
||||||
|
RSpec.describe ActionsHandler do
|
||||||
|
let(:env) { Env.new(StringIO.new) }
|
||||||
|
let(:events) { Dispatcher.new }
|
||||||
|
subject(:actions) { described_class.new env, events }
|
||||||
|
|
||||||
|
describe '#evaluate' do
|
||||||
|
it 'evaluates given code' do
|
||||||
|
expect { actions.evaluate proc { throw :action_code } }
|
||||||
|
.to throw_symbol :action_code
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '#quit' do
|
||||||
|
it 'emits the quit event' do
|
||||||
|
expect(events).to receive(:emit).with :quit
|
||||||
|
actions.quit
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
@ -21,6 +21,10 @@ module Uh
|
|||||||
expect(env.layout_class).not_to be
|
expect(env.layout_class).not_to be
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'has defaults key bindings set' do
|
||||||
|
expect(env.keybinds.keys).to eq %i[q]
|
||||||
|
end
|
||||||
|
|
||||||
describe '#verbose?' do
|
describe '#verbose?' do
|
||||||
context 'when verbose mode is disabled' do
|
context 'when verbose mode is disabled' do
|
||||||
before { env.verbose = false }
|
before { env.verbose = false }
|
||||||
|
@ -23,7 +23,8 @@ module Uh
|
|||||||
end
|
end
|
||||||
|
|
||||||
it 'tells the new instance to evaluate run control file content' do
|
it 'tells the new instance to evaluate run control file content' do
|
||||||
expect(rc).to receive(:evaluate).with ':run_control_code'
|
expect(rc)
|
||||||
|
.to receive(:evaluate).with(':run_control_code', env.rc_path)
|
||||||
allow(described_class).to receive(:new) { rc }
|
allow(described_class).to receive(:new) { rc }
|
||||||
described_class.evaluate env
|
described_class.evaluate env
|
||||||
end
|
end
|
||||||
@ -39,12 +40,12 @@ module Uh
|
|||||||
|
|
||||||
describe '#evaluate' do
|
describe '#evaluate' do
|
||||||
it 'evaluates given code' do
|
it 'evaluates given code' do
|
||||||
expect { rc.evaluate 'throw :run_control_code' }
|
expect { rc.evaluate 'throw :run_control_code', 'some_path' }
|
||||||
.to throw_symbol :run_control_code
|
.to throw_symbol :run_control_code
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'provides access to assigned env' do
|
it 'provides access to assigned env' do
|
||||||
expect { rc.evaluate 'fail @env.object_id.to_s' }
|
expect { rc.evaluate 'fail @env.object_id.to_s', 'some_path' }
|
||||||
.to raise_error env.object_id.to_s
|
.to raise_error env.object_id.to_s
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -63,6 +63,12 @@ module Uh
|
|||||||
end
|
end
|
||||||
|
|
||||||
describe '#register_event_hooks' do
|
describe '#register_event_hooks' do
|
||||||
|
it 'registers quit event hook' do
|
||||||
|
runner.register_event_hooks
|
||||||
|
expect(runner).to receive(:stop!)
|
||||||
|
runner.events.emit :quit
|
||||||
|
end
|
||||||
|
|
||||||
it 'registers manager event hooks for logging' do
|
it 'registers manager event hooks for logging' do
|
||||||
runner.register_event_hooks
|
runner.register_event_hooks
|
||||||
expect(env).to receive(:log)
|
expect(env).to receive(:log)
|
||||||
@ -86,6 +92,13 @@ module Uh
|
|||||||
runner.register_event_hooks
|
runner.register_event_hooks
|
||||||
expect(runner.events[:key, :f, :shift]).not_to be_empty
|
expect(runner.events[:key, :f, :shift]).not_to be_empty
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'registers key bindings code evaluation with the actions handler' do
|
||||||
|
env.keybinds[:f] = code = proc { }
|
||||||
|
runner.register_event_hooks
|
||||||
|
expect(runner.actions).to receive(:evaluate).with code
|
||||||
|
runner.events.emit :key, :f
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#connect_manager' do
|
describe '#connect_manager' do
|
||||||
|
Loading…
x
Reference in New Issue
Block a user