* [PATCH] ui/gtk: Fix gd_refresh_rate_millihz() when using VirtualConsole
@ 2020-02-08 14:30 Philippe Mathieu-Daudé
2020-02-08 15:20 ` Jan Kiszka
0 siblings, 1 reply; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-02-08 14:30 UTC (permalink / raw)
To: qemu-devel
Cc: Nikola Pavlica, Jan Kiszka, Gerd Hoffmann, Philippe Mathieu-Daudé
Fix using virtual console under gtk 3.22.30 (mate 1.20.1):
qemu-system-x86_64: Gdk: gdk_window_get_origin: assertion 'GDK_IS_WINDOW (window)' failed
Fixes: c4c00922cc and 28b58f19d2 (display/gtk: get proper refreshrate)
Reported-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Nikola Pavlica <pavlica.nikola@gmail.com>
Report:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg678130.html
---
ui/gtk.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index d18892d1de..c59297ff4d 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1965,11 +1965,11 @@ static GtkWidget *gd_create_menu_machine(GtkDisplayState *s)
* If available, return the refresh rate of the display in milli-Hertz,
* else return 0.
*/
-static int gd_refresh_rate_millihz(GtkDisplayState *s)
+static int gd_refresh_rate_millihz(GtkWidget *window)
{
#ifdef GDK_VERSION_3_22
- GdkDisplay *dpy = gtk_widget_get_display(s->window);
- GdkWindow *win = gtk_widget_get_window(s->window);
+ GdkDisplay *dpy = gtk_widget_get_display(window);
+ GdkWindow *win = gtk_widget_get_window(window);
GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
return gdk_monitor_get_refresh_rate(monitor);
@@ -2045,7 +2045,8 @@ 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(s);
+ 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;
}
--
2.21.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ui/gtk: Fix gd_refresh_rate_millihz() when using VirtualConsole
2020-02-08 14:30 [PATCH] ui/gtk: Fix gd_refresh_rate_millihz() when using VirtualConsole Philippe Mathieu-Daudé
@ 2020-02-08 15:20 ` Jan Kiszka
2020-02-08 15:22 ` Jan Kiszka
0 siblings, 1 reply; 3+ messages in thread
From: Jan Kiszka @ 2020-02-08 15:20 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: Gerd Hoffmann, Nikola Pavlica
On 08.02.20 15:30, Philippe Mathieu-Daudé wrote:
> Fix using virtual console under gtk 3.22.30 (mate 1.20.1):
>
> qemu-system-x86_64: Gdk: gdk_window_get_origin: assertion 'GDK_IS_WINDOW (window)' failed
>
> Fixes: c4c00922cc and 28b58f19d2 (display/gtk: get proper refreshrate)
> Reported-by: Jan Kiszka <jan.kiszka@web.de>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> Cc: Nikola Pavlica <pavlica.nikola@gmail.com>
> Report:
> https://www.mail-archive.com/qemu-devel@nongnu.org/msg678130.html
> ---
> ui/gtk.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/ui/gtk.c b/ui/gtk.c
> index d18892d1de..c59297ff4d 100644
> --- a/ui/gtk.c
> +++ b/ui/gtk.c
> @@ -1965,11 +1965,11 @@ static GtkWidget *gd_create_menu_machine(GtkDisplayState *s)
> * If available, return the refresh rate of the display in milli-Hertz,
> * else return 0.
> */
> -static int gd_refresh_rate_millihz(GtkDisplayState *s)
> +static int gd_refresh_rate_millihz(GtkWidget *window)
> {
> #ifdef GDK_VERSION_3_22
> - GdkDisplay *dpy = gtk_widget_get_display(s->window);
> - GdkWindow *win = gtk_widget_get_window(s->window);
> + GdkDisplay *dpy = gtk_widget_get_display(window);
> + GdkWindow *win = gtk_widget_get_window(window);
> GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
Nope, no change. It's triggered right from ui/gtk.c:1973, the line above.
>
> return gdk_monitor_get_refresh_rate(monitor);
> @@ -2045,7 +2045,8 @@ 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(s);
> + 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;
> }
>
Jan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ui/gtk: Fix gd_refresh_rate_millihz() when using VirtualConsole
2020-02-08 15:20 ` Jan Kiszka
@ 2020-02-08 15:22 ` Jan Kiszka
0 siblings, 0 replies; 3+ messages in thread
From: Jan Kiszka @ 2020-02-08 15:22 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: Gerd Hoffmann, Nikola Pavlica
On 08.02.20 16:20, Jan Kiszka wrote:
> On 08.02.20 15:30, Philippe Mathieu-Daudé wrote:
>> Fix using virtual console under gtk 3.22.30 (mate 1.20.1):
>>
>> qemu-system-x86_64: Gdk: gdk_window_get_origin: assertion
>> 'GDK_IS_WINDOW (window)' failed
>>
>> Fixes: c4c00922cc and 28b58f19d2 (display/gtk: get proper refreshrate)
>> Reported-by: Jan Kiszka <jan.kiszka@web.de>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>> Cc: Nikola Pavlica <pavlica.nikola@gmail.com>
>> Report:
>> https://www.mail-archive.com/qemu-devel@nongnu.org/msg678130.html
>> ---
>> ui/gtk.c | 9 +++++----
>> 1 file changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/ui/gtk.c b/ui/gtk.c
>> index d18892d1de..c59297ff4d 100644
>> --- a/ui/gtk.c
>> +++ b/ui/gtk.c
>> @@ -1965,11 +1965,11 @@ static GtkWidget
>> *gd_create_menu_machine(GtkDisplayState *s)
>> * If available, return the refresh rate of the display in milli-Hertz,
>> * else return 0.
>> */
>> -static int gd_refresh_rate_millihz(GtkDisplayState *s)
>> +static int gd_refresh_rate_millihz(GtkWidget *window)
>> {
>> #ifdef GDK_VERSION_3_22
>> - GdkDisplay *dpy = gtk_widget_get_display(s->window);
>> - GdkWindow *win = gtk_widget_get_window(s->window);
>> + GdkDisplay *dpy = gtk_widget_get_display(window);
>> + GdkWindow *win = gtk_widget_get_window(window);
>> GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win);
>
> Nope, no change. It's triggered right from ui/gtk.c:1973, the line above.
>
>> return gdk_monitor_get_refresh_rate(monitor);
>> @@ -2045,7 +2045,8 @@ 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(s);
>> + 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;
>> }
>>
>
> Jan
Here is the full backtrace, just in case:
#0 0x00007ffff496cf70 in gdk_window_get_origin () from /usr/lib64/libgdk-3.so.0
#1 0x00007ffff49582a0 in gdk_display_get_monitor_at_window () from /usr/lib64/libgdk-3.so.0
#2 0x0000555555bb73e2 in gd_refresh_rate_millihz (window=0x5555579d6280) at /data/qemu/ui/gtk.c:1973
#3 gd_vc_gfx_init (view_menu=0x5555579f0590, group=0x0, idx=0, con=<optimized out>, vc=0x5555579d4a90, s=0x5555579d49f0) at /data/qemu/ui/gtk.c:2048
#4 gd_create_menu_view (s=0x5555579d49f0) at /data/qemu/ui/gtk.c:2149
#5 gd_create_menus (s=0x5555579d49f0) at /data/qemu/ui/gtk.c:2188
#6 gtk_display_init (ds=<optimized out>, opts=0x55555661ed80 <dpy>) at /data/qemu/ui/gtk.c:2256
#7 0x000055555583d5a0 in main (argc=<optimized out>, argv=<optimized out>, envp=<optimized out>) at /data/qemu/vl.c:4358
Jan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-08 15:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-08 14:30 [PATCH] ui/gtk: Fix gd_refresh_rate_millihz() when using VirtualConsole Philippe Mathieu-Daudé
2020-02-08 15:20 ` Jan Kiszka
2020-02-08 15:22 ` Jan Kiszka
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.