[PULL 0/5] Ui patches

[PULL 0/5] Ui patches

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

The following changes since commit 8aba939e77daca10eac99d9d467f65ba7df5ab3e:

  Merge tag 'pull-riscv-to-apply-20231107' of https://github.com/alistair23/qemu into staging (2023-11-07 11:08:16 +0800)

are available in the Git repository at:

  https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request

for you to fetch changes up to fb93569e422d4f4b5953dd953c92ba7838309972:

  ui: Replacing pointer in function (2023-11-07 11:45:48 +0400)

----------------------------------------------------------------
UI patch queue

----------------------------------------------------------------

Antonio Caggiano (1):
  ui/gtk-egl: Check EGLSurface before doing scanout

Carwyn Ellis (1):
  ui/cocoa: add zoom-to-fit display option

Dongwon Kim (1):
  ui/gtk-egl: apply scale factor when calculating window's dimension

Marc-André Lureau (1):
  ui/gtk: force realization of drawing area

Sergey Mironov (1):
  ui: Replacing pointer in function

 qapi/ui.json |  7 ++++++-
 ui/gtk-egl.c | 31 ++++++++++++++++++++-----------
 ui/gtk.c     | 12 +++++++++++-
 ui/cocoa.m   | 32 ++++++++++++++++++--------------
 4 files changed, 55 insertions(+), 27 deletions(-)

-- 
2.41.0

Re: [PULL 0/5] Ui patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 115 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PULL 0/5] Ui patches

[Michael Tokarev]

07.11.2023 12:30, marcandre.lureau@redhat.com:
...
> Antonio Caggiano (1):
>    ui/gtk-egl: Check EGLSurface before doing scanout
> 
> Carwyn Ellis (1):
>    ui/cocoa: add zoom-to-fit display option
> 
> Dongwon Kim (1):
>    ui/gtk-egl: apply scale factor when calculating window's dimension
> 
> Marc-André Lureau (1):
>    ui/gtk: force realization of drawing area
> 
> Sergey Mironov (1):
>    ui: Replacing pointer in function

Which changes are worth picking up for qemu-stable?

I'm definitely picking up "ui/gtk: force realization of drawing area"
which fixes a real bug.  "ui/gtk-egl: Check EGLSurface before doing scanout"
and "ui/gtk-egl: apply scale factor when calculating window's dimension"
smells like valid candidates too, maybe "ui: Replacing pointer in function"
as well?

(Adding patch authors to the Cc list)

Thanks,

/mjt

[PULL 0/5] Ui patches

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

The following changes since commit af9264da80073435fd78944bc5a46e695897d7e5:

  Merge tag '20231119-xtensa-1' of https://github.com/OSLL/qemu-xtensa into staging (2023-11-20 05:25:19 -0500)

are available in the Git repository at:

  https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request

for you to fetch changes up to e0c58720bfd8c0553f170b64717278b07438d2f5:

  ui/pixman-minimal.h: fix empty allocation (2023-11-21 14:38:14 +0400)

----------------------------------------------------------------
UI: fixes for 8.2-rc1

----------------------------------------------------------------

Manos Pitsidianakis (1):
  ui/pixman-minimal.h: fix empty allocation

Marc-André Lureau (4):
  vl: revert behaviour for -display none
  ui: use "vc" chardev for dbus, gtk & spice-app
  ui/console: fix default VC when there are no display
  vl: add missing display_remote++

 include/ui/pixman-minimal.h | 48 +++++++++++++++++++++++++++++++++++--
 system/vl.c                 |  4 +++-
 ui/console.c                | 18 +++++++-------
 ui/dbus.c                   |  1 +
 ui/gtk.c                    |  1 +
 ui/spice-app.c              |  1 +
 6 files changed, 60 insertions(+), 13 deletions(-)

-- 
2.42.0

Re: [PULL 0/5] Ui patches

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 115 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[PULL 0/5] UI patches

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

The following changes since commit 8f3f329f5e0117bd1a23a79ab751f8a7d3471e4b:

  Merge tag 'migration-20240311-pull-request' of https://gitlab.com/peterx/qemu into staging (2024-03-12 11:35:41 +0000)

are available in the Git repository at:

  https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request

for you to fetch changes up to dfcf74fa68c88233209aafc5f82728d0b9a1af5c:

  virtio-gpu: fix scanout migration post-load (2024-03-12 17:57:58 +0400)

----------------------------------------------------------------
display/ui: pending fixes

- ui/vnc: Respect bound console
- ui/dbus: optimize a bit message queuing
- virtio-gpu: fix blob scanout post-load

----------------------------------------------------------------

Akihiko Odaki (1):
  ui/vnc: Respect bound console

Marc-André Lureau (4):
  ui/dbus: factor out sending a scanout
  ui/dbus: filter out pending messages when scanout
  virtio-gpu: remove needless condition
  virtio-gpu: fix scanout migration post-load

 include/hw/virtio/virtio-gpu.h |  1 +
 hw/display/virtio-gpu.c        | 58 ++++++++++++++++++--------
 ui/dbus-listener.c             | 75 ++++++++++++++++++++++++++--------
 ui/vnc.c                       | 59 +++++++++++++-------------
 ui/trace-events                |  1 +
 5 files changed, 130 insertions(+), 64 deletions(-)

-- 
2.44.0

Re: [PULL 0/5] UI patches

[Peter Maydell]

On Tue, 12 Mar 2024 at 14:02, <marcandre.lureau@redhat.com> wrote:
>
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> The following changes since commit 8f3f329f5e0117bd1a23a79ab751f8a7d3471e4b:
>
>   Merge tag 'migration-20240311-pull-request' of https://gitlab.com/peterx/qemu into staging (2024-03-12 11:35:41 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request
>
> for you to fetch changes up to dfcf74fa68c88233209aafc5f82728d0b9a1af5c:
>
>   virtio-gpu: fix scanout migration post-load (2024-03-12 17:57:58 +0400)
>
> ----------------------------------------------------------------
> display/ui: pending fixes
>
> - ui/vnc: Respect bound console
> - ui/dbus: optimize a bit message queuing
> - virtio-gpu: fix blob scanout post-load
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/9.0
for any user-visible changes.

-- PMM

[PULL 0/5] Ui patches

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

The following changes since commit c62d54d0a8067ffb3d5b909276f7296d7df33fa7:

  Update version for v9.0.0-rc0 release (2024-03-19 19:13:52 +0000)

are available in the Git repository at:

  https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request

for you to fetch changes up to d4069a84a3380247c1b524096c6a807743bf687a:

  ui: compile dbus-display1.c with -fPIC as necessary (2024-03-20 10:28:00 +0400)

----------------------------------------------------------------
UI: fixes

- dbus-display shared-library compilation fix
- remove console_select() and fix related issues

----------------------------------------------------------------

Akihiko Odaki (4):
  ui/vc: Do not inherit the size of active console
  ui/vnc: Do not use console_select()
  ui/cocoa: Do not use console_select()
  ui/curses: Do not use console_select()

Marc-André Lureau (1):
  ui: compile dbus-display1.c with -fPIC as necessary

 include/ui/console.h   |   2 +-
 include/ui/kbd-state.h |  11 ++++
 ui/console-priv.h      |   2 +-
 ui/console-vc-stubs.c  |   2 +-
 ui/console-vc.c        |   7 +--
 ui/console.c           | 133 ++++++++++-------------------------------
 ui/curses.c            |  48 ++++++++-------
 ui/kbd-state.c         |   6 ++
 ui/vnc.c               |  14 +++--
 ui/cocoa.m             |  37 ++++++++----
 ui/meson.build         |   3 +-
 11 files changed, 119 insertions(+), 146 deletions(-)

-- 
2.44.0

Re: [PULL 0/5] Ui patches

[Peter Maydell]

On Wed, 20 Mar 2024 at 13:54, <marcandre.lureau@redhat.com> wrote:
>
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> The following changes since commit c62d54d0a8067ffb3d5b909276f7296d7df33fa7:
>
>   Update version for v9.0.0-rc0 release (2024-03-19 19:13:52 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request
>
> for you to fetch changes up to d4069a84a3380247c1b524096c6a807743bf687a:
>
>   ui: compile dbus-display1.c with -fPIC as necessary (2024-03-20 10:28:00 +0400)
>
> ----------------------------------------------------------------
> UI: fixes
>
> - dbus-display shared-library compilation fix
> - remove console_select() and fix related issues
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/9.0
for any user-visible changes.

-- PMM

[PULL 0/5] Ui patches

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

The following changes since commit 9b16edec6e9a483469c789475b2065d26b52db35:

  Merge tag 'pull-ppc-for-20250928-20250929' of https://gitlab.com/harshpb/qemu into staging (2025-09-29 07:25:28 -0700)

are available in the Git repository at:

  https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request

for you to fetch changes up to 9163424c50981dbc4ded9990228ac01a3b193656:

  ui/icons/qemu.svg: Add metadata information (author, license) to the logo (2025-09-30 11:21:55 +0400)

----------------------------------------------------------------
UI-related

Fixes for gtk, sdl2, spice UI backends.

----------------------------------------------------------------

Marc-André Lureau (1):
  ui/spice: fix crash when disabling GL scanout on

Mohamed Akram (1):
  ui/spice: Fix abort on macOS

Nir Lichtman (1):
  ui/sdl2: fix reset scaling binding to be consistent with gtk

Thomas Huth (1):
  ui/icons/qemu.svg: Add metadata information (author, license) to the
    logo

Weifeng Liu (1):
  gtk: Skip drawing if console surface is NULL

 ui/gtk-egl.c       |  5 +----
 ui/gtk-gl-area.c   |  5 +----
 ui/sdl2.c          |  2 +-
 ui/spice-core.c    |  6 +-----
 ui/spice-display.c |  4 +++-
 ui/icons/qemu.svg  | 21 ++++++++++++++++++++-
 6 files changed, 27 insertions(+), 16 deletions(-)

-- 
2.51.0

[PULL 1/5] gtk: Skip drawing if console surface is NULL

[marcandre.lureau]

From: Weifeng Liu <weifeng.liu.z@gmail.com>

In gtk draw/render callbacks, add an early NULL check for the console
surface and skip drawing if it's NULL. Otherwise, attempting to fetch
its width and height crash. This change fixes Coverity CID 1610328.

In practice, this case wouldn't happen at all because we always install
a placeholder surface to the console when there is nothing to display.

Resolves: Coverity CID 1610328
Signed-off-by: Weifeng Liu <weifeng.liu.z@gmail.com>
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-ID: <20250714141758.10062-1-weifeng.liu.z@gmail.com>
---
 ui/gtk-egl.c     | 5 +----
 ui/gtk-gl-area.c | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c
index 0b787bea25..ae9239999c 100644
--- a/ui/gtk-egl.c
+++ b/ui/gtk-egl.c
@@ -72,7 +72,7 @@ void gd_egl_draw(VirtualConsole *vc)
 #endif
     int ww, wh, pw, ph, gs;
 
-    if (!vc->gfx.gls) {
+    if (!vc->gfx.gls || !vc->gfx.ds) {
         return;
     }
 
@@ -112,9 +112,6 @@ void gd_egl_draw(VirtualConsole *vc)
         }
 #endif
     } else {
-        if (!vc->gfx.ds) {
-            return;
-        }
         eglMakeCurrent(qemu_egl_display, vc->gfx.esurface,
                        vc->gfx.esurface, vc->gfx.ectx);
 
diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c
index 8151cc413c..05fc38096e 100644
--- a/ui/gtk-gl-area.c
+++ b/ui/gtk-gl-area.c
@@ -48,7 +48,7 @@ void gd_gl_area_draw(VirtualConsole *vc)
     int fbw, fbh;
     int wx_offset, wy_offset;
 
-    if (!vc->gfx.gls) {
+    if (!vc->gfx.gls || !vc->gfx.ds) {
         return;
     }
 
@@ -135,9 +135,6 @@ void gd_gl_area_draw(VirtualConsole *vc)
         }
 #endif
     } else {
-        if (!vc->gfx.ds) {
-            return;
-        }
         gtk_gl_area_make_current(GTK_GL_AREA(vc->gfx.drawing_area));
 
         surface_gl_setup_viewport(vc->gfx.gls, vc->gfx.ds, pw, ph);
-- 
2.51.0

[PULL 2/5] ui/spice: Fix abort on macOS

[marcandre.lureau]

From: Mohamed Akram <mohd.akram@outlook.com>

The check is faulty because the thread variable was assigned in the main
thread while the main loop runs in a different thread on macOS.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3070
Signed-off-by: Mohamed Akram <mohd.akram@outlook.com>
Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-ID: <C87205B9-DD8F-4E53-AB5B-C8BF82EF1D16@outlook.com>
---
 ui/spice-core.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 5992f9daec..2645e96ef6 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -50,8 +50,6 @@ static int spice_migration_completed;
 static int spice_display_is_running;
 static int spice_have_target_host;
 
-static QemuThread me;
-
 struct SpiceTimer {
     QEMUTimer *timer;
 };
@@ -222,7 +220,7 @@ static void channel_event(int event, SpiceChannelEventInfo *info)
      * thread and grab the BQL if so before calling qemu
      * functions.
      */
-    bool need_lock = !qemu_thread_is_self(&me);
+    bool need_lock = !bql_locked();
     if (need_lock) {
         bql_lock();
     }
@@ -675,8 +673,6 @@ static void qemu_spice_init(void)
     spice_wan_compression_t wan_compr;
     bool seamless_migration;
 
-    qemu_thread_get_self(&me);
-
     if (!opts) {
         return;
     }
-- 
2.51.0

[PULL 3/5] ui/spice: fix crash when disabling GL scanout on

[marcandre.lureau]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

When spice_qxl_gl_scanout2() isn't available, the fallback code
incorrectly handles NULL arguments to disable the scanout, leading to:

Program terminated with signal SIGSEGV, Segmentation fault.
#0  spice_server_gl_scanout (qxl=0x55a25ce57ae8, fd=0x0, width=0, height=0, offset=0x0, stride=0x0, num_planes=0, format=0, modifier=72057594037927935, y_0_top=0)
    at ../ui/spice-display.c:983
983         if (num_planes <= 1) {

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2391334
Fixes: 98a050ca93afd8 ("ui/spice: support multi plane dmabuf scanout")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Message-Id: <20250903193818.2460914-1-marcandre.lureau@redhat.com>
---
 ui/spice-display.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/spice-display.c b/ui/spice-display.c
index 669832c561..db71e866f8 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -980,7 +980,9 @@ static void spice_server_gl_scanout(QXLInstance *qxl,
     spice_qxl_gl_scanout2(qxl, fd, width, height, offset, stride,
                           num_planes, format, modifier, y_0_top);
 #else
-    if (num_planes <= 1) {
+    if (fd == NULL) {
+        spice_qxl_gl_scanout(qxl, -1, 0, 0, 0, 0, false);
+    } else if (num_planes <= 1) {
         spice_qxl_gl_scanout(qxl, fd[0], width, height, stride[0], format, y_0_top);
     } else {
         error_report("SPICE server does not support multi plane GL scanout");
-- 
2.51.0

[PULL 4/5] ui/sdl2: fix reset scaling binding to be consistent with gtk

[marcandre.lureau]

From: Nir Lichtman <nir@lichtman.org>

Problem: Currently the reset scaling hotkey is inconsistent between SDL
and GTK graphics modes.

Solution: Fix SDL to use MOD+0 instead of MOD+u which is in line with
GTK and generally more consistent with other apps.

This is also related to my previously sent patch fixing the docs.

Suggested-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Nir Lichtman <nir@lichtman.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250910114929.GA1783677@lichtman.org>
---
 ui/sdl2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/sdl2.c b/ui/sdl2.c
index b00e421f7f..032dc14bc3 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -421,7 +421,7 @@ static void handle_keydown(SDL_Event *ev)
                 sdl_grab_end(scon);
             }
             break;
-        case SDL_SCANCODE_U:
+        case SDL_SCANCODE_0:
             sdl2_window_resize(scon);
             if (!scon->opengl) {
                 /* re-create scon->texture */
-- 
2.51.0

[PULL 5/5] ui/icons/qemu.svg: Add metadata information (author, license) to the logo

[marcandre.lureau]

From: Thomas Huth <thuth@redhat.com>

We've got two versions of the QEMU logo in the repository, one with
the whole word "QEMU" (pc-bios/qemu_logo.svg) and one that only contains
the letter "Q" (ui/icons/qemu.svg). While qemu_logo.svg contains the
proper metadata with license and author information, this is missing
from the ui/icons/qemu.svg file. Copy the meta data there so that
people have a chance to know the license of the file if they only
look at the qemu.svg file.

Closes: https://gitlab.com/qemu-project/qemu/-/issues/3139
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-ID: <20250930071419.117592-1-thuth@redhat.com>
---
 ui/icons/qemu.svg | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/ui/icons/qemu.svg b/ui/icons/qemu.svg
index 24ca23a1e9..f2500de339 100644
--- a/ui/icons/qemu.svg
+++ b/ui/icons/qemu.svg
@@ -918,7 +918,26 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title>Kew the Angry Emu</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Benoît Canet</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>CC BY 3.0</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>QEMU Community</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:date>2012-02-15</dc:date>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by/3.0/" />
+        <dc:source>https://lists.gnu.org/archive/html/qemu-devel/2012-02/msg02865.html</dc:source>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-- 
2.51.0

Re: [PULL 0/5] Ui patches

[Richard Henderson]

On 9/30/25 00:55, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau<marcandre.lureau@redhat.com>
> 
> The following changes since commit 9b16edec6e9a483469c789475b2065d26b52db35:
> 
>    Merge tag 'pull-ppc-for-20250928-20250929' ofhttps://gitlab.com/harshpb/qemu into staging (2025-09-29 07:25:28 -0700)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/marcandre.lureau/qemu.git tags/ui-pull-request
> 
> for you to fetch changes up to 9163424c50981dbc4ded9990228ac01a3b193656:
> 
>    ui/icons/qemu.svg: Add metadata information (author, license) to the logo (2025-09-30 11:21:55 +0400)
> 
> ----------------------------------------------------------------
> UI-related
> 
> Fixes for gtk, sdl2, spice UI backends.


Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/10.2 as appropriate.

r~

Re: [PULL 4/5] ui/sdl2: fix reset scaling binding to be consistent with gtk

[Michael Tokarev]

On 9/30/25 10:55, marcandre.lureau@redhat.com wrote:
> From: Nir Lichtman <nir@lichtman.org>
> 
> Problem: Currently the reset scaling hotkey is inconsistent between SDL
> and GTK graphics modes.
> 
> Solution: Fix SDL to use MOD+0 instead of MOD+u which is in line with
> GTK and generally more consistent with other apps.
> 
> This is also related to my previously sent patch fixing the docs.
> 
> Suggested-by: Gerd Hoffmann <kraxel@redhat.com>
> Signed-off-by: Nir Lichtman <nir@lichtman.org>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Message-ID: <20250910114929.GA1783677@lichtman.org>
> ---
>   ui/sdl2.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ui/sdl2.c b/ui/sdl2.c
> index b00e421f7f..032dc14bc3 100644
> --- a/ui/sdl2.c
> +++ b/ui/sdl2.c
> @@ -421,7 +421,7 @@ static void handle_keydown(SDL_Event *ev)
>                   sdl_grab_end(scon);
>               }
>               break;
> -        case SDL_SCANCODE_U:
> +        case SDL_SCANCODE_0:

Can't we keep the old behavior too, for a release or two maybe?

Thanks,

/mjt

Re: [PULL 4/5] ui/sdl2: fix reset scaling binding to be consistent with gtk

[Thomas Huth]

On 01/10/2025 22.11, Michael Tokarev wrote:
> On 9/30/25 10:55, marcandre.lureau@redhat.com wrote:
>> From: Nir Lichtman <nir@lichtman.org>
>>
>> Problem: Currently the reset scaling hotkey is inconsistent between SDL
>> and GTK graphics modes.
>>
>> Solution: Fix SDL to use MOD+0 instead of MOD+u which is in line with
>> GTK and generally more consistent with other apps.
>>
>> This is also related to my previously sent patch fixing the docs.
>>
>> Suggested-by: Gerd Hoffmann <kraxel@redhat.com>
>> Signed-off-by: Nir Lichtman <nir@lichtman.org>
>> Reviewed-by: Thomas Huth <thuth@redhat.com>
>> Message-ID: <20250910114929.GA1783677@lichtman.org>
>> ---
>>   ui/sdl2.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/ui/sdl2.c b/ui/sdl2.c
>> index b00e421f7f..032dc14bc3 100644
>> --- a/ui/sdl2.c
>> +++ b/ui/sdl2.c
>> @@ -421,7 +421,7 @@ static void handle_keydown(SDL_Event *ev)
>>                   sdl_grab_end(scon);
>>               }
>>               break;
>> -        case SDL_SCANCODE_U:
>> +        case SDL_SCANCODE_0:
> 
> Can't we keep the old behavior too, for a release or two maybe?

It's already merge, so please send a new patch for this.

  Thomas