brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta_display_screen_for_root is quite capable of returning NULL.

Browse Source 
2008-03-26  Thomas Thurman  <tthurman@gnome.org>

        * src/core/display.c (event_callback): meta_display_screen_for_root
        is quite capable of returning NULL.


svn path=/trunk/; revision=3664
This commit is contained in:
Thomas Thurman 2008-03-26 13:32:58 +00:00 committed by Thomas James Alexander Thurman
parent 1e325bcbdf
commit 0130c0d5b6
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-03-26 Thomas Thurman <tthurman@gnome.org>
* src/core/display.c (event_callback): meta_display_screen_for_root
is quite capable of returning NULL.
2008-03-25 Thomas Thurman <tthurman@gnome.org> 2008-03-25 Thomas Thurman <tthurman@gnome.org>
* src/core/display.c (meta_display_queue_retheme_all_windows, * src/core/display.c (meta_display_queue_retheme_all_windows,

19
src/core/display.c
View File

@ -1798,8 +1798,10 @@ event_callback (XEvent *event,
"Syncing to old stack positions.\n"); "Syncing to old stack positions.\n");
screen = screen =
meta_display_screen_for_root (display, event->xany.window); meta_display_screen_for_root (display, event->xany.window);
meta_stack_set_positions (screen->stack,
display->grab_old_window_stacking); if (screen!=NULL)
meta_stack_set_positions (screen->stack,
display->grab_old_window_stacking);
} }
meta_display_end_grab_op (display, meta_display_end_grab_op (display,
event->xbutton.time); event->xbutton.time);
@ -1988,16 +1990,15 @@ event_callback (XEvent *event,
* screen; this will make keybindings and workspace-launched items * screen; this will make keybindings and workspace-launched items
* actually appear on the right screen. * actually appear on the right screen.
*/ */
if (display->active_screen != {
meta_display_screen_for_root (display, event->xcrossing.root)) MetaScreen *new_screen =
{ meta_display_screen_for_root (display, event->xcrossing.root);
MetaScreen *new_screen;
new_screen = meta_display_screen_for_root (display, if (new_screen != NULL && display->active_screen != new_screen)
event->xcrossing.root);
meta_workspace_focus_default_window (new_screen->active_workspace, meta_workspace_focus_default_window (new_screen->active_workspace,
NULL, NULL,
event->xcrossing.time); event->xcrossing.time);
} }
/* Check if we've entered a window; do this even if window->has_focus to /* Check if we've entered a window; do this even if window->has_focus to
* avoid races. * avoid races.