diff options
| -rw-r--r-- | driver/xf86-input-ws/src/emumb.c | 10 | ||||
| -rw-r--r-- | driver/xf86-input-ws/src/ws.c | 10 |
2 files changed, 6 insertions, 14 deletions
diff --git a/driver/xf86-input-ws/src/emumb.c b/driver/xf86-input-ws/src/emumb.c index a1946bf92..f557c156c 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.6 2011/11/07 18:33:04 shadchin Exp $ */ +/* $OpenBSD: emumb.c,v 1.7 2011/11/19 12:36:16 shadchin Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * Copyright 1993 by David Dawes <dawes@xfree86.org> @@ -54,8 +54,8 @@ enum { MBEMU_AUTO }; -static Atom prop_mbemu = 0; /* Middle button emulation on/off property */ -static Atom prop_mbtimeout = 0; /* Middle button timeout property */ +static Atom prop_mbemu; /* Middle button emulation on/off property */ +static Atom prop_mbtimeout; /* Middle button timeout property */ /* * Lets create a simple finite-state machine for 3 button emulation: @@ -191,7 +191,6 @@ static signed char stateTab[11][5][3] = { }, }; - int wsmbEmuTimer(InputInfoPtr pInfo) { @@ -215,7 +214,6 @@ wsmbEmuTimer(InputInfoPtr pInfo) return 0; } - /** * Emulate a middle button on button press. * @@ -273,7 +271,6 @@ wsmbEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL press) return ret; } - void wsmbEmuWakeupHandler(pointer data, int i, @@ -352,7 +349,6 @@ wsmbEmuEnable(InputInfoPtr pInfo, BOOL enable) priv->emulateMB.enabled = enable; } - static int wsmbEmuSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr val, BOOL checkonly) diff --git a/driver/xf86-input-ws/src/ws.c b/driver/xf86-input-ws/src/ws.c index c9b8c55d0..b288e1e6b 100644 --- a/driver/xf86-input-ws/src/ws.c +++ b/driver/xf86-input-ws/src/ws.c @@ -13,7 +13,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $OpenBSD: ws.c,v 1.46 2011/11/09 16:17:44 shadchin Exp $ */ +/* $OpenBSD: ws.c,v 1.47 2011/11/19 12:36:16 shadchin Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -42,7 +42,6 @@ #include "ws-properties.h" #include <xserver-properties.h> - static MODULESETUPPROTO(SetupProc); static void TearDownProc(pointer); @@ -62,8 +61,8 @@ static void wsControlProc(DeviceIntPtr , PtrCtrl *); static void wsInitCalibProperty(DeviceIntPtr); static int wsSetCalibProperty(DeviceIntPtr, Atom, XIPropertyValuePtr, BOOL); -static Atom prop_calibration = 0; -static Atom prop_swap = 0; +static Atom prop_calibration; +static Atom prop_swap; #ifdef DEBUG int ws_debug_level = 0; @@ -89,7 +88,6 @@ static XF86ModuleVersionInfo VersionRec = { XF86ModuleData wsModuleData = {&VersionRec, SetupProc, TearDownProc }; - InputDriverRec WS = { 1, "ws", @@ -118,7 +116,6 @@ TearDownProc(pointer p) DBG(1, ErrorF("WS TearDownProc called\n")); } - static int wsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) { @@ -667,7 +664,6 @@ wsSendButtons(InputInfoPtr pInfo, int buttons) priv->lastButtons = buttons; } /* wsSendButtons */ - static int wsSwitchMode(ClientPtr client, DeviceIntPtr dev, int mode) { |