From 27b254db8a843b9ee4b090dc1a33c30fdb86f8f9 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Wed, 29 Jan 2025 13:12:11 -0800
Subject: [PATCH] apprt/gtk: set key modifier flag if physical modifier key is
 pressed

Fixes #5191
---
 src/apprt/gtk/Surface.zig |  1 +
 src/apprt/gtk/key.zig     | 57 +++++++++++++++++++++++++++++++++------
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/src/apprt/gtk/Surface.zig b/src/apprt/gtk/Surface.zig
index 3677c5e8d7..1ca39425bf 100644
--- a/src/apprt/gtk/Surface.zig
+++ b/src/apprt/gtk/Surface.zig
@@ -1757,6 +1757,7 @@ pub fn keyEvent(
         event,
         physical_key,
         gtk_mods,
+        action,
         &self.app.winproto,
     );
 
diff --git a/src/apprt/gtk/key.zig b/src/apprt/gtk/key.zig
index 40c9ca9a4b..60f12edca0 100644
--- a/src/apprt/gtk/key.zig
+++ b/src/apprt/gtk/key.zig
@@ -108,6 +108,7 @@ pub fn eventMods(
     event: *c.GdkEvent,
     physical_key: input.Key,
     gtk_mods: c.GdkModifierType,
+    action: input.Action,
     app_winproto: *winproto.App,
 ) input.Mods {
     const device = c.gdk_event_get_device(event);
@@ -115,15 +116,55 @@ pub fn eventMods(
     var mods = app_winproto.eventMods(device, gtk_mods);
     mods.num_lock = c.gdk_device_get_num_lock_state(device) == 1;
 
+    // We use the physical key to determine sided modifiers. As
+    // far as I can tell there's no other way to reliably determine
+    // this.
+    //
+    // We also set the main modifier to true if either side is true,
+    // since on both X11/Wayland, GTK doesn't set the main modifier
+    // if only the modifier key is pressed, but our core logic
+    // relies on it.
     switch (physical_key) {
-        .left_shift => mods.sides.shift = .left,
-        .right_shift => mods.sides.shift = .right,
-        .left_control => mods.sides.ctrl = .left,
-        .right_control => mods.sides.ctrl = .right,
-        .left_alt => mods.sides.alt = .left,
-        .right_alt => mods.sides.alt = .right,
-        .left_super => mods.sides.super = .left,
-        .right_super => mods.sides.super = .right,
+        .left_shift => {
+            mods.shift = action != .release;
+            mods.sides.shift = .left;
+        },
+
+        .right_shift => {
+            mods.shift = action != .release;
+            mods.sides.shift = .right;
+        },
+
+        .left_control => {
+            mods.ctrl = action != .release;
+            mods.sides.ctrl = .left;
+        },
+
+        .right_control => {
+            mods.ctrl = action != .release;
+            mods.sides.ctrl = .right;
+        },
+
+        .left_alt => {
+            mods.alt = action != .release;
+            mods.sides.alt = .left;
+        },
+
+        .right_alt => {
+            mods.alt = action != .release;
+            mods.sides.alt = .right;
+        },
+
+        .left_super => {
+            mods.super = action != .release;
+            mods.sides.super = .left;
+        },
+
+        .right_super => {
+            mods.super = action != .release;
+            mods.sides.super = .right;
+        },
+
         else => {},
     }