Implement `quit' action keyword

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

lib/uh/wm/env.rb

@@ -19,7 +19,9 @@ module Uh
       def initialize output
         @output   = output
         @rc_path  = RC_PATH
-        @keybinds = {}
+        @keybinds = {
+          q: proc { quit }
+        }
       end
 
       def verbose?

lib/uh/wm/runner.rb

@@ -14,12 +14,13 @@ module Uh
       extend Forwardable
       def_delegator :@env, :layout
 
-      attr_reader :env, :events, :manager
+      attr_reader :env, :events, :manager, :actions
 
       def initialize env, manager: nil, stopped: false
         @env      = env
         @events   = Dispatcher.new
         @manager  = manager || Manager.new(@events)
+        @actions  = ActionsHandler.new(@env, @events)
         @stopped  = stopped
       end
 
@@ -36,6 +37,7 @@ module Uh
       end
 
       def register_event_hooks
+        register_runner_hooks
         register_manager_hooks
         register_layout_event_hooks
         register_key_bindings_hooks
@@ -43,7 +45,6 @@ module Uh
 
       def connect_manager
         @manager.connect
-        @manager.grab_key :q
         @env.keybinds.each do |keysym, _|
           @manager.grab_key *keysym
         end
@@ -56,6 +57,10 @@ module Uh
 
       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}'"
@@ -72,9 +77,10 @@ module Uh
       end
 
       def register_key_bindings_hooks
-        @events.on(:key, :q) { stop! }
         @env.keybinds.each do |keysym, code|
-          @events.on :key, *keysym, &code
+          @events.on :key, *keysym do
+            @actions.evaluate code
+          end
         end
       end
     end