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

display: Rename window_ids to xids

Browse Source 
As the hash table no longer stores only window IDs, we should rename it so
that we make sure to check if something is actually a window before using it
as a window.

https://bugzilla.gnome.org/show_bug.cgi?id=677215
This commit is contained in:
Jasper St. Pierre 2013-02-06 17:02:59 -05:00
parent 57c31a56f4
commit d8f569eaf5
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/barrier.c
View File

@ -196,7 +196,7 @@ meta_barrier_constructed (GObject *object)
* so that the object stays alive and doesn't get GC'd. */ * so that the object stays alive and doesn't get GC'd. */
g_object_ref (barrier); g_object_ref (barrier);
g_hash_table_insert (priv->display->window_ids, &priv->xbarrier, barrier); g_hash_table_insert (priv->display->xids, &priv->xbarrier, barrier);
G_OBJECT_CLASS (meta_barrier_parent_class)->constructed (object); G_OBJECT_CLASS (meta_barrier_parent_class)->constructed (object);
} }
@ -310,7 +310,7 @@ meta_barrier_destroy (MetaBarrier *barrier)
return; return;
XFixesDestroyPointerBarrier (dpy, priv->xbarrier); XFixesDestroyPointerBarrier (dpy, priv->xbarrier);
g_hash_table_remove (priv->display->window_ids, &priv->xbarrier); g_hash_table_remove (priv->display->xids, &priv->xbarrier);
priv->xbarrier = 0; priv->xbarrier = 0;
g_object_unref (barrier); g_object_unref (barrier);
@ -360,7 +360,7 @@ meta_display_process_barrier_event (MetaDisplay *display,
{ {
MetaBarrier *barrier; MetaBarrier *barrier;
barrier = g_hash_table_lookup (display->window_ids, &xev->barrier); barrier = g_hash_table_lookup (display->xids, &xev->barrier);
if (barrier != NULL) if (barrier != NULL)
{ {
meta_barrier_fire_event (barrier, xev); meta_barrier_fire_event (barrier, xev);

2
src/core/display-private.h
View File

@ -146,7 +146,7 @@ struct _MetaDisplay
MetaEventQueue *events; MetaEventQueue *events;
GSList *screens; GSList *screens;
MetaScreen *active_screen; MetaScreen *active_screen;
GHashTable *window_ids; GHashTable *xids;
int error_traps; int error_traps;
int (* error_trap_handler) (Display *display, int (* error_trap_handler) (Display *display,
XErrorEvent *error); XErrorEvent *error);

18
src/core/display.c
View File

@ -588,8 +588,8 @@ meta_display_open (void)
event_callback, event_callback,
the_display); the_display);
the_display->window_ids = g_hash_table_new (meta_unsigned_long_hash, the_display->xids = g_hash_table_new (meta_unsigned_long_hash,
meta_unsigned_long_equal); meta_unsigned_long_equal);
i = 0; i = 0;
while (i < N_IGNORED_CROSSING_SERIALS) while (i < N_IGNORED_CROSSING_SERIALS)
@ -1004,7 +1004,7 @@ meta_display_list_windows (MetaDisplay *display,
winlist = NULL; winlist = NULL;
g_hash_table_iter_init (&iter, display->window_ids); g_hash_table_iter_init (&iter, display->xids);
while (g_hash_table_iter_next (&iter, &key, &value)) while (g_hash_table_iter_next (&iter, &key, &value))
{ {
MetaWindow *window = value; MetaWindow *window = value;
@ -1114,7 +1114,7 @@ meta_display_close (MetaDisplay *display,
/* Must be after all calls to meta_window_unmanage() since they /* Must be after all calls to meta_window_unmanage() since they
* unregister windows * unregister windows
*/ */
g_hash_table_destroy (display->window_ids); g_hash_table_destroy (display->xids);
if (display->leader_window != None) if (display->leader_window != None)
XDestroyWindow (display->xdisplay, display->leader_window); XDestroyWindow (display->xdisplay, display->leader_window);
@ -3569,7 +3569,7 @@ MetaWindow*
meta_display_lookup_x_window (MetaDisplay *display, meta_display_lookup_x_window (MetaDisplay *display,
Window xwindow) Window xwindow)
{ {
return g_hash_table_lookup (display->window_ids, &xwindow); return g_hash_table_lookup (display->xids, &xwindow);
} }
void void
@ -3577,18 +3577,18 @@ meta_display_register_x_window (MetaDisplay *display,
Window *xwindowp, Window *xwindowp,
MetaWindow *window) MetaWindow *window)
{ {
g_return_if_fail (g_hash_table_lookup (display->window_ids, xwindowp) == NULL); g_return_if_fail (g_hash_table_lookup (display->xids, xwindowp) == NULL);
g_hash_table_insert (display->window_ids, xwindowp, window); g_hash_table_insert (display->xids, xwindowp, window);
} }
void void
meta_display_unregister_x_window (MetaDisplay *display, meta_display_unregister_x_window (MetaDisplay *display,
Window xwindow) Window xwindow)
{ {
g_return_if_fail (g_hash_table_lookup (display->window_ids, &xwindow) != NULL); g_return_if_fail (g_hash_table_lookup (display->xids, &xwindow) != NULL);
g_hash_table_remove (display->window_ids, &xwindow); g_hash_table_remove (display->xids, &xwindow);
/* Remove any pending pings */ /* Remove any pending pings */
remove_pending_pings_for_window (display, xwindow); remove_pending_pings_for_window (display, xwindow);

2
src/core/screen.c
View File

@ -1220,7 +1220,7 @@ meta_screen_foreach_window (MetaScreen *screen,
*/ */
winlist = NULL; winlist = NULL;
g_hash_table_foreach (screen->display->window_ids, g_hash_table_foreach (screen->display->xids,
listify_func, listify_func,
&winlist); &winlist);