[epiphany] window: Fix key event state comparisons
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] window: Fix key event state comparisons
- Date: Wed, 23 Nov 2016 02:40:17 +0000 (UTC)
commit 7ba5e64a4c3df76b14b7dbb529ebd6645af999ef
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Tue Nov 22 18:38:01 2016 -0600
window: Fix key event state comparisons
GDK can set random bits in the state to indicate internal stuff. We have
to use GDK_MODIFIER_MASK to mask out its reserved values before trying
to look at the state.
https://bugzilla.gnome.org/show_bug.cgi?id=772437
src/ephy-window.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 9db23d3..6f0989c 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -534,7 +534,7 @@ ephy_window_unfullscreen (EphyWindow *window)
static gboolean
should_web_view_receive_key_press_event (GdkEventKey *event)
{
- if (event->state == GDK_CONTROL_MASK)
+ if ((event->state & GDK_MODIFIER_MASK) == GDK_CONTROL_MASK)
return event->keyval != GDK_KEY_n &&
event->keyval != GDK_KEY_q &&
event->keyval != GDK_KEY_t &&
@@ -544,7 +544,7 @@ should_web_view_receive_key_press_event (GdkEventKey *event)
event->keyval != GDK_KEY_Page_Down &&
event->keyval != GDK_KEY_KP_3;
- if (event->state == (GDK_SHIFT_MASK | GDK_CONTROL_MASK))
+ if ((event->state & GDK_MODIFIER_MASK) == (GDK_SHIFT_MASK | GDK_CONTROL_MASK))
return event->keyval != GDK_KEY_N &&
event->keyval != GDK_KEY_T &&
event->keyval != GDK_KEY_Page_Up &&
@@ -552,7 +552,7 @@ should_web_view_receive_key_press_event (GdkEventKey *event)
event->keyval != GDK_KEY_Page_Down &&
event->keyval != GDK_KEY_KP_3;
- if (event->state == GDK_MOD1_MASK)
+ if ((event->state & GDK_MODIFIER_MASK) == GDK_MOD1_MASK)
return event->keyval != GDK_KEY_Left &&
event->keyval != GDK_KEY_Right;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]