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.
This commit is contained in:
Craig Black 2002-08-09 03:32:09 +00:00 committed by Craig Black
parent 311052d555
commit 8c5369d522
3 changed files with 9 additions and 2 deletions

View File

@ -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> 2002-08-07 Craig Black <blackc@speakeasy.net>
* src/display.c: (meta_display_unshow_desktop): focus * src/display.c: (meta_display_unshow_desktop): focus

View File

@ -153,8 +153,7 @@ struct _MetaDisplay
*/ */
MetaWindow *focus_window; MetaWindow *focus_window;
/* WM_TAKE_FOCUS has been sent but we have not yet /* window we are expecting a FocusIn event for
* received the resulting FocusIn event for this window
*/ */
MetaWindow *expected_focus_window; MetaWindow *expected_focus_window;

View File

@ -2781,6 +2781,7 @@ meta_window_focus (MetaWindow *window,
window->frame->xwindow, window->frame->xwindow,
RevertToPointerRoot, RevertToPointerRoot,
CurrentTime); CurrentTime);
window->display->expected_focus_window = window;
} }
} }
else else
@ -2796,6 +2797,7 @@ meta_window_focus (MetaWindow *window,
window->xwindow, window->xwindow,
RevertToPointerRoot, RevertToPointerRoot,
timestamp); timestamp);
window->display->expected_focus_window = window;
} }
if (window->take_focus) if (window->take_focus)