Skip to contentSkip to conversation

ui/gtk: Get display refresh rate with GDK version 3.22 or later

PATCH Superseded Philippe Mathieu-Daudé 4 participants 5 messages Jan 16, 2020 – Feb 8, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ui/gtk: Get display refresh rate with GDK version 3.22 or later

The GdkMonitor was introduced in GTK+ 3.22:
https://developer.gnome.org/gdk3/stable/api-index-3-22.html#api-index-3.22

If we build with older GTK+, the build fails:

CC ui/gtk.o
qemu/ui/gtk.c: In function ‘gd_vc_gfx_init’:
qemu/ui/gtk.c:1973:5: error: unknown type name ‘GdkMonitor’

       GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
       ^
  qemu/ui/gtk.c:1973:27: error: implicit declaration of function ‘gdk_display_get_monitor_at_window’ [-Werror=implicit-function-declaration]
       GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
                             ^
  qemu/ui/gtk.c:1973:5: error: nested extern declaration of ‘gdk_display_get_monitor_at_window’ [-Werror=nested-externs]
       GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
       ^
  qemu/ui/gtk.c:1973:27: error: initialization makes pointer from integer without a cast [-Werror=int-conversion]
       GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
                             ^
  qemu/ui/gtk.c:2035:28: error: implicit declaration of function ‘gdk_monitor_get_refresh_rate’ [-Werror=implicit-function-declaration]
       refresh_rate_millihz = gdk_monitor_get_refresh_rate(monitor);
                              ^
  qemu/ui/gtk.c:2035:5: error: nested extern declaration of ‘gdk_monitor_get_refresh_rate’ [-Werror=nested-externs]
       refresh_rate_millihz = gdk_monitor_get_refresh_rate(monitor);
       ^

cc1: all warnings being treated as errors qemu/rules.mak:69: recipe for target 'ui/gtk.o' failed
make: *** [ui/gtk.o] Error 1

We only use the GdkMonitor API to get the monitor refresh rate.

GTK+ provides convenient definition in <gdk/gdkversionmacros.h> (already include by <gdk/gdk.h>) to check which API are available.

Extract this code as a new gd_refresh_rate_millihz() function, and check GDK_VERSION_3_22 is defined before calling its API. If it is not defined, return 0. This is safe and fixes our build failure.

Fixes c4c00922cc (display/gtk: get proper refreshrate)

---
Sorry I missed that, I only tested Nikola's patch on my workstation which runs Fedora 30:

  $ pkg-config --modversion gtk+-3.0
  3.24.11

If Gerd acks this patch, we might consider having it directly applied as a build fix.

---
 ui/gtk.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)
ui/gtk.c +18 -5
index 7355d34fcf..d18892d1de 100644
@@ -1961,6 +1961,23 @@ static GtkWidget *gd_create_menu_machine(GtkDisplayState *s)
     return machine_menu;
 }
 
+/*
+ * If available, return the refresh rate of the display in milli-Hertz,
+ * else return 0.
+ */
+static int gd_refresh_rate_millihz(GtkDisplayState *s)
+{
+#ifdef GDK_VERSION_3_22
+    GdkDisplay *dpy = gtk_widget_get_display(s->window);
+    GdkWindow *win = gtk_widget_get_window(s->window);
+    GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
+
+    return gdk_monitor_get_refresh_rate(monitor);
+#else
+    return 0;
+#endif
+}
+
 static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
                               QemuConsole *con, int idx,
                               GSList *group, GtkWidget *view_menu)
@@ -1968,10 +1985,6 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
     bool zoom_to_fit = false;
     int refresh_rate_millihz;
 
-    GdkDisplay *dpy = gtk_widget_get_display(s->window);
-    GdkWindow *win = gtk_widget_get_window(s->window);
-    GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
-
     vc->label = qemu_console_get_label(con);
     vc->s = s;
     vc->gfx.scale_x = 1.0;
@@ -2032,7 +2045,7 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
     vc->gfx.kbd = qkbd_state_init(con);
     vc->gfx.dcl.con = con;
 
-    refresh_rate_millihz = gdk_monitor_get_refresh_rate(monitor);
+    refresh_rate_millihz = gd_refresh_rate_millihz(s);
     if (refresh_rate_millihz) {
         vc->gfx.dcl.update_interval = MILLISEC_PER_SEC / refresh_rate_millihz;
     }
Signature · 1 line
2.21.1
Reviewed-by on v1 1/1
#1 lore raw

Hi,

Quoted 2 lines
Fixes c4c00922cc (display/gtk: get proper refreshrate)
Quoted 6 lines

---
Sorry I missed that, I only tested Nikola's patch on my workstation which runs Fedora 30:

  $ pkg-config --modversion gtk+-3.0
  3.24.11

Even RHEL-7 has a gtk version new enough for that, so my build tests didn't catch it either ...

Quoted 2 lines

If Gerd acks this patch, we might consider having it directly applied as a build fix.

Fine with me.

cheers,
Gerd

#2 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 4 lines · Philippe Mathieu-Daudé

The GdkMonitor was introduced in GTK+ 3.22:
https://developer.gnome.org/gdk3/stable/api-index-3-22.html#api-index-3.22

If we build with older GTK+, the build fails:

Presumably the problem here is Ubuntu Xenial 16.04 which only has 3.18.9 ?

We should put in a sanity check for this against our min version

#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_14 #define GDK_VERSION_MAX_ALLOWED GDK_VERSION_3_14

into glib-compat.h

For that matter we can update our min version to 3.18 I believe since that looks like the oldest version any supported build platform has.

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#3 lore raw
Quoted 8 lines · Daniel P. Berrangé
Quoted 4 lines · Philippe Mathieu-Daudé

The GdkMonitor was introduced in GTK+ 3.22:
https://developer.gnome.org/gdk3/stable/api-index-3-22.html#api-index-3.22

If we build with older GTK+, the build fails:

Presumably the problem here is Ubuntu Xenial 16.04 which only has 3.18.9 ?

Indeed:

  $ lsb_release -a
  No LSB modules are available.
  Distributor ID: Ubuntu
  Description:    Ubuntu 16.04.5 LTS
  Release:        16.04
  Codename:       xenial
  $ pkg-config --modversion gtk+-3.0
  3.18.9
Quoted 14 lines

We should put in a sanity check for this against our min version

  #define  GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_14
  #define  GDK_VERSION_MAX_ALLOWED GDK_VERSION_3_14

into glib-compat.h

For that matter we can update our min version to 3.18 I believe since that looks like the oldest version any supported build platform has.

Regards,
Daniel

#4 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 95 lines · Philippe Mathieu-Daudé

The GdkMonitor was introduced in GTK+ 3.22:
https://developer.gnome.org/gdk3/stable/api-index-3-22.html#api-index-3.22

If we build with older GTK+, the build fails:

CC ui/gtk.o
qemu/ui/gtk.c: In function ‘gd_vc_gfx_init’:

   qemu/ui/gtk.c:1973:5: error: unknown type name ‘GdkMonitor’
        GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
        ^
   qemu/ui/gtk.c:1973:27: error: implicit declaration of function ‘gdk_display_get_monitor_at_window’ [-Werror=implicit-function-declaration]
        GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
                              ^
   qemu/ui/gtk.c:1973:5: error: nested extern declaration of ‘gdk_display_get_monitor_at_window’ [-Werror=nested-externs]
        GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
        ^
   qemu/ui/gtk.c:1973:27: error: initialization makes pointer from integer without a cast [-Werror=int-conversion]
        GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
                              ^
   qemu/ui/gtk.c:2035:28: error: implicit declaration of function ‘gdk_monitor_get_refresh_rate’ [-Werror=implicit-function-declaration]
        refresh_rate_millihz = gdk_monitor_get_refresh_rate(monitor);
                               ^
   qemu/ui/gtk.c:2035:5: error: nested extern declaration of ‘gdk_monitor_get_refresh_rate’ [-Werror=nested-externs]
        refresh_rate_millihz = gdk_monitor_get_refresh_rate(monitor);
        ^
   cc1: all warnings being treated as errors
   qemu/rules.mak:69: recipe for target 'ui/gtk.o' failed
   make: *** [ui/gtk.o] Error 1

We only use the GdkMonitor API to get the monitor refresh rate.

GTK+ provides convenient definition in <gdk/gdkversionmacros.h> (already include by <gdk/gdk.h>) to check which API are available.

Extract this code as a new gd_refresh_rate_millihz() function, and check GDK_VERSION_3_22 is defined before calling its API. If it is not defined, return 0. This is safe and fixes our build failure.

Fixes c4c00922cc (display/gtk: get proper refreshrate)

---
Sorry I missed that, I only tested Nikola's patch on my workstation which runs Fedora 30:

   $ pkg-config --modversion gtk+-3.0
   3.24.11

If Gerd acks this patch, we might consider having it directly applied as a build fix.

---
  ui/gtk.c | 23 ++++++++++++++++++-----
  1 file changed, 18 insertions(+), 5 deletions(-)
ui/gtk.c +17 -4
index 7355d34fcf..d18892d1de 100644
@@ -1961,6 +1961,23 @@ static GtkWidget *gd_create_menu_machine(GtkDisplayState *s)
      return machine_menu;
  }
 
+/*
+ * If available, return the refresh rate of the display in milli-Hertz,
+ * else return 0.
+ */
+static int gd_refresh_rate_millihz(GtkDisplayState *s)
+{
+#ifdef GDK_VERSION_3_22
+    GdkDisplay *dpy = gtk_widget_get_display(s->window);
+    GdkWindow *win = gtk_widget_get_window(s->window);
+    GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
+
+    return gdk_monitor_get_refresh_rate(monitor);
+#else
+    return 0;
+#endif
+}
+
  static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
                                QemuConsole *con, int idx,
                                GSList *group, GtkWidget *view_menu)
@@ -1968,10 +1985,6 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
      bool zoom_to_fit = false;
      int refresh_rate_millihz;
 
-    GdkDisplay *dpy = gtk_widget_get_display(s->window);
-    GdkWindow *win = gtk_widget_get_window(s->window);
-    GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
-
      vc->label = qemu_console_get_label(con);
      vc->s = s;
      vc->gfx.scale_x = 1.0;

ui/gtk.c static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc, · line 2051

Quoted 8 lines
ui/gtk.c +1 -1
@@ -2032,7 +2045,7 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
      vc->gfx.kbd = qkbd_state_init(con);
      vc->gfx.dcl.con = con;
 
-    refresh_rate_millihz = gdk_monitor_get_refresh_rate(monitor);
+    refresh_rate_millihz = gd_refresh_rate_millihz(s);
      if (refresh_rate_millihz) {
          vc->gfx.dcl.update_interval = MILLISEC_PER_SEC / refresh_rate_millihz;
      }

This (as well as c4c00922cc) gives

qemu-system-x86_64: Gdk: gdk_window_get_origin: assertion 'GDK_IS_WINDOW (window)' failed

on startup under gtk 3.22.30 (mate 1.20.1).

Jan