summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/reference/gdk/gdk3-sections.txt1
-rw-r--r--gdk/x11/gdkcursor-x11.c2
-rw-r--r--gdk/x11/gdkdevice-core.c4
-rw-r--r--gdk/x11/gdkdevice-xi.c4
-rw-r--r--gdk/x11/gdkdevice-xi2.c8
-rw-r--r--gdk/x11/gdkdevicemanager-xi2.c2
-rw-r--r--gdk/x11/gdkdnd-x11.c16
-rw-r--r--gdk/x11/gdkproperty-x11.c4
-rw-r--r--gdk/x11/gdkwindow-x11.c18
-rw-r--r--gdk/x11/gdkx.h5
-rw-r--r--gtk/gtkplug-x11.c10
-rw-r--r--gtk/gtkselection.c2
-rw-r--r--gtk/gtksocket-x11.c42
-rw-r--r--gtk/gtktrayicon-x11.c4
-rw-r--r--gtk/gtkxembed.c4
-rw-r--r--modules/other/gail/gailwindow.c6
16 files changed, 65 insertions, 67 deletions
diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index e884a7722b..37ea219b00 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -975,7 +975,6 @@ GDK_SCREEN_XNUMBER
GDK_SCREEN_XSCREEN
GDK_CURSOR_XCURSOR
GDK_CURSOR_XDISPLAY
-GDK_WINDOW_XWINDOW
gdkx_visual_get
gdk_window_foreign_new
gdk_window_foreign_new_for_display
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 60380672c2..6169cc1d89 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -1035,6 +1035,6 @@ gdk_display_get_maximal_cursor_size (GdkDisplay *display,
screen = gdk_display_get_default_screen (display);
window = gdk_screen_get_root_window (screen);
XQueryBestCursor (GDK_DISPLAY_XDISPLAY (display),
- GDK_WINDOW_XWINDOW (window),
+ GDK_WINDOW_XID (window),
128, 128, width, height);
}
diff --git a/gdk/x11/gdkdevice-core.c b/gdk/x11/gdkdevice-core.c
index a674aac654..acb438641f 100644
--- a/gdk/x11/gdkdevice-core.c
+++ b/gdk/x11/gdkdevice-core.c
@@ -228,7 +228,7 @@ gdk_device_core_warp (GdkDevice *device,
Window dest;
xdisplay = GDK_DISPLAY_XDISPLAY (gdk_device_get_display (device));
- dest = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen));
+ dest = GDK_WINDOW_XID (gdk_screen_get_root_window (screen));
XWarpPointer (xdisplay, None, dest, 0, 0, 0, 0, x, y);
}
@@ -497,6 +497,6 @@ gdk_device_core_select_window_events (GdkDevice *device,
xmask |= StructureNotifyMask | PropertyChangeMask;
XSelectInput (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XWINDOW (window),
+ GDK_WINDOW_XID (window),
xmask);
}
diff --git a/gdk/x11/gdkdevice-xi.c b/gdk/x11/gdkdevice-xi.c
index 8bebf075d3..8ffd8dfa06 100644
--- a/gdk/x11/gdkdevice-xi.c
+++ b/gdk/x11/gdkdevice-xi.c
@@ -443,7 +443,7 @@ gdk_device_xi_grab (GdkDevice *device,
status = XGrabDevice (GDK_WINDOW_XDISPLAY (window),
device_xi->xdevice,
- GDK_WINDOW_XWINDOW (window),
+ GDK_WINDOW_XID (window),
owner_events,
num_classes, event_classes,
GrabModeAsync, GrabModeAsync,
@@ -492,7 +492,7 @@ gdk_device_xi_select_window_events (GdkDevice *device,
find_events (device, event_mask, event_classes, &num_classes);
XSelectExtensionEvent (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XWINDOW (window),
+ GDK_WINDOW_XID (window),
event_classes, num_classes);
if (event_mask)
diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index 41142e2097..7c91cd3f82 100644
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -258,13 +258,13 @@ gdk_device_xi2_set_window_cursor (GdkDevice *device,
XIDefineCursor (GDK_WINDOW_XDISPLAY (window),
priv->device_id,
- GDK_WINDOW_XWINDOW (window),
+ GDK_WINDOW_XID (window),
cursor_private->xcursor);
}
else
XIUndefineCursor (GDK_WINDOW_XDISPLAY (window),
priv->device_id,
- GDK_WINDOW_XWINDOW (window));
+ GDK_WINDOW_XID (window));
}
static void
@@ -277,7 +277,7 @@ gdk_device_xi2_warp (GdkDevice *device,
Window dest;
priv = GDK_DEVICE_XI2 (device)->priv;
- dest = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen));
+ dest = GDK_WINDOW_XID (gdk_screen_get_root_window (screen));
XIWarpPointer (GDK_SCREEN_XDISPLAY (screen),
priv->device_id,
@@ -512,7 +512,7 @@ gdk_device_xi2_select_window_events (GdkDevice *device,
evmask.mask = gdk_device_xi2_translate_event_mask (event_mask, &evmask.mask_len);
XISelectEvents (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XWINDOW (window),
+ GDK_WINDOW_XID (window),
&evmask, 1);
g_free (evmask.mask);
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index f97717d522..25d7a841a6 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -369,7 +369,7 @@ gdk_device_manager_xi2_constructed (GObject *object)
event_mask.mask = mask;
_gdk_device_manager_xi2_select_events (GDK_DEVICE_MANAGER (object),
- GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)),
+ GDK_WINDOW_XID (gdk_screen_get_root_window (screen)),
&event_mask);
}
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 8927d5ef81..0c94a6456b 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -547,7 +547,7 @@ gdk_window_cache_new (GdkScreen *screen)
result->child_hash = g_hash_table_new (g_direct_hash, NULL);
result->screen = screen;
- XGetWindowAttributes (xdisplay, GDK_WINDOW_XWINDOW (root_window), &xwa);
+ XGetWindowAttributes (xdisplay, GDK_WINDOW_XID (root_window), &xwa);
result->old_event_mask = xwa.your_event_mask;
if (G_UNLIKELY (!GDK_DISPLAY_X11 (GDK_SCREEN_X11 (screen)->display)->trusted_client))
@@ -568,13 +568,13 @@ gdk_window_cache_new (GdkScreen *screen)
return result;
}
- XSelectInput (xdisplay, GDK_WINDOW_XWINDOW (root_window),
+ XSelectInput (xdisplay, GDK_WINDOW_XID (root_window),
result->old_event_mask | SubstructureNotifyMask);
gdk_window_add_filter (root_window, gdk_window_cache_filter, result);
gdk_window_add_filter (NULL, gdk_window_cache_shape_filter, result);
if (!_gdk_x11_get_window_child_info (gdk_screen_get_display (screen),
- GDK_WINDOW_XWINDOW (root_window),
+ GDK_WINDOW_XID (root_window),
FALSE, NULL,
&children, &nchildren))
return result;
@@ -598,9 +598,9 @@ gdk_window_cache_new (GdkScreen *screen)
*/
if (gdk_screen_is_composited (screen))
{
- cow = XCompositeGetOverlayWindow (xdisplay, GDK_WINDOW_XWINDOW (root_window));
+ cow = XCompositeGetOverlayWindow (xdisplay, GDK_WINDOW_XID (root_window));
gdk_window_cache_add (result, cow, 0, 0, gdk_screen_get_width (screen), gdk_screen_get_height (screen), TRUE);
- XCompositeReleaseOverlayWindow (xdisplay, GDK_WINDOW_XWINDOW (root_window));
+ XCompositeReleaseOverlayWindow (xdisplay, GDK_WINDOW_XID (root_window));
}
#endif
@@ -613,7 +613,7 @@ gdk_window_cache_destroy (GdkWindowCache *cache)
GdkWindow *root_window = gdk_screen_get_root_window (cache->screen);
XSelectInput (GDK_WINDOW_XDISPLAY (root_window),
- GDK_WINDOW_XWINDOW (root_window),
+ GDK_WINDOW_XID (root_window),
cache->old_event_mask);
gdk_window_remove_filter (root_window, gdk_window_cache_filter, cache);
gdk_window_remove_filter (NULL, gdk_window_cache_shape_filter, cache);
@@ -774,7 +774,7 @@ get_client_window_at_coords (GdkWindowCache *cache,
if (retval)
return retval;
else
- return GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (cache->screen));
+ return GDK_WINDOW_XID (gdk_screen_get_root_window (cache->screen));
}
/*************************************************************
@@ -2397,7 +2397,7 @@ xdnd_send_xevent (GdkDragContext *context,
}
}
- xwindow = GDK_WINDOW_XWINDOW (window);
+ xwindow = GDK_WINDOW_XID (window);
if (_gdk_x11_display_is_root_window (display, xwindow))
event_mask = ButtonPressMask;
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index b55cd42e5f..00132b29e1 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -703,7 +703,7 @@ gdk_property_get (GdkWindow *window,
}
res = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
- GDK_WINDOW_XWINDOW (window), xproperty,
+ GDK_WINDOW_XID (window), xproperty,
offset, get_length, pdelete,
xtype, &ret_prop_type, &ret_format,
&ret_nitems, &ret_bytes_after,
@@ -892,7 +892,7 @@ gdk_property_delete (GdkWindow *window,
if (GDK_WINDOW_DESTROYED (window))
return;
- XDeleteProperty (GDK_WINDOW_XDISPLAY (window), GDK_WINDOW_XWINDOW (window),
+ XDeleteProperty (GDK_WINDOW_XDISPLAY (window), GDK_WINDOW_XID (window),
gdk_x11_atom_to_xatom_for_display (GDK_WINDOW_DISPLAY (window),
property));
}
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 2589fa6c54..e2cfcb8c02 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -878,7 +878,7 @@ _gdk_window_impl_new (GdkWindow *window,
gdk_window_set_type_hint (window, attributes->type_hint);
gdk_event_source_select_events ((GdkEventSource *) display_x11->event_source,
- GDK_WINDOW_XWINDOW (window), event_mask,
+ GDK_WINDOW_XID (window), event_mask,
StructureNotifyMask | PropertyChangeMask);
}
@@ -1826,7 +1826,7 @@ move_to_current_desktop (GdkWindow *window)
xclient.type = ClientMessage;
xclient.serial = 0;
xclient.send_event = True;
- xclient.window = GDK_WINDOW_XWINDOW (window);
+ xclient.window = GDK_WINDOW_XID (window);
xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_DESKTOP");
xclient.format = 32;
@@ -1877,7 +1877,7 @@ gdk_window_focus (GdkWindow *window,
memset (&xclient, 0, sizeof (xclient));
xclient.type = ClientMessage;
- xclient.window = GDK_WINDOW_XWINDOW (window);
+ xclient.window = GDK_WINDOW_XID (window);
xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display,
"_NET_ACTIVE_WINDOW");
xclient.format = 32;
@@ -3305,7 +3305,7 @@ _gdk_windowing_window_at_device_position (GdkDisplay *display,
toplevels = gdk_screen_get_toplevel_windows (screen);
for (list = toplevels; list != NULL; list = g_list_next (list)) {
window = GDK_WINDOW (list->data);
- xwindow = GDK_WINDOW_XWINDOW (window);
+ xwindow = GDK_WINDOW_XID (window);
gdk_error_trap_push ();
XQueryPointer (xdisplay, xwindow,
&root, &child, &rootx, &rooty, &winx, &winy, &xmask);
@@ -3407,7 +3407,7 @@ gdk_window_x11_set_events (GdkWindow *window,
display_x11 = GDK_DISPLAY_X11 (gdk_window_get_display (window));
gdk_event_source_select_events ((GdkEventSource *) display_x11->event_source,
- GDK_WINDOW_XWINDOW (window), event_mask,
+ GDK_WINDOW_XID (window), event_mask,
xevent_mask);
}
}
@@ -3986,7 +3986,7 @@ gdk_window_iconify (GdkWindow *window)
if (GDK_WINDOW_IS_MAPPED (window))
{
XIconifyWindow (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XWINDOW (window),
+ GDK_WINDOW_XID (window),
gdk_screen_get_number (GDK_WINDOW_SCREEN (window)));
}
else
@@ -4067,7 +4067,7 @@ gdk_window_stick (GdkWindow *window)
/* Request desktop 0xFFFFFFFF */
memset (&xclient, 0, sizeof (xclient));
xclient.type = ClientMessage;
- xclient.window = GDK_WINDOW_XWINDOW (window);
+ xclient.window = GDK_WINDOW_XID (window);
xclient.display = GDK_WINDOW_XDISPLAY (window);
xclient.message_type = gdk_x11_get_xatom_by_name_for_display (GDK_WINDOW_DISPLAY (window),
"_NET_WM_DESKTOP");
@@ -5541,7 +5541,7 @@ _gdk_windowing_window_set_composited (GdkWindow *window,
display = gdk_window_get_display (window);
dpy = GDK_DISPLAY_XDISPLAY (display);
- xid = GDK_WINDOW_XWINDOW (private);
+ xid = GDK_WINDOW_XID (private);
if (composited)
{
@@ -5642,7 +5642,7 @@ gdk_x11_get_server_time (GdkWindow *window)
g_return_val_if_fail (!GDK_WINDOW_DESTROYED (window), 0);
xdisplay = GDK_WINDOW_XDISPLAY (window);
- xwindow = GDK_WINDOW_XWINDOW (window);
+ xwindow = GDK_WINDOW_XID (window);
timestamp_prop_atom =
gdk_x11_get_xatom_by_name_for_display (GDK_WINDOW_DISPLAY (window),
"GDK_TIMESTAMP_PROP");
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 0a6178ee24..911f93bf97 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -118,7 +118,6 @@ gint gdk_x11_get_default_screen (void);
*/
#define GDK_WINDOW_XDISPLAY(win) (GDK_SCREEN_X11 (GDK_WINDOW_SCREEN (win))->xdisplay)
#define GDK_WINDOW_XID(win) (GDK_WINDOW_IMPL_X11(((GdkWindowObject *)win)->impl)->xid)
-#define GDK_WINDOW_XWINDOW(win) (GDK_WINDOW_IMPL_X11(((GdkWindowObject *)win)->impl)->xid)
#define GDK_SCREEN_XDISPLAY(screen) (GDK_SCREEN_X11 (screen)->xdisplay)
@@ -159,11 +158,11 @@ gint gdk_x11_get_default_screen (void);
#define GDK_WINDOW_XID(win) (gdk_x11_window_get_xid (win))
/**
- * GDK_WINDOW_XWINDOW:
+ * GDK_WINDOW_XID:
*
* Another name for GDK_DRAWABLE_XID().
*/
-#define GDK_WINDOW_XWINDOW(win) (gdk_x11_window_get_xid (win))
+#define GDK_WINDOW_XID(win) (gdk_x11_window_get_xid (win))
#define GDK_SCREEN_XDISPLAY(screen) (gdk_x11_display_get_xdisplay (gdk_screen_get_display (screen)))
#define GDK_SCREEN_XSCREEN(screen) (gdk_x11_screen_get_xscreen (screen))
diff --git a/gtk/gtkplug-x11.c b/gtk/gtkplug-x11.c
index ca3af73c27..df98e93e29 100644
--- a/gtk/gtkplug-x11.c
+++ b/gtk/gtkplug-x11.c
@@ -57,7 +57,7 @@ static void xembed_set_info (GdkWindow *window,
GdkNativeWindow
_gtk_plug_windowing_get_id (GtkPlug *plug)
{
- return GDK_WINDOW_XWINDOW (gtk_widget_get_window (GTK_WIDGET (plug)));
+ return GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (plug)));
}
void
@@ -146,7 +146,7 @@ xembed_set_info (GdkWindow *window,
buffer[1] = flags;
XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
- GDK_WINDOW_XWINDOW (window),
+ GDK_WINDOW_XID (window),
xembed_info_atom, xembed_info_atom, 32,
PropModeReplace,
(unsigned char *)buffer, 2);
@@ -280,7 +280,7 @@ _gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
* Probably need check in _gtk_plug_add_to_socket
*/
- if (xre->parent != GDK_WINDOW_XWINDOW (priv->socket_window))
+ if (xre->parent != GDK_WINDOW_XID (priv->socket_window))
{
GtkWidget *widget = GTK_WIDGET (plug);
@@ -297,7 +297,7 @@ _gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
* be invisible to the app.
*/
- if (xre->parent == GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)))
+ if (xre->parent == GDK_WINDOW_XID (gdk_screen_get_root_window (screen)))
{
GTK_NOTE (PLUGSOCKET, g_message ("GtkPlug: calling gtk_plug_send_delete_event()"));
_gtk_plug_send_delete_event (widget);
@@ -309,7 +309,7 @@ _gtk_plug_windowing_filter_func (GdkXEvent *gdk_xevent,
goto done;
}
- if (xre->parent != GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)))
+ if (xre->parent != GDK_WINDOW_XID (gdk_screen_get_root_window (screen)))
{
/* Start of embedding protocol */
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 70b3c055c8..4148f37b23 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -2567,7 +2567,7 @@ _gtk_selection_incr_event (GdkWindow *window,
#ifdef DEBUG_SELECTION
g_message ("INCR: put %d bytes (offset = %d) into window 0x%lx , property %ld",
num_bytes, info->conversions[i].offset,
- GDK_WINDOW_XWINDOW(info->requestor), event->atom);
+ GDK_WINDOW_XID(info->requestor), event->atom);
#endif
bytes_per_item = gtk_selection_bytes_per_item (info->conversions[i].data.format);
diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index b408fa6bcb..c5f2824f88 100644
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -57,7 +57,7 @@ static gboolean xembed_get_info (GdkWindow *gdk_window,
GdkNativeWindow
_gtk_socket_windowing_get_id (GtkSocket *socket)
{
- return GDK_WINDOW_XWINDOW (gtk_widget_get_window (GTK_WIDGET (socket)));
+ return GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (socket)));
}
void
@@ -69,7 +69,7 @@ _gtk_socket_windowing_realize_window (GtkSocket *socket)
window = gtk_widget_get_window (GTK_WIDGET (socket));
XGetWindowAttributes (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XWINDOW (window),
+ GDK_WINDOW_XID (window),
&xattrs);
/* Sooooo, it turns out that mozilla, as per the gtk2xt code selects
@@ -81,7 +81,7 @@ _gtk_socket_windowing_realize_window (GtkSocket *socket)
this for GtkSocket, so we unselect it here, fixing the crashes in
firefox. */
XSelectInput (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XWINDOW (window),
+ GDK_WINDOW_XID (window),
(xattrs.your_event_mask & ~ButtonPressMask) |
SubstructureNotifyMask | SubstructureRedirectMask);
}
@@ -90,7 +90,7 @@ void
_gtk_socket_windowing_end_embedding_toplevel (GtkSocket *socket)
{
gtk_window_remove_embedded_xid (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (socket))),
- GDK_WINDOW_XWINDOW (socket->plug_window));
+ GDK_WINDOW_XID (socket->plug_window));
}
void
@@ -105,7 +105,7 @@ _gtk_socket_windowing_size_request (GtkSocket *socket)
socket->request_height = 1;
if (XGetWMNormalHints (GDK_WINDOW_XDISPLAY (socket->plug_window),
- GDK_WINDOW_XWINDOW (socket->plug_window),
+ GDK_WINDOW_XID (socket->plug_window),
&hints, &supplied))
{
if (hints.flags & PMinSize)
@@ -134,8 +134,8 @@ _gtk_socket_windowing_send_key_event (GtkSocket *socket,
memset (&xkey, 0, sizeof (xkey));
xkey.type = (gdk_event->type == GDK_KEY_PRESS) ? KeyPress : KeyRelease;
- xkey.window = GDK_WINDOW_XWINDOW (socket->plug_window);
- xkey.root = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen));
+ xkey.window = GDK_WINDOW_XID (socket->plug_window);
+ xkey.root = GDK_WINDOW_XID (gdk_screen_get_root_window (screen));
xkey.subwindow = None;
xkey.time = gdk_event->key.time;
xkey.x = 0;
@@ -148,7 +148,7 @@ _gtk_socket_windowing_send_key_event (GtkSocket *socket,
gdk_error_trap_push ();
XSendEvent (GDK_WINDOW_XDISPLAY (socket->plug_window),
- GDK_WINDOW_XWINDOW (socket->plug_window),
+ GDK_WINDOW_XID (socket->plug_window),
False,
(mask_key_presses ? KeyPressMask : NoEventMask),
(XEvent *)&xkey);
@@ -220,8 +220,8 @@ _gtk_socket_windowing_send_configure_event (GtkSocket *socket)
memset (&xconfigure, 0, sizeof (xconfigure));
xconfigure.type = ConfigureNotify;
- xconfigure.event = GDK_WINDOW_XWINDOW (socket->plug_window);
- xconfigure.window = GDK_WINDOW_XWINDOW (socket->plug_window);
+ xconfigure.event = GDK_WINDOW_XID (socket->plug_window);
+ xconfigure.window = GDK_WINDOW_XID (socket->plug_window);
/* The ICCCM says that synthetic events should have root relative
* coordinates. We still aren't really ICCCM compliant, since
@@ -243,7 +243,7 @@ _gtk_socket_windowing_send_configure_event (GtkSocket *socket)
gdk_error_trap_push ();
XSendEvent (GDK_WINDOW_XDISPLAY (socket->plug_window),
- GDK_WINDOW_XWINDOW (socket->plug_window),
+ GDK_WINDOW_XID (socket->plug_window),
False, NoEventMask, (XEvent *)&xconfigure);
gdk_error_trap_pop_ignored ();
}
@@ -252,7 +252,7 @@ void
_gtk_socket_windowing_select_plug_window_input (GtkSocket *socket)
{
XSelectInput (GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (socket))),
- GDK_WINDOW_XWINDOW (socket->plug_window),
+ GDK_WINDOW_XID (socket->plug_window),
StructureNotifyMask | PropertyChangeMask);
}
@@ -283,13 +283,13 @@ _gtk_socket_windowing_embed_notify (GtkSocket *socket)
gdk_error_trap_push ();
XFixesChangeSaveSet (GDK_DISPLAY_XDISPLAY (display),
- GDK_WINDOW_XWINDOW (socket->plug_window),
+ GDK_WINDOW_XID (socket->plug_window),
SetModeInsert, SaveSetRoot, SaveSetUnmap);
gdk_error_trap_pop_ignored ();
#endif
_gtk_xembed_send_message (socket->plug_window,
XEMBED_EMBEDDED_NOTIFY, 0,
- GDK_WINDOW_XWINDOW (gtk_widget_get_window (GTK_WIDGET (socket))),
+ GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (socket))),
socket->xembed_version);
}
@@ -309,7 +309,7 @@ xembed_get_info (GdkWindow *window,
gdk_error_trap_push ();
status = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
- GDK_WINDOW_XWINDOW (window),
+ GDK_WINDOW_XID (window),
xembed_info_atom,
0, 2, False,
xembed_info_atom, &type, &format,
@@ -508,7 +508,7 @@ _gtk_socket_windowing_filter_func (GdkXEvent *gdk_xevent,
/* Note that we get destroy notifies both from SubstructureNotify on
* our window and StructureNotify on socket->plug_window
*/
- if (socket->plug_window && (xdwe->window == GDK_WINDOW_XWINDOW (socket->plug_window)))
+ if (socket->plug_window && (xdwe->window == GDK_WINDOW_XID (socket->plug_window)))
{
gboolean result;
@@ -554,7 +554,7 @@ _gtk_socket_windowing_filter_func (GdkXEvent *gdk_xevent,
break;
case PropertyNotify:
if (socket->plug_window &&
- xevent->xproperty.window == GDK_WINDOW_XWINDOW (socket->plug_window))
+ xevent->xproperty.window == GDK_WINDOW_XID (socket->plug_window))
{
GdkDragProtocol protocol;
@@ -615,7 +615,7 @@ _gtk_socket_windowing_filter_func (GdkXEvent *gdk_xevent,
GTK_NOTE (PLUGSOCKET, g_message ("GtkSocket - ReparentNotify received"));
if (!socket->plug_window &&
- xre->parent == GDK_WINDOW_XWINDOW (window))
+ xre->parent == GDK_WINDOW_XID (window))
{
_gtk_socket_add_window (socket, xre->window, FALSE);
@@ -629,8 +629,8 @@ _gtk_socket_windowing_filter_func (GdkXEvent *gdk_xevent,
else
{
if (socket->plug_window &&
- xre->window == GDK_WINDOW_XWINDOW (socket->plug_window) &&
- xre->parent != GDK_WINDOW_XWINDOW (window))
+ xre->window == GDK_WINDOW_XID (socket->plug_window) &&
+ xre->parent != GDK_WINDOW_XID (window))
{
gboolean result;
@@ -650,7 +650,7 @@ _gtk_socket_windowing_filter_func (GdkXEvent *gdk_xevent,
}
case UnmapNotify:
if (socket->plug_window &&
- xevent->xunmap.window == GDK_WINDOW_XWINDOW (socket->plug_window))
+ xevent->xunmap.window == GDK_WINDOW_XID (socket->plug_window))
{
GTK_NOTE (PLUGSOCKET, g_message ("GtkSocket - Unmap notify"));
diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c
index 0d9b3afd17..150b634823 100644
--- a/gtk/gtktrayicon-x11.c
+++ b/gtk/gtktrayicon-x11.c
@@ -879,9 +879,9 @@ gtk_tray_icon_realize (GtkWidget *widget)
GTK_NOTE (PLUGSOCKET,
g_print ("GtkStatusIcon %p: realized, window: %lx, socket window: %lx\n",
widget,
- (gulong) GDK_WINDOW_XWINDOW (window),
+ (gulong) GDK_WINDOW_XID (window),
gtk_plug_get_socket_window (GTK_PLUG (icon)) ?
- (gulong) GDK_WINDOW_XWINDOW (gtk_plug_get_socket_window (GTK_PLUG (icon))) : 0UL));
+ (gulong) GDK_WINDOW_XID (gtk_plug_get_socket_window (GTK_PLUG (icon))) : 0UL));
if (icon->priv->manager_window != None)
gtk_tray_icon_send_dock_request (icon);
diff --git a/gtk/gtkxembed.c b/gtk/gtkxembed.c
index 7353e30cd3..5c900fc479 100644
--- a/gtk/gtkxembed.c
+++ b/gtk/gtkxembed.c
@@ -153,7 +153,7 @@ _gtk_xembed_send_message (GdkWindow *recipient,
g_message ("Sending %s", _gtk_xembed_message_name (message)));
memset (&xclient, 0, sizeof (xclient));
- xclient.window = GDK_WINDOW_XWINDOW (recipient);
+ xclient.window = GDK_WINDOW_XID (recipient);
xclient.type = ClientMessage;
xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED");
xclient.format = 32;
@@ -165,7 +165,7 @@ _gtk_xembed_send_message (GdkWindow *recipient,
gdk_error_trap_push ();
XSendEvent (GDK_WINDOW_XDISPLAY(recipient),
- GDK_WINDOW_XWINDOW (recipient),
+ GDK_WINDOW_XID (recipient),
False, NoEventMask, (XEvent *)&xclient);
gdk_error_trap_pop_ignored ();
}
diff --git a/modules/other/gail/gailwindow.c b/modules/other/gail/gailwindow.c
index a99e43036d..75d9a1c1d5 100644
--- a/modules/other/gail/gailwindow.c
+++ b/modules/other/gail/gailwindow.c
@@ -723,7 +723,7 @@ get_stacked_windows (GailScreenInfo *info)
gdk_error_trap_push ();
ret_type = None;
result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- GDK_WINDOW_XWINDOW (info->root_window),
+ GDK_WINDOW_XID (info->root_window),
_net_client_list_stacking,
0, G_MAXLONG,
False, XA_WINDOW, &ret_type, &format, &nitems,
@@ -920,11 +920,11 @@ init_gail_screen (GdkScreen *screen,
get_stacked_windows (&gail_screens [screen_n]);
XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- GDK_WINDOW_XWINDOW (gail_screens [screen_n].root_window),
+ GDK_WINDOW_XID (gail_screens [screen_n].root_window),
&attrs);
XSelectInput (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- GDK_WINDOW_XWINDOW (gail_screens [screen_n].root_window),
+ GDK_WINDOW_XID (gail_screens [screen_n].root_window),
attrs.your_event_mask | PropertyChangeMask);
gail_screens [screen_n].screen_initialized = TRUE;
View Lorry Controller Status