brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move focus change handling out of a meta_later

Browse Source 
Ok, there admittedly wasn't a strong rationale for having it in a
later, and by performing this immediately we reduce race conditions
for our focus_app versus startup_notification handling.

https://bugzilla.gnome.org/show_bug.cgi?id=612833
This commit is contained in:
Colin Walters 2010-02-25 16:11:14 -05:00
parent 611ca3c161
commit 1a25cd98ea
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/shell-window-tracker.c
View File

@ -724,25 +724,22 @@ shell_window_tracker_get_running_apps (ShellWindowTracker *monitor,
return ret; return ret;
} }
static gboolean static void
idle_handle_focus_change (gpointer data) on_focus_window_changed (MetaDisplay *display,
GParamSpec *spec,
ShellWindowTracker *tracker)
{ {
MetaScreen *screen; MetaScreen *screen;
MetaDisplay *display;
ShellWindowTracker *tracker = data;
MetaWindow *new_focus_win; MetaWindow *new_focus_win;
ShellApp *new_focus_app; ShellApp *new_focus_app;
tracker->idle_focus_change_id = 0;
screen = shell_global_get_screen (shell_global_get ()); screen = shell_global_get_screen (shell_global_get ());
display = meta_screen_get_display (screen);
new_focus_win = meta_display_get_focus_window (display); new_focus_win = meta_display_get_focus_window (display);
new_focus_app = new_focus_win ? g_hash_table_lookup (tracker->window_to_app, new_focus_win) : NULL; new_focus_app = new_focus_win ? g_hash_table_lookup (tracker->window_to_app, new_focus_win) : NULL;
if (new_focus_app == tracker->focus_app) if (new_focus_app == tracker->focus_app)
return FALSE; return;
if (tracker->focus_app != NULL) if (tracker->focus_app != NULL)
g_object_unref (tracker->focus_app); g_object_unref (tracker->focus_app);
@ -754,22 +751,8 @@ idle_handle_focus_change (gpointer data)
tracker->focus_app = g_object_ref (new_focus_app); tracker->focus_app = g_object_ref (new_focus_app);
g_object_notify (G_OBJECT (tracker), "focus-app"); g_object_notify (G_OBJECT (tracker), "focus-app");
return FALSE;
} }
static void
on_focus_window_changed (MetaDisplay *display,
GParamSpec *spec,
ShellWindowTracker *self)
{
if (self->idle_focus_change_id != 0)
return;
self->idle_focus_change_id = meta_later_add (META_LATER_BEFORE_REDRAW, idle_handle_focus_change, self, NULL);
}
/** /**
* shell_window_tracker_get_startup_sequences: * shell_window_tracker_get_startup_sequences:
* @self: * @self: