openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-11 11:49:01 +00:00
Code Issues Projects Releases Wiki Activity

Handle the TOUCH events from wsmouse.

Browse Source 
With the changes for multitouch input, new event types have been
introduced in wsmouse. There are separate types for contact count
and width values, and RESET events for controlling/stopping
pointer motion.

ok mpi@, shadchin@
This commit is contained in:
bru
2016-03-30 23:33:34 +00:00
parent 031a47d9fa
commit a2c103ac08
1 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
driver/xf86-input-synaptics/src/wsconscomm.c
View File

@@ -215,45 +215,29 @@ WSConsReadHwState(InputInfoPtr pInfo,
hw->y = priv->maxy - event->value + priv->miny;
hw->cumulative_dy = hw->y;
break;
case WSCONS_EVENT_MOUSE_ABSOLUTE_Z:
case WSCONS_EVENT_TOUCH_PRESSURE:
hw->z = event->value;
break;
case WSCONS_EVENT_MOUSE_ABSOLUTE_W:
if (priv->model == MODEL_ELANTECH) {
/* Elantech touchpads report number of fingers directly. */
case WSCONS_EVENT_TOUCH_CONTACTS:
hw->numFingers = event->value;
if (hw->numFingers == 0)
hw->fingerWidth = 0;
else if (hw->fingerWidth == 0)
hw->fingerWidth = 5;
hw->numFingers = event->value;
break;
}
/* XXX magic number mapping which is mirrored in pms driver */
switch (event->value) {
case 0:
hw->fingerWidth = 5;
hw->numFingers = 2;
break;
case 1:
hw->fingerWidth = 5;
hw->numFingers = 3;
break;
case 4 ... 5:
hw->fingerWidth = event->value;
hw->numFingers = 1;
break;
}
break;
case WSCONS_EVENT_TOUCH_WIDTH:
hw->fingerWidth = event->value;
break;
case WSCONS_EVENT_TOUCH_RESET:
/*
* The contact count or the active MT-slot has changed.
* Suppress pointer motion and two-finger scrolling.
*/
priv->count_packet_finger = 0;
priv->vert_scroll_twofinger_on = FALSE;
priv->horiz_scroll_twofinger_on = FALSE;
break;
case WSCONS_EVENT_SYNC:
if (hw->z == 0) {
hw->fingerWidth = 0;
hw->numFingers = 0;
} else if (hw->numFingers == 0) {
/*
* Because W may be 0 already, a two-finger touch on a
* Synaptics touchpad doesn't necessarily produce an update
* event for W.
*/
hw->fingerWidth = 5;
hw->numFingers = 2;
}
hw->millis = 1000 * event->time.tv_sec +
event->time.tv_nsec / 1000000;
SynapticsCopyHwState(hwRet, hw);