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

replace obsoleted xf86{,Un}BlockSIGIO() calls by input_{,un}lock()

Browse Source 
for xserver 1.20. No functional change.
This commit is contained in:
matthieu 2019-08-08 12:28:09 +00:00
parent 2aeb2bf61b
commit 3a6045e486
1 changed files with 3 additions and 6 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.15 2019/08/08 12:23:34 matthieu Exp $ */
/* $OpenBSD: emumb.c,v 1.16 2019/08/08 12:28:09 matthieu Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
* Copyright 1993 by David Dawes <dawes@xfree86.org>
@ -197,11 +197,9 @@ int
wsmbEmuTimer(InputInfoPtr pInfo)
{
WSDevicePtr priv = (WSDevicePtr)pInfo->private;
int sigstate;
int id;
sigstate = xf86BlockSIGIO();
input_lock();
priv->emulateMB.pending = FALSE;
if ((id = stateTab[priv->emulateMB.state][4][0]) != 0) {
xf86PostButtonEvent(pInfo->dev, 0, abs(id), (id >= 0), 0, 0);
@ -211,8 +209,7 @@ wsmbEmuTimer(InputInfoPtr pInfo)
"Got unexpected buttonTimer in state %d\n",
priv->emulateMB.state);
}
xf86UnblockSIGIO(sigstate);
input_unlock();
return 0;
}