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

replace pointer by void *

Browse Source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-12-16 17:17:54 +01:00
committed by Enrico Weigelt
parent 8956e142b3
commit 0777036640
4 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/mouse.c
View File

@@ -140,9 +140,9 @@ static Bool SetupMouse(InputInfoPtr pInfo);
static Bool initMouseHW(InputInfoPtr pInfo);
#ifdef SUPPORT_MOUSE_RESET
static Bool mouseReset(InputInfoPtr pInfo, unsigned char val);
static void ps2WakeupHandler(pointer data, int i, pointer LastSelectMask);
static void ps2BlockHandler(pointer data, struct timeval **waitTime,
pointer LastSelectMask);
static void ps2WakeupHandler(void *data, int i, void *LastSelectMask);
static void ps2BlockHandler(void *data, struct timeval **waitTime,
void *LastSelectMask);
#endif
static void Emulate3ButtonsSetEnabled(InputInfoPtr pInfo, Bool enable);
@@ -1714,7 +1714,7 @@ MouseProc(DeviceIntPtr device, int what)
if (pMse->emulate3Buttons || pMse->emulate3ButtonsSoft) {
RegisterBlockAndWakeupHandlers (MouseBlockHandler,
MouseWakeupHandler,
(pointer) pInfo);
(void*) pInfo);
}
}
}
@@ -1741,7 +1741,7 @@ MouseProc(DeviceIntPtr device, int what)
{
RemoveBlockAndWakeupHandlers (MouseBlockHandler,
MouseWakeupHandler,
(pointer) pInfo);
(void*) pInfo);
}
}
device->public.on = FALSE;
@@ -1975,13 +1975,13 @@ Emulate3ButtonsSetEnabled(InputInfoPtr pInfo, Bool enable)
pMse->emulate3ButtonsSoft = FALSE; /* specifically requested now */
RegisterBlockAndWakeupHandlers (MouseBlockHandler, MouseWakeupHandler,
(pointer) pInfo);
(void*) pInfo);
} else {
if (pMse->emulate3Pending)
buttonTimer(pInfo);
RemoveBlockAndWakeupHandlers (MouseBlockHandler, MouseWakeupHandler,
(pointer) pInfo);
(void*) pInfo);
}
}
@@ -2527,7 +2527,7 @@ SetupMouse(InputInfoPtr pInfo)
if ((pMse->protocolID >= 0)
&& (pMse->protocolID < PROT_NUMPROTOS)
&& mouseProtocols[pMse->protocolID].defaults) {
pointer tmp = xf86OptionListCreate(
void *tmp = xf86OptionListCreate(
mouseProtocols[pMse->protocolID].defaults, -1, 0);
pInfo->options = xf86OptionListMerge(pInfo->options, tmp);
}
@@ -2621,7 +2621,7 @@ initMouseHW(InputInfoPtr pInfo)
const char *s;
unsigned char c;
int speed;
pointer options;
void *options;
unsigned char *param = NULL;
int paramlen = 0;
int count = RETRY_COUNT;
@@ -3018,7 +3018,7 @@ mouseReset(InputInfoPtr pInfo, unsigned char val)
LogMessageVerbSigSafe(X_INFO, -1, "Found PS/2 Reset string\n");
#endif
RegisterBlockAndWakeupHandlers (ps2BlockHandler,
ps2WakeupHandler, (pointer) pInfo);
ps2WakeupHandler, (void*) pInfo);
ret = TRUE;
}
}
@@ -3031,8 +3031,8 @@ mouseReset(InputInfoPtr pInfo, unsigned char val)
}
static void
ps2BlockHandler(pointer data, struct timeval **waitTime,
pointer LastSelectMask)
ps2BlockHandler(void *data, struct timeval **waitTime,
void *LastSelectMask)
{
InputInfoPtr pInfo = (InputInfoPtr) data;
MouseDevPtr pMse = (MouseDevPtr) pInfo->private;
@@ -3046,11 +3046,11 @@ ps2BlockHandler(pointer data, struct timeval **waitTime,
AdjustWaitForDelay (waitTime, ms);
} else
RemoveBlockAndWakeupHandlers (ps2BlockHandler, ps2WakeupHandler,
(pointer) pInfo);
(void*) pInfo);
}
static void
ps2WakeupHandler(pointer data, int i, pointer LastSelectMask)
ps2WakeupHandler(void *data, int i, void *LastSelectMask)
{
InputInfoPtr pInfo = (InputInfoPtr) data;
MouseDevPtr pMse = (MouseDevPtr) pInfo->private;
@@ -3076,7 +3076,7 @@ ps2WakeupHandler(pointer data, int i, pointer LastSelectMask)
xf86UnblockSIGIO(blocked);
}
RemoveBlockAndWakeupHandlers (ps2BlockHandler, ps2WakeupHandler,
(pointer) pInfo);
(void*) pInfo);
}
#endif /* SUPPORT_MOUSE_RESET */
@@ -3542,7 +3542,7 @@ autoProbeMouse(InputInfoPtr pInfo, Bool inSync, Bool lostSync)
break;
case AUTOPROBE_SWITCHSERIAL:
{
pointer serialDefaults;
void *serialDefaults;
AP_DBG(("State SWITCHSERIAL\n"));
if (!serialDefaultsList)
@@ -3553,7 +3553,7 @@ autoProbeMouse(InputInfoPtr pInfo, Bool inSync, Bool lostSync)
serialDefaultsList[++mPriv->serialDefaultsNum]) == NULL) {
mPriv->serialDefaultsNum = 0;
} else {
pointer tmp = xf86OptionListCreate(serialDefaults, -1, 0);
void *tmp = xf86OptionListCreate(serialDefaults, -1, 0);
xf86SetSerial(pInfo->fd, tmp);
xf86OptionListFree(tmp);
mPriv->count = 0;
@@ -3711,15 +3711,11 @@ collectData(MouseDevPtr pMse, unsigned char u)
/**************** end of autoprobe stuff *****************/
static void
xf86MouseUnplug(pointer p)
static void xf86MouseUnplug(void *p)
{
}
static pointer
xf86MousePlug(pointer module,
pointer options,
int *errmaj,
int *errmin)
static void *xf86MousePlug(void *module, void *options, int *errmaj, int *errmin)
{
static Bool Initialised = FALSE;

6
src/mouse.h
View File

@@ -228,12 +228,12 @@ typedef struct _MouseDevRec {
int positiveZ; /* button mask */
int negativeW; /* button mask */
int positiveW; /* button mask */
pointer buffer; /* usually an XISBuffer* */
void *buffer; /* usually an XISBuffer* */
int protoBufTail;
unsigned char protoBuf[8];
unsigned char protoPara[8];
unsigned char inSync; /* driver in sync with datastream */
pointer mousePriv; /* private area */
void *mousePriv; /* private area */
InputInfoPtr pInfo;
Bool emulate3Pending;/* timer waiting */
CARD32 emulate3Expires;/* time to fire emulation code */
@@ -252,7 +252,7 @@ typedef struct _MouseDevRec {
collectDataProc collectData;
dataGoodProc dataGood;
int angleOffset;
pointer pDragLock; /* drag lock area */
void *pDragLock; /* drag lock area */
int xisbscale; /* buffer size for 1 event */
int wheelButtonTimeout;/* Timeout for the wheel button emulation */
CARD32 wheelButtonExpires;

2
src/pnp.c
View File

@@ -235,7 +235,7 @@ pnpgets(InputInfoPtr pInfo, char *buf, Bool *prePNP)
{
int i;
char c;
pointer pnpOpts;
void *pnpOpts;
#if 0
/*

2
src/sun_mouse.c
View File

@@ -157,7 +157,7 @@ VuidMsePtr getVuidMsePriv(InputInfoPtr pInfo)
list or changing pInfo->fd while xf86Wakeup is looping through the list
causes server crashes */
static CARD32
vuidRemoveMouse(OsTimerPtr timer, CARD32 now, pointer arg)
vuidRemoveMouse(OsTimerPtr timer, CARD32 now, void *arg)
{
InputInfoPtr pInfo = (InputInfoPtr) arg;