* [PULL 0/8] Ui 20201211 patches
@ 2020-12-11 9:12 Gerd Hoffmann
2020-12-11 9:12 ` [PULL 1/8] console: drop qemu_console_get_ui_info Gerd Hoffmann
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2020-12-11 9:12 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
The following changes since commit 2ecfc0657afa5d29a373271b342f704a1a3c6737:
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2020-12-10' into staging (2020-12-10 17:01:05 +0000)
are available in the Git repository at:
git://git.kraxel.org/qemu tags/ui-20201211-pull-request
for you to fetch changes up to 2951106143f6cf20b3a0e4f2078721503fe6418a:
sdl2: Add extra mouse buttons (2020-12-11 08:06:40 +0100)
----------------------------------------------------------------
ui/console ui_info tweaks.
ui/vnc: alpha cursor support.
ui/vnc: locking fixes.
ui/sdl: add extra mouse buttons.
----------------------------------------------------------------
Darrell Walisser (1):
sdl2: Add extra mouse buttons
Gerd Hoffmann (6):
console: drop qemu_console_get_ui_info
console: allow con==NULL in dpy_{get, set}_ui_info and
dpy_ui_info_supported
vnc: use enum for features
vnc: drop unused copyrect feature
vnc: add pseudo encodings
vnc: add alpha cursor support
Peng Liang (1):
ui/vnc: Add missing lock for send_color_map
include/ui/console.h | 1 -
ui/vnc.h | 30 +++++++++++++++++-------------
ui/console.c | 18 ++++++++++--------
ui/sdl2.c | 2 ++
ui/vnc.c | 26 ++++++++++++++++++++------
5 files changed, 49 insertions(+), 28 deletions(-)
--
2.27.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PULL 1/8] console: drop qemu_console_get_ui_info
2020-12-11 9:12 [PULL 0/8] Ui 20201211 patches Gerd Hoffmann
@ 2020-12-11 9:12 ` Gerd Hoffmann
2020-12-11 9:12 ` [PULL 2/8] console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported Gerd Hoffmann
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2020-12-11 9:12 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Daniel P . Berrangé, Gerd Hoffmann
Unused and duplicate (there is dpy_get_ui_info).
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20201208115737.18581-2-kraxel@redhat.com
---
include/ui/console.h | 1 -
ui/console.c | 6 ------
2 files changed, 7 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index e7303d8b98a8..5dd21976a376 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -390,7 +390,6 @@ bool qemu_console_is_gl_blocked(QemuConsole *con);
char *qemu_console_get_label(QemuConsole *con);
int qemu_console_get_index(QemuConsole *con);
uint32_t qemu_console_get_head(QemuConsole *con);
-QemuUIInfo *qemu_console_get_ui_info(QemuConsole *con);
int qemu_console_get_width(QemuConsole *con, int fallback);
int qemu_console_get_height(QemuConsole *con, int fallback);
/* Return the low-level window id for the console */
diff --git a/ui/console.c b/ui/console.c
index 53dee8e26b17..f995639e45f6 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -2122,12 +2122,6 @@ uint32_t qemu_console_get_head(QemuConsole *con)
return con ? con->head : -1;
}
-QemuUIInfo *qemu_console_get_ui_info(QemuConsole *con)
-{
- assert(con != NULL);
- return &con->ui_info;
-}
-
int qemu_console_get_width(QemuConsole *con, int fallback)
{
if (con == NULL) {
--
2.27.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PULL 2/8] console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported
2020-12-11 9:12 [PULL 0/8] Ui 20201211 patches Gerd Hoffmann
2020-12-11 9:12 ` [PULL 1/8] console: drop qemu_console_get_ui_info Gerd Hoffmann
@ 2020-12-11 9:12 ` Gerd Hoffmann
2020-12-11 9:12 ` [PULL 3/8] vnc: use enum for features Gerd Hoffmann
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2020-12-11 9:12 UTC (permalink / raw)
To: qemu-devel; +Cc: Daniel P . Berrangé, Gerd Hoffmann
Use active_console in that case like we do in many other places.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20201208115737.18581-3-kraxel@redhat.com
---
ui/console.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/ui/console.c b/ui/console.c
index f995639e45f6..30e70be555db 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1544,19 +1544,27 @@ static void dpy_set_ui_info_timer(void *opaque)
bool dpy_ui_info_supported(QemuConsole *con)
{
+ if (con == NULL) {
+ con = active_console;
+ }
+
return con->hw_ops->ui_info != NULL;
}
const QemuUIInfo *dpy_get_ui_info(const QemuConsole *con)
{
- assert(con != NULL);
+ if (con == NULL) {
+ con = active_console;
+ }
return &con->ui_info;
}
int dpy_set_ui_info(QemuConsole *con, QemuUIInfo *info)
{
- assert(con != NULL);
+ if (con == NULL) {
+ con = active_console;
+ }
if (!dpy_ui_info_supported(con)) {
return -1;
--
2.27.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PULL 3/8] vnc: use enum for features
2020-12-11 9:12 [PULL 0/8] Ui 20201211 patches Gerd Hoffmann
2020-12-11 9:12 ` [PULL 1/8] console: drop qemu_console_get_ui_info Gerd Hoffmann
2020-12-11 9:12 ` [PULL 2/8] console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported Gerd Hoffmann
@ 2020-12-11 9:12 ` Gerd Hoffmann
2020-12-11 9:12 ` [PULL 4/8] vnc: drop unused copyrect feature Gerd Hoffmann
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2020-12-11 9:12 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, Gerd Hoffmann
Use an enum for the vnc feature bits. That way they are enumerated
automatically and we don't have to do that manually when adding or
removing features.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20201208115737.18581-4-kraxel@redhat.com
---
ui/vnc.h | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/ui/vnc.h b/ui/vnc.h
index 4e2637ce6c5c..262fcf179b44 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -438,18 +438,20 @@ enum {
*
*****************************************************************************/
-#define VNC_FEATURE_RESIZE 0
-#define VNC_FEATURE_HEXTILE 1
-#define VNC_FEATURE_POINTER_TYPE_CHANGE 2
-#define VNC_FEATURE_WMVI 3
-#define VNC_FEATURE_TIGHT 4
-#define VNC_FEATURE_ZLIB 5
-#define VNC_FEATURE_COPYRECT 6
-#define VNC_FEATURE_RICH_CURSOR 7
-#define VNC_FEATURE_TIGHT_PNG 8
-#define VNC_FEATURE_ZRLE 9
-#define VNC_FEATURE_ZYWRLE 10
-#define VNC_FEATURE_LED_STATE 11
+enum VncFeatures {
+ VNC_FEATURE_RESIZE,
+ VNC_FEATURE_HEXTILE,
+ VNC_FEATURE_POINTER_TYPE_CHANGE,
+ VNC_FEATURE_WMVI,
+ VNC_FEATURE_TIGHT,
+ VNC_FEATURE_ZLIB,
+ VNC_FEATURE_COPYRECT,
+ VNC_FEATURE_RICH_CURSOR,
+ VNC_FEATURE_TIGHT_PNG,
+ VNC_FEATURE_ZRLE,
+ VNC_FEATURE_ZYWRLE,
+ VNC_FEATURE_LED_STATE,
+};
#define VNC_FEATURE_RESIZE_MASK (1 << VNC_FEATURE_RESIZE)
#define VNC_FEATURE_HEXTILE_MASK (1 << VNC_FEATURE_HEXTILE)
--
2.27.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PULL 4/8] vnc: drop unused copyrect feature
2020-12-11 9:12 [PULL 0/8] Ui 20201211 patches Gerd Hoffmann
` (2 preceding siblings ...)
2020-12-11 9:12 ` [PULL 3/8] vnc: use enum for features Gerd Hoffmann
@ 2020-12-11 9:12 ` Gerd Hoffmann
2020-12-11 9:12 ` [PULL 5/8] vnc: add pseudo encodings Gerd Hoffmann
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2020-12-11 9:12 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Daniel P . Berrangé, Gerd Hoffmann
vnc stopped using the copyrect pseudo encoding in 2017, in commit
50628d3479e4 ("cirrus/vnc: zap bitblit support from console code.")
So we can drop the now unused copyrect feature bit.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20201208115737.18581-5-kraxel@redhat.com
---
ui/vnc.h | 2 --
ui/vnc.c | 3 ---
2 files changed, 5 deletions(-)
diff --git a/ui/vnc.h b/ui/vnc.h
index 262fcf179b44..a7fd38a82075 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -445,7 +445,6 @@ enum VncFeatures {
VNC_FEATURE_WMVI,
VNC_FEATURE_TIGHT,
VNC_FEATURE_ZLIB,
- VNC_FEATURE_COPYRECT,
VNC_FEATURE_RICH_CURSOR,
VNC_FEATURE_TIGHT_PNG,
VNC_FEATURE_ZRLE,
@@ -459,7 +458,6 @@ enum VncFeatures {
#define VNC_FEATURE_WMVI_MASK (1 << VNC_FEATURE_WMVI)
#define VNC_FEATURE_TIGHT_MASK (1 << VNC_FEATURE_TIGHT)
#define VNC_FEATURE_ZLIB_MASK (1 << VNC_FEATURE_ZLIB)
-#define VNC_FEATURE_COPYRECT_MASK (1 << VNC_FEATURE_COPYRECT)
#define VNC_FEATURE_RICH_CURSOR_MASK (1 << VNC_FEATURE_RICH_CURSOR)
#define VNC_FEATURE_TIGHT_PNG_MASK (1 << VNC_FEATURE_TIGHT_PNG)
#define VNC_FEATURE_ZRLE_MASK (1 << VNC_FEATURE_ZRLE)
diff --git a/ui/vnc.c b/ui/vnc.c
index 49235056f7a8..8c2771c1ce3b 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2061,9 +2061,6 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
case VNC_ENCODING_RAW:
vs->vnc_encoding = enc;
break;
- case VNC_ENCODING_COPYRECT:
- vs->features |= VNC_FEATURE_COPYRECT_MASK;
- break;
case VNC_ENCODING_HEXTILE:
vs->features |= VNC_FEATURE_HEXTILE_MASK;
vs->vnc_encoding = enc;
--
2.27.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PULL 5/8] vnc: add pseudo encodings
2020-12-11 9:12 [PULL 0/8] Ui 20201211 patches Gerd Hoffmann
` (3 preceding siblings ...)
2020-12-11 9:12 ` [PULL 4/8] vnc: drop unused copyrect feature Gerd Hoffmann
@ 2020-12-11 9:12 ` Gerd Hoffmann
2020-12-11 9:12 ` [PULL 6/8] vnc: add alpha cursor support Gerd Hoffmann
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2020-12-11 9:12 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Daniel P . Berrangé, Gerd Hoffmann
Add #defines for two new pseudo encodings:
* cursor with alpha channel.
* extended desktop resize.
https://github.com/rfbproto/rfbproto/blob/master/rfbproto.rst#pseudo-encodings
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20201208115737.18581-6-kraxel@redhat.com
---
ui/vnc.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ui/vnc.h b/ui/vnc.h
index a7fd38a82075..6f5006da3593 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -411,6 +411,8 @@ enum {
#define VNC_ENCODING_AUDIO 0XFFFFFEFD /* -259 */
#define VNC_ENCODING_TIGHT_PNG 0xFFFFFEFC /* -260 */
#define VNC_ENCODING_LED_STATE 0XFFFFFEFB /* -261 */
+#define VNC_ENCODING_DESKTOP_RESIZE_EXT 0XFFFFFECC /* -308 */
+#define VNC_ENCODING_ALPHA_CURSOR 0XFFFFFEC6 /* -314 */
#define VNC_ENCODING_WMVi 0x574D5669
/*****************************************************************************
--
2.27.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PULL 6/8] vnc: add alpha cursor support
2020-12-11 9:12 [PULL 0/8] Ui 20201211 patches Gerd Hoffmann
` (4 preceding siblings ...)
2020-12-11 9:12 ` [PULL 5/8] vnc: add pseudo encodings Gerd Hoffmann
@ 2020-12-11 9:12 ` Gerd Hoffmann
2020-12-11 9:12 ` [PULL 7/8] ui/vnc: Add missing lock for send_color_map Gerd Hoffmann
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2020-12-11 9:12 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Daniel P . Berrangé, Gerd Hoffmann
There is a new vnc extension for cursors with an alpha channel. Use
it if supported by the vnc client, prefer it over the "rich cursor"
extension which supports only a bitmask for transparency.
This is a visible improvement especially on modern desktops which
actually use the alpha channel when defining cursors.
https://github.com/rfbproto/rfbproto/blob/master/rfbproto.rst#cursor-with-alpha-pseudo-encoding
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Tested-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20201208115737.18581-7-kraxel@redhat.com
---
ui/vnc.h | 2 ++
ui/vnc.c | 21 ++++++++++++++++++---
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ui/vnc.h b/ui/vnc.h
index 6f5006da3593..c8d3ad9ec496 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -448,6 +448,7 @@ enum VncFeatures {
VNC_FEATURE_TIGHT,
VNC_FEATURE_ZLIB,
VNC_FEATURE_RICH_CURSOR,
+ VNC_FEATURE_ALPHA_CURSOR,
VNC_FEATURE_TIGHT_PNG,
VNC_FEATURE_ZRLE,
VNC_FEATURE_ZYWRLE,
@@ -461,6 +462,7 @@ enum VncFeatures {
#define VNC_FEATURE_TIGHT_MASK (1 << VNC_FEATURE_TIGHT)
#define VNC_FEATURE_ZLIB_MASK (1 << VNC_FEATURE_ZLIB)
#define VNC_FEATURE_RICH_CURSOR_MASK (1 << VNC_FEATURE_RICH_CURSOR)
+#define VNC_FEATURE_ALPHA_CURSOR_MASK (1 << VNC_FEATURE_ALPHA_CURSOR)
#define VNC_FEATURE_TIGHT_PNG_MASK (1 << VNC_FEATURE_TIGHT_PNG)
#define VNC_FEATURE_ZRLE_MASK (1 << VNC_FEATURE_ZRLE)
#define VNC_FEATURE_ZYWRLE_MASK (1 << VNC_FEATURE_ZYWRLE)
diff --git a/ui/vnc.c b/ui/vnc.c
index 8c2771c1ce3b..247e80d8f5c8 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -937,6 +937,18 @@ static int vnc_cursor_define(VncState *vs)
QEMUCursor *c = vs->vd->cursor;
int isize;
+ if (vnc_has_feature(vs, VNC_FEATURE_ALPHA_CURSOR)) {
+ vnc_lock_output(vs);
+ vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE);
+ vnc_write_u8(vs, 0); /* padding */
+ vnc_write_u16(vs, 1); /* # of rects */
+ vnc_framebuffer_update(vs, c->hot_x, c->hot_y, c->width, c->height,
+ VNC_ENCODING_ALPHA_CURSOR);
+ vnc_write_s32(vs, VNC_ENCODING_RAW);
+ vnc_write(vs, c->data, c->width * c->height * 4);
+ vnc_unlock_output(vs);
+ return 0;
+ }
if (vnc_has_feature(vs, VNC_FEATURE_RICH_CURSOR)) {
vnc_lock_output(vs);
vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE);
@@ -2102,9 +2114,9 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
break;
case VNC_ENCODING_RICH_CURSOR:
vs->features |= VNC_FEATURE_RICH_CURSOR_MASK;
- if (vs->vd->cursor) {
- vnc_cursor_define(vs);
- }
+ break;
+ case VNC_ENCODING_ALPHA_CURSOR:
+ vs->features |= VNC_FEATURE_ALPHA_CURSOR_MASK;
break;
case VNC_ENCODING_EXT_KEY_EVENT:
send_ext_key_event_ack(vs);
@@ -2134,6 +2146,9 @@ static void set_encodings(VncState *vs, int32_t *encodings, size_t n_encodings)
vnc_desktop_resize(vs);
check_pointer_type_change(&vs->mouse_mode_notifier, NULL);
vnc_led_state_change(vs);
+ if (vs->vd->cursor) {
+ vnc_cursor_define(vs);
+ }
}
static void set_pixel_conversion(VncState *vs)
--
2.27.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PULL 7/8] ui/vnc: Add missing lock for send_color_map
2020-12-11 9:12 [PULL 0/8] Ui 20201211 patches Gerd Hoffmann
` (5 preceding siblings ...)
2020-12-11 9:12 ` [PULL 6/8] vnc: add alpha cursor support Gerd Hoffmann
@ 2020-12-11 9:12 ` Gerd Hoffmann
2020-12-11 9:12 ` [PULL 8/8] sdl2: Add extra mouse buttons Gerd Hoffmann
2020-12-11 19:30 ` [PULL 0/8] Ui 20201211 patches Peter Maydell
8 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2020-12-11 9:12 UTC (permalink / raw)
To: qemu-devel; +Cc: Peng Liang, Euler Robot, Gerd Hoffmann, qemu-stable
From: Peng Liang <liangpeng10@huawei.com>
vnc_write() should be locked after the RFB protocol is initialized.
Fixes: 0c426e4534b4 ("vnc: Add support for color map")
Cc: qemu-stable@nongnu.org
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Peng Liang <liangpeng10@huawei.com>
Message-id: 20201116141338.148911-1-liangpeng10@huawei.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/vnc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ui/vnc.c b/ui/vnc.c
index 247e80d8f5c8..34e6dc437c0f 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2168,6 +2168,7 @@ static void send_color_map(VncState *vs)
{
int i;
+ vnc_lock_output(vs);
vnc_write_u8(vs, VNC_MSG_SERVER_SET_COLOUR_MAP_ENTRIES);
vnc_write_u8(vs, 0); /* padding */
vnc_write_u16(vs, 0); /* first color */
@@ -2180,6 +2181,7 @@ static void send_color_map(VncState *vs)
vnc_write_u16(vs, (((i >> pf->gshift) & pf->gmax) << (16 - pf->gbits)));
vnc_write_u16(vs, (((i >> pf->bshift) & pf->bmax) << (16 - pf->bbits)));
}
+ vnc_unlock_output(vs);
}
static void set_pixel_format(VncState *vs, int bits_per_pixel,
--
2.27.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PULL 8/8] sdl2: Add extra mouse buttons
2020-12-11 9:12 [PULL 0/8] Ui 20201211 patches Gerd Hoffmann
` (6 preceding siblings ...)
2020-12-11 9:12 ` [PULL 7/8] ui/vnc: Add missing lock for send_color_map Gerd Hoffmann
@ 2020-12-11 9:12 ` Gerd Hoffmann
2020-12-11 19:30 ` [PULL 0/8] Ui 20201211 patches Peter Maydell
8 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2020-12-11 9:12 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Darrell Walisser
From: Darrell Walisser <darrell.walisser@gmail.com>
Allows guest to receive mouse buttons 4 and 5, aka "SIDE" button
and "EXTRA" button
Signed-off-by: Darrell Walisser <darrell.walisser@gmail.com>
Message-id: GNUALCfDBqhCUvLwBNJaKqxcPewMtlqCnixk8xTrgI@ubuntu
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/sdl2.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 189d26e2a951..a578017268ae 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -275,6 +275,8 @@ static void sdl_send_mouse_event(struct sdl2_console *scon, int dx, int dy,
[INPUT_BUTTON_LEFT] = SDL_BUTTON(SDL_BUTTON_LEFT),
[INPUT_BUTTON_MIDDLE] = SDL_BUTTON(SDL_BUTTON_MIDDLE),
[INPUT_BUTTON_RIGHT] = SDL_BUTTON(SDL_BUTTON_RIGHT),
+ [INPUT_BUTTON_SIDE] = SDL_BUTTON(SDL_BUTTON_X1),
+ [INPUT_BUTTON_EXTRA] = SDL_BUTTON(SDL_BUTTON_X2)
};
static uint32_t prev_state;
--
2.27.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PULL 0/8] Ui 20201211 patches
2020-12-11 9:12 [PULL 0/8] Ui 20201211 patches Gerd Hoffmann
` (7 preceding siblings ...)
2020-12-11 9:12 ` [PULL 8/8] sdl2: Add extra mouse buttons Gerd Hoffmann
@ 2020-12-11 19:30 ` Peter Maydell
8 siblings, 0 replies; 10+ messages in thread
From: Peter Maydell @ 2020-12-11 19:30 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: QEMU Developers
On Fri, 11 Dec 2020 at 09:16, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit 2ecfc0657afa5d29a373271b342f704a1a3c6737:
>
> Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2020-12-10' into staging (2020-12-10 17:01:05 +0000)
>
> are available in the Git repository at:
>
> git://git.kraxel.org/qemu tags/ui-20201211-pull-request
>
> for you to fetch changes up to 2951106143f6cf20b3a0e4f2078721503fe6418a:
>
> sdl2: Add extra mouse buttons (2020-12-11 08:06:40 +0100)
>
> ----------------------------------------------------------------
> ui/console ui_info tweaks.
> ui/vnc: alpha cursor support.
> ui/vnc: locking fixes.
> ui/sdl: add extra mouse buttons.
>
> ----------------------------------------------------------------
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/6.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-12-11 19:44 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-11 9:12 [PULL 0/8] Ui 20201211 patches Gerd Hoffmann
2020-12-11 9:12 ` [PULL 1/8] console: drop qemu_console_get_ui_info Gerd Hoffmann
2020-12-11 9:12 ` [PULL 2/8] console: allow con==NULL in dpy_{get, set}_ui_info and dpy_ui_info_supported Gerd Hoffmann
2020-12-11 9:12 ` [PULL 3/8] vnc: use enum for features Gerd Hoffmann
2020-12-11 9:12 ` [PULL 4/8] vnc: drop unused copyrect feature Gerd Hoffmann
2020-12-11 9:12 ` [PULL 5/8] vnc: add pseudo encodings Gerd Hoffmann
2020-12-11 9:12 ` [PULL 6/8] vnc: add alpha cursor support Gerd Hoffmann
2020-12-11 9:12 ` [PULL 7/8] ui/vnc: Add missing lock for send_color_map Gerd Hoffmann
2020-12-11 9:12 ` [PULL 8/8] sdl2: Add extra mouse buttons Gerd Hoffmann
2020-12-11 19:30 ` [PULL 0/8] Ui 20201211 patches Peter Maydell
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.