Implement `modifier' run control keyword

lib/uh/wm/env.rb

@@ -3,6 +3,8 @@ module Uh
     class Env
       RC_PATH = '~/.uhwmrc.rb'.freeze
 
+      MODIFIER = :mod1
+
       LOGGER_LEVEL          = Logger::WARN
       LOGGER_LEVEL_VERBOSE  = Logger::INFO
       LOGGER_LEVEL_DEBUG    = Logger::DEBUG
@@ -14,11 +16,12 @@ module Uh
       def_delegator :@output, :print
 
       attr_reader   :output, :keybinds
-      attr_accessor :verbose, :debug, :rc_path, :layout_class
+      attr_accessor :verbose, :debug, :rc_path, :layout_class, :modifier
 
       def initialize output
         @output   = output
         @rc_path  = RC_PATH
+        @modifier = MODIFIER
         @keybinds = {
           q: proc { quit }
         }

lib/uh/wm/manager.rb

@@ -3,10 +3,11 @@ module Uh
     class Manager
       INPUT_MASK = Events::SUBSTRUCTURE_REDIRECT_MASK
 
-      attr_reader :display
+      attr_reader :modifier, :display
 
-      def initialize events, display = Display.new
+      def initialize events, modifier, display = Display.new
         @events   = events
+        @modifier = modifier
         @display  = display
       end
 
@@ -22,7 +23,7 @@ module Uh
       end
 
       def grab_key keysym, mod = nil
-        mod_mask = KEY_MODIFIERS[:mod1]
+        mod_mask = KEY_MODIFIERS[@modifier]
         mod_mask |= KEY_MODIFIERS[mod] if mod
         @display.grab_key keysym.to_s, mod_mask
       end

lib/uh/wm/run_control.rb

@@ -24,6 +24,10 @@ module Uh
         instance_eval code, path
       end
 
+      def modifier mod
+        @env.modifier = mod
+      end
+
       def key keysym, &block
         @env.keybinds[translate_keysym keysym] = block
       end

lib/uh/wm/runner.rb

@@ -14,12 +14,12 @@ module Uh
       extend Forwardable
       def_delegator :@env, :layout
 
-      attr_reader :env, :events, :manager, :actions
+      attr_reader :env, :events, :actions
 
       def initialize env, manager: nil, stopped: false
         @env      = env
         @events   = Dispatcher.new
-        @manager  = manager || Manager.new(@events)
+        @manager  = manager
         @actions  = ActionsHandler.new(@env, @events)
         @stopped  = stopped
       end
@@ -32,6 +32,10 @@ module Uh
         @stopped = true
       end
 
+      def manager
+        @manager ||= Manager.new(@events, @env.modifier)
+      end
+
       def evaluate_run_control
         RunControl.evaluate(env)
       end
@@ -44,14 +48,14 @@ module Uh
       end
 
       def connect_manager
-        @manager.connect
+        manager.connect
         @env.keybinds.each do |keysym, _|
-          @manager.grab_key *keysym
+          manager.grab_key *keysym
         end
       end
 
       def run_until &block
-        @manager.handle_pending_events until block.call
+        manager.handle_pending_events until block.call
       end