qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt Block and Wakeup handlers prototypes to X server 1.20.

Browse Source 
No functional change.
This commit is contained in:
matthieu 2019-08-08 12:23:34 +00:00
parent c0e6abce88
commit 2aeb2bf61b
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
driver/xf86-input-ws/src/emumb.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: emumb.c,v 1.14 2015/12/25 15:08:28 matthieu Exp $ */
/* $OpenBSD: emumb.c,v 1.15 2019/08/08 12:23:34 matthieu Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
* Copyright 1993 by David Dawes <dawes@xfree86.org>
@ -275,7 +275,7 @@ wsmbEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL press)
}
void
wsmbEmuWakeupHandler(pointer data, int i, pointer LastSelectMask)
wsmbEmuWakeupHandler(pointer data, int i)
{
InputInfoPtr pInfo = (InputInfoPtr)data;
WSDevicePtr priv = (WSDevicePtr)pInfo->private;
@ -289,8 +289,7 @@ wsmbEmuWakeupHandler(pointer data, int i, pointer LastSelectMask)
}
void
wsmbEmuBlockHandler(pointer data, struct timeval **waitTime,
pointer LastSelectMask)
wsmbEmuBlockHandler(pointer data, void *waitTime)
{
InputInfoPtr pInfo = (InputInfoPtr)data;
WSDevicePtr priv = (WSDevicePtr)pInfo->private;
@ -300,7 +299,7 @@ wsmbEmuBlockHandler(pointer data, struct timeval **waitTime,
ms = priv->emulateMB.expires - GetTimeInMillis();
if (ms <= 0)
ms = 0;
AdjustWaitForDelay(waitTime, ms);
AdjustWaitForDelay((struct timeval **)waitTime, ms);
}
}

4
driver/xf86-input-ws/src/ws.h
View File

@ -103,8 +103,8 @@ typedef struct WSDevice {
/* Middle mouse button emulation */
extern int wsmbEmuTimer(InputInfoPtr);
extern BOOL wsmbEmuFilterEvent(InputInfoPtr, int, BOOL);
extern void wsmbEmuWakeupHandler(pointer, int, pointer);
extern void wsmbEmuBlockHandler(pointer, struct timeval **, pointer);
extern void wsmbEmuWakeupHandler(pointer, int);
extern void wsmbEmuBlockHandler(pointer, pointer);
extern void wsmbEmuPreInit(InputInfoPtr);
extern void wsmbEmuOn(InputInfoPtr);
extern void wsmbEmuFinalize(InputInfoPtr);