80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Adapted vnc.c to the new mouse API.

Browse Source
This commit is contained in:
OBattler
2023-08-13 18:23:45 +02:00
parent 1958b7398d
commit d90592b291
1 changed files with 23 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/vnc.c
View File

@@ -82,26 +82,31 @@ vnc_kbdevent(rfbBool down, rfbKeySym k, rfbClientPtr cl)
vnc_kbinput(down ? 1 : 0, (int) k); vnc_kbinput(down ? 1 : 0, (int) k);
} }
void static void
vnc_mouse_poll(void) vnc_ptrevent(int but, int x, int y, rfbClientPtr cl)
{ {
static int b = 0; int dx;
if (ms.dx != 0 || ms.dy != 0) { int dy;
mouse_x += ms.dx; int b;
mouse_y += ms.dy;
ms.dx = 0; b = 0x00;
ms.dy = 0; if (but & 0x01)
b |= 0x01;
if (but & 0x02)
b |= 0x04;
if (but & 0x04)
b |= 0x02;
mouse_set_buttons_ex(b);
ptr_but = but;
#if 0 dx = (x - ptr_x) / 0.96; /* TODO: Figure out the correct scale factor for X and Y. */
pclog("dx=%d, dy=%d, dwheel=%d\n", mouse_x, mouse_y, mouse_z); dy = (y - ptr_y) / 0.96;
#endif
}
if (b != ms.buttons) { /* VNC uses absolute positions within the window, no deltas. */
mouse_buttons = ms.buttons; mouse_scale_x(dx, dy);
b = ms.buttons;
} ptr_x = x;
ptr_y = y;
mouse_x_abs = (double)ptr_x / (double)allowedX; mouse_x_abs = (double)ptr_x / (double)allowedX;
mouse_y_abs = (double)ptr_y / (double)allowedY; mouse_y_abs = (double)ptr_y / (double)allowedY;
@@ -110,25 +115,6 @@ vnc_mouse_poll(void)
if (mouse_y_abs > 1.0) mouse_y_abs = 1.0; if (mouse_y_abs > 1.0) mouse_y_abs = 1.0;
if (mouse_x_abs < 0.0) mouse_x_abs = 0.0; if (mouse_x_abs < 0.0) mouse_x_abs = 0.0;
if (mouse_y_abs < 0.0) mouse_y_abs = 0.0; if (mouse_y_abs < 0.0) mouse_y_abs = 0.0;
}
static void
vnc_ptrevent(int but, int x, int y, rfbClientPtr cl)
{
ms.buttons = 0;
if (but & 0x01)
ms.buttons |= 0x01;
if (but & 0x02)
ms.buttons |= 0x04;
if (but & 0x04)
ms.buttons |= 0x02;
ptr_but = but;
/* VNC uses absolute positions within the window, no deltas. */
ms.dx += (x - ptr_x) / 0.96; /* TODO: Figure out the correct scale factor for X and Y. */
ms.dy += (y - ptr_y) / 0.96;
ptr_x = x;
ptr_y = y;
rfbDefaultPtrAddEvent(but, x, y, cl); rfbDefaultPtrAddEvent(but, x, y, cl);
} }
@@ -165,8 +151,8 @@ vnc_newclient(rfbClientPtr cl)
/* Reset the mouse. */ /* Reset the mouse. */
ptr_x = allowedX / 2; ptr_x = allowedX / 2;
ptr_y = allowedY / 2; ptr_y = allowedY / 2;
mouse_x = mouse_y = mouse_z = 0; mouse_clear_coords();
mouse_buttons = 0x00; mouse_clear_buttons();
memset(&ms, 0, sizeof(MOUSESTATE)); memset(&ms, 0, sizeof(MOUSESTATE));
/* We now have clients, un-pause the emulator if needed. */ /* We now have clients, un-pause the emulator if needed. */