diff options
Diffstat (limited to 'hw/kdrive/linux/tslib.c')
-rw-r--r-- | hw/kdrive/linux/tslib.c | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/hw/kdrive/linux/tslib.c b/hw/kdrive/linux/tslib.c index 1f30ccae7..1403c7968 100644 --- a/hw/kdrive/linux/tslib.c +++ b/hw/kdrive/linux/tslib.c @@ -30,7 +30,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - #ifdef HAVE_KDRIVE_CONFIG_H #include <kdrive-config.h> #endif @@ -50,25 +49,24 @@ struct TslibPrivate { int fd; int lastx, lasty; struct tsdev *tsDev; - void (*raw_event_hook)(int x, int y, int pressure, void *closure); + void (*raw_event_hook) (int x, int y, int pressure, void *closure); void *raw_event_closure; int phys_screen; }; - static void -TsRead (int fd, void *closure) +TsRead(int fd, void *closure) { - KdPointerInfo *pi = closure; + KdPointerInfo *pi = closure; struct TslibPrivate *private = pi->driverPrivate; - struct ts_sample event; - long x = 0, y = 0; - unsigned long flags; + struct ts_sample event; + long x = 0, y = 0; + unsigned long flags; if (private->raw_event_hook) { while (ts_read_raw(private->tsDev, &event, 1) == 1) - private->raw_event_hook (event.x, event.y, event.pressure, - private->raw_event_closure); + private->raw_event_hook(event.x, event.y, event.pressure, + private->raw_event_closure); return; } @@ -84,30 +82,33 @@ TsRead (int fd, void *closure) if (KdCurScreen == private->phys_screen) { x = event.x; y = event.y; - } else { + } + else { flags |= KD_MOUSE_DELTA; if ((private->lastx == 0) || (private->lasty == 0)) { x = event.x; y = event.y; - } else { + } + else { x = event.x - private->lastx; y = event.y - private->lasty; - } + } } private->lastx = event.x; private->lasty = event.y; - } else { + } + else { flags = 0; x = private->lastx; y = private->lasty; } - KdEnqueuePointerEvent (pi, flags, x, y, event.pressure); + KdEnqueuePointerEvent(pi, flags, x, y, event.pressure); } } static Status -TslibEnable (KdPointerInfo *pi) +TslibEnable(KdPointerInfo * pi) { struct TslibPrivate *private = pi->driverPrivate; @@ -115,7 +116,8 @@ TslibEnable (KdPointerInfo *pi) private->raw_event_closure = NULL; if (!pi->path) { pi->path = strdup("/dev/input/touchscreen0"); - ErrorF("[tslib/TslibEnable] no device path given, trying %s\n", pi->path); + ErrorF("[tslib/TslibEnable] no device path given, trying %s\n", + pi->path); } private->tsDev = ts_open(pi->path, 0); @@ -138,9 +140,8 @@ TslibEnable (KdPointerInfo *pi) return Success; } - static void -TslibDisable (KdPointerInfo *pi) +TslibDisable(KdPointerInfo * pi) { struct TslibPrivate *private = pi->driverPrivate; @@ -154,9 +155,8 @@ TslibDisable (KdPointerInfo *pi) private->tsDev = NULL; } - static Status -TslibInit (KdPointerInfo *pi) +TslibInit(KdPointerInfo * pi) { struct TslibPrivate *private = NULL; @@ -164,7 +164,7 @@ TslibInit (KdPointerInfo *pi) return !Success; pi->driverPrivate = (struct TslibPrivate *) - calloc(sizeof(struct TslibPrivate), 1); + calloc(sizeof(struct TslibPrivate), 1); if (!pi->driverPrivate) return !Success; @@ -178,15 +178,13 @@ TslibInit (KdPointerInfo *pi) return Success; } - static void -TslibFini (KdPointerInfo *pi) +TslibFini(KdPointerInfo * pi) { free(pi->driverPrivate); pi->driverPrivate = NULL; } - KdPointerDriver TsDriver = { "tslib", TslibInit, |