summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@math.utah.edu>2004-09-15 15:46:25 +0000
committerElijah Newren <newren@src.gnome.org>2004-09-15 15:46:25 +0000
commita880f5d401335e51249be5453eaf538f9c681adf (patch)
tree5b45013769f47b722df1e3f94da53627c5b117c0
parent4b9fe2cae7117418d47bbcf48e0f155d87c31970 (diff)
downloadmetacity-a880f5d401335e51249be5453eaf538f9c681adf.tar.gz
Fix unwanted loss of focus to the mouse window when using keynav (fixes
2004-09-15 Elijah Newren <newren@math.utah.edu> Fix unwanted loss of focus to the mouse window when using keynav (fixes #101190) * src/display.c (event_callback): Ignore EnterNotify events with xcrossing.mode of either NotifyGrab or NotifyUngrab
-rw-r--r--ChangeLog8
-rw-r--r--src/display.c2
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b7fc771..928fc023 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2004-09-15 Elijah Newren <newren@math.utah.edu>
+ Fix unwanted loss of focus to the mouse window when using keynav
+ (fixes #101190)
+
+ * src/display.c (event_callback): Ignore EnterNotify events with
+ xcrossing.mode of either NotifyGrab or NotifyUngrab
+
+2004-09-15 Elijah Newren <newren@math.utah.edu>
+
Focus correct window after minimizing via the tasklist (fixes
#128200; see also #107681)
diff --git a/src/display.c b/src/display.c
index dbf8daa4..0b94758c 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1677,6 +1677,8 @@ event_callback (XEvent *event,
meta_window_handle_mouse_grab_op_event (window, event);
/* do this even if window->has_focus to avoid races */
else if (window && !serial_is_ignored (display, event->xany.serial) &&
+ event->xcrossing.mode != NotifyGrab &&
+ event->xcrossing.mode != NotifyUngrab &&
event->xcrossing.detail != NotifyInferior &&
meta_display_focus_sentinel_clear (display))
{