{
GdkDisplay *display = GDK_WINDOW_DISPLAY (wrapper);
- _gdk_xid_table_remove (display, impl->xid);
+ _gdk_x11_display_remove_window (display, impl->xid);
if (impl->toplevel && impl->toplevel->focus_window)
- _gdk_xid_table_remove (display, impl->toplevel->focus_window);
+ _gdk_x11_display_remove_window (display, impl->toplevel->focus_window);
}
g_free (impl->toplevel);
window->event_mask = GDK_STRUCTURE_MASK;
_gdk_window_update_size (screen_x11->root_window);
-
- _gdk_xid_table_insert (screen_x11->display,
- &screen_x11->xroot_window,
- screen_x11->root_window);
+
+ _gdk_x11_display_add_window (screen_x11->display,
+ &screen_x11->xroot_window,
+ screen_x11->root_window);
}
static void
* press events so they don't get sent to child windows.
*/
toplevel->focus_window = create_focus_window (display, xid);
- _gdk_xid_table_insert (screen_x11->display, &toplevel->focus_window, window);
+ _gdk_x11_display_add_window (screen_x11->display,
+ &toplevel->focus_window,
+ window);
}
-
+
check_leader_window_title (screen_x11->display);
-
+
/* FIXME: Is there any point in doing this? Do any WM's pay
* attention to PSize, and even if they do, is this the
* correct value???
xattributes_mask, &xattributes);
g_object_ref (window);
- _gdk_xid_table_insert (screen_x11->display, &impl->xid, window);
+ _gdk_x11_display_add_window (screen_x11->display, &impl->xid, window);
switch (GDK_WINDOW_TYPE (window))
{
display_x11 = GDK_DISPLAY_X11 (display);
- if ((win = _gdk_xid_table_lookup (display, window)) != NULL)
+ if ((win = gdk_x11_window_lookup_for_display (display, window)) != NULL)
return g_object_ref (win);
gdk_x11_display_error_trap_push (display);
impl = GDK_WINDOW_IMPL_X11 (win->impl);
impl->wrapper = win;
- win->parent = _gdk_xid_table_lookup (display, parent);
+ win->parent = gdk_x11_window_lookup_for_display (display, parent);
if (!win->parent || GDK_WINDOW_TYPE (win->parent) == GDK_WINDOW_FOREIGN)
win->parent = gdk_screen_get_root_window (screen);
win->depth = attrs.depth;
g_object_ref (win);
- _gdk_xid_table_insert (display, &GDK_WINDOW_XID (win), win);
+ _gdk_x11_display_add_window (display, &GDK_WINDOW_XID (win), win);
/* Update the clip region, etc */
_gdk_window_update_size (win);
return win;
}
-/**
- * gdk_x11_window_lookup_for_display:
- * @display: the #GdkDisplay corresponding to the window handle
- * @window: an XLib <type>Window</type>
- *
- * Looks up the #GdkWindow that wraps the given native window handle.
- *
- * Return value: (transfer none): the #GdkWindow wrapper for the native
- * window, or %NULL if there is none.
- *
- * Since: 3.0
- */
-GdkWindow *
-gdk_x11_window_lookup_for_display (GdkDisplay *display,
- Window window)
-{
- return (GdkWindow*) _gdk_xid_table_lookup (display, window);
-}
-
static void
gdk_toplevel_x11_free_contents (GdkDisplay *display,
GdkToplevelX11 *toplevel)
_gdk_window_destroy (window, TRUE);
}
- _gdk_xid_table_remove (GDK_WINDOW_DISPLAY (window), GDK_WINDOW_XID (window));
+ _gdk_x11_display_remove_window (GDK_WINDOW_DISPLAY (window), GDK_WINDOW_XID (window));
if (window_impl->toplevel && window_impl->toplevel->focus_window)
- _gdk_xid_table_remove (GDK_WINDOW_DISPLAY (window), window_impl->toplevel->focus_window);
+ _gdk_x11_display_remove_window (GDK_WINDOW_DISPLAY (window), window_impl->toplevel->focus_window);
_gdk_x11_window_grab_check_destroy (window);
if (impl->toplevel->focus_window)
{
XDestroyWindow (GDK_WINDOW_XDISPLAY (window), impl->toplevel->focus_window);
- _gdk_xid_table_remove (GDK_WINDOW_DISPLAY (window), impl->toplevel->focus_window);
+ _gdk_x11_display_remove_window (GDK_WINDOW_DISPLAY (window), impl->toplevel->focus_window);
}
gdk_toplevel_x11_free_contents (GDK_WINDOW_DISPLAY (window),
}
void
-_gdk_xid_table_insert (GdkDisplay *display,
- XID *xid,
- gpointer data)
+_gdk_x11_display_add_window (GdkDisplay *display,
+ XID *xid,
+ GdkWindow *data)
{
GdkDisplayX11 *display_x11;
}
void
-_gdk_xid_table_remove (GdkDisplay *display,
- XID xid)
+_gdk_x11_display_remove_window (GdkDisplay *display,
+ XID xid)
{
GdkDisplayX11 *display_x11;
g_hash_table_remove (display_x11->xid_ht, &xid);
}
-gpointer
-_gdk_xid_table_lookup (GdkDisplay *display,
- XID xid)
+/**
+ * gdk_x11_window_lookup_for_display:
+ * @display: the #GdkDisplay corresponding to the window handle
+ * @window: an XLib <type>Window</type>
+ *
+ * Looks up the #GdkWindow that wraps the given native window handle.
+ *
+ * Return value: (transfer none): the #GdkWindow wrapper for the native
+ * window, or %NULL if there is none.
+ *
+ * Since: 3.0
+ */
+GdkWindow *
+gdk_x11_window_lookup_for_display (GdkDisplay *display,
+ Window window)
{
GdkDisplayX11 *display_x11;
- gpointer data = NULL;
+ GdkWindow *data = NULL;
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
display_x11 = GDK_DISPLAY_X11 (display);
if (display_x11->xid_ht)
- data = g_hash_table_lookup (display_x11->xid_ht, &xid);
+ data = g_hash_table_lookup (display_x11->xid_ht, &window);
return data;
}