qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 31ab41: ui/gtk: Update gd_refresh_rate_millih

From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 31ab41: ui/gtk: Update gd_refresh_rate_millihz() to handle...
Date: Thu, 13 Feb 2020 05:45:14 -0800 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 31ab416d7dcb73a72efd59b9031f96a3944fbbe4
      
https://github.com/qemu/qemu/commit/31ab416d7dcb73a72efd59b9031f96a3944fbbe4
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-02-12 (Wed, 12 Feb 2020)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  ui/gtk: Update gd_refresh_rate_millihz() to handle VirtualConsole

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Jan Kiszka <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 7f4d96f960dcba6778d2c2dde2d653c9446115e4
      
https://github.com/qemu/qemu/commit/7f4d96f960dcba6778d2c2dde2d653c9446115e4
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-02-12 (Wed, 12 Feb 2020)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  ui/gtk: Fix gd_refresh_rate_millihz() when widget window is not realized

gtk_widget_get_window() returns NULL if the widget's window is not
realized, and QEMU crashes. Example under gtk 3.22.30 (mate 1.20.1):

  qemu-system-x86_64: Gdk: gdk_window_get_origin: assertion 'GDK_IS_WINDOW 
(window)' failed
  (gdb) bt
  #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 
ui/gtk.c:1973
  #3  gd_vc_gfx_init (view_menu=0x5555579f0590, group=0x0, idx=0, 
con=<optimized out>, vc=0x5555579d4a90, s=0x5555579d49f0) at ui/gtk.c:2048
  #4  gd_create_menu_view (s=0x5555579d49f0) at ui/gtk.c:2149
  #5  gd_create_menus (s=0x5555579d49f0) at ui/gtk.c:2188
  #6  gtk_display_init (ds=<optimized out>, opts=0x55555661ed80 <dpy>) at 
ui/gtk.c:2256
  #7  0x000055555583d5a0 in main (argc=<optimized out>, argv=<optimized out>, 
envp=<optimized out>) at vl.c:4358

Fixes: c4c00922cc and 28b58f19d2 (display/gtk: get proper refreshrate)
Reported-by: Jan Kiszka <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Jan Kiszka <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 7027bdd77f7f5b8ce9572281b64b69680f109acf
      
https://github.com/qemu/qemu/commit/7027bdd77f7f5b8ce9572281b64b69680f109acf
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-02-12 (Wed, 12 Feb 2020)

  Changed paths:
    M qapi/ui.json

  Log Message:
  -----------
  ui: add show-cursor option

When enabled, this forces showing the mouse cursor,
i.e. do not hide the pointer on mouse grabs.
Defaults to off.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Ján Tomko <address@hidden>


  Commit: 09aa82ee7aee476fd9fd51dd969d7a7cd13a2ef0
      
https://github.com/qemu/qemu/commit/09aa82ee7aee476fd9fd51dd969d7a7cd13a2ef0
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-02-12 (Wed, 12 Feb 2020)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  ui: wire up legacy -show-cursor option

Set new show-cursor display option when legacy -show-cursor
is specified on the command line.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Ján Tomko <address@hidden>


  Commit: 86a088e62454995c04a794d43661a549fd293f3b
      
https://github.com/qemu/qemu/commit/86a088e62454995c04a794d43661a549fd293f3b
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-02-12 (Wed, 12 Feb 2020)

  Changed paths:
    M ui/sdl2.c
    M vl.c

  Log Message:
  -----------
  ui/sdl: switch to new show-cursor option

Use DisplayOpts settings instead of cursor_hide global variable.
Also make "-display sdl,show-cursor=on" work.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Ján Tomko <address@hidden>


  Commit: 3487da6aeb127407f4f0bf5f683c90fe5c34d6c5
      
https://github.com/qemu/qemu/commit/3487da6aeb127407f4f0bf5f683c90fe5c34d6c5
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-02-12 (Wed, 12 Feb 2020)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  ui/cocoa: switch to new show-cursor option

Use DisplayOpts settings to set the new file-global cursor_hide
variable, stop using the qemu-global cursor_hide variable.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Ján Tomko <address@hidden>


  Commit: 9cfca0b937d2b947e6a821436180f7bcea208f66
      
https://github.com/qemu/qemu/commit/9cfca0b937d2b947e6a821436180f7bcea208f66
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-02-12 (Wed, 12 Feb 2020)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  ui/gtk: implement show-cursor option

When specified just set null_cursor to NULL so we get the default
pointer instead of a blank pointer.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Ján Tomko <address@hidden>


  Commit: 9b6701290af7abc789e621d2aff527c75ffd82f1
      
https://github.com/qemu/qemu/commit/9b6701290af7abc789e621d2aff527c75ffd82f1
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-02-12 (Wed, 12 Feb 2020)

  Changed paths:
    M include/sysemu/sysemu.h
    M vl.c

  Log Message:
  -----------
  ui: drop curor_hide global variable.

No users left.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Ján Tomko <address@hidden>


  Commit: 2811ce368e20321705ff782ebd2fd6c2063dd610
      
https://github.com/qemu/qemu/commit/2811ce368e20321705ff782ebd2fd6c2063dd610
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-02-12 (Wed, 12 Feb 2020)

  Changed paths:
    M qemu-deprecated.texi
    M vl.c

  Log Message:
  -----------
  ui: deprecate legacy -show-cursor option

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Ján Tomko <address@hidden>


  Commit: 483644c25b932360018d15818d8bcd8c85ba70b8
      
https://github.com/qemu/qemu/commit/483644c25b932360018d15818d8bcd8c85ba70b8
  Author: Peter Maydell <address@hidden>
  Date:   2020-02-12 (Wed, 12 Feb 2020)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  ui/cocoa: Drop workarounds for pre-10.12 OSX

Our official OSX support policy covers the last two released versions.
Currently that is 10.14 and 10.15.  We also may work on older versions, but
don't guarantee it.

In commit 50290c002c045280f8d in mid-2019 we introduced some uses of
CLOCK_MONOTONIC which incidentally broke compilation for pre-10.12 OSX
versions (see LP:1861551). We don't intend to fix that, so we might
as well drop the code in ui/cocoa.m which caters for pre-10.12
versions as well. (For reference, 10.11 fell out of Apple extended
security support in September 2018.)

Signed-off-by: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 7ce9ce89930ce260af839fb3e3e5f9101f5c69a0
      
https://github.com/qemu/qemu/commit/7ce9ce89930ce260af839fb3e3e5f9101f5c69a0
  Author: Peter Maydell <address@hidden>
  Date:   2020-02-13 (Thu, 13 Feb 2020)

  Changed paths:
    M include/sysemu/sysemu.h
    M qapi/ui.json
    M qemu-deprecated.texi
    M ui/cocoa.m
    M ui/gtk.c
    M ui/sdl2.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/ui-20200212-pull-request' 
into staging

gtk: refresh rate fix.
cocoa: drop pre-10.12 support.
ui: rework show-cursor option.

# gpg: Signature made Wed 12 Feb 2020 16:18:17 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20200212-pull-request:
  ui/cocoa: Drop workarounds for pre-10.12 OSX
  ui: deprecate legacy -show-cursor option
  ui: drop curor_hide global variable.
  ui/gtk: implement show-cursor option
  ui/cocoa: switch to new show-cursor option
  ui/sdl: switch to new show-cursor option
  ui: wire up legacy -show-cursor option
  ui: add show-cursor option
  ui/gtk: Fix gd_refresh_rate_millihz() when widget window is not realized
  ui/gtk: Update gd_refresh_rate_millihz() to handle VirtualConsole

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/e18e5501d8ac...7ce9ce89930c
reply via email to
[Prev in Thread] Current Thread [Next in Thread]