[libgnomekbd: 2/6] Avoid use of GdkScreen

[Corentin Noël <corentinnoel src gnome org>]

commit 67bda1f9d1662d3951bdd5d52989652b0c9fc0b1
Author: Daniel Kahn Gillmor <dkg fifthhorseman net>
Date:   Fri Apr 8 12:14:15 2022 -0700

    Avoid use of GdkScreen
    
    The only places that were using GdkScreen were using it to get monitor
    width and height.
    
    All the gdk_screen_* calls that were being used are explicitly
    deprecated.  Use GdkDisplay instead.

 libgnomekbd/gkbd-keyboard-drawing.c | 17 ++---------------
 libgnomekbd/gkbd-keyboard-drawing.h |  1 -
 libgnomekbd/gkbd-util.c             |  6 +++---
 test/gkbd-keyboard-drawing-test.c   |  8 +++-----
 4 files changed, 8 insertions(+), 24 deletions(-)
---
diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
index f39d44e..132968b 100644
--- a/libgnomekbd/gkbd-keyboard-drawing.c
+++ b/libgnomekbd/gkbd-keyboard-drawing.c
@@ -2017,15 +2017,6 @@ gkbd_keyboard_drawing_init (GkbdKeyboardDrawing * drawing)
                g_critical
                    ("XkbQueryExtension failed! Stuff probably won't work.");
 
-       /* XXX: this stuff probably doesn't matter.. also, gdk_screen_get_default can fail */
-       if (gtk_widget_has_screen (GTK_WIDGET (drawing)))
-               drawing->screen_num =
-                   gdk_screen_get_number (gtk_widget_get_screen
-                                          (GTK_WIDGET (drawing)));
-       else
-               drawing->screen_num =
-                   gdk_screen_get_number (gdk_screen_get_default ());
-
        alloc_render_context (drawing);
 
        drawing->keyboard_items = NULL;
@@ -2124,13 +2115,9 @@ get_preferred_width (GtkWidget * widget,
                     gint * minimum_width, gint * natural_width)
 {
        GdkRectangle rect;
-       gint w, monitor;
-       GdkScreen *scr = NULL;
-
-       scr = gdk_screen_get_default ();
-       monitor = gdk_screen_get_primary_monitor (scr);
+       gint w;
 
-       gdk_screen_get_monitor_geometry (scr, monitor, &rect);
+       gdk_monitor_get_geometry (gdk_display_get_primary_monitor (gdk_display_get_default ()), &rect);
        w = rect.width;
        *minimum_width = *natural_width = w - (w >> 2);
 }
diff --git a/libgnomekbd/gkbd-keyboard-drawing.h b/libgnomekbd/gkbd-keyboard-drawing.h
index 118596b..056157d 100644
--- a/libgnomekbd/gkbd-keyboard-drawing.h
+++ b/libgnomekbd/gkbd-keyboard-drawing.h
@@ -145,7 +145,6 @@ struct _GkbdKeyboardDrawing {
        guint mods;
 
        Display *display;
-       gint screen_num;
 
        gint xkb_event_type;
 
diff --git a/libgnomekbd/gkbd-util.c b/libgnomekbd/gkbd-util.c
index e7fd10c..b814ddc 100644
--- a/libgnomekbd/gkbd-util.c
+++ b/libgnomekbd/gkbd-util.c
@@ -80,9 +80,9 @@ gkbd_preview_load_position (void)
                /* default values should be treated as 
                 * "0.75 of the screen size" */
                GdkRectangle rect;
-               GdkScreen *scr = gdk_screen_get_default ();
-               gint w, h, monitor = gdk_screen_get_primary_monitor (scr);
-               gdk_screen_get_monitor_geometry (scr, monitor, &rect);
+               gint w, h;
+               gdk_monitor_get_geometry (gdk_display_get_primary_monitor
+                                          (gdk_display_get_default ()), &rect);
                w = rect.width; h = rect.height;
                rv->x = w >> 3;
                rv->y = h >> 3;
diff --git a/test/gkbd-keyboard-drawing-test.c b/test/gkbd-keyboard-drawing-test.c
index 3a2f7f2..46f1c35 100644
--- a/test/gkbd-keyboard-drawing-test.c
+++ b/test/gkbd-keyboard-drawing-test.c
@@ -160,8 +160,6 @@ main (gint argc, gchar ** argv)
 {
        GtkWidget *window;
        GtkWidget *gkbd_keyboard_drawing;
-       GdkScreen *screen;
-       gint monitor;
        GdkRectangle rect;
        GOptionContext *context;
        GError *error = NULL;
@@ -203,9 +201,9 @@ main (gint argc, gchar ** argv)
        g_signal_connect (G_OBJECT (window), "destroy",
                          G_CALLBACK (gtk_main_quit), NULL);
 
-       screen = gtk_window_get_screen (GTK_WINDOW (window));
-       monitor = gdk_screen_get_monitor_at_point (screen, 0, 0);
-       gdk_screen_get_monitor_geometry (screen, monitor, &rect);
+       gdk_monitor_get_geometry (gdk_display_get_monitor_at_window
+                                  (gdk_window_get_display (GDK_WINDOW (window)),
+                                   (GDK_WINDOW (window))), &rect);
        gtk_window_set_default_size (GTK_WINDOW (window),
                                     rect.width * 4 / 5,
                                     rect.height * 1 / 2);