mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added mouse wheel support to the rfb and vncsrv guis

Browse Source
This commit is contained in:
Volker Ruppert 2013-12-25 09:48:53 +00:00
parent bb90270b8d
commit a603fe4471
3 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/CHANGES
View File

@ -47,7 +47,7 @@ Changes after 2.6.2 (updated Dec 16, 2013):
- Added new experimental gui 'vncsrv" using the LibVNCServer library
- RFB: set maximum resolution to 1280x1024 (same as vncsrv)
- RFB: don't wait for client connection on startup if timeout is set to 0
- wx: added mouse wheel support
- Added mouse wheel support to the rfb, vncsrv and wx guis
- Tools
- bximage utility rewritten in C++ for image creation, conversion, resize

21
bochs/gui/rfb.cc
View File

@ -135,6 +135,7 @@ static struct _rfbKeyboardEvent {
int down;
int x;
int y;
int z;
} rfbKeyboardEvent[MAX_KEY_EVENTS];
static unsigned long rfbKeyboardEvents = 0;
static bx_bool bKeyboardInUse = 0;
@ -204,7 +205,7 @@ void rfbAddUpdateRegion(unsigned x0, unsigned y0, unsigned w, unsigned h);
void rfbSetStatusText(int element, const char *text, bx_bool active, bx_bool w = 0);
static Bit32u convertStringToRfbKey(const char *string);
void rfbKeyPressed(Bit32u key, int press_release);
void rfbMouseMove(int x, int y, int bmask);
void rfbMouseMove(int x, int y, int z, int bmask);
#if BX_SHOW_IPS && defined(WIN32)
DWORD WINAPI rfbShowIPSthread(LPVOID);
#endif
@ -360,7 +361,7 @@ void bx_rfb_gui_c::handle_events(void)
if (rfbKeyboardEvent[i].type == KEYBOARD) {
rfbKeyPressed(rfbKeyboardEvent[i].key, rfbKeyboardEvent[i].down);
} else { //type == MOUSE;
rfbMouseMove(rfbKeyboardEvent[i].x, rfbKeyboardEvent[i].y, rfbKeyboardEvent[i].down);
rfbMouseMove(rfbKeyboardEvent[i].x, rfbKeyboardEvent[i].y, rfbKeyboardEvent[i].z, rfbKeyboardEvent[i].down);
}
}
rfbKeyboardEvents = 0;
@ -985,6 +986,7 @@ void HandleRfbClient(SOCKET sClient)
rfbClientInitMessage cim;
rfbServerInitMessage sim;
bx_bool mouse_toggle = 0;
static Bit8u wheel_status = 0;
setsockopt(sClient, IPPROTO_TCP, TCP_NODELAY, (const char *)&one, sizeof(one));
BX_INFO(("accepted client connection."));
@ -1193,9 +1195,18 @@ void HandleRfbClient(SOCKET sClient)
rfbKeyboardEvent[rfbKeyboardEvents].type = MOUSE;
rfbKeyboardEvent[rfbKeyboardEvents].x = ntohs(pe.xPosition);
rfbKeyboardEvent[rfbKeyboardEvents].y = ntohs(pe.yPosition);
rfbKeyboardEvent[rfbKeyboardEvents].z = 0;
rfbKeyboardEvent[rfbKeyboardEvents].down = (pe.buttonMask & 0x01) |
((pe.buttonMask>>1) & 0x02) |
((pe.buttonMask<<1) & 0x04);
if ((pe.buttonMask & 0x18) != wheel_status) {
if (pe.buttonMask & 0x10) {
rfbKeyboardEvent[rfbKeyboardEvents].z = -1;
} else if (pe.buttonMask & 0x08) {
rfbKeyboardEvent[rfbKeyboardEvents].z = 1;
}
wheel_status = pe.buttonMask & 0x18;
}
rfbKeyboardEvents++;
bKeyboardInUse = 0;
}
@ -1807,7 +1818,7 @@ void rfbKeyPressed(Bit32u key, int press_release)
DEV_kbd_gen_scancode(key_event);
}
void rfbMouseMove(int x, int y, int bmask)
void rfbMouseMove(int x, int y, int z, int bmask)
{
static int oldx = -1;
static int oldy = -1;
@ -1823,10 +1834,10 @@ void rfbMouseMove(int x, int y, int bmask)
if ((y >= rfbHeaderbarY) && (y < (int)(rfbDimensionY + rfbHeaderbarY))) {
dx = x * 0x7fff / rfbDimensionX;
dy = (y - rfbHeaderbarY) * 0x7fff / rfbDimensionY;
DEV_mouse_motion(dx, dy, 0, bmask, 1);
DEV_mouse_motion(dx, dy, z, bmask, 1);
}
} else {
DEV_mouse_motion(x - oldx, oldy - y, 0, bmask, 0);
DEV_mouse_motion(x - oldx, oldy - y, z, bmask, 0);
}
oldx = x;
oldy = y;

23
bochs/gui/vncsrv.cc
View File

@ -150,6 +150,7 @@ static struct _rfbKeyboardEvent {
int down;
int x;
int y;
int z;
} rfbKeyboardEvent[MAX_KEY_EVENTS];
static unsigned long rfbKeyboardEvents = 0;
static MUTEX(bKeyboardInUse);
@ -221,7 +222,7 @@ void SendUpdate(int x, int y, int width, int height);
void vncSetStatusText(int element, const char *text, bx_bool active, bx_bool w = 0);
static Bit32u convertStringToRfbKey(const char *string);
void vncKeyPressed(Bit32u key, int press_release);
void vncMouseMove(int x, int y, int bmask);
void vncMouseMove(int x, int y, int z, int bmask);
void clientgone(rfbClientPtr cl);
enum rfbNewClientAction newclient(rfbClientPtr cl);
@ -382,7 +383,7 @@ void bx_vncsrv_gui_c::handle_events(void)
if (rfbKeyboardEvent[i].type == KEYBOARD) {
vncKeyPressed(rfbKeyboardEvent[i].key, rfbKeyboardEvent[i].down);
} else { //type == MOUSE;
vncMouseMove(rfbKeyboardEvent[i].x, rfbKeyboardEvent[i].y, rfbKeyboardEvent[i].down);
vncMouseMove(rfbKeyboardEvent[i].x, rfbKeyboardEvent[i].y, rfbKeyboardEvent[i].z, rfbKeyboardEvent[i].down);
}
}
rfbKeyboardEvents = 0;
@ -1352,7 +1353,7 @@ void vncKeyPressed(Bit32u key, int press_release)
DEV_kbd_gen_scancode(key_event);
}
void vncMouseMove(int x, int y, int bmask)
void vncMouseMove(int x, int y, int z, int bmask)
{
static int oldx = -1;
static int oldy = -1;
@ -1368,10 +1369,10 @@ void vncMouseMove(int x, int y, int bmask)
if ((y >= rfbHeaderbarY) && (y < (int)(rfbDimensionY + rfbHeaderbarY))) {
dx = x * 0x7fff / rfbDimensionX;
dy = (y - rfbHeaderbarY) * 0x7fff / rfbDimensionY;
DEV_mouse_motion(dx, dy, 0, bmask, 1);
DEV_mouse_motion(dx, dy, z, bmask, 1);
}
} else {
DEV_mouse_motion(x - oldx, oldy - y, 0, bmask, 0);
DEV_mouse_motion(x - oldx, oldy - y, z, bmask, 0);
}
oldx = x;
oldy = y;
@ -1436,6 +1437,8 @@ void dokey(rfbBool down, rfbKeySym key, rfbClientPtr cl)
void doptr(int buttonMask, int x, int y, rfbClientPtr cl)
{
static Bit8u wheel_status = 0;
if (bx_gui->mouse_toggle_check(BX_MT_MBUTTON, (buttonMask & 0x02) > 0)) {
bx_gui->toggle_mouse_enable();
} else {
@ -1445,8 +1448,18 @@ void doptr(int buttonMask, int x, int y, rfbClientPtr cl)
rfbKeyboardEvent[rfbKeyboardEvents].type = MOUSE;
rfbKeyboardEvent[rfbKeyboardEvents].x = x;
rfbKeyboardEvent[rfbKeyboardEvents].y = y;
rfbKeyboardEvent[rfbKeyboardEvents].z = 0;
rfbKeyboardEvent[rfbKeyboardEvents].down = (buttonMask & 0x01)
| ((buttonMask >> 1) & 0x02) | ((buttonMask << 1) & 0x04);
if ((buttonMask & 0x18) != wheel_status) {
if (buttonMask & 0x10) {
rfbKeyboardEvent[rfbKeyboardEvents].z = -1;
} else if (buttonMask & 0x08) {
rfbKeyboardEvent[rfbKeyboardEvents].z = 1;
}
wheel_status = buttonMask & 0x18;
}
rfbKeyboardEvents++;
UNLOCK(bKeyboardInUse);
}