#5 refactor: extract KeyboardGrabber and InputFocusHandler

lcarsde · Feb 20, 2021 · 1eae384 · 1eae384
1 parent 74790e2
commit 1eae384
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 39 deletions.
diff --git a/src/nativeMain/kotlin/de/atennert/lcarswm/keys/KeyboardGrabber.kt b/src/nativeMain/kotlin/de/atennert/lcarswm/keys/KeyboardGrabber.kt
@@ -0,0 +1,40 @@
+package de.atennert.lcarswm.keys
+
+import de.atennert.lcarswm.events.EventTime
+import de.atennert.lcarswm.system.api.InputApi
+import de.atennert.lcarswm.window.FocusObserver
+import kotlinx.cinterop.convert
+import xlib.CurrentTime
+import xlib.Time
+import xlib.Window
+
+/**
+ * Used to grab the key during a focus toggle session
+ * so we also get key release events for modifier keys.
+ */
+class FocusSessionKeyboardGrabber(
+    private val inputApi: InputApi,
+    private val eventTime: EventTime,
+    private val ewmhSupportWindow: Window
+) : FocusObserver {
+    private var grabActive = false
+    private var grabTime: Time = CurrentTime.convert()
+
+    override fun invoke(activeWindow: Window?, oldWindow: Window?, toggleSessionActive: Boolean) {
+        if (toggleSessionActive != grabActive) {
+            grabActive = toggleSessionActive
+
+            if (toggleSessionActive) {
+                grabTime = eventTime.lastEventTime
+                inputApi.grabKeyboard(ewmhSupportWindow, grabTime)
+            } else {
+                inputApi.ungrabKeyboard(
+                    if (eventTime.lastEventTime > grabTime)
+                        eventTime.lastEventTime
+                    else
+                        CurrentTime.convert()
+                )
+            }
+        }
+    }
+}
diff --git a/src/nativeMain/kotlin/de/atennert/lcarswm/lifecycle/startup.kt b/src/nativeMain/kotlin/de/atennert/lcarswm/lifecycle/startup.kt
@@ -7,6 +7,7 @@ import de.atennert.lcarswm.atom.AtomLibrary
 import de.atennert.lcarswm.atom.TextAtomReader
 import de.atennert.lcarswm.drawing.*
 import de.atennert.lcarswm.events.*
+import de.atennert.lcarswm.keys.FocusSessionKeyboardGrabber
 import de.atennert.lcarswm.keys.KeyConfiguration
 import de.atennert.lcarswm.keys.KeyManager
 import de.atennert.lcarswm.keys.KeySessionManager
@@ -181,42 +182,10 @@ fun startup(system: SystemApi, logger: Logger): RuntimeResources? {
         windowList
     )
 
-    val keyboardGrabber = object : FocusObserver {
-        private var grabActive = false
-        private var grabTime: Time = CurrentTime.convert()
-
-        override fun invoke(activeWindow: Window?, oldWindow: Window?, toggleSessionActive: Boolean) {
-            if (toggleSessionActive != grabActive) {
-                grabActive = toggleSessionActive
-
-                if (toggleSessionActive) {
-                    grabTime = eventTime.lastEventTime
-                    system.grabKeyboard(rootWindowPropertyHandler.ewmhSupportWindow, grabTime)
-                } else {
-                    system.ungrabKeyboard(
-                        if (eventTime.lastEventTime > grabTime)
-                            eventTime.lastEventTime
-                        else
-                            CurrentTime.convert()
-                    )
-                }
-            }
-        }
-    }
+    focusHandler.registerObserver(
+        FocusSessionKeyboardGrabber(system, eventTime, rootWindowPropertyHandler.ewmhSupportWindow))
 
-    focusHandler.registerObserver(keyboardGrabber)
-
-    focusHandler.registerObserver { activeWindow, _, toggleSessionActive ->
-        if (!toggleSessionActive) {
-            if (activeWindow != null) {
-                logger.logDebug("::startup::set input focus to $activeWindow")
-                system.setInputFocus(activeWindow, RevertToNone, eventTime.lastEventTime)
-            } else {
-                logger.logDebug("::startup::set input focus to root")
-                system.setInputFocus(screen.root, RevertToPointerRoot, eventTime.lastEventTime)
-            }
-        }
-    }
+    focusHandler.registerObserver(InputFocusHandler(logger, system, eventTime, screen.root))
 
     focusHandler.registerObserver { activeWindow, oldWindow, _ ->
         listOf(oldWindow, activeWindow).forEach {
@@ -269,10 +238,8 @@ fun startup(system: SystemApi, logger: Logger): RuntimeResources? {
         windowRegistration
     )
 
-    val xEventResources =
-        XEventResources(eventManager, eventTime, eventBuffer)
-    val appMenuResources =
-        AppMenuResources(appMenuMessageHandler, appMenuMessageQueue)
+    val xEventResources = XEventResources(eventManager, eventTime, eventBuffer)
+    val appMenuResources = AppMenuResources(appMenuMessageHandler, appMenuMessageQueue)
 
     return RuntimeResources(xEventResources, appMenuResources)
 }

diff --git a/src/nativeMain/kotlin/de/atennert/lcarswm/window/InputFocusHandler.kt b/src/nativeMain/kotlin/de/atennert/lcarswm/window/InputFocusHandler.kt
@@ -0,0 +1,30 @@
+package de.atennert.lcarswm.window
+
+import de.atennert.lcarswm.events.EventTime
+import de.atennert.lcarswm.log.Logger
+import de.atennert.lcarswm.system.api.InputApi
+import xlib.RevertToNone
+import xlib.RevertToPointerRoot
+import xlib.Window
+
+/**
+ * Sets the input focus based on the current window focus.
+ */
+class InputFocusHandler(
+    private val logger: Logger,
+    private val inputApi: InputApi,
+    private val eventTime: EventTime,
+    private val rootWindow: Window
+) : FocusObserver {
+    override fun invoke(activeWindow: Window?, oldWindow: Window?, toggleSessionActive: Boolean) {
+        if (!toggleSessionActive) {
+            if (activeWindow != null) {
+                logger.logDebug("::startup::set input focus to $activeWindow")
+                inputApi.setInputFocus(activeWindow, RevertToNone, eventTime.lastEventTime)
+            } else {
+                logger.logDebug("::startup::set input focus to root")
+                inputApi.setInputFocus(rootWindow, RevertToPointerRoot, eventTime.lastEventTime)
+            }
+        }
+    }
+}