Inject the compositor state into handle-key-event

This will make it easier to test if we ever get around to it.
stumpwm · Nov 2, 2024 · e7cd922 · e7cd922
1 parent 5bfd290
commit e7cd922
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lisp/input.lisp b/lisp/input.lisp
@@ -29,11 +29,11 @@
 		(t  nil)))
 	  (log-string :trace "Keyboard state: ~A" (mahogany-state-key-state *compositor-state*)))))))
 
-(defun handle-key-event (key seat event-state)
+(defun handle-key-event (state key seat event-state)
   (declare (type key key)
 	   (type bit event-state)
 	   (optimize(speed 3)))
-  (let ((key-state (mahogany-state-key-state *compositor-state*)))
+  (let ((key-state (mahogany-state-key-state state)))
     (declare (type key-state key-state))
     (if (= event-state 1)
 	(or (check-and-run-keybinding key seat key-state)

diff --git a/lisp/main.lisp b/lisp/main.lisp
@@ -12,7 +12,7 @@
     ;; I'm not sure why this is an array, but it's what tinywl does:
     (dotimes (i hrt:keysyms-len)
       (let ((key (make-key (cffi:mem-aref hrt:keysyms :uint32 i) hrt:modifiers)))
-	(when (handle-key-event key seat hrt:wl-key-state)
+	(when (handle-key-event *compositor-state* key seat hrt:wl-key-state)
 	  (return t))))))
 
 (defmacro init-callback-struct (variable type &body sets)