diff options
author | Jamey Sharp <jamey@minilop.net> | 2011-09-12 13:54:40 -0500 |
---|---|---|
committer | Jamey Sharp <jamey@minilop.net> | 2011-09-14 14:36:13 -0500 |
commit | 8d80f2e415e9e58ca481fe52ae8f2290e25de898 (patch) | |
tree | 2accb658a750bce9b40ce18c6ef5bad0a9806d15 | |
parent | fceee1716625badf698ca27dd5788a4deb8533bc (diff) |
Update for input ABI 12.2.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
-rw-r--r-- | src/input.c | 38 | ||||
-rw-r--r-- | src/input.h | 4 |
2 files changed, 10 insertions, 32 deletions
diff --git a/src/input.c b/src/input.c index 4856604..fac3537 100644 --- a/src/input.c +++ b/src/input.c @@ -98,42 +98,28 @@ _X_EXPORT XF86ModuleData nestedInputModuleData = { &NestedInputUnplug }; -InputInfoPtr -NestedInputPreInit(InputDriverPtr drv, IDevPtr dev, int flags) { - InputInfoPtr pInfo; +int +NestedInputPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) { NestedInputDevicePtr pNestedInput; - if (!(pInfo = xf86AllocateInput(drv, 0))) - return NULL; - pNestedInput = calloc(1, sizeof(NestedInputDeviceRec)); - if (!pNestedInput) { - pInfo->private = NULL; - xf86DeleteInput(pInfo, 0); - return NULL; - } + if (!pNestedInput) + return BadAlloc; pInfo->private = pNestedInput; - pInfo->name = xstrdup(dev->identifier); - pInfo->flags = 0; pInfo->type_name = XI_MOUSE; // This is really both XI_MOUSE and XI_KEYBOARD... but oh well. - pInfo->conf_idev = dev; pInfo->read_input = NestedInputReadInput; // new data available. pInfo->switch_mode = NULL; // Toggle absolute/relative mode. pInfo->device_control = NestedInputControl; // Enable/disable device. // Process driver specific options. - pNestedInput->device = xf86SetStrOption(dev->commonOptions, + pNestedInput->device = xf86SetStrOption(pInfo->options, "Device", "/dev/null"); xf86Msg(X_INFO, "%s: Using device %s.\n", pInfo->name, pNestedInput->device); - // Process generic options. - xf86CollectInputOptions(pInfo, NULL, NULL); - xf86ProcessCommonOptions(pInfo, pInfo->options); - // Open sockets, init device files, etc. SYSCALL(pInfo->fd = open(pNestedInput->device, O_RDWR | O_NONBLOCK)); @@ -144,15 +130,11 @@ NestedInputPreInit(InputDriverPtr drv, IDevPtr dev, int flags) { pInfo->private = NULL; free(pNestedInput); - xf86DeleteInput(pInfo, 0); - return NULL; + return BadValue; } - pInfo->flags |= XI86_OPEN_ON_INIT; - pInfo->flags |= XI86_CONFIGURED; - - return pInfo; + return Success; } void @@ -213,13 +195,9 @@ _nested_input_init_axes(DeviceIntPtr device) { return BadAlloc; } - pInfo->dev->valuator->mode = Relative; - if (!InitAbsoluteClassDeviceStruct(device)) - return BadAlloc; - int i; for (i = 0; i < NUM_MOUSE_AXES; i++) { - xf86InitValuatorAxisStruct(device, i, (Atom)0, -1, -1, 1, 1, 1); + xf86InitValuatorAxisStruct(device, i, (Atom)0, 0, 640, 1, 1, 1, Absolute); xf86InitValuatorDefaults(device, i); } diff --git a/src/input.h b/src/input.h index 72b2d77..b153b61 100644 --- a/src/input.h +++ b/src/input.h @@ -37,8 +37,8 @@ void NestedInputLoadDriver(NestedClientPrivatePtr clientData); // Driver init functions. -InputInfoPtr -NestedInputPreInit(InputDriverPtr drv, IDevPtr dev, int flags); +int +NestedInputPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags); void NestedInputUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags); |