summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCraig Black <blackc@speakeasy.net>2002-08-09 03:32:09 +0000
committerCraig Black <blackc@src.gnome.org>2002-08-09 03:32:09 +0000
commit8c5369d5223078decaaf7e955101cc7748248f6c (patch)
tree2294b09dff4bcf1dcf16e1401552570390388850 /src
parent311052d55541089d384890a645e8aa7b3eaa8cf2 (diff)
downloadmetacity-8c5369d5223078decaaf7e955101cc7748248f6c.tar.gz
metacity-8c5369d5223078decaaf7e955101cc7748248f6c.tar.bz2
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.
Diffstat (limited to 'src')
-rw-r--r--src/display.h3
-rw-r--r--src/window.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/display.h b/src/display.h
index c48292f..95acc6b 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 f114517..66d08d2 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)