From: Matthias Clasen Date: Mon, 6 Nov 2017 02:25:42 +0000 (-0500) Subject: x11: Stop using gdk_display_get_root_window X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~23^2~827 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=063db3630b8ea1835331d1c9e3a97fcdae31d818;p=gtk4.git x11: Stop using gdk_display_get_root_window Use the backend api for this. --- diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c index 38f3dbf925..c0fc7fd343 100644 --- a/gdk/x11/gdkcursor-x11.c +++ b/gdk/x11/gdkcursor-x11.c @@ -78,7 +78,7 @@ get_blank_cursor (GdkDisplay *display) cairo_surface_t *surface; cairo_t *cr; - surface = _gdk_x11_window_create_bitmap_surface (gdk_display_get_root_window (display), 1, 1); + surface = _gdk_x11_window_create_bitmap_surface (gdk_x11_display_get_root_window (display), 1, 1); /* Clear surface */ cr = cairo_create (surface); cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR); @@ -309,7 +309,7 @@ _gdk_x11_display_get_maximal_cursor_size (GdkDisplay *display, g_return_if_fail (GDK_IS_DISPLAY (display)); - window = gdk_display_get_root_window (display); + window = gdk_x11_display_get_root_window (display); XQueryBestCursor (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window), 128, 128, width, height); diff --git a/gdk/x11/gdkdevice-core-x11.c b/gdk/x11/gdkdevice-core-x11.c index f165ff46cb..91515ddbe6 100644 --- a/gdk/x11/gdkdevice-core-x11.c +++ b/gdk/x11/gdkdevice-core-x11.c @@ -242,7 +242,7 @@ gdk_x11_device_core_warp (GdkDevice *device, display = gdk_device_get_display (device); xdisplay = GDK_DISPLAY_XDISPLAY (display); screen = GDK_X11_DISPLAY (display)->screen; - dest = GDK_WINDOW_XID (gdk_display_get_root_window (display)); + dest = GDK_WINDOW_XID (gdk_x11_display_get_root_window (display)); XWarpPointer (xdisplay, None, dest, 0, 0, 0, 0, round (x * GDK_X11_SCREEN (screen)->window_scale), @@ -269,7 +269,7 @@ gdk_x11_device_core_query_state (GdkDevice *device, display = gdk_device_get_display (device); screen = GDK_X11_DISPLAY (display)->screen; if (window == NULL) - window = gdk_display_get_root_window (display); + window = gdk_x11_display_get_root_window (display); impl = GDK_WINDOW_IMPL_X11 (window->impl); if (!GDK_X11_DISPLAY (display)->trusted_client || diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c index bbc62943bf..90dc1a0a0a 100644 --- a/gdk/x11/gdkdevice-xi2.c +++ b/gdk/x11/gdkdevice-xi2.c @@ -244,7 +244,7 @@ gdk_x11_device_xi2_get_state (GdkDevice *device, GdkWindow *root_window; gint root_x, root_y; - root_window = gdk_display_get_root_window (gdk_window_get_display (window)); + root_window = gdk_x11_display_get_root_window (gdk_window_get_display (window)); /* FIXME: Maybe root coords chaching should happen here */ gdk_window_get_origin (window, &root_x, &root_y); _gdk_device_translate_screen_coord (device, window, @@ -307,7 +307,7 @@ gdk_x11_device_xi2_warp (GdkDevice *device, GdkDisplay *display = gdk_device_get_display (device); GdkScreen *screen = GDK_X11_DISPLAY (display)->screen; - dest = GDK_WINDOW_XID (gdk_display_get_root_window (display)); + dest = GDK_WINDOW_XID (gdk_x11_display_get_root_window (display)); XIWarpPointer (GDK_SCREEN_XDISPLAY (screen), device_xi2->device_id, @@ -340,7 +340,7 @@ gdk_x11_device_xi2_query_state (GdkDevice *device, display = gdk_device_get_display (device); default_screen = GDK_X11_DISPLAY (display)->screen; if (window == NULL) - window = gdk_display_get_root_window (display); + window = gdk_x11_display_get_root_window (display); impl = GDK_WINDOW_IMPL_X11 (window->impl); if (gdk_device_get_device_type (device) == GDK_DEVICE_TYPE_SLAVE) diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c index f2660d1737..165c8d5152 100644 --- a/gdk/x11/gdkdevicemanager-xi2.c +++ b/gdk/x11/gdkdevicemanager-xi2.c @@ -744,7 +744,7 @@ gdk_x11_device_manager_xi2_constructed (GObject *object) event_mask.mask = mask; _gdk_x11_device_manager_xi2_select_events (GDK_DEVICE_MANAGER (object), - GDK_WINDOW_XID (gdk_display_get_root_window (display)), + GDK_WINDOW_XID (gdk_x11_display_get_root_window (display)), &event_mask); } diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index d3813cd3bb..6ecab62886 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -2250,7 +2250,7 @@ broadcast_xmessage (GdkDisplay *display, const char *message) { Display *xdisplay = GDK_DISPLAY_XDISPLAY (display); - GdkWindow *root_window = gdk_display_get_root_window (display); + GdkWindow *root_window = gdk_x11_display_get_root_window (display); Window xroot_window = GDK_WINDOW_XID (root_window); Atom type_atom; diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index c2895e1fb4..d64706b796 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -564,7 +564,7 @@ gdk_window_cache_new (GdkDisplay *display) XWindowAttributes xwa; GdkScreen *screen = GDK_X11_DISPLAY (display)->screen; Display *xdisplay = GDK_SCREEN_XDISPLAY (screen); - GdkWindow *root_window = gdk_display_get_root_window (display); + GdkWindow *root_window = gdk_x11_display_get_root_window (display); GdkChildInfoX11 *children; guint nchildren, i; #ifdef HAVE_XCOMPOSITE @@ -649,7 +649,7 @@ gdk_window_cache_new (GdkDisplay *display) static void gdk_window_cache_destroy (GdkWindowCache *cache) { - GdkWindow *root_window = gdk_display_get_root_window (cache->display); + GdkWindow *root_window = gdk_x11_display_get_root_window (cache->display); XSelectInput (GDK_WINDOW_XDISPLAY (root_window), GDK_WINDOW_XID (root_window), @@ -858,7 +858,7 @@ get_client_window_at_coords (GdkWindowCache *cache, if (retval) return retval; else - return GDK_WINDOW_XID (gdk_display_get_root_window (cache->display)); + return GDK_WINDOW_XID (gdk_x11_display_get_root_window (cache->display)); } #ifdef G_ENABLE_DEBUG @@ -2678,7 +2678,7 @@ drag_context_grab (GdkDragContext *context) if (!x11_context->ipc_window) return FALSE; - root = gdk_display_get_root_window (GDK_WINDOW_DISPLAY (x11_context->ipc_window)); + root = gdk_x11_display_get_root_window (GDK_WINDOW_DISPLAY (x11_context->ipc_window)); seat = gdk_device_get_seat (gdk_drag_context_get_device (context)); #ifdef XINPUT_2 @@ -2767,7 +2767,7 @@ drag_context_ungrab (GdkDragContext *context) gdk_seat_ungrab (x11_context->grab_seat); keyboard = gdk_seat_get_keyboard (x11_context->grab_seat); - root = gdk_display_get_root_window (GDK_WINDOW_DISPLAY (x11_context->ipc_window)); + root = gdk_x11_display_get_root_window (GDK_WINDOW_DISPLAY (x11_context->ipc_window)); g_clear_object (&x11_context->grab_seat); for (i = 0; i < G_N_ELEMENTS (grab_keys); ++i) @@ -3030,7 +3030,7 @@ gdk_dnd_handle_key_event (GdkDragContext *context, * to query it here. We could use XGetModifierMapping, but * that would be overkill. */ - root_window = gdk_display_get_root_window (GDK_WINDOW_DISPLAY (x11_context->ipc_window)); + root_window = gdk_x11_display_get_root_window (GDK_WINDOW_DISPLAY (x11_context->ipc_window)); gdk_window_get_device_position (root_window, pointer, NULL, NULL, &state); if (dx != 0 || dy != 0) diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c index 47cdfb21b9..e4bd58fe0b 100644 --- a/gdk/x11/gdkproperty-x11.c +++ b/gdk/x11/gdkproperty-x11.c @@ -379,7 +379,7 @@ _gdk_x11_window_get_property (GdkWindow *window, g_return_val_if_fail (!window || GDK_WINDOW_IS_X11 (window), FALSE); if (!window) - window = gdk_display_get_root_window (gdk_display_get_default ()); + window = gdk_x11_display_get_root_window (gdk_display_get_default ()); else if (!GDK_WINDOW_IS_X11 (window)) return FALSE; @@ -510,7 +510,7 @@ _gdk_x11_window_change_property (GdkWindow *window, g_return_if_fail (!window || GDK_WINDOW_IS_X11 (window)); if (!window) - window = gdk_display_get_root_window (gdk_display_get_default ()); + window = gdk_x11_display_get_root_window (gdk_display_get_default ()); else if (!GDK_WINDOW_IS_X11 (window)) return; @@ -560,7 +560,7 @@ _gdk_x11_window_delete_property (GdkWindow *window, g_return_if_fail (!window || GDK_WINDOW_IS_X11 (window)); if (!window) - window = gdk_display_get_root_window (gdk_display_get_default ()); + window = gdk_x11_display_get_root_window (gdk_display_get_default ()); else if (!GDK_WINDOW_IS_X11 (window)) return; diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index 3bf4a44567..814ebc203c 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -215,7 +215,7 @@ gdk_x11_screen_get_work_area (GdkScreen *screen, Display *display; display = GDK_SCREEN_XDISPLAY (screen); - root_window = gdk_display_get_root_window (GDK_SCREEN_DISPLAY (screen)); + root_window = gdk_x11_display_get_root_window (GDK_SCREEN_DISPLAY (screen)); workarea = XInternAtom (display, "_NET_WORKAREA", True); /* Defaults in case of error */ @@ -910,7 +910,7 @@ _gdk_x11_screen_get_edge_monitors (GdkScreen *screen, { #ifdef HAVE_XFREE_XINERAMA GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen); - GdkWindow *root_window = gdk_display_get_root_window (GDK_SCREEN_DISPLAY (screen)); + GdkWindow *root_window = gdk_x11_display_get_root_window (GDK_SCREEN_DISPLAY (screen)); gint top_most_pos = gdk_window_get_height (root_window); gint left_most_pos = gdk_window_get_width (root_window); gint bottom_most_pos = 0; diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index c02e1dc5ad..d4be4efd4f 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -1149,9 +1149,7 @@ gdk_x11_window_foreign_new_for_display (GdkDisplay *display, impl->window_scale = GDK_X11_SCREEN (screen)->window_scale; /* Always treat foreigns as toplevels */ - win->parent = gdk_display_get_root_window (display); - - win->parent->children = g_list_concat (&win->children_list_node, win->parent->children); + win->parent = NULL; impl->xid = window; @@ -1701,8 +1699,8 @@ _gdk_x11_window_set_window_scale (GdkWindow *window, if (window->window_type == GDK_WINDOW_FOREIGN) XMoveWindow (GDK_WINDOW_XDISPLAY (window), GDK_WINDOW_XID (window), - (window->x + window->parent->abs_x) * impl->window_scale, - (window->y + window->parent->abs_y) * impl->window_scale); + window->x * impl->window_scale, + window->y * impl->window_scale); else { if (impl->override_redirect)