OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

msmouse: send short messages if possible. 

Keep track of button changes.  Send the extended 4-byte messages for
three button mice only in case we have something to report for the
middle button.  Use the short 3-byte messages (original protocol for
two-button microsoft mouse) otherwise.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1467625375-31774-5-git-send-email-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2016-07-04 11:42:55 +02:00
parent 96d7c0720e
commit d7b7f526b1
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
backends/msmouse.c
View File

@ -35,6 +35,7 @@ typedef struct {
QemuInputHandlerState *hs; QemuInputHandlerState *hs;
int axis[INPUT_AXIS__MAX]; int axis[INPUT_AXIS__MAX];
bool btns[INPUT_BUTTON__MAX]; bool btns[INPUT_BUTTON__MAX];
bool btnc[INPUT_BUTTON__MAX];
uint8_t outbuf[32]; uint8_t outbuf[32];
int outlen; int outlen;
} MouseState; } MouseState;
@ -62,7 +63,7 @@ static void msmouse_chr_accept_input(CharDriverState *chr)
static void msmouse_queue_event(MouseState *mouse) static void msmouse_queue_event(MouseState *mouse)
{ {
unsigned char bytes[4] = { 0x40, 0x00, 0x00, 0x00 }; unsigned char bytes[4] = { 0x40, 0x00, 0x00, 0x00 };
int dx, dy; int dx, dy, count = 3;
dx = mouse->axis[INPUT_AXIS_X]; dx = mouse->axis[INPUT_AXIS_X];
mouse->axis[INPUT_AXIS_X] = 0; mouse->axis[INPUT_AXIS_X] = 0;
@ -78,14 +79,16 @@ static void msmouse_queue_event(MouseState *mouse)
/* Buttons */ /* Buttons */
bytes[0] |= (mouse->btns[INPUT_BUTTON_LEFT] ? 0x20 : 0x00); bytes[0] |= (mouse->btns[INPUT_BUTTON_LEFT] ? 0x20 : 0x00);
bytes[0] |= (mouse->btns[INPUT_BUTTON_RIGHT] ? 0x10 : 0x00); bytes[0] |= (mouse->btns[INPUT_BUTTON_RIGHT] ? 0x10 : 0x00);
bytes[3] |= (mouse->btns[INPUT_BUTTON_MIDDLE] ? 0x20 : 0x00); if (mouse->btns[INPUT_BUTTON_MIDDLE] ||
mouse->btnc[INPUT_BUTTON_MIDDLE]) {
bytes[3] |= (mouse->btns[INPUT_BUTTON_MIDDLE] ? 0x20 : 0x00);
mouse->btnc[INPUT_BUTTON_MIDDLE] = false;
count = 4;
}
if (mouse->outlen <= sizeof(mouse->outbuf) - 4) { if (mouse->outlen <= sizeof(mouse->outbuf) - count) {
/* We always send the packet of, so that we do not have to keep track memcpy(mouse->outbuf + mouse->outlen, bytes, count);
of previous state of the middle button. This can potentially confuse mouse->outlen += count;
some very old drivers for two button mice though. */
memcpy(mouse->outbuf + mouse->outlen, bytes, 4);
mouse->outlen += 4;
} else { } else {
/* queue full -> drop event */ /* queue full -> drop event */
} }
@ -107,6 +110,7 @@ static void msmouse_input_event(DeviceState *dev, QemuConsole *src,
case INPUT_EVENT_KIND_BTN: case INPUT_EVENT_KIND_BTN:
btn = evt->u.btn.data; btn = evt->u.btn.data;
mouse->btns[btn->button] = btn->down; mouse->btns[btn->button] = btn->down;
mouse->btnc[btn->button] = true;
break; break;
default: default: