GNOME.org
 

[gtk+] x11: Stop using gdk_display_get_default_screen

commit e3daf986caff31c2a1a4e8780206b759518690c2
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Nov 1 18:06:24 2017 -0400

    x11: Stop using gdk_display_get_default_screen
    
    There's no point in using this api here, we can directly
    get the screen member from the GdkX11Display struct.

 gdk/x11/gdkapplaunchcontext-x11.c |    4 ++--
 gdk/x11/gdkdevice-core-x11.c      |   18 ++++++++++--------
 gdk/x11/gdkdevice-xi2.c           |    4 ++--
 gdk/x11/gdkdisplay-x11.c          |    2 +-
 gdk/x11/gdkdnd-x11.c              |    4 ++--
 gdk/x11/gdkglcontext-x11.c        |    2 +-
 gdk/x11/gdkmain-x11.c             |    6 ++++--
 gdk/x11/gdkmonitor-x11.c          |    4 +++-
 gdk/x11/gdkprivate-x11.h          |    4 ++--
 gdk/x11/gdkwindow-x11.c           |    2 +-
 10 files changed, 28 insertions(+), 22 deletions(-)
---
diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c
index 7abb0a1..a4e9800 100644
--- a/gdk/x11/gdkapplaunchcontext-x11.c
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
@@ -282,7 +282,7 @@ gdk_x11_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
   ctx = GDK_APP_LAUNCH_CONTEXT (context);
 
   display = ctx->display;
-  screen = gdk_display_get_default_screen (ctx->display);
+  screen = GDK_X11_DISPLAY (display)->screen;
 
   fileinfo = NULL;
 
@@ -399,7 +399,7 @@ gdk_x11_app_launch_context_launch_failed (GAppLaunchContext *context,
 
   ctx = GDK_APP_LAUNCH_CONTEXT (context);
 
-  screen = gdk_display_get_default_screen (ctx->display);
+  screen = GDK_X11_DISPLAY (ctx->display)->screen;
 
   data = g_object_get_data (G_OBJECT (screen), "appinfo-startup-data");
 
diff --git a/gdk/x11/gdkdevice-core-x11.c b/gdk/x11/gdkdevice-core-x11.c
index 8c9bf43..5737bf6 100644
--- a/gdk/x11/gdkdevice-core-x11.c
+++ b/gdk/x11/gdkdevice-core-x11.c
@@ -233,13 +233,15 @@ gdk_x11_device_core_warp (GdkDevice *device,
                           gdouble    x,
                           gdouble    y)
 {
+  GdkDisplay *display;
   Display *xdisplay;
   Window dest;
   GdkScreen *screen;
 
-  xdisplay = GDK_DISPLAY_XDISPLAY (gdk_device_get_display (device));
-  screen = gdk_display_get_default_screen (gdk_device_get_display (device));
-  dest = GDK_WINDOW_XID (gdk_display_get_root_window (gdk_device_get_display (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));
 
   XWarpPointer (xdisplay, None, dest, 0, 0, 0, 0,
                 round (x * GDK_X11_SCREEN (screen)->window_scale),
@@ -258,13 +260,13 @@ gdk_x11_device_core_query_state (GdkDevice        *device,
 {
   GdkWindowImplX11 *impl;
   GdkDisplay *display;
-  GdkScreen *default_screen;
+  GdkScreen *screen;
   Window xroot_window, xchild_window;
   int xroot_x, xroot_y, xwin_x, xwin_y;
   unsigned int xmask;
 
   display = gdk_device_get_display (device);
-  default_screen = gdk_display_get_default_screen (display);
+  screen = GDK_X11_DISPLAY (display)->screen;
   if (window == NULL)
     window = gdk_display_get_root_window (display);
   impl = GDK_WINDOW_IMPL_X11 (window->impl);
@@ -283,8 +285,8 @@ gdk_x11_device_core_query_state (GdkDevice        *device,
       Window xwindow, w;
 
       /* FIXME: untrusted clients not multidevice-safe */
-      xdisplay = GDK_SCREEN_XDISPLAY (default_screen);
-      xwindow = GDK_SCREEN_XROOTWIN (default_screen);
+      xdisplay = GDK_SCREEN_XDISPLAY (screen);
+      xwindow = GDK_SCREEN_XROOTWIN (screen);
 
       w = XCreateWindow (xdisplay, xwindow, 0, 0, 1, 1, 0,
                          CopyFromParent, InputOnly, CopyFromParent,
@@ -435,7 +437,7 @@ gdk_x11_device_core_window_at_position (GdkDevice       *device,
 
   last = None;
   display = gdk_device_get_display (device);
-  screen = gdk_display_get_default_screen (display);
+  screen = GDK_X11_DISPLAY (display)->screen;
 
   /* This function really only works if the mouse pointer is held still
    * during its operation. If it moves from one leaf window to another
diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index e8c3c79..74574e3 100644
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -337,7 +337,7 @@ gdk_x11_device_xi2_query_state (GdkDevice        *device,
   XIGroupState group_state;
 
   display = gdk_device_get_display (device);
-  default_screen = gdk_display_get_default_screen (display);
+  default_screen = GDK_X11_DISPLAY (display)->screen;
   if (window == NULL)
     window = gdk_display_get_root_window (display);
   impl = GDK_WINDOW_IMPL_X11 (window->impl);
@@ -505,7 +505,7 @@ gdk_x11_device_xi2_window_at_position (GdkDevice       *device,
   Bool retval;
 
   display = gdk_device_get_display (device);
-  screen = gdk_display_get_default_screen (display);
+  screen = GDK_X11_DISPLAY (display)->screen;
 
   gdk_x11_display_error_trap_push (display);
 
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 369f38f..c7a99ae 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -2150,7 +2150,7 @@ _gdk_x11_display_screen_for_xrootwin (GdkDisplay *display,
   GdkX11Display *display_x11;
   GList *l;
 
-  screen = gdk_display_get_default_screen (display);
+  screen = GDK_X11_DISPLAY (display)->screen;
 
   if (GDK_SCREEN_XROOTWIN (screen) == xrootwin)
     return screen;
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 92f0414..1bce293 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -562,7 +562,7 @@ static GdkWindowCache *
 gdk_window_cache_new (GdkDisplay *display)
 {
   XWindowAttributes xwa;
-  GdkScreen *screen = gdk_display_get_default_screen (display);
+  GdkScreen *screen = GDK_X11_DISPLAY (display)->screen;
   Display *xdisplay = GDK_SCREEN_XDISPLAY (screen);
   GdkWindow *root_window = gdk_display_get_root_window (display);
   GdkChildInfoX11 *children;
@@ -2111,7 +2111,7 @@ gdk_x11_drag_context_find_window (GdkDragContext  *context,
                                   gint             y_root,
                                   GdkDragProtocol *protocol)
 {
-  GdkX11Screen *screen_x11 = GDK_X11_SCREEN(gdk_display_get_default_screen (context->display));
+  GdkX11Screen *screen_x11 = GDK_X11_SCREEN(GDK_X11_DISPLAY (context->display)->screen);
   GdkX11DragContext *context_x11 = GDK_X11_DRAG_CONTEXT (context);
   GdkWindowCache *window_cache;
   GdkDisplay *display;
diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c
index 7dad708..9750016 100644
--- a/gdk/x11/gdkglcontext-x11.c
+++ b/gdk/x11/gdkglcontext-x11.c
@@ -1315,7 +1315,7 @@ gdk_x11_display_get_glx_version (GdkDisplay *display,
   if (!GDK_IS_X11_DISPLAY (display))
     return FALSE;
 
-  if (!gdk_x11_screen_init_gl (gdk_display_get_default_screen (display)))
+  if (!gdk_x11_screen_init_gl (GDK_X11_DISPLAY (display)->screen))
     return FALSE;
 
   if (major != NULL)
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index e8a4c49..c365940 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -427,7 +427,8 @@ gdk_x11_ungrab_server (void)
 gint
 gdk_x11_get_default_screen (void)
 {
-  return gdk_x11_screen_get_screen_number (gdk_screen_get_default ());
+  GdkDisplay *display = gdk_display_get_default ();
+  return gdk_x11_screen_get_screen_number (GDK_X11_DISPLAY (display)->screen);
 }
 
 /**
@@ -441,7 +442,8 @@ gdk_x11_get_default_screen (void)
 Window
 gdk_x11_get_default_root_xwindow (void)
 {
-  return GDK_SCREEN_XROOTWIN (gdk_screen_get_default ());
+  GdkDisplay *display = gdk_display_get_default ();
+  return GDK_SCREEN_XROOTWIN (GDK_X11_DISPLAY (display)->screen);
 }
 
 /**
diff --git a/gdk/x11/gdkmonitor-x11.c b/gdk/x11/gdkmonitor-x11.c
index 1cd37a5..6a32f9f 100644
--- a/gdk/x11/gdkmonitor-x11.c
+++ b/gdk/x11/gdkmonitor-x11.c
@@ -21,6 +21,8 @@
 #include <gio/gio.h>
 
 #include "gdkmonitor-x11.h"
+#include "gdkx11display.h"
+#include "gdkdisplay-x11.h"
 #include "gdkscreen-x11.h"
 #include "gdkdisplayprivate.h"
 
@@ -61,7 +63,7 @@ static void
 gdk_x11_monitor_get_workarea (GdkMonitor   *monitor,
                               GdkRectangle *dest)
 {
-  GdkScreen *screen = gdk_display_get_default_screen (monitor->display);
+  GdkScreen *screen = GDK_X11_DISPLAY (monitor->display)->screen;
   GdkRectangle workarea;
 
   gdk_monitor_get_geometry (monitor, dest);
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 0d7a571..d6550e7 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -295,8 +295,8 @@ 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_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_SCREEN(win)        (GDK_X11_DISPLAY (gdk_window_get_display (win))->screen)
+#define GDK_WINDOW_DISPLAY(win)       (gdk_window_get_display (win))
 #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))
 #define GDK_WINDOW_IS_X11(win)        (GDK_IS_WINDOW_IMPL_X11 ((win)->impl))
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index f0783e5..e292b7a 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -924,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 (gdk_display_get_default_screen (display));
+  x11_screen = GDK_X11_SCREEN (display_x11->screen);
 
   impl = g_object_new (GDK_TYPE_WINDOW_IMPL_X11, NULL);
   window->impl = GDK_WINDOW_IMPL (impl);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]