diff options
| author | Craig Black <blackc@speakeasy.net> | 2002-08-09 03:32:09 +0000 |
|---|---|---|
| committer | Craig Black <blackc@src.gnome.org> | 2002-08-09 03:32:09 +0000 |
| commit | 8c5369d5223078decaaf7e955101cc7748248f6c (patch) | |
| tree | 2294b09dff4bcf1dcf16e1401552570390388850 | |
| parent | 311052d55541089d384890a645e8aa7b3eaa8cf2 (diff) | |
| download | metacity-8c5369d5223078decaaf7e955101cc7748248f6c.tar.gz | |
update comment also set expected focus window when setting input focus.
2002-08-08 Craig Black <blackc@speakeasy.net>
* src/display.h: update comment
* src/window.c: (meta_window_focus): also set expected
focus window when setting input focus.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/display.h | 3 | ||||
| -rw-r--r-- | src/window.c | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2002-08-08 Craig Black <blackc@speakeasy.net> + + * src/display.h: update comment + * src/window.c: (meta_window_focus): also set expected + focus window when setting input focus. + 2002-08-07 Craig Black <blackc@speakeasy.net> * src/display.c: (meta_display_unshow_desktop): focus diff --git a/src/display.h b/src/display.h index c48292fd..95acc6bc 100644 --- a/src/display.h +++ b/src/display.h @@ -153,8 +153,7 @@ struct _MetaDisplay */ MetaWindow *focus_window; - /* WM_TAKE_FOCUS has been sent but we have not yet - * received the resulting FocusIn event for this window + /* window we are expecting a FocusIn event for */ MetaWindow *expected_focus_window; diff --git a/src/window.c b/src/window.c index f1145179..66d08d25 100644 --- a/src/window.c +++ b/src/window.c @@ -2781,6 +2781,7 @@ meta_window_focus (MetaWindow *window, window->frame->xwindow, RevertToPointerRoot, CurrentTime); + window->display->expected_focus_window = window; } } else @@ -2796,6 +2797,7 @@ meta_window_focus (MetaWindow *window, window->xwindow, RevertToPointerRoot, timestamp); + window->display->expected_focus_window = window; } if (window->take_focus) |