#include "evdev.h"
#include "filter.h"
+#include "timer.h"
#define TOUCHPAD_HISTORY_LENGTH 4
#define TOUCHPAD_MIN_SAMPLES 4
+#define VENDOR_ID_APPLE 0x5ac
+
enum touchpad_event {
TOUCHPAD_EVENT_NONE = 0,
TOUCHPAD_EVENT_MOTION = (1 << 0),
};
enum button_event {
- BUTTON_EVENT_IN_BOTTOM_R = 30,
- BUTTON_EVENT_IN_BOTTOM_L,
- BUTTON_EVENT_IN_AREA,
- BUTTON_EVENT_UP,
- BUTTON_EVENT_PRESS,
- BUTTON_EVENT_RELEASE,
- BUTTON_EVENT_TIMEOUT,
+ BUTTON_EVENT_IN_BOTTOM_R = 30,
+ BUTTON_EVENT_IN_BOTTOM_L,
+ BUTTON_EVENT_IN_TOP_R,
+ BUTTON_EVENT_IN_TOP_M,
+ BUTTON_EVENT_IN_TOP_L,
+ BUTTON_EVENT_IN_AREA,
+ BUTTON_EVENT_UP,
+ BUTTON_EVENT_PRESS,
+ BUTTON_EVENT_RELEASE,
+ BUTTON_EVENT_TIMEOUT,
};
enum button_state {
- BUTTON_STATE_NONE,
- BUTTON_STATE_AREA,
- BUTTON_STATE_BOTTOM,
- BUTTON_STATE_BOTTOM_NEW,
- BUTTON_STATE_BOTTOM_TO_AREA,
-};
-
-enum scroll_state {
- SCROLL_STATE_NONE,
- SCROLL_STATE_SCROLLING
+ BUTTON_STATE_NONE,
+ BUTTON_STATE_AREA,
+ BUTTON_STATE_BOTTOM,
+ BUTTON_STATE_TOP,
+ BUTTON_STATE_TOP_NEW,
+ BUTTON_STATE_TOP_TO_IGNORE,
+ BUTTON_STATE_IGNORE,
};
enum tp_tap_state {
TAP_STATE_DEAD, /**< finger count exceeded */
};
+enum tp_tap_touch_state {
+ TAP_TOUCH_STATE_IDLE = 16, /**< not in touch */
+ TAP_TOUCH_STATE_TOUCH, /**< touching, may tap */
+ TAP_TOUCH_STATE_DEAD, /**< exceeded motion/timeout */
+};
+
struct tp_motion {
int32_t x;
int32_t y;
};
struct tp_touch {
+ struct tp_dispatch *tp;
enum touch_state state;
bool dirty;
- bool fake; /* a fake touch */
bool is_pointer; /* the pointer-controlling touch */
int32_t x;
int32_t y;
- uint32_t millis;
+ uint64_t millis;
struct {
struct tp_motion samples[TOUCHPAD_HISTORY_LENGTH];
enum button_state state;
/* We use button_event here so we can use == on events */
enum button_event curr;
- uint32_t timeout;
+ struct libinput_timer timer;
} button;
+
+ struct {
+ enum tp_tap_touch_state state;
+ } tap;
+
+ struct {
+ bool is_palm;
+ int32_t x, y; /* first coordinates if is_palm == true */
+ uint32_t time; /* first timestamp if is_palm == true */
+ } palm;
};
struct tp_dispatch {
struct evdev_dispatch base;
struct evdev_device *device;
unsigned int nfingers_down; /* number of fingers down */
+ unsigned int old_nfingers_down; /* previous no fingers down */
unsigned int slot; /* current slot */
bool has_mt;
+ bool semi_mt;
- unsigned int ntouches; /* number of slots */
+ unsigned int real_touches; /* number of slots */
+ unsigned int ntouches; /* no slots inc. fakes */
struct tp_touch *touches; /* len == ntouches */
unsigned int fake_touches; /* fake touch mask */
struct motion_filter *filter;
struct {
- double constant_factor;
- double min_factor;
- double max_factor;
+ double x_scale_coeff;
+ double y_scale_coeff;
} accel;
struct {
- bool has_buttons; /* true for physical LMR buttons */
+ bool is_clickpad; /* true for clickpads */
+ bool has_topbuttons;
bool use_clickfinger; /* number of fingers decides button number */
- bool use_softbuttons; /* use software-button area */
+ bool click_pending;
uint32_t state;
uint32_t old_state;
uint32_t motion_dist; /* for pinned touches */
unsigned int active; /* currently active button, for release event */
- /* Only used if has_buttons is false. The software button area is always
- * a horizontal strip across the touchpad. Depending on the
- * rightbutton_left_edge value, the buttons are split according to the
- * edge settings.
- */
+ /* Only used for clickpads. The software button areas are
+ * always 2 horizontal stripes across the touchpad.
+ * The buttons are split according to the edge settings.
+ */
struct {
int32_t top_edge;
int32_t rightbutton_left_edge;
- } area;
-
- unsigned int timeout; /* current timeout in ms */
+ } bottom_area;
- int timer_fd;
- struct libinput_source *source;
+ struct {
+ int32_t bottom_edge;
+ int32_t rightbutton_left_edge;
+ int32_t leftbutton_right_edge;
+ } top_area;
} buttons; /* physical buttons */
struct {
- enum scroll_state state;
enum libinput_pointer_axis direction;
} scroll;
enum touchpad_event queued;
struct {
+ struct libinput_device_config_tap config;
bool enabled;
- int timer_fd;
- struct libinput_source *source;
- unsigned int timeout;
+ struct libinput_timer timer;
enum tp_tap_state state;
} tap;
+
+ struct {
+ int32_t right_edge;
+ int32_t left_edge;
+ } palm;
};
#define tp_for_each_touch(_tp, _t) \
tp_set_pointer(struct tp_dispatch *tp, struct tp_touch *t);
int
-tp_tap_handle_state(struct tp_dispatch *tp, uint32_t time);
-
-unsigned int
-tp_tap_handle_timeout(struct tp_dispatch *tp, uint32_t time);
+tp_tap_handle_state(struct tp_dispatch *tp, uint64_t time);
int
tp_init_tap(struct tp_dispatch *tp);
int
tp_process_button(struct tp_dispatch *tp,
const struct input_event *e,
- uint32_t time);
+ uint64_t time);
int
-tp_post_button_events(struct tp_dispatch *tp, uint32_t time);
+tp_post_button_events(struct tp_dispatch *tp, uint64_t time);
int
-tp_button_handle_state(struct tp_dispatch *tp, uint32_t time);
+tp_button_handle_state(struct tp_dispatch *tp, uint64_t time);
int
tp_button_touch_active(struct tp_dispatch *tp, struct tp_touch *t);
+bool
+tp_button_is_inside_softbutton_area(struct tp_dispatch *tp, struct tp_touch *t);
+
#endif