[mutter/wip/carlosg/modifier-query-x11: 1/2] backends/x11: Use XkbBuildCoreState the right way around




commit 91c0aa6a54ccf912dcf88e2a7174708ff1288f94
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Nov 30 19:00:31 2020 +0100

    backends/x11: Use XkbBuildCoreState the right way around
    
    Pass parameters in the correct order, and don't let it clamp button
    modifiers away (Since this macro does "state & 0xff").
    
    Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1559

 src/backends/x11/meta-seat-x11.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/src/backends/x11/meta-seat-x11.c b/src/backends/x11/meta-seat-x11.c
index ce1fae3c00..e320a1e4c8 100644
--- a/src/backends/x11/meta-seat-x11.c
+++ b/src/backends/x11/meta-seat-x11.c
@@ -1535,7 +1535,7 @@ translate_state (XIButtonState   *button_state,
     }
 
   if (group_state)
-    state = XkbBuildCoreState (group_state->effective, state);
+    state |= XkbBuildCoreState (0, group_state->effective);
 
   return state;
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]