XLibre/xf86-input-evdev
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-evdev.git synced 2026-04-14 11:44:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace open_slot/close_slot with a SlotState enum

Browse Source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2011-10-26 13:09:30 +10:00
parent 239e972be1
commit 9411749f76
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/evdev.c
View File

@@ -709,9 +709,9 @@ EvdevProcessTouch(InputInfoPtr pInfo)
if (pEvdev->cur_slot < 0 || !pEvdev->mt_mask)
return;
if (pEvdev->close_slot)
if (pEvdev->slot_state == SLOTSTATE_CLOSE)
type = XI_TouchEnd;
else if (pEvdev->open_slot)
else if (pEvdev->slot_state == SLOTSTATE_OPEN)
type = XI_TouchBegin;
else
type = XI_TouchUpdate;
@@ -719,8 +719,7 @@ EvdevProcessTouch(InputInfoPtr pInfo)
EvdevQueueTouchEvent(pInfo, pEvdev->cur_slot, pEvdev->mt_mask, type);
pEvdev->close_slot = 0;
pEvdev->open_slot = 0;
pEvdev->slot_state = SLOTSTATE_EMPTY;
valuator_mask_zero(pEvdev->mt_mask);
}
@@ -736,9 +735,9 @@ EvdevProcessTouchEvent(InputInfoPtr pInfo, struct input_event *ev)
pEvdev->cur_slot = ev->value;
} else if (ev->code == ABS_MT_TRACKING_ID) {
if (ev->value >= 0)
pEvdev->open_slot = 1;
pEvdev->slot_state = SLOTSTATE_OPEN;
else
pEvdev->close_slot = 1;
pEvdev->slot_state = SLOTSTATE_CLOSE;
} else {
map = pEvdev->axis_map[ev->code] - pEvdev->num_vals;
valuator_mask_set(pEvdev->mt_mask, map, ev->value);

9
src/evdev.h
View File

@@ -100,6 +100,12 @@ enum fkeymode {
FKEYMODE_MMKEYS, /* function keys send multimedia keys */
};
enum SlotState {
SLOTSTATE_OPEN = 8,
SLOTSTATE_CLOSE,
SLOTSTATE_EMPTY,
};
/* axis specific data for wheel emulation */
typedef struct {
int up_button;
@@ -144,8 +150,7 @@ typedef struct {
#ifdef MULTITOUCH
ValuatorMask *mt_mask;
int cur_slot;
BOOL close_slot;
BOOL open_slot;
enum SlotState slot_state;
struct mtdev *mtdev;
#endif