diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-06-01 21:15:51 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-06-01 21:15:51 +0000 |
| commit | 38d810b67466dce32c09006f15717ae845a43479 (patch) | |
| tree | 37fcde9e0e59a28932c48d4751ac64f676cbf984 /driver | |
| parent | ad84b9e5e85489e6e844c6185b466c265add6bc0 (diff) | |
Update to be compatible with xserver 1.6 and Xinput 1.5.
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/openbsd-input-ws/src/ws.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/driver/openbsd-input-ws/src/ws.c b/driver/openbsd-input-ws/src/ws.c index 3cae91b91..a246847d3 100644 --- a/driver/openbsd-input-ws/src/ws.c +++ b/driver/openbsd-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.6 2008/09/20 16:07:42 matthieu Exp $ */ +/* $OpenBSD: ws.c,v 1.7 2009/06/01 21:15:50 matthieu Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -83,7 +83,7 @@ static XF86ModuleVersionInfo VersionRec = { MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, @@ -120,18 +120,9 @@ static const OptionInfoRec WSOptions[] = { { -1, NULL, OPTV_NONE, {0}, FALSE } }; -#ifdef XFree86LOADER XF86ModuleData wsModuleData = {&VersionRec, SetupProc, TearDownProc }; -ModuleInfoRec wsInfo = { - 1, - "WS", - NULL, - 0, - wsAvailableOptions, -}; -#endif InputDriverRec WS = { 1, @@ -160,10 +151,6 @@ SetupProc(pointer module, pointer options, int *errmaj, int *errmin) static Bool Initialised = FALSE; if (!Initialised) { -#ifndef REMOVE_LOADER_CHECK_MODULE_INFO - if (xf86LoaderCheckSymbol("xf86AddModuleInfo")) -#endif - xf86AddModuleInfo(&wsInfo, module); xf86AddInputDriver(&WS, module, 0); Initialised = TRUE; } @@ -374,7 +361,7 @@ wsProc(DeviceIntPtr pWS, int what) min(priv->buttons, NBUTTONS), #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 miPointerGetMotionEvents, -#else +#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 GetMotionHistory, #endif wsControlProc, |