frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kdrive/tslib: port to new absolute API, remove debugging 

Port to new absolute device (not touchscreen) API, and remove some
leftover debugging.
This commit is contained in:
Daniel Stone 2006-10-23 02:55:41 +03:00 committed by Daniel Stone
parent a6dc629052
commit 57f98e2b72
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/kdrive/linux/tslib.c
View File

@ -74,11 +74,8 @@ TsRead (int fd, void *closure)
} }
while (ts_read(private->tsDev, &event, 1) == 1) { while (ts_read(private->tsDev, &event, 1) == 1) {
#ifdef DEBUG
ErrorF("[tslib] originally from (%d, %d)\n", event.x, event.y);
#endif
if (event.pressure) { if (event.pressure) {
if (event.pressure > pi->dixdev->touchscreen->button_threshold) if (event.pressure > pi->dixdev->absolute->button_threshold)
flags = KD_BUTTON_8; flags = KD_BUTTON_8;
else else
flags = KD_BUTTON_1; flags = KD_BUTTON_1;
@ -109,9 +106,6 @@ TsRead (int fd, void *closure)
y = private->lasty; y = private->lasty;
} }
#ifdef DEBUG
ErrorF("event at (%lu, %lu), pressure is %d, sending flags %lu\n", x, y, event.pressure, flags);
#endif
KdEnqueuePointerEvent (pi, flags, x, y, event.pressure); KdEnqueuePointerEvent (pi, flags, x, y, event.pressure);
} }
} }
@ -132,13 +126,9 @@ TslibEnable (KdPointerInfo *pi)
close(private->fd); close(private->fd);
return BadAlloc; return BadAlloc;
} }
if (pi->dixdev && pi->dixdev->touchscreen && if (pi->dixdev && pi->dixdev->absolute &&
pi->dixdev->touchscreen->button_threshold == 0) pi->dixdev->absolute->button_threshold == 0)
pi->dixdev->touchscreen->button_threshold = 115; pi->dixdev->absolute->button_threshold = 115;
#ifdef DEBUG
ErrorF("[tslib/TslibEnable] successfully enabled %s\n", pi->path);
#endif
KdRegisterFd(private->fd, TsRead, pi); KdRegisterFd(private->fd, TsRead, pi);
@ -186,9 +176,6 @@ TslibInit (KdPointerInfo *pi)
pi->nAxes = 3; pi->nAxes = 3;
pi->name = KdSaveString("Touchscreen"); pi->name = KdSaveString("Touchscreen");
pi->inputClass = KD_TOUCHSCREEN; pi->inputClass = KD_TOUCHSCREEN;
#ifdef DEBUG
ErrorF("[tslib/TslibInit] successfully inited for device %s\n", pi->path);
#endif
return Success; return Success;
} }