Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
include/ui/console.h | 4 ++--
hw/display/ati.c | 2 +-
hw/display/virtio-gpu.c | 3 +--
hw/display/vmware_vga.c | 2 +-
ui/console.c | 5 +++--
ui/dbus-listener.c | 2 +-
ui/gtk.c | 2 +-
ui/sdl2.c | 4 ++--
ui/spice-display.c | 11 ++++++-----
ui/vnc.c | 2 +-
10 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index a208a68b8886..82b573e68082 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -233,7 +233,7 @@ typedef struct DisplayChangeListenerOps {
/* optional */
void (*dpy_mouse_set)(DisplayChangeListener *dcl,
- int x, int y, int on);
+ int x, int y, bool on);
/* optional */
void (*dpy_cursor_define)(DisplayChangeListener *dcl,
QEMUCursor *cursor);
@@ -322,7 +322,7 @@ void dpy_gfx_replace_surface(QemuConsole *con,
void dpy_text_cursor(QemuConsole *con, int x, int y);
void dpy_text_update(QemuConsole *con, int x, int y, int w, int h);
void dpy_text_resize(QemuConsole *con, int w, int h);
-void dpy_mouse_set(QemuConsole *con, int x, int y, int on);
+void dpy_mouse_set(QemuConsole *con, int x, int y, bool on);
void dpy_cursor_define(QemuConsole *con, QEMUCursor *cursor);
bool dpy_cursor_define_supported(QemuConsole *con);
bool dpy_gfx_check_format(QemuConsole *con,
diff --git a/hw/display/ati.c b/hw/display/ati.c
index 8d2501bd8210..b1f94f5b767d 100644
--- a/hw/display/ati.c
+++ b/hw/display/ati.c
@@ -742,7 +742,7 @@ static void ati_mm_write(void *opaque, hwaddr addr,
if (!s->cursor_guest_mode &&
(s->regs.crtc_gen_cntl & CRTC2_CUR_EN) && !(t & BIT(31))) {
dpy_mouse_set(s->vga.con, s->regs.cur_hv_pos >> 16,
- s->regs.cur_hv_pos & 0xffff, 1);
+ s->regs.cur_hv_pos & 0xffff, true);
}
break;
}
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index d60b1b2973af..3281842bfe1b 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -109,8 +109,7 @@ static void update_cursor(VirtIOGPU *g, struct virtio_gpu_update_cursor *cursor)
s->cursor.pos.x = cursor->pos.x;
s->cursor.pos.y = cursor->pos.y;
}
- dpy_mouse_set(s->con, cursor->pos.x, cursor->pos.y,
- cursor->resource_id ? 1 : 0);
+ dpy_mouse_set(s->con, cursor->pos.x, cursor->pos.y, cursor->resource_id);
}
struct virtio_gpu_simple_resource *
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index 1c0f9d9a991d..512f224b9f58 100644
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -1167,7 +1167,7 @@ static void vmsvga_reset(DeviceState *dev)
s->enable = 0;
s->config = 0;
s->svgaid = SVGA_ID;
- s->cursor.on = 0;
+ s->cursor.on = false;
s->redraw_fifo_last = 0;
s->syncing = 0;
diff --git a/ui/console.c b/ui/console.c
index 1b2cd0c7365d..0ec70cb50ce6 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -49,7 +49,8 @@ typedef struct QemuGraphicConsole {
uint32_t head;
QEMUCursor *cursor;
- int cursor_x, cursor_y, cursor_on;
+ int cursor_x, cursor_y;
+ bool cursor_on;
} QemuGraphicConsole;
typedef QemuConsoleClass QemuGraphicConsoleClass;
@@ -957,7 +958,7 @@ void dpy_text_resize(QemuConsole *con, int w, int h)
}
}
-void dpy_mouse_set(QemuConsole *c, int x, int y, int on)
+void dpy_mouse_set(QemuConsole *c, int x, int y, bool on)
{
QemuGraphicConsole *con = QEMU_GRAPHIC_CONSOLE(c);
DisplayState *s = c->ds;
diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c
index 54900880433e..a54123acea7d 100644
--- a/ui/dbus-listener.c
+++ b/ui/dbus-listener.c
@@ -726,7 +726,7 @@ static void dbus_gfx_switch(DisplayChangeListener *dcl,
}
static void dbus_mouse_set(DisplayChangeListener *dcl,
- int x, int y, int on)
+ int x, int y, bool on)
{
DBusDisplayListener *ddl = container_of(dcl, DBusDisplayListener, dcl);
diff --git a/ui/gtk.c b/ui/gtk.c
index 93b13b7a30ff..bc29f7a1b4f7 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -446,7 +446,7 @@ static GdkDevice *gd_get_pointer(GdkDisplay *dpy)
}
static void gd_mouse_set(DisplayChangeListener *dcl,
- int x, int y, int visible)
+ int x, int y, bool visible)
{
VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl);
GdkDisplay *dpy;
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 0a0eb5a42d58..98ed97437171 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -49,7 +49,7 @@ static int gui_grab_code = KMOD_LALT | KMOD_LCTRL;
static SDL_Cursor *sdl_cursor_normal;
static SDL_Cursor *sdl_cursor_hidden;
static int absolute_enabled;
-static int guest_cursor;
+static bool guest_cursor;
static int guest_x, guest_y;
static SDL_Cursor *guest_sprite;
static Notifier mouse_mode_notifier;
@@ -729,7 +729,7 @@ void sdl2_poll_events(struct sdl2_console *scon)
}
static void sdl_mouse_warp(DisplayChangeListener *dcl,
- int x, int y, int on)
+ int x, int y, bool on)
{
struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl);
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 8a8472d0294e..c794ae06498b 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -254,7 +254,7 @@ static void qemu_spice_create_update(SimpleSpiceDisplay *ssd)
static SimpleSpiceCursor*
qemu_spice_create_cursor_update(SimpleSpiceDisplay *ssd,
QEMUCursor *c,
- int on)
+ bool on)
{
size_t size = c ? c->width * c->height * 4 : 0;
SimpleSpiceCursor *update;
@@ -448,7 +448,8 @@ void qemu_spice_display_switch(SimpleSpiceDisplay *ssd,
qemu_mutex_lock(&ssd->lock);
if (ssd->cursor) {
g_free(ssd->ptr_define);
- ssd->ptr_define = qemu_spice_create_cursor_update(ssd, ssd->cursor, 0);
+ ssd->ptr_define =
+ qemu_spice_create_cursor_update(ssd, ssd->cursor, false);
}
qemu_mutex_unlock(&ssd->lock);
}
@@ -476,7 +477,7 @@ void qemu_spice_cursor_refresh_bh(void *opaque)
ssd->mouse_x = -1;
ssd->mouse_y = -1;
qemu_mutex_unlock(&ssd->lock);
- dpy_mouse_set(ssd->dcl.con, x, y, 1);
+ dpy_mouse_set(ssd->dcl.con, x, y, true);
} else {
qemu_mutex_unlock(&ssd->lock);
}
@@ -747,7 +748,7 @@ static void display_refresh(DisplayChangeListener *dcl)
}
static void display_mouse_set(DisplayChangeListener *dcl,
- int x, int y, int on)
+ int x, int y, bool on)
{
SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
@@ -774,7 +775,7 @@ static void display_mouse_define(DisplayChangeListener *dcl,
g_free(ssd->ptr_move);
ssd->ptr_move = NULL;
g_free(ssd->ptr_define);
- ssd->ptr_define = qemu_spice_create_cursor_update(ssd, c, 0);
+ ssd->ptr_define = qemu_spice_create_cursor_update(ssd, c, false);
qemu_mutex_unlock(&ssd->lock);
qemu_spice_wakeup(ssd);
}
diff --git a/ui/vnc.c b/ui/vnc.c
index dd530f04e579..dae5d51210be 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -981,7 +981,7 @@ int vnc_send_framebuffer_update(VncState *vs, int x, int y, int w, int h)
}
static void vnc_mouse_set(DisplayChangeListener *dcl,
- int x, int y, int visible)
+ int x, int y, bool visible)
{
/* can we ask the client(s) to move the pointer ??? */
}
--
2.45.2On Thu, Jun 27, 2024 at 3:19 PM Akihiko Odaki <akihiko.odaki@daynix.com>
wrote:
> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> include/ui/console.h | 4 ++--
> hw/display/ati.c | 2 +-
> hw/display/virtio-gpu.c | 3 +--
> hw/display/vmware_vga.c | 2 +-
> ui/console.c | 5 +++--
> ui/dbus-listener.c | 2 +-
> ui/gtk.c | 2 +-
> ui/sdl2.c | 4 ++--
> ui/spice-display.c | 11 ++++++-----
> ui/vnc.c | 2 +-
> 10 files changed, 19 insertions(+), 18 deletions(-)
>
> diff --git a/include/ui/console.h b/include/ui/console.h
> index a208a68b8886..82b573e68082 100644
> --- a/include/ui/console.h
> +++ b/include/ui/console.h
> @@ -233,7 +233,7 @@ typedef struct DisplayChangeListenerOps {
>
> /* optional */
> void (*dpy_mouse_set)(DisplayChangeListener *dcl,
> - int x, int y, int on);
> + int x, int y, bool on);
> /* optional */
> void (*dpy_cursor_define)(DisplayChangeListener *dcl,
> QEMUCursor *cursor);
> @@ -322,7 +322,7 @@ void dpy_gfx_replace_surface(QemuConsole *con,
> void dpy_text_cursor(QemuConsole *con, int x, int y);
> void dpy_text_update(QemuConsole *con, int x, int y, int w, int h);
> void dpy_text_resize(QemuConsole *con, int w, int h);
> -void dpy_mouse_set(QemuConsole *con, int x, int y, int on);
> +void dpy_mouse_set(QemuConsole *con, int x, int y, bool on);
> void dpy_cursor_define(QemuConsole *con, QEMUCursor *cursor);
> bool dpy_cursor_define_supported(QemuConsole *con);
> bool dpy_gfx_check_format(QemuConsole *con,
> diff --git a/hw/display/ati.c b/hw/display/ati.c
> index 8d2501bd8210..b1f94f5b767d 100644
> --- a/hw/display/ati.c
> +++ b/hw/display/ati.c
> @@ -742,7 +742,7 @@ static void ati_mm_write(void *opaque, hwaddr addr,
> if (!s->cursor_guest_mode &&
> (s->regs.crtc_gen_cntl & CRTC2_CUR_EN) && !(t & BIT(31))) {
> dpy_mouse_set(s->vga.con, s->regs.cur_hv_pos >> 16,
> - s->regs.cur_hv_pos & 0xffff, 1);
> + s->regs.cur_hv_pos & 0xffff, true);
> }
> break;
> }
> diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
> index d60b1b2973af..3281842bfe1b 100644
> --- a/hw/display/virtio-gpu.c
> +++ b/hw/display/virtio-gpu.c
> @@ -109,8 +109,7 @@ static void update_cursor(VirtIOGPU *g, struct
> virtio_gpu_update_cursor *cursor)
> s->cursor.pos.x = cursor->pos.x;
> s->cursor.pos.y = cursor->pos.y;
> }
> - dpy_mouse_set(s->con, cursor->pos.x, cursor->pos.y,
> - cursor->resource_id ? 1 : 0);
> + dpy_mouse_set(s->con, cursor->pos.x, cursor->pos.y,
> cursor->resource_id);
> }
>
> struct virtio_gpu_simple_resource *
> diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
> index 1c0f9d9a991d..512f224b9f58 100644
> --- a/hw/display/vmware_vga.c
> +++ b/hw/display/vmware_vga.c
> @@ -1167,7 +1167,7 @@ static void vmsvga_reset(DeviceState *dev)
> s->enable = 0;
> s->config = 0;
> s->svgaid = SVGA_ID;
> - s->cursor.on = 0;
> + s->cursor.on = false;
> s->redraw_fifo_last = 0;
> s->syncing = 0;
>
> diff --git a/ui/console.c b/ui/console.c
> index 1b2cd0c7365d..0ec70cb50ce6 100644
> --- a/ui/console.c
> +++ b/ui/console.c
> @@ -49,7 +49,8 @@ typedef struct QemuGraphicConsole {
> uint32_t head;
>
> QEMUCursor *cursor;
> - int cursor_x, cursor_y, cursor_on;
> + int cursor_x, cursor_y;
> + bool cursor_on;
> } QemuGraphicConsole;
>
> typedef QemuConsoleClass QemuGraphicConsoleClass;
> @@ -957,7 +958,7 @@ void dpy_text_resize(QemuConsole *con, int w, int h)
> }
> }
>
> -void dpy_mouse_set(QemuConsole *c, int x, int y, int on)
> +void dpy_mouse_set(QemuConsole *c, int x, int y, bool on)
> {
> QemuGraphicConsole *con = QEMU_GRAPHIC_CONSOLE(c);
> DisplayState *s = c->ds;
> diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c
> index 54900880433e..a54123acea7d 100644
> --- a/ui/dbus-listener.c
> +++ b/ui/dbus-listener.c
> @@ -726,7 +726,7 @@ static void dbus_gfx_switch(DisplayChangeListener *dcl,
> }
>
> static void dbus_mouse_set(DisplayChangeListener *dcl,
> - int x, int y, int on)
> + int x, int y, bool on)
> {
> DBusDisplayListener *ddl = container_of(dcl, DBusDisplayListener,
> dcl);
>
> diff --git a/ui/gtk.c b/ui/gtk.c
> index 93b13b7a30ff..bc29f7a1b4f7 100644
> --- a/ui/gtk.c
> +++ b/ui/gtk.c
> @@ -446,7 +446,7 @@ static GdkDevice *gd_get_pointer(GdkDisplay *dpy)
> }
>
> static void gd_mouse_set(DisplayChangeListener *dcl,
> - int x, int y, int visible)
> + int x, int y, bool visible)
> {
> VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl);
> GdkDisplay *dpy;
> diff --git a/ui/sdl2.c b/ui/sdl2.c
> index 0a0eb5a42d58..98ed97437171 100644
> --- a/ui/sdl2.c
> +++ b/ui/sdl2.c
> @@ -49,7 +49,7 @@ static int gui_grab_code = KMOD_LALT | KMOD_LCTRL;
> static SDL_Cursor *sdl_cursor_normal;
> static SDL_Cursor *sdl_cursor_hidden;
> static int absolute_enabled;
> -static int guest_cursor;
> +static bool guest_cursor;
> static int guest_x, guest_y;
> static SDL_Cursor *guest_sprite;
> static Notifier mouse_mode_notifier;
> @@ -729,7 +729,7 @@ void sdl2_poll_events(struct sdl2_console *scon)
> }
>
> static void sdl_mouse_warp(DisplayChangeListener *dcl,
> - int x, int y, int on)
> + int x, int y, bool on)
> {
> struct sdl2_console *scon = container_of(dcl, struct sdl2_console,
> dcl);
>
> diff --git a/ui/spice-display.c b/ui/spice-display.c
> index 8a8472d0294e..c794ae06498b 100644
> --- a/ui/spice-display.c
> +++ b/ui/spice-display.c
> @@ -254,7 +254,7 @@ static void
> qemu_spice_create_update(SimpleSpiceDisplay *ssd)
> static SimpleSpiceCursor*
> qemu_spice_create_cursor_update(SimpleSpiceDisplay *ssd,
> QEMUCursor *c,
> - int on)
> + bool on)
> {
> size_t size = c ? c->width * c->height * 4 : 0;
> SimpleSpiceCursor *update;
> @@ -448,7 +448,8 @@ void qemu_spice_display_switch(SimpleSpiceDisplay *ssd,
> qemu_mutex_lock(&ssd->lock);
> if (ssd->cursor) {
> g_free(ssd->ptr_define);
> - ssd->ptr_define = qemu_spice_create_cursor_update(ssd,
> ssd->cursor, 0);
> + ssd->ptr_define =
> + qemu_spice_create_cursor_update(ssd, ssd->cursor, false);
> }
> qemu_mutex_unlock(&ssd->lock);
> }
> @@ -476,7 +477,7 @@ void qemu_spice_cursor_refresh_bh(void *opaque)
> ssd->mouse_x = -1;
> ssd->mouse_y = -1;
> qemu_mutex_unlock(&ssd->lock);
> - dpy_mouse_set(ssd->dcl.con, x, y, 1);
> + dpy_mouse_set(ssd->dcl.con, x, y, true);
> } else {
> qemu_mutex_unlock(&ssd->lock);
> }
> @@ -747,7 +748,7 @@ static void display_refresh(DisplayChangeListener *dcl)
> }
>
> static void display_mouse_set(DisplayChangeListener *dcl,
> - int x, int y, int on)
> + int x, int y, bool on)
> {
> SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
>
> @@ -774,7 +775,7 @@ static void display_mouse_define(DisplayChangeListener
> *dcl,
> g_free(ssd->ptr_move);
> ssd->ptr_move = NULL;
> g_free(ssd->ptr_define);
> - ssd->ptr_define = qemu_spice_create_cursor_update(ssd, c, 0);
> + ssd->ptr_define = qemu_spice_create_cursor_update(ssd, c, false);
> qemu_mutex_unlock(&ssd->lock);
> qemu_spice_wakeup(ssd);
> }
> diff --git a/ui/vnc.c b/ui/vnc.c
> index dd530f04e579..dae5d51210be 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -981,7 +981,7 @@ int vnc_send_framebuffer_update(VncState *vs, int x,
> int y, int w, int h)
> }
>
> static void vnc_mouse_set(DisplayChangeListener *dcl,
> - int x, int y, int visible)
> + int x, int y, bool visible)
> {
> /* can we ask the client(s) to move the pointer ??? */
> }
>
> --
> 2.45.2
>
>
>
--
Marc-André Lureau
On Sat, 29 Jun 2024 at 14:18, Marc-André Lureau <marcandre.lureau@gmail.com> wrote: > > On Thu, Jun 27, 2024 at 3:19 PM Akihiko Odaki <akihiko.odaki@daynix.com> > wrote: > >> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> >> > > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > > Reviewed-by: Phil Dennis-Jordan <phil@philjordan.eu>
© 2016 - 2024 Red Hat, Inc.