Re: [PATCH] ui/gtk: Fix gd_refresh_rate_millihz() when using VirtualConsole

[Jan Kiszka]

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 <address@hidden>
>> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
>> ---
>> Cc: Nikola Pavlica <address@hidden>
>> Report:
>> https://www.mail-archive.com/address@hidden/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