diff options
| author | Elijah Newren <newren@math.utah.edu> | 2004-10-08 21:57:01 +0000 |
|---|---|---|
| committer | Elijah Newren <newren@src.gnome.org> | 2004-10-08 21:57:01 +0000 |
| commit | 79b4de04fc9e99d5df79c1e5be42c3fea649264c (patch) | |
| tree | 5956fe0fe54056261003e8a7de146e1a70fa7225 | |
| parent | 714fb3d539cdaf7fafe6205d114e6a29276bd7b7 (diff) | |
| download | metacity-79b4de04fc9e99d5df79c1e5be42c3fea649264c.tar.gz | |
Alter the meaning of expected_focus_window; doesn't affect current
2004-10-08 Elijah Newren <newren@math.utah.edu>
Alter the meaning of expected_focus_window; doesn't affect
current operation but assists in fixing some other bugs
(#154598)
* src/display.c (meta_display_focus_the_no_focus_window): set the
expected_focus_window to NULL.
* src/window.c (meta_window_notify_focus): don't NULL the
expected_focus_window when that window receives a FocusIn event
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | src/display.c | 1 | ||||
| -rw-r--r-- | src/window.c | 3 |
3 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,15 @@ +2004-10-08 Elijah Newren <newren@math.utah.edu> + + Alter the meaning of expected_focus_window; doesn't affect + current operation but assists in fixing some other bugs + (#154598) + + * src/display.c (meta_display_focus_the_no_focus_window): set the + expected_focus_window to NULL. + + * src/window.c (meta_window_notify_focus): don't NULL the + expected_focus_window when that window receives a FocusIn event + 2004-10-04 Elijah Newren <newren@math.utah.edu> * src/display.c (event_callback): if the root window gets focused, diff --git a/src/display.c b/src/display.c index ca949331..6fffee1b 100644 --- a/src/display.c +++ b/src/display.c @@ -4593,6 +4593,7 @@ meta_display_focus_the_no_focus_window (MetaDisplay *display, display->no_focus_window, RevertToPointerRoot, timestamp); + display->expected_focus_window = NULL; meta_display_remove_autoraise_callback (display); } diff --git a/src/window.c b/src/window.c index 3460f8de..95300ad7 100644 --- a/src/window.c +++ b/src/window.c @@ -4303,9 +4303,6 @@ meta_window_notify_focus (MetaWindow *window, if (event->type == FocusIn) { - if (window->display->expected_focus_window == window) - window->display->expected_focus_window = NULL; - if (window != window->display->focus_window) { meta_topic (META_DEBUG_FOCUS, |