From 8c5369d5223078decaaf7e955101cc7748248f6c Mon Sep 17 00:00:00 2001 From: Craig Black Date: Fri, 9 Aug 2002 03:32:09 +0000 Subject: [PATCH] update comment also set expected focus window when setting input focus. 2002-08-08 Craig Black * src/display.h: update comment * src/window.c: (meta_window_focus): also set expected focus window when setting input focus. --- ChangeLog | 6 ++++++ src/display.h | 3 +-- src/window.c | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 553dfa159..98d8a24f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-08-08 Craig Black + + * 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 * src/display.c: (meta_display_unshow_desktop): focus diff --git a/src/display.h b/src/display.h index c48292fde..95acc6bc5 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 f1145179d..66d08d259 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)