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.
Reported-by: Nikola Pavlica <pavlica.nikola@gmail.com>
Tested-by: Nikola Pavlica <pavlica.nikola@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200817172331.598255-1-philmd@redhat.com
Suggested-by: Nikola Pavlica <pavlica.nikola@gmail.com>
Tested-by: Nikola Pavlica <pavlica.nikola@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
5b57a87e4e
commit
dc26435edb
52
ui/gtk.c
52
ui/gtk.c
|
@ -744,6 +744,25 @@ static void gd_resize_event(GtkGLArea *area,
|
||||||
|
|
||||||
#endif
|
#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)
|
static gboolean gd_draw_event(GtkWidget *widget, cairo_t *cr, void *opaque)
|
||||||
{
|
{
|
||||||
VirtualConsole *vc = opaque;
|
VirtualConsole *vc = opaque;
|
||||||
|
@ -751,6 +770,7 @@ static gboolean gd_draw_event(GtkWidget *widget, cairo_t *cr, void *opaque)
|
||||||
int mx, my;
|
int mx, my;
|
||||||
int ww, wh;
|
int ww, wh;
|
||||||
int fbw, fbh;
|
int fbw, fbh;
|
||||||
|
int refresh_rate_millihz;
|
||||||
|
|
||||||
#if defined(CONFIG_OPENGL)
|
#if defined(CONFIG_OPENGL)
|
||||||
if (vc->gfx.gls) {
|
if (vc->gfx.gls) {
|
||||||
|
@ -771,6 +791,12 @@ static gboolean gd_draw_event(GtkWidget *widget, cairo_t *cr, void *opaque)
|
||||||
return FALSE;
|
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);
|
fbw = surface_width(vc->gfx.ds);
|
||||||
fbh = surface_height(vc->gfx.ds);
|
fbh = surface_height(vc->gfx.ds);
|
||||||
|
|
||||||
|
@ -1949,31 +1975,11 @@ static GtkWidget *gd_create_menu_machine(GtkDisplayState *s)
|
||||||
return machine_menu;
|
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,
|
static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
|
||||||
QemuConsole *con, int idx,
|
QemuConsole *con, int idx,
|
||||||
GSList *group, GtkWidget *view_menu)
|
GSList *group, GtkWidget *view_menu)
|
||||||
{
|
{
|
||||||
bool zoom_to_fit = false;
|
bool zoom_to_fit = false;
|
||||||
int refresh_rate_millihz;
|
|
||||||
|
|
||||||
vc->label = qemu_console_get_label(con);
|
vc->label = qemu_console_get_label(con);
|
||||||
vc->s = s;
|
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.kbd = qkbd_state_init(con);
|
||||||
vc->gfx.dcl.con = 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);
|
register_displaychangelistener(&vc->gfx.dcl);
|
||||||
|
|
||||||
gd_connect_vc_gfx_signals(vc);
|
gd_connect_vc_gfx_signals(vc);
|
||||||
|
|
Loading…
Reference in New Issue