ui/gtk: Update refresh interval after widget is realized
PATCH 1/1 ui/gtk: Update refresh interval after widget is realized
Nikola reported on Windows when gd_vc_gfx_init() is called, the window is not yet realized, so we run gd_refresh_rate_millihz(NULL) which returns 0 milli-Hertz.
When a Widget is realized, it fires a 'realized' event. We already have the gd_draw_event() handler registered for this even, so simply move the gd_refresh_rate_millihz() there. When the event fires, the window is known to exist.
This completes commit c4c00922cc original intention.
--- ui/gtk.c | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-)
ui/gtk.c +26 -26
@@ -744,6 +744,25 @@ static void gd_resize_event(GtkGLArea *area,#endif +/* +* If available, return the refresh rate of the display in milli-Hertz, +* else return 0. +*/ +static int gd_refresh_rate_millihz (GtkWidget *window) +{ +#ifdef GDK_VERSION_3_22 +GdkWindow *win =gtk_widget_get_window (window); + +if (win) { +GdkDisplay *dpy =gtk_widget_get_display (window); +GdkMonitor *monitor =gdk_display_get_monitor_at_window (dpy, win); + +return gdk_monitor_get_refresh_rate (monitor); + } +#endif +return 0 ; +} +static gboolean gd_draw_event (GtkWidget *widget,cairo_t *cr,void *opaque) {VirtualConsole *vc = opaque;
@@ -751,6 +770,7 @@ static gboolean gd_draw_event(GtkWidget *widget, cairo_t *cr, void *opaque)int mx, my;int ww, wh;int fbw, fbh; +int refresh_rate_millihz;#if defined(CONFIG_OPENGL )if (vc->gfx.gls) {
@@ -771,6 +791,12 @@ static gboolean gd_draw_event(GtkWidget *widget, cairo_t *cr, void *opaque)return FALSE; } + refresh_rate_millihz =gd_refresh_rate_millihz (vc->window ? + vc->window : s->window); +if (refresh_rate_millihz) { + vc->gfx.dcl.update_interval =MILLISEC_PER_SEC / refresh_rate_millihz; + } + fbw =surface_width (vc->gfx.ds); fbh =surface_height (vc->gfx.ds);
@@ -1949,31 +1975,11 @@ 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 (GtkWidget *window) -{ -#ifdef GDK_VERSION_3_22 -GdkWindow *win =gtk_widget_get_window (window); - -if (win) { -GdkDisplay *dpy =gtk_widget_get_display (window); -GdkMonitor *monitor =gdk_display_get_monitor_at_window (dpy, win); - -return gdk_monitor_get_refresh_rate (monitor); - } -#endif -return 0 ; -} -static GSList *gd_vc_gfx_init (GtkDisplayState *s,VirtualConsole *vc,QemuConsole *con,int idx,GSList *group,GtkWidget *view_menu) {bool zoom_to_fit = false; -int refresh_rate_millihz; vc->label =qemu_console_get_label (con); vc->s = s;
@@ -2031,12 +2037,6 @@ 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 =gd_refresh_rate_millihz (vc->window ? - vc->window : s->window); -if (refresh_rate_millihz) { - vc->gfx.dcl.update_interval =MILLISEC_PER_SEC / refresh_rate_millihz; - } -register_displaychangelistener (&vc->gfx.dcl);gd_connect_vc_gfx_signals (vc);
Signature · 1 line
2.26.2
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
TEST check-unit: tests/test-char
Unexpected error in object_property_try_add() at /tmp/qemu-test/src/qom/object.c:1181:
attempt to add duplicate property 'serial-id' to object (type 'container')
ERROR test-char - too few tests run (expected 38, got 9)
make: *** [check-unit] Error 1
make: *** Waiting for unfinished jobs....
TEST iotest-qcow2: 029
TEST check-qtest-x86_64: tests/qtest/hd-geo-test
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=37e16bb5eb52443f9e55d52ba52a5e56', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-pye3f5bs/src/docker-src.2020-08-17-14.10.26.31148:/var/tmp/qemu:z,ro', 'qemu/centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=37e16bb5eb52443f9e55d52ba52a5e56
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-pye3f5bs/src'
make: *** [docker-run-test-quick@centos7] Error 2
real 13m34.512s
user 0m8.394s
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Quoted 16 lines · On 8/17/20 8:24 PM, [email protected] wrote:
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
Quoted 3 lines
TEST check-unit: tests/test-char
Unexpected error inobject_property_try_add()at/tmp/qemu-test/src/qom/object.c:1181:
attempt to add duplicate property 'serial-id' to object (type 'container')
Unrelated bug Marc-André is tracking.
Quoted 23 lines
ERROR test-char - too few tests run (expected 38, got 9)
make: *** [check-unit] Error 1
make: *** Waiting for unfinished jobs....
TEST iotest-qcow2: 029
TEST check-qtest-x86_64: tests/qtest/hd-geo-test
---
raiseCalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=37e16bb5eb52443f9e55d52ba52a5e56', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-pye3f5bs/src/docker-src.2020-08-17-14.10.26.31148:/var/tmp/qemu:z,ro', 'qemu/centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=37e16bb5eb52443f9e55d52ba52a5e56
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-pye3f5bs/src'
make: *** [docker-run-test-quick@centos7] Error 2real 13m34.512s
user 0m8.394sThe full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Quoted 8 lines · Philippe Mathieu-Daudé
Nikola reported on Windows when
gd_vc_gfx_init()is called, the window is not yet realized, so we rungd_refresh_rate_millihz(NULL)which returns 0 milli-Hertz.
When a Widget is realized, it fires a 'realized' event. We already have thegd_draw_event()handler registered for this even, so simply move thegd_refresh_rate_millihz()there. When the event fires, the window is known to exist.
This completes commitc4c00922ccoriginal intention.
Added to UI queue.
thanks,
Gerd