diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2019-08-08 12:28:10 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2019-08-08 12:28:10 +0000 |
| commit | f9caa743787d0b6d2b1152e1f7b45868ad71e141 (patch) | |
| tree | 35e5b2da4575f8d91f1ab8d246a499ccefa5f872 /driver/xf86-input-ws/src/emumb.c | |
| parent | 1c73fb2c5df9dd115871f593b6805ed094c521d4 (diff) | |
replace obsoleted xf86{,Un}BlockSIGIO() calls by input_{,un}lock()
for xserver 1.20. No functional change.
Diffstat (limited to 'driver/xf86-input-ws/src/emumb.c')
| -rw-r--r-- | driver/xf86-input-ws/src/emumb.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/driver/xf86-input-ws/src/emumb.c b/driver/xf86-input-ws/src/emumb.c index ab8c1534b..a5df6f56e 100644 --- a/driver/xf86-input-ws/src/emumb.c +++ b/driver/xf86-input-ws/src/emumb.c @@ -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; } |