summaryrefslogtreecommitdiff
path: root/gdk/x11
diff options
context:
space:
mode:
Diffstat (limited to 'gdk/x11')
-rw-r--r--gdk/x11/gdkdevice-xi2.c2
-rw-r--r--gdk/x11/gdkdevicemanager-core-x11.c2
-rw-r--r--gdk/x11/gdkdnd-x11.c6
-rw-r--r--gdk/x11/gdkeventsource.c2
-rw-r--r--gdk/x11/gdkglcontext-x11.c2
-rw-r--r--gdk/x11/gdkprivate-x11.h3
-rw-r--r--gdk/x11/gdkwindow-x11.c7
7 files changed, 11 insertions, 13 deletions
diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index 82eed04664..63f52d8c4e 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_screen_get_root_window (gdk_window_get_screen (window));
+ root_window = gdk_screen_get_root_window (gdk_display_get_default_screen (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,
diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c
index 11ab5c2790..d487bb7cbf 100644
--- a/gdk/x11/gdkdevicemanager-core-x11.c
+++ b/gdk/x11/gdkdevicemanager-core-x11.c
@@ -808,7 +808,7 @@ _gdk_device_manager_core_handle_focus (GdkWindow *window,
return;
had_focus = HAS_FOCUS (toplevel);
- x11_screen = GDK_X11_SCREEN (gdk_window_get_screen (window));
+ x11_screen = GDK_X11_SCREEN (GDK_WINDOW_SCREEN (window));
switch (detail)
{
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 1236beb00d..28a86f8541 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -2678,7 +2678,7 @@ drag_context_grab (GdkDragContext *context)
if (!x11_context->ipc_window)
return FALSE;
- root = gdk_screen_get_root_window (gdk_window_get_screen (x11_context->ipc_window));
+ root = gdk_screen_get_root_window (GDK_WINDOW_SCREEN (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_screen_get_root_window (gdk_window_get_screen (x11_context->ipc_window));
+ root = gdk_screen_get_root_window (GDK_WINDOW_SCREEN (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_screen_get_root_window (gdk_window_get_screen (x11_context->ipc_window));
+ root_window = gdk_screen_get_root_window (GDK_WINDOW_SCREEN (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/gdkeventsource.c b/gdk/x11/gdkeventsource.c
index ae465db7bb..a088cb0664 100644
--- a/gdk/x11/gdkeventsource.c
+++ b/gdk/x11/gdkeventsource.c
@@ -136,7 +136,7 @@ handle_focus_change (GdkEventCrossing *event)
gboolean focus_in, had_focus;
toplevel = _gdk_x11_window_get_toplevel (event->window);
- x11_screen = GDK_X11_SCREEN (gdk_window_get_screen (event->window));
+ x11_screen = GDK_X11_SCREEN (GDK_WINDOW_SCREEN (event->window));
focus_in = (event->type == GDK_ENTER_NOTIFY);
if (x11_screen->wmspec_check_window)
diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 5a28f58ac5..76ea3fcc71 100644
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -1209,7 +1209,7 @@ gdk_x11_window_create_gl_context (GdkWindow *window,
display = gdk_window_get_display (window);
- if (!gdk_x11_screen_init_gl (gdk_window_get_screen (window)))
+ if (!gdk_x11_screen_init_gl (GDK_WINDOW_SCREEN (window)))
{
g_set_error_literal (error, GDK_GL_ERROR,
GDK_GL_ERROR_NOT_AVAILABLE,
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 30a388f0b2..59b5e36b82 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -250,7 +250,6 @@ void _gdk_x11_display_get_maximal_cursor_size (GdkDisplay *display,
void _gdk_x11_display_create_window_impl (GdkDisplay *display,
GdkWindow *window,
GdkWindow *real_parent,
- GdkScreen *screen,
GdkEventMask event_mask,
GdkWindowAttr *attributes);
@@ -297,7 +296,7 @@ extern const gint _gdk_x11_event_mask_table_size;
#define GDK_SCREEN_DISPLAY(screen) (GDK_X11_SCREEN (screen)->display)
#define GDK_SCREEN_XROOTWIN(screen) (GDK_X11_SCREEN (screen)->xroot_window)
-#define GDK_WINDOW_SCREEN(win) (gdk_window_get_screen (win))
+#define GDK_WINDOW_SCREEN(win) (gdk_display_get_default_screen (gdk_window_get_display (win)))
#define GDK_WINDOW_DISPLAY(win) (GDK_X11_SCREEN (GDK_WINDOW_SCREEN (win))->display)
#define GDK_WINDOW_XROOTWIN(win) (GDK_X11_SCREEN (GDK_WINDOW_SCREEN (win))->xroot_window)
#define GDK_GC_DISPLAY(gc) (GDK_SCREEN_DISPLAY (GDK_GC_X11(gc)->screen))
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index ad27a450f3..c5651980b6 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -437,7 +437,7 @@ gdk_x11_window_end_frame (GdkWindow *window)
impl->toplevel->current_counter_value);
if (impl->frame_sync_enabled &&
- gdk_x11_screen_supports_net_wm_hint (gdk_window_get_screen (window),
+ gdk_x11_screen_supports_net_wm_hint (GDK_WINDOW_SCREEN (window),
gdk_atom_intern_static_string ("_NET_WM_FRAME_DRAWN")))
{
impl->toplevel->frame_pending = TRUE;
@@ -904,7 +904,6 @@ void
_gdk_x11_display_create_window_impl (GdkDisplay *display,
GdkWindow *window,
GdkWindow *real_parent,
- GdkScreen *screen,
GdkEventMask event_mask,
GdkWindowAttr *attributes)
{
@@ -925,7 +924,7 @@ _gdk_x11_display_create_window_impl (GdkDisplay *display,
display_x11 = GDK_X11_DISPLAY (display);
xparent = GDK_WINDOW_XID (real_parent);
- x11_screen = GDK_X11_SCREEN (screen);
+ x11_screen = GDK_X11_SCREEN (gdk_display_get_default_screen (display));
impl = g_object_new (GDK_TYPE_WINDOW_IMPL_X11, NULL);
window->impl = GDK_WINDOW_IMPL (impl);
@@ -948,7 +947,7 @@ _gdk_x11_display_create_window_impl (GdkDisplay *display,
if (GDK_WINDOW_TYPE (window->parent) != GDK_WINDOW_ROOT)
{
/* The common code warns for this case */
- xparent = GDK_SCREEN_XROOTWIN (screen);
+ xparent = GDK_SCREEN_XROOTWIN (x11_screen);
}
break;
View Lorry Controller Status