Android-x86
Forkexternal/tslib
| Révision | 62778e0f1a92ba6ab947f5b3621e3e920b38fdcf (tree) |
|---|---|
| l'heure | 2012-04-30 23:38:49 |
| Auteur | Gernot Hillier <gernot.hillier@siem...> |
| Commiter | Gernot Hillier |
ts_calibrate: Accept touchscreens using BTN_MOUSE events instead of BTN_TOUCH
ts_input_read was already extended to accept BTN_MOUSE events, however
some startup checks in check_fd() were not extended accordingly.
plugins/input-raw.c (diff)| @@ -111,8 +111,9 @@ static int check_fd(struct tslib_input *i) | ||
| 111 | 111 | i->current_p = 255; |
| 112 | 112 | |
| 113 | 113 | if ((ioctl(ts->fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) < 0) || |
| 114 | - !(keybit[BIT_WORD(BTN_TOUCH)] & BIT_MASK(BTN_TOUCH)) ) { | |
| 115 | - fprintf(stderr, "tslib: Selected device is not a touchscreen (must support BTN_TOUCH events)\n"); | |
| 114 | + ( !(keybit[BIT_WORD(BTN_TOUCH)] & BIT_MASK(BTN_TOUCH)) && | |
| 115 | + !(keybit[BIT_WORD(BTN_MOUSE)] & BIT_MASK(BTN_MOUSE)) ) ) { | |
| 116 | + fprintf(stderr, "tslib: Selected device is not a touchscreen (must support BTN_TOUCH or BTN_MOUSE events)\n"); | |
| 116 | 117 | return -1; |
| 117 | 118 | } |
| 118 | 119 | } |
