Merge branch 'feature/KASM-2346_extend_mouse_buttons' into 'master'

Resolve KASM-2346 "Feature/ extend mouse buttons"

Closes KASM-2346

See merge request kasm-technologies/internal/KasmVNC!72
release/1.0.0
Matthew McClaskey 3 years ago
commit 0cf6654355

@ -225,7 +225,7 @@ void SMsgReader::readKeyEvent()
void SMsgReader::readPointerEvent() void SMsgReader::readPointerEvent()
{ {
int mask = is->readU8(); int mask = is->readU16();
int x = is->readU16(); int x = is->readU16();
int y = is->readU16(); int y = is->readU16();
int scrollX = is->readS16(); int scrollX = is->readS16();

@ -1634,13 +1634,15 @@ On a conventional mouse, buttons 1, 2 and 3 correspond to the left,
middle and right buttons on the mouse. On a wheel mouse, each step of middle and right buttons on the mouse. On a wheel mouse, each step of
the wheel is represented by a press and release of a certain button. the wheel is represented by a press and release of a certain button.
Button 4 means up, button 5 means down, button 6 means left and Button 4 means up, button 5 means down, button 6 means left and
button 7 means right. button 7 means right. Some pointer devices support additional buttons.
Button 8 is typically the back button and button 9 is typically the
forward button.
=============== ==================== ========== ======================= =============== ==================== ========== =======================
No. of bytes Type [Value] Description No. of bytes Type [Value] Description
=============== ==================== ========== ======================= =============== ==================== ========== =======================
1 ``U8`` 5 *message-type* 1 ``U8`` 5 *message-type*
1 ``U8`` *button-mask* 1 ``U16`` *button-mask*
2 ``U16`` *x-position* 2 ``U16`` *x-position*
2 ``U16`` *y-position* 2 ``U16`` *y-position*
=============== ==================== ========== ======================= =============== ==================== ========== =======================

@ -1 +1 @@
Subproject commit cac1f25ce4a5b866ac57ed62b682e89f1ce0dc92 Subproject commit 26c97c1dd3b52f80af198fd05062ccd04d716f7d

@ -50,7 +50,7 @@ extern const unsigned int code_map_qnum_to_xorgevdev_len;
extern const unsigned short code_map_qnum_to_xorgkbd[]; extern const unsigned short code_map_qnum_to_xorgkbd[];
extern const unsigned int code_map_qnum_to_xorgkbd_len; extern const unsigned int code_map_qnum_to_xorgkbd_len;
#define BUTTONS 7 #define BUTTONS 10
/* Event queue is shared between all devices. */ /* Event queue is shared between all devices. */
#if XORG < 111 #if XORG < 111

Loading…
Cancel
Save