XLibre/xf86-input-vmmouse
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-vmmouse.git synced 2026-03-24 01:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move passthrough initialization out into a separate function.

Browse Source 
No functional changes, just modularising a bit to make future changes
easier.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
This commit is contained in:
Peter Hutterer
2010-10-26 10:43:42 +10:00
committed by Thomas Hellstrom
parent 6561d57d4c
commit 4527ef863a
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vmmouse.c
View File

@@ -217,6 +217,17 @@ static char reverseMap[32] = { 0, 4, 2, 6, 1, 5, 3, 7,
#define reverseBits(map, b) (((b) & ~0x0f) | map[(b) & 0x0f])
static InputInfoPtr
VMMouseInitPassthru(InputDriverPtr drv, IDevPtr dev, int flags)
{
InputDriverRec *passthruMouse;
passthruMouse = (InputDriverRec *)LoaderSymbol("MOUSE");
if(passthruMouse != NULL) {
return (passthruMouse->PreInit)(drv, dev, flags);
} else {
return NULL;
}
}
/*
*----------------------------------------------------------------------
@@ -274,16 +285,9 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
* vmmouse failed
* Fall back to normal mouse module
*/
InputDriverRec *passthruMouse;
xf86Msg(X_ERROR, "VMWARE(0): vmmouse enable failed\n");
passthruMouse = (InputDriverRec *)LoaderSymbol("MOUSE");
free(mPriv);
if(passthruMouse != NULL){
return (passthruMouse->PreInit)(drv, dev, flags);
} else {
return NULL;
}
return VMMouseInitPassthru(drv, dev, flags);
} else {
/*
* vmmouse is available