ps2: Initial horizontal scroll support
PATCH v2 1/5 ps2: Initial horizontal scroll support
v2:
- Patch is split into a sequence
- value is clamped to 31 for horizontal scroll
This patch introduces horizontal scroll support for the ps/2 mouse.
The patch is based on the previous work
by Brad Jorsch done in 2010
but never merge, see
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=579968
This change adds support for horizontal scroll to ps/2 mouse device code. The code is implemented to match the logic of linux kernel which is used as a reference.
--- hw/input/ps2.c | 57 +++++++++++++++++++++++++++++++++++++++++++------- qapi/ui.json | 2 +- 2 files changed, 50 insertions(+), 9 deletions(-)
hw/input/ps2.c +49 -8
@@ -123,6 +123,7 @@ typedef struct {int mouse_dx;/* current values, needed for 'poll' mode */ int mouse_dy;int mouse_dz; +int mouse_dw;uint8_t mouse_buttons; } PS2MouseState;
@@ -715,7 +716,7 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* IMPS/2 and IMEX send 4 bytes, PS2 sends 3 bytes */ const int needed = s->mouse_type ?4 :3 ;unsigned int b; -int dx1, dy1, dz1; +int dx1, dy1, dz1, dw1;if (PS2_QUEUE_SIZE - s->common.queue.count < needed) {return 0 ;
@@ -724,6 +725,7 @@ static int ps2_mouse_send_packet(PS2MouseState *s) dx1 = s->mouse_dx; dy1 = s->mouse_dy; dz1 = s->mouse_dz; + dw1 = s->mouse_dw;/* XXX: increase range to 8 bits ? */ if (dx1 >127 ) dx1 =127 ;
@@ -740,6 +742,9 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* extra byte for IMPS/2 or IMEX */ switch (s->mouse_type) {default : +/* Just ignore the wheels if not supported */ + s->mouse_dz =0 ; + s->mouse_dw =0 ;break ;case 3 :if (dz1 >127 )
@@ -747,13 +752,41 @@ static int ps2_mouse_send_packet(PS2MouseState *s)else if (dz1 <-127 ) dz1 =-127 ;ps2_queue_noirq (&s->common, dz1 &0xff ); + s->mouse_dz -= dz1; + s->mouse_dw =0 ;break ;case 4 : -if (dz1 >7 ) - dz1 =7 ; -else if (dz1 <-7 ) - dz1 =-7 ; - b = (dz1 &0x0f ) | ((s->mouse_buttons &0x18 ) <<1 ); +/* +* This matches what the Linux kernel expects for exps/2 in +* drivers/input/mouse/psmouse-base.c. Note, if you happen to +* press/release the 4th or 5th buttons at the same moment as a +* horizontal wheel scroll, those button presses will get lost. I'm not +* sure what to do about that, since by this point we don't know +* whether those buttons actually changed state. +*/ +if (dw1 !=0 ) { +if (dw1 >31 ) { + dw1 =31 ; + }else if (dw1 <-31 ) { + dw1 =-31 ; + } + +/* +* linux kernel expects first 6 bits to represent the value +* for horizontal scroll +*/ + b = (dw1 &0x3f ) |0x40 ; + s->mouse_dw -= dw1; + }else { +if (dz1 >7 ) { + dz1 =7 ; + }else if (dz1 <-7 ) { + dz1 =-7 ; + } + + b = (dz1 &0x0f ) | ((s->mouse_buttons &0x18 ) <<1 ); + s->mouse_dz -= dz1; + }ps2_queue_noirq (&s->common, b);break ; }
@@ -764,7 +797,6 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* update deltas */ s->mouse_dx -= dx1; s->mouse_dy -= dy1; - s->mouse_dz -= dz1;return 1 ; }
@@ -806,6 +838,12 @@ static void ps2_mouse_event(DeviceState *dev, QemuConsole *src, }else if (btn->button ==INPUT_BUTTON_WHEEL_DOWN ) { s->mouse_dz++; } + +if (btn->button ==INPUT_BUTTON_WHEEL_RIGHT ) { + s->mouse_dw--; + }else if (btn->button ==INPUT_BUTTON_WHEEL_LEFT ) { + s->mouse_dw++; + } }else { s->mouse_buttons &= ~bmap[btn->button]; }
@@ -833,8 +871,10 @@ static void ps2_mouse_sync(DeviceState *dev)/* if not remote, send event. Multiple events are sent if too big deltas */ while (ps2_mouse_send_packet (s)) { -if (s->mouse_dx ==0 && s->mouse_dy ==0 && s->mouse_dz ==0 ) +if (s->mouse_dx ==0 && s->mouse_dy ==0 + && s->mouse_dz ==0 && s->mouse_dw ==0 ) {break ; + } } } }
@@ -1036,6 +1076,7 @@ static void ps2_mouse_reset(void *opaque) s->mouse_dx =0 ; s->mouse_dy =0 ; s->mouse_dz =0 ; + s->mouse_dw =0 ; s->mouse_buttons =0 ; }
qapi/ui.json +1 -1
@@ -905,7 +905,7 @@ ## { 'enum' : 'InputButton', 'data' : [ 'left', 'middle', 'right', 'wheel-up', 'wheel-down', 'side', - 'extra' ] } + 'extra', 'wheel-left', 'wheel-right' ] } ## # @InputAxis:
Signature · 1 line
2.32.0
PATCH v2 2/5 ui/cocoa: pass horizontal scroll information to the device code
--- ui/cocoa.m | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
ui/cocoa.m +12 -6
@@ -970,21 +970,27 @@ QemuCocoaView *cocoaView; */ /* - * When deltaY is zero, it means that this scrolling event was - * either horizontal, or so fine that it only appears in - * scrollingDeltaY. So we drop the event. + * We shouldn't have got a scroll event when deltaY and delta Y + * are zero, hence no harm in dropping the event */ - if ([event deltaY] != 0) { + if ([event deltaY] != 0 || [event deltaX] != 0) { /* Determine if this is a scroll up or scroll down event */ - buttons = ([event deltaY] > 0) ? + if ([event deltaY] != 0) { + buttons = ([event deltaY] > 0) ? INPUT_BUTTON_WHEEL_UP : INPUT_BUTTON_WHEEL_DOWN; + } else if ([event deltaX] != 0) { + buttons = ([event deltaX] > 0) ? + INPUT_BUTTON_WHEEL_LEFT : INPUT_BUTTON_WHEEL_RIGHT; + } + qemu_input_queue_btn(dcl.con, buttons, true); qemu_input_event_sync(); qemu_input_queue_btn(dcl.con, buttons, false); qemu_input_event_sync(); } + /* - * Since deltaY also reports scroll wheel events we prevent mouse + * Since deltaX/deltaY also report scroll wheel events we prevent mouse * movement code from executing. */ mouse_event = false;
Signature · 1 line
2.32.0
PATCH v2 3/5 ui/gtk: pass horizontal scroll information to the device code
In reply to Dmitry Petrov--- ui/gtk.c | 54 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 12 deletions(-)
ui/gtk.c +42 -12
@@ -963,33 +963,63 @@ static gboolean gd_scroll_event(GtkWidget *widget, GdkEventScroll *scroll, void *opaque) {VirtualConsole *vc = opaque; -InputButton btn; +InputButton btn_vertical; +InputButton btn_horizontal; +bool has_vertical = false; +bool has_horizontal = false;if (scroll->direction ==GDK_SCROLL_UP ) { - btn =INPUT_BUTTON_WHEEL_UP ; + btn_vertical =INPUT_BUTTON_WHEEL_UP ; + has_vertical = true; }else if (scroll->direction ==GDK_SCROLL_DOWN ) { - btn =INPUT_BUTTON_WHEEL_DOWN ; + btn_vertical =INPUT_BUTTON_WHEEL_DOWN ; + has_vertical = true; + }else if (scroll->direction ==GDK_SCROLL_LEFT ) { + btn_horizontal =INPUT_BUTTON_WHEEL_LEFT ; + has_horizontal = true; + }else if (scroll->direction ==GDK_SCROLL_RIGHT ) { + btn_horizontal =INPUT_BUTTON_WHEEL_RIGHT ; + has_horizontal = true; }else if (scroll->direction ==GDK_SCROLL_SMOOTH ) {gdouble delta_x, delta_y;if (!gdk_event_get_scroll_deltas ((GdkEvent *)scroll, &delta_x, &delta_y)) {return TRUE; } -if (delta_y ==0 ) { -return TRUE; - }else if (delta_y >0 ) { - btn =INPUT_BUTTON_WHEEL_DOWN ; + +if (delta_y >0 ) { + btn_vertical =INPUT_BUTTON_WHEEL_DOWN ; + has_vertical = true; + }else if (delta_y <0 ) { + btn_vertical =INPUT_BUTTON_WHEEL_UP ; + has_vertical = true; + }else if (delta_x >0 ) { + btn_horizontal =INPUT_BUTTON_WHEEL_RIGHT ; + has_horizontal = true; + }else if (delta_x <0 ) { + btn_horizontal =INPUT_BUTTON_WHEEL_LEFT ; + has_horizontal = true; }else { - btn =INPUT_BUTTON_WHEEL_UP ; +return TRUE; } }else {return TRUE; } -qemu_input_queue_btn (vc->gfx.dcl.con, btn, true); -qemu_input_event_sync (); -qemu_input_queue_btn (vc->gfx.dcl.con, btn, false); -qemu_input_event_sync (); +if (has_vertical) { +qemu_input_queue_btn (vc->gfx.dcl.con, btn_vertical, true); +qemu_input_event_sync (); +qemu_input_queue_btn (vc->gfx.dcl.con, btn_vertical, false); +qemu_input_event_sync (); + } + +if (has_horizontal) { +qemu_input_queue_btn (vc->gfx.dcl.con, btn_horizontal, true); +qemu_input_event_sync (); +qemu_input_queue_btn (vc->gfx.dcl.con, btn_horizontal, false); +qemu_input_event_sync (); + } +return TRUE; }
Signature · 1 line
2.32.0
PATCH v2 4/5 ui/sdl2: pass horizontal scroll information to the device code
In reply to Dmitry Petrov--- ui/sdl2.c | 5 +++++ 1 file changed, 5 insertions(+)
ui/sdl2.c +5 -0
@@ -33,6 +33,7 @@#include "sysemu/runstate-action.h" #include "sysemu/sysemu.h" #include "ui/win32-kbd-hook.h" +#include "qemu/log.h" static int sdl2_num_outputs;static struct sdl2_console *sdl2_console;
@@ -535,6 +536,10 @@ static void handle_mousewheel(SDL_Event *ev) btn =INPUT_BUTTON_WHEEL_UP ; }else if (wev->y <0 ) { btn =INPUT_BUTTON_WHEEL_DOWN ; + }else if (wev->x <0 ) { + btn =INPUT_BUTTON_WHEEL_RIGHT ; + }else if (wev->x >0 ) { + btn =INPUT_BUTTON_WHEEL_LEFT ; }else {return ; }
Signature · 1 line
2.32.0
PATCH v2 5/5 ui/input-legacy: pass horizontal scroll information
In reply to Dmitry PetrovThis code seems to be used by vmport hack, passing these values allows to implement horizontal scroll support even when using vmport. In case it's not supported horizontal scroll will act as a vertical one.
--- ui/input-legacy.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
ui/input-legacy.c +16 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "qemu/log.h" #include "qapi/qapi-commands-ui.h" #include "ui/console.h" #include "keymaps.h"
@@ -179,6 +180,20 @@ static void legacy_mouse_event(DeviceState *dev, QemuConsole *src,1 , s->buttons); } +if (btn->down && btn->button ==INPUT_BUTTON_WHEEL_RIGHT ) { + s->qemu_put_mouse_event (s->qemu_put_mouse_event_opaque, + s->axis[INPUT_AXIS_X ], + s->axis[INPUT_AXIS_Y ], +-2 , + s->buttons); + } +if (btn->down && btn->button ==INPUT_BUTTON_WHEEL_LEFT ) { + s->qemu_put_mouse_event (s->qemu_put_mouse_event_opaque, + s->axis[INPUT_AXIS_X ], + s->axis[INPUT_AXIS_Y ], +2 , + s->buttons); + }break ;case INPUT_EVENT_KIND_ABS : move = evt->u.abs.data;
@@ -216,6 +231,7 @@ QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func,QEMUPutMouseEntry *s; s =g_new0 (QEMUPutMouseEntry,1 ); +qemu_log ("qemu_add_mouse_event_handler %s" , name); s->qemu_put_mouse_event = func; s->qemu_put_mouse_event_opaque = opaque;
Signature · 1 line
2.32.0
Re: [PATCH v2 5/5] ui/input-legacy: pass horizontal scroll information
Hi
Quoted 6 lines · Dmitry Petrov
This code seems to be used by vmport hack, passing these values allows to implement horizontal scroll support even when using vmport. In case it's not supported horizontal scroll will act as a vertical one.
Signed-off-by Dmitry Petrov <[email protected]>
Hmm, apparently Linux kernel handles PSMOUSE_VMMOUSE as a generic ps/2 mouse without the extensions.
And there is no horizontal scrolling in vmmouse protocol I can find.
---
Quoted 25 lines
ui/input-legacy.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)ui/input-legacy.c +6
-0@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "qemu/log.h" #include "qapi/qapi-commands-ui.h" #include "ui/console.h" #include "keymaps.h" @@ -179,6 +180,20 @@ static void legacy_mouse_event(DeviceState *dev, QemuConsole *src,1 , s->buttons); } +if (btn->down && btn->button ==INPUT_BUTTON_WHEEL_RIGHT ) { + s->qemu_put_mouse_event(s->qemu_put_mouse_event_opaque, + s->axis[INPUT_AXIS_X], + s->axis[INPUT_AXIS_Y], + -2,
ui/input-legacy.c static void legacy_mouse_event(DeviceState *dev, · line 198
Quoted 10 lines
ui/input-legacy.c +9
-0+ s->buttons); + } +if (btn->down && btn->button ==INPUT_BUTTON_WHEEL_LEFT ) { + s->qemu_put_mouse_event (s->qemu_put_mouse_event_opaque, + s->axis[INPUT_AXIS_X ], + s->axis[INPUT_AXIS_Y ], +2 , + s->buttons); + }
So I think mapping to vertical makes sense, although I am not sure it's necessary.
break;
ui/input-legacy.c QEMUPutMouseEntry · line 237
Quoted 10 lines
ui/input-legacy.c +0
-0case INPUT_EVENT_KIND_ABS :move = evt->u.abs.data;ui/input-legacy.c +1
-0@@ -216,6 +231,7 @@ QEMUPutMouseEntry *qemu_add_mouse_event_handler (QEMUPutMouseEvent *func, QEMUPutMouseEntry *s; s =g_new0 (QEMUPutMouseEntry,1 ); +qemu_log ("qemu_add_mouse_event_handler %s" , name);
Please remove that logging
Quoted 7 lines
s->qemu_put_mouse_event = func; s->qemu_put_mouse_event_opaque = opaque;--
2.32.0
Signature · 1 line
Marc-André Lureau
Hi
Quoted 4 lines · Dmitry Petrov
v2:
- Patch is split into a sequence
- value is clamped to 31 for horizontal scroll
Quoted 9 lines
This patch introduces horizontal scroll support for the ps/2 mouse.
The patch is based on the previous work
by Brad Jorsch done in 2010
but never merge, see
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=579968
The patch series doesn't form a thread. You should also add a cover letter. This way, tools like patchew/patchwork can handle it correctly.
Quoted 6 lines
This change adds support for horizontal scroll to ps/2 mouse device code. The code is implemented to match the logic of linux kernel which is used as a reference.
Signed-off-by Dmitry Petrov <[email protected]>
I just realized that ps2.c isn't reused by vmmouse.
What's really the point in adding horizontal scroll to ps2?
A VM without absolute pointer is not really acceptable or working these days. Especially on Wayland with the QEMU GTK display. (fwiw, spice-gtk and rdw do implement pointer contraints & relative extensions so it's kinda working ok).
Have you looked at adding virtio-input-hid support instead? That should be more straightforward.
---
Quoted 147 lines
hw/input/ps2.c | 57 +++++++++++++++++++++++++++++++++++++++++++------- qapi/ui.json | 2 +- 2 files changed, 50 insertions(+), 9 deletions(-)hw/input/ps2.c +13
-6@@ -123,6 +123,7 @@ typedef struct {int mouse_dx;/* current values, needed for 'poll' mode */ int mouse_dy;int mouse_dz; +int mouse_dw;uint8_t mouse_buttons; } PS2MouseState;@@ -715,7 +716,7 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* IMPS/2 and IMEX send 4 bytes, PS2 sends 3 bytes */ const int needed = s->mouse_type ?4 :3 ;unsigned int b; -int dx1, dy1, dz1; +int dx1, dy1, dz1, dw1;if (PS2_QUEUE_SIZE - s->common.queue.count < needed) {return 0 ;@@ -724,6 +725,7 @@ static int ps2_mouse_send_packet(PS2MouseState *s) dx1 = s->mouse_dx; dy1 = s->mouse_dy; dz1 = s->mouse_dz; + dw1 = s->mouse_dw;/* XXX: increase range to 8 bits ? */ if (dx1 >127 ) dx1 =127 ;@@ -740,6 +742,9 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* extra byte for IMPS/2 or IMEX */ switch (s->mouse_type) {default : +/* Just ignore the wheels if not supported */ + s->mouse_dz =0 ; + s->mouse_dw =0 ;break ;case 3 :if (dz1 >127 )@@ -747,13 +752,41 @@ static int ps2_mouse_send_packet(PS2MouseState *s)else if (dz1 <-127 ) dz1 =-127 ;ps2_queue_noirq (&s->common, dz1 &0xff ); + s->mouse_dz -= dz1; + s->mouse_dw =0 ;break ;case 4 : -if (dz1 >7 ) - dz1 =7 ; -else if (dz1 <-7 ) - dz1 =-7 ; - b = (dz1 &0x0f ) | ((s->mouse_buttons &0x18 ) <<1 ); +/* +* This matches what the Linux kernel expects for exps/2 in +* drivers/input/mouse/psmouse-base.c. Note, if you happen to +* press/release the 4th or 5th buttons at the same moment as a +* horizontal wheel scroll, those button presses will get lost. I'm not
hw/input/ps2.c +32
-1+* sure what to do about that, since by this point we don't know +* whether those buttons actually changed state. +*/ +if (dw1 !=0 ) { +if (dw1 >31 ) { + dw1 =31 ; + }else if (dw1 <-31 ) { + dw1 =-31 ; + } + +/* +* linux kernel expects first 6 bits to represent the value +* for horizontal scroll +*/ + b = (dw1 &0x3f ) |0x40 ; + s->mouse_dw -= dw1; + }else { +if (dz1 >7 ) { + dz1 =7 ; + }else if (dz1 <-7 ) { + dz1 =-7 ; + } + + b = (dz1 &0x0f ) | ((s->mouse_buttons &0x18 ) <<1 ); + s->mouse_dz -= dz1; + }ps2_queue_noirq (&s->common, b);break ; }@@ -764,7 +797,6 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* update deltas */ s->mouse_dx -= dx1; s->mouse_dy -= dy1; - s->mouse_dz -= dz1;return 1 ; }@@ -806,6 +838,12 @@ static void ps2_mouse_event(DeviceState *dev, QemuConsole *src, }else if (btn->button ==INPUT_BUTTON_WHEEL_DOWN ) { s->mouse_dz++; } + +if (btn->button ==INPUT_BUTTON_WHEEL_RIGHT ) { + s->mouse_dw--; + }else if (btn->button ==INPUT_BUTTON_WHEEL_LEFT ) { + s->mouse_dw++; + } }else { s->mouse_buttons &= ~bmap[btn->button];}hw/input/ps2.c +4
-1@@ -833,8 +871,10 @@ static void ps2_mouse_sync(DeviceState *dev)/* if not remote, send event. Multiple events are sent if too big deltas */ while (ps2_mouse_send_packet (s)) { -if (s->mouse_dx ==0 && s->mouse_dy ==0 && s->mouse_dz ==0 ) +if (s->mouse_dx ==0 && s->mouse_dy ==0 + && s->mouse_dz ==0 && s->mouse_dw ==0 ) {break ; + } } } }@@ -1036,6 +1076,7 @@ static void ps2_mouse_reset(void *opaque) s->mouse_dx =0 ; s->mouse_dy =0 ; s->mouse_dz =0 ; + s->mouse_dw =0 ; s->mouse_buttons =0 ; }qapi/ui.json +1
-2@@ -905,7 +905,7 @@ ## { 'enum' : 'InputButton', 'data' : [ 'left', 'middle', 'right', 'wheel-up', 'wheel-down', 'side', - 'extra' ] } + 'extra', 'wheel-left', 'wheel-right' ] } ## # @InputAxis: --
Quoted 4 lines
2.32.0
No objection otherwise, patch looks fine (I couldn't really test it on wayland..).
Signature · 1 line
Marc-André Lureau
Hi Marc-André,
Thank you for the comments!
The reason of adding the support there was because I've been working on horizontal scroll support for another os
(serenity os - https://github.com/SerenityOS/serenity/pull/11246) and wanted to make sure that any changes I made
worked fine and ps/2 mouse code was the most straightforward way I could find especially because I could test it
both against linux and serenity os code.
Did I get it right that the only changes needed for these patches are:
- Drop unnecessary log line
- Submit again as v3 with a cover letter?
It's my first submission, still trying to get used to the tooling and requirements.
Thanks! Dmitry Petrov
Quoted 200 lines · Marc-André Lureau
Hi
Quoted 4 lines · Dmitry Petrov
v2:
- Patch is split into a sequence
- value is clamped to 31 for horizontal scrollQuoted 9 lines
This patch introduces horizontal scroll support for the ps/2 mouse.
The patch is based on the previous work
by Brad Jorsch done in 2010
but never merge, see
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=579968The patch series doesn't form a thread. You should also add a cover letter. This way, tools like patchew/patchwork can handle it correctly.
Quoted 6 lines
This change adds support for horizontal scroll to ps/2 mouse device code. The code is implemented to match the logic of linux kernel which is used as a reference.
Signed-off-by Dmitry Petrov <[email protected]>I just realized that
ps2.cisn't reused by vmmouse.What's really the point in adding horizontal scroll to ps2?
A VM without absolute pointer is not really acceptable or working these days. Especially on Wayland with the QEMU GTK display. (fwiw, spice-gtk and rdw do implement pointer contraints & relative extensions so it's kinda working ok).
Have you looked at adding virtio-input-hid support instead? That should be more straightforward.
---
Quoted 146 lines
hw/input/ps2.c | 57 +++++++++++++++++++++++++++++++++++++++++++------- qapi/ui.json | 2 +- 2 files changed, 50 insertions(+), 9 deletions(-)hw/input/ps2.c +13
-6@@ -123,6 +123,7 @@ typedef struct {int mouse_dx;/* current values, needed for 'poll' mode */ int mouse_dy;int mouse_dz; +int mouse_dw;uint8_t mouse_buttons; } PS2MouseState;@@ -715,7 +716,7 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* IMPS/2 and IMEX send 4 bytes, PS2 sends 3 bytes */ const int needed = s->mouse_type ?4 :3 ;unsigned int b; -int dx1, dy1, dz1; +int dx1, dy1, dz1, dw1;if (PS2_QUEUE_SIZE - s->common.queue.count < needed) {return 0 ;@@ -724,6 +725,7 @@ static int ps2_mouse_send_packet(PS2MouseState *s) dx1 = s->mouse_dx; dy1 = s->mouse_dy; dz1 = s->mouse_dz; + dw1 = s->mouse_dw;/* XXX: increase range to 8 bits ? */ if (dx1 >127 ) dx1 =127 ;@@ -740,6 +742,9 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* extra byte for IMPS/2 or IMEX */ switch (s->mouse_type) {default : +/* Just ignore the wheels if not supported */ + s->mouse_dz =0 ; + s->mouse_dw =0 ;break ;case 3 :if (dz1 >127 )@@ -747,13 +752,41 @@ static int ps2_mouse_send_packet(PS2MouseState *s)else if (dz1 <-127 ) dz1 =-127 ;ps2_queue_noirq (&s->common, dz1 &0xff ); + s->mouse_dz -= dz1; + s->mouse_dw =0 ;break ;case 4 : -if (dz1 >7 ) - dz1 =7 ; -else if (dz1 <-7 ) - dz1 =-7 ; - b = (dz1 &0x0f ) | ((s->mouse_buttons &0x18 ) <<1 ); +/* +* This matches what the Linux kernel expects for exps/2 in +* drivers/input/mouse/psmouse-base.c. Note, if you happen to +* press/release the 4th or 5th buttons at the same moment as a +* horizontal wheel scroll, those button presses will get lost. I'm not
hw/input/ps2.c +32
-1+* sure what to do about that, since by this point we don't know +* whether those buttons actually changed state. +*/ +if (dw1 !=0 ) { +if (dw1 >31 ) { + dw1 =31 ; + }else if (dw1 <-31 ) { + dw1 =-31 ; + } + +/* +* linux kernel expects first 6 bits to represent the value +* for horizontal scroll +*/ + b = (dw1 &0x3f ) |0x40 ; + s->mouse_dw -= dw1; + }else { +if (dz1 >7 ) { + dz1 =7 ; + }else if (dz1 <-7 ) { + dz1 =-7 ; + } + + b = (dz1 &0x0f ) | ((s->mouse_buttons &0x18 ) <<1 ); + s->mouse_dz -= dz1; + }ps2_queue_noirq (&s->common, b);break ; }@@ -764,7 +797,6 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* update deltas */ s->mouse_dx -= dx1; s->mouse_dy -= dy1; - s->mouse_dz -= dz1;return 1 ; }@@ -806,6 +838,12 @@ static void ps2_mouse_event(DeviceState *dev, QemuConsole *src, }else if (btn->button ==INPUT_BUTTON_WHEEL_DOWN ) { s->mouse_dz++; } + +if (btn->button ==INPUT_BUTTON_WHEEL_RIGHT ) { + s->mouse_dw--; + }else if (btn->button ==INPUT_BUTTON_WHEEL_LEFT ) { + s->mouse_dw++; + } }else { s->mouse_buttons &= ~bmap[btn->button];}hw/input/ps2.c +4
-1@@ -833,8 +871,10 @@ static void ps2_mouse_sync(DeviceState *dev)/* if not remote, send event. Multiple events are sent if too big deltas */ while (ps2_mouse_send_packet (s)) { -if (s->mouse_dx ==0 && s->mouse_dy ==0 && s->mouse_dz ==0 ) +if (s->mouse_dx ==0 && s->mouse_dy ==0 + && s->mouse_dz ==0 && s->mouse_dw ==0 ) {break ; + } } } }@@ -1036,6 +1076,7 @@ static void ps2_mouse_reset(void *opaque) s->mouse_dx =0 ; s->mouse_dy =0 ; s->mouse_dz =0 ; + s->mouse_dw =0 ; s->mouse_buttons =0 ; }qapi/ui.json +1
-1@@ -905,7 +905,7 @@ ## { 'enum' : 'InputButton', 'data' : [ 'left', 'middle', 'right', 'wheel-up', 'wheel-down', 'side', - 'extra' ] } + 'extra', 'wheel-left', 'wheel-right' ] } ##Quoted 6 lines
# @InputAxis:
--
2.32.0No objection otherwise, patch looks fine (I couldn't really test it on wayland..).
--
Marc-André Lureau
Hi Dmitry
Quoted 12 lines · Dmitry Petrov
Hi Marc-André,
Thank you for the comments!
The reason of adding the support there was because I've been working on horizontal scroll support for another os
(serenity os - https://github.com/SerenityOS/serenity/pull/11246) and wanted to make sure that any changes I made
worked fine and ps/2 mouse code was the most straightforward way I could find especially because I could test it
both against linux and serenity os code.
Quoted 6 lines
Did I get it right that the only changes needed for these patches are:
- Drop unnecessary log line
- Submit again as v3 with a cover letter?
Yes, that would be nice, so more tools and people can review easily.
Quoted 3 lines
It's my first submission, still trying to get used to the tooling and requirements.
We have some documentation in
https://www.qemu.org/docs/master/devel/submitting-a-patch.html
(I'd recommend using git-publish, although it's good to understand and know the underlying commands and workflow before using it).
Quoted 1 line
Signature · 1 line
Marc-André Lureau
Quoted 11 lines · Dmitry Petrov
v2:
- Patch is split into a sequence
- value is clamped to 31 for horizontal scrollThis patch introduces horizontal scroll support for the ps/2 mouse.
The patch is based on the previous work
by Brad Jorsch done in 2010
but never merge, see
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=579968
The bugs attached to that ticket don't have any Signed-off-by from Brad. Fortunately at the time he did re-submit them on qemu-devel with Signed-off-by present.
Can you include this link to his patches in your commit message to get the paper trail
https://lists.gnu.org/archive/html/qemu-devel/2010-05/msg00223.html
Quoted 154 lines
This change adds support for horizontal scroll to ps/2 mouse device code. The code is implemented to match the logic of linux kernel which is used as a reference.
Signed-off-by Dmitry Petrov <[email protected]>--- hw/input/ps2.c | 57 +++++++++++++++++++++++++++++++++++++++++++------- qapi/ui.json | 2 +- 2 files changed, 50 insertions(+), 9 deletions(-)hw/input/ps2.c +49
-8@@ -123,6 +123,7 @@ typedef struct {int mouse_dx;/* current values, needed for 'poll' mode */ int mouse_dy;int mouse_dz; +int mouse_dw;uint8_t mouse_buttons; } PS2MouseState;@@ -715,7 +716,7 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* IMPS/2 and IMEX send 4 bytes, PS2 sends 3 bytes */ const int needed = s->mouse_type ?4 :3 ;unsigned int b; -int dx1, dy1, dz1; +int dx1, dy1, dz1, dw1;if (PS2_QUEUE_SIZE - s->common.queue.count < needed) {return 0 ;@@ -724,6 +725,7 @@ static int ps2_mouse_send_packet(PS2MouseState *s) dx1 = s->mouse_dx; dy1 = s->mouse_dy; dz1 = s->mouse_dz; + dw1 = s->mouse_dw;/* XXX: increase range to 8 bits ? */ if (dx1 >127 ) dx1 =127 ;@@ -740,6 +742,9 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* extra byte for IMPS/2 or IMEX */ switch (s->mouse_type) {default : +/* Just ignore the wheels if not supported */ + s->mouse_dz =0 ; + s->mouse_dw =0 ;break ;case 3 :if (dz1 >127 )@@ -747,13 +752,41 @@ static int ps2_mouse_send_packet(PS2MouseState *s)else if (dz1 <-127 ) dz1 =-127 ;ps2_queue_noirq (&s->common, dz1 &0xff ); + s->mouse_dz -= dz1; + s->mouse_dw =0 ;break ;case 4 : -if (dz1 >7 ) - dz1 =7 ; -else if (dz1 <-7 ) - dz1 =-7 ; - b = (dz1 &0x0f ) | ((s->mouse_buttons &0x18 ) <<1 ); +/* +* This matches what the Linux kernel expects for exps/2 in +* drivers/input/mouse/psmouse-base.c. Note, if you happen to +* press/release the 4th or 5th buttons at the same moment as a +* horizontal wheel scroll, those button presses will get lost. I'm not +* sure what to do about that, since by this point we don't know +* whether those buttons actually changed state. +*/ +if (dw1 !=0 ) { +if (dw1 >31 ) { + dw1 =31 ; + }else if (dw1 <-31 ) { + dw1 =-31 ; + } + +/* +* linux kernel expects first 6 bits to represent the value +* for horizontal scroll +*/ + b = (dw1 &0x3f ) |0x40 ; + s->mouse_dw -= dw1; + }else { +if (dz1 >7 ) { + dz1 =7 ; + }else if (dz1 <-7 ) { + dz1 =-7 ; + } + + b = (dz1 &0x0f ) | ((s->mouse_buttons &0x18 ) <<1 ); + s->mouse_dz -= dz1; + }ps2_queue_noirq (&s->common, b);break ; }@@ -764,7 +797,6 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* update deltas */ s->mouse_dx -= dx1; s->mouse_dy -= dy1; - s->mouse_dz -= dz1;return 1 ; }@@ -806,6 +838,12 @@ static void ps2_mouse_event(DeviceState *dev, QemuConsole *src, }else if (btn->button ==INPUT_BUTTON_WHEEL_DOWN ) { s->mouse_dz++; } + +if (btn->button ==INPUT_BUTTON_WHEEL_RIGHT ) { + s->mouse_dw--; + }else if (btn->button ==INPUT_BUTTON_WHEEL_LEFT ) { + s->mouse_dw++; + } }else { s->mouse_buttons &= ~bmap[btn->button]; }@@ -833,8 +871,10 @@ static void ps2_mouse_sync(DeviceState *dev)/* if not remote, send event. Multiple events are sent if too big deltas */ while (ps2_mouse_send_packet (s)) { -if (s->mouse_dx ==0 && s->mouse_dy ==0 && s->mouse_dz ==0 ) +if (s->mouse_dx ==0 && s->mouse_dy ==0 + && s->mouse_dz ==0 && s->mouse_dw ==0 ) {break ; + } } } }@@ -1036,6 +1076,7 @@ static void ps2_mouse_reset(void *opaque) s->mouse_dx =0 ; s->mouse_dy =0 ; s->mouse_dz =0 ; + s->mouse_dw =0 ; s->mouse_buttons =0 ; }qapi/ui.json +1
-1@@ -905,7 +905,7 @@ ## { 'enum' : 'InputButton', 'data' : [ 'left', 'middle', 'right', 'wheel-up', 'wheel-down', 'side', - 'extra' ] } + 'extra', 'wheel-left', 'wheel-right' ] } ## # @InputAxis:Signature · 1 line
2.32.0
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Hi Daniel,
Thanks for the link! I've sent a v4 patch with a cover letter that includes it as well
as the latest comments by Marc-André to v2 of the patch.
Kind regards, Dmitry
Quoted 192 lines · Daniel P. Berrangé
Quoted 11 lines · Dmitry Petrov
v2:
- Patch is split into a sequence
- value is clamped to 31 for horizontal scrollThis patch introduces horizontal scroll support for the ps/2 mouse.
The patch is based on the previous work
by Brad Jorsch done in 2010
but never merge, see
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=579968The bugs attached to that ticket don't have any Signed-off-by from Brad. Fortunately at the time he did re-submit them on qemu-devel with Signed-off-by present.
Can you include this link to his patches in your commit message to get the paper trail
https://lists.gnu.org/archive/html/qemu-devel/2010-05/msg00223.html
Quoted 57 lines
This change adds support for horizontal scroll to ps/2 mouse device code. The code is implemented to match the logic of linux kernel which is used as a reference.
Signed-off-by Dmitry Petrov <[email protected]>--- hw/input/ps2.c | 57 +++++++++++++++++++++++++++++++++++++++++++------- qapi/ui.json | 2 +- 2 files changed, 50 insertions(+), 9 deletions(-)hw/input/ps2.c +8
-1@@ -123,6 +123,7 @@ typedef struct {int mouse_dx;/* current values, needed for 'poll' mode */ int mouse_dy;int mouse_dz; +int mouse_dw;uint8_t mouse_buttons; } PS2MouseState;@@ -715,7 +716,7 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* IMPS/2 and IMEX send 4 bytes, PS2 sends 3 bytes */ const int needed = s->mouse_type ?4 :3 ;unsigned int b; -int dx1, dy1, dz1; +int dx1, dy1, dz1, dw1;if (PS2_QUEUE_SIZE - s->common.queue.count < needed) {return 0 ;@@ -724,6 +725,7 @@ static int ps2_mouse_send_packet(PS2MouseState *s) dx1 = s->mouse_dx; dy1 = s->mouse_dy; dz1 = s->mouse_dz; + dw1 = s->mouse_dw;/* XXX: increase range to 8 bits ? */ if (dx1 >127 ) dx1 =127 ;@@ -740,6 +742,9 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* extra byte for IMPS/2 or IMEX */ switch (s->mouse_type) {default : +/* Just ignore the wheels if not supported */ + s->mouse_dz =0 ; + s->mouse_dw =0 ;break ;case 3 :if (dz1 >127 )@@ -747,13 +752,41 @@ static int ps2_mouse_send_packet(PS2MouseState *s)else if (dz1 <-127 ) dz1 =-127 ;ps2_queue_noirq (&s->common, dz1 &0xff ); + s->mouse_dz -= dz1; + s->mouse_dw =0 ;break ;case 4 :hw/input/ps2.c static int ps2_mouse_send_packet(PS2MouseState *s) · line 763
Quoted 10 lines
hw/input/ps2.c +5
-5-if (dz1 >7 ) - dz1 =7 ; -else if (dz1 <-7 ) - dz1 =-7 ; - b = (dz1 &0x0f ) | ((s->mouse_buttons &0x18 ) <<1 ); +/* +* This matches what the Linux kernel expects for exps/2 in +* drivers/input/mouse/psmouse-base.c. Note, if you happen to +* press/release the 4th or 5th buttons at the same moment as a +* horizontal wheel scroll, those button presses will get lost. I'm not
hw/input/ps2.c static void ps2_mouse_event(DeviceState *dev,
Quoted 38 lines
hw/input/ps2.c +26
-1+* sure what to do about that, since by this point we don't know +* whether those buttons actually changed state. +*/ +if (dw1 !=0 ) { +if (dw1 >31 ) { + dw1 =31 ; + }else if (dw1 <-31 ) { + dw1 =-31 ; + } + +/* +* linux kernel expects first 6 bits to represent the value +* for horizontal scroll +*/ + b = (dw1 &0x3f ) |0x40 ; + s->mouse_dw -= dw1; + }else { +if (dz1 >7 ) { + dz1 =7 ; + }else if (dz1 <-7 ) { + dz1 =-7 ; + } + + b = (dz1 &0x0f ) | ((s->mouse_buttons &0x18 ) <<1 ); + s->mouse_dz -= dz1; + }ps2_queue_noirq (&s->common, b);break ; }@@ -764,7 +797,6 @@ static int ps2_mouse_send_packet(PS2MouseState *s)/* update deltas */ s->mouse_dx -= dx1; s->mouse_dy -= dy1; - s->mouse_dz -= dz1;return 1 ; }@@ -806,6 +838,12 @@ static void ps2_mouse_event(DeviceState *dev,QemuConsole *src,
Quoted 13 lines
hw/input/ps2.c +6
-0}else if (btn->button ==INPUT_BUTTON_WHEEL_DOWN ) { s->mouse_dz++; } + +if (btn->button ==INPUT_BUTTON_WHEEL_RIGHT ) { + s->mouse_dw--; + }else if (btn->button ==INPUT_BUTTON_WHEEL_LEFT ) { + s->mouse_dw++; + } }else { s->mouse_buttons &= ~bmap[btn->button]; }hw/input/ps2.c static void ps2_mouse_sync(DeviceState *dev) · line 836
Quoted 4 lines
hw/input/ps2.c +0
-1@@ -833,8 +871,10 @@ static void ps2_mouse_sync(DeviceState *dev)/* if not remote, send event. Multiple events are sent if too big deltas */ while (ps2_mouse_send_packet (s)) { - if (s->mouse_dx == 0 && s->mouse_dy == 0 && s->mouse_dz ==0)
Quoted 20 lines
hw/input/ps2.c +4
-0+if (s->mouse_dx ==0 && s->mouse_dy ==0 + && s->mouse_dz ==0 && s->mouse_dw ==0 ) {break ; + } } } }@@ -1036,6 +1076,7 @@ static void ps2_mouse_reset(void *opaque) s->mouse_dx =0 ; s->mouse_dy =0 ; s->mouse_dz =0 ; + s->mouse_dw =0 ; s->mouse_buttons =0 ; }qapi/ui.json +0
-0qapi/ui.json line 907
Quoted 3 lines
qapi/ui.json +0
-0@@ -905,7 +905,7 @@ ## { 'enum' : 'InputButton', 'data' : [ 'left', 'middle', 'right', 'wheel-up', 'wheel-down','side',
Quoted 9 lines
qapi/ui.json +1
-2- 'extra' ] } + 'extra', 'wheel-left', 'wheel-right' ] } ## # @InputAxis: --2.32.0
Regards,
Daniel
--
|: https://berrange.com -o-
https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-
https://fstop138.berrange.com :|
|: https://entangle-photo.org -o-
https://www.instagram.com/dberrange :|