* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "config.h"
+
#include <stdlib.h>
#include <string.h>
#include <linux/input.h>
#include "compositor.h"
#include "evdev.h"
+#define DEFAULT_AXIS_STEP_DISTANCE wl_fixed_from_int(10)
+
void
-evdev_led_update(struct wl_list *evdev_devices, enum weston_led leds)
+evdev_led_update(struct evdev_device *device, enum weston_led leds)
{
static const struct {
enum weston_led weston;
{ LED_CAPS_LOCK, LED_CAPSL },
{ LED_SCROLL_LOCK, LED_SCROLLL },
};
- struct evdev_input_device *device;
struct input_event ev[ARRAY_LENGTH(map)];
unsigned int i;
+ if (!device->caps & EVDEV_KEYBOARD)
+ return;
+
memset(ev, 0, sizeof(ev));
for (i = 0; i < ARRAY_LENGTH(map); i++) {
ev[i].type = EV_LED;
ev[i].value = !!(leds & map[i].weston);
}
- wl_list_for_each(device, evdev_devices, link) {
- if (device->caps & EVDEV_KEYBOARD)
- write(device->fd, ev, sizeof ev);
- }
+ i = write(device->fd, ev, sizeof ev);
+ (void)i; /* no, we really don't care about the return value */
}
static inline void
-evdev_process_key(struct evdev_input_device *device,
- struct input_event *e, int time)
+evdev_process_key(struct evdev_device *device, struct input_event *e, int time)
{
if (e->value == 2)
return;
case BTN_FORWARD:
case BTN_BACK:
case BTN_TASK:
- notify_button(&device->seat->seat,
+ notify_button(device->seat,
time, e->code,
e->value ? WL_POINTER_BUTTON_STATE_PRESSED :
WL_POINTER_BUTTON_STATE_RELEASED);
break;
+ case BTN_TOUCH:
+ if (e->value == 0 && !device->is_mt)
+ notify_touch(device->seat, time, device->mt.slot, 0, 0,
+ WL_TOUCH_UP);
+ break;
default:
- notify_key(&device->seat->seat,
+ notify_key(device->seat,
time, e->code,
e->value ? WL_KEYBOARD_KEY_STATE_PRESSED :
WL_KEYBOARD_KEY_STATE_RELEASED,
}
static void
-evdev_process_touch(struct evdev_input_device *device,
- struct input_event *e)
+evdev_process_touch(struct evdev_device *device, struct input_event *e)
{
const int screen_width = device->output->current->width;
const int screen_height = device->output->current->height;
case ABS_MT_POSITION_X:
device->mt.x[device->mt.slot] =
(e->value - device->abs.min_x) * screen_width /
- (device->abs.max_x - device->abs.min_x) +
- device->output->x;
+ (device->abs.max_x - device->abs.min_x);
device->pending_events |= EVDEV_ABSOLUTE_MT_MOTION;
break;
case ABS_MT_POSITION_Y:
device->mt.y[device->mt.slot] =
(e->value - device->abs.min_y) * screen_height /
- (device->abs.max_y - device->abs.min_y) +
- device->output->y;
+ (device->abs.max_y - device->abs.min_y);
device->pending_events |= EVDEV_ABSOLUTE_MT_MOTION;
break;
}
}
static inline void
-evdev_process_absolute_motion(struct evdev_input_device *device,
+evdev_process_absolute_motion(struct evdev_device *device,
struct input_event *e)
{
const int screen_width = device->output->current->width;
case ABS_X:
device->abs.x =
(e->value - device->abs.min_x) * screen_width /
- (device->abs.max_x - device->abs.min_x) +
- device->output->x;
+ (device->abs.max_x - device->abs.min_x);
device->pending_events |= EVDEV_ABSOLUTE_MOTION;
break;
case ABS_Y:
device->abs.y =
(e->value - device->abs.min_y) * screen_height /
- (device->abs.max_y - device->abs.min_y) +
- device->output->y;
+ (device->abs.max_y - device->abs.min_y);
device->pending_events |= EVDEV_ABSOLUTE_MOTION;
break;
}
}
static inline void
-evdev_process_relative(struct evdev_input_device *device,
+evdev_process_relative(struct evdev_device *device,
struct input_event *e, uint32_t time)
{
switch (e->code) {
device->pending_events |= EVDEV_RELATIVE_MOTION;
break;
case REL_WHEEL:
- notify_axis(&device->seat->seat,
- time,
- WL_POINTER_AXIS_VERTICAL_SCROLL,
- wl_fixed_from_int(e->value));
+ switch (e->value) {
+ case -1:
+ /* Scroll down */
+ case 1:
+ /* Scroll up */
+ notify_axis(device->seat,
+ time,
+ WL_POINTER_AXIS_VERTICAL_SCROLL,
+ -1 * e->value * DEFAULT_AXIS_STEP_DISTANCE);
+ break;
+ default:
+ break;
+ }
break;
case REL_HWHEEL:
- notify_axis(&device->seat->seat,
- time,
- WL_POINTER_AXIS_HORIZONTAL_SCROLL,
- wl_fixed_from_int(e->value));
- break;
+ switch (e->value) {
+ case -1:
+ /* Scroll left */
+ case 1:
+ /* Scroll right */
+ notify_axis(device->seat,
+ time,
+ WL_POINTER_AXIS_HORIZONTAL_SCROLL,
+ e->value * DEFAULT_AXIS_STEP_DISTANCE);
+ break;
+ default:
+ break;
+
+ }
}
}
static inline void
-evdev_process_absolute(struct evdev_input_device *device,
- struct input_event *e)
+evdev_process_absolute(struct evdev_device *device, struct input_event *e)
{
if (device->is_mt) {
evdev_process_touch(device, e);
case REL_Y:
return 1;
}
+ break;
case EV_ABS:
switch (e->code) {
case ABS_X:
}
static void
-evdev_flush_motion(struct evdev_input_device *device, uint32_t time)
+transform_absolute(struct evdev_device *device)
+{
+ int32_t x, y;
+
+ if (!device->abs.apply_calibration)
+ return;
+
+ x = device->abs.x * device->abs.calibration[0] +
+ device->abs.y * device->abs.calibration[1] +
+ device->abs.calibration[2];
+
+ y = device->abs.x * device->abs.calibration[3] +
+ device->abs.y * device->abs.calibration[4] +
+ device->abs.calibration[5];
+
+ device->abs.x = x;
+ device->abs.y = y;
+}
+
+static void
+evdev_flush_motion(struct evdev_device *device, uint32_t time)
{
struct weston_seat *master = device->seat;
+ wl_fixed_t x, y;
+ int slot;
- if (!device->pending_events)
+ if (!(device->pending_events & EVDEV_SYN))
return;
+ slot = device->mt.slot;
+ device->pending_events &= ~EVDEV_SYN;
if (device->pending_events & EVDEV_RELATIVE_MOTION) {
- notify_motion(&master->seat, time,
- master->seat.pointer->x + device->rel.dx,
- master->seat.pointer->y + device->rel.dy);
+ notify_motion(master, time, device->rel.dx, device->rel.dy);
device->pending_events &= ~EVDEV_RELATIVE_MOTION;
device->rel.dx = 0;
device->rel.dy = 0;
}
if (device->pending_events & EVDEV_ABSOLUTE_MT_DOWN) {
- notify_touch(&master->seat, time,
- device->mt.slot,
- wl_fixed_from_int(device->mt.x[device->mt.slot]),
- wl_fixed_from_int(device->mt.y[device->mt.slot]),
- WL_TOUCH_DOWN);
+ weston_output_transform_coordinate(device->output,
+ device->mt.x[slot],
+ device->mt.y[slot],
+ &x, &y);
+ notify_touch(master, time,
+ device->mt.slot, x, y, WL_TOUCH_DOWN);
device->pending_events &= ~EVDEV_ABSOLUTE_MT_DOWN;
device->pending_events &= ~EVDEV_ABSOLUTE_MT_MOTION;
}
if (device->pending_events & EVDEV_ABSOLUTE_MT_MOTION) {
- notify_touch(&master->seat, time,
- device->mt.slot,
- wl_fixed_from_int(device->mt.x[device->mt.slot]),
- wl_fixed_from_int(device->mt.y[device->mt.slot]),
- WL_TOUCH_MOTION);
+ weston_output_transform_coordinate(device->output,
+ device->mt.x[slot],
+ device->mt.y[slot],
+ &x, &y);
+ notify_touch(master, time,
+ device->mt.slot, x, y, WL_TOUCH_MOTION);
device->pending_events &= ~EVDEV_ABSOLUTE_MT_DOWN;
device->pending_events &= ~EVDEV_ABSOLUTE_MT_MOTION;
}
if (device->pending_events & EVDEV_ABSOLUTE_MT_UP) {
- notify_touch(&master->seat, time, device->mt.slot, 0, 0,
+ notify_touch(master, time, device->mt.slot, 0, 0,
WL_TOUCH_UP);
device->pending_events &= ~EVDEV_ABSOLUTE_MT_UP;
}
if (device->pending_events & EVDEV_ABSOLUTE_MOTION) {
- notify_motion(&master->seat, time,
- wl_fixed_from_int(device->abs.x),
- wl_fixed_from_int(device->abs.y));
+ transform_absolute(device);
+ weston_output_transform_coordinate(device->output,
+ device->abs.x,
+ device->abs.y, &x, &y);
+
+ if (device->caps & EVDEV_TOUCH) {
+ if (master->num_tp == 0)
+ notify_touch(master, time, 0,
+ x, y, WL_TOUCH_DOWN);
+ else
+ notify_touch(master, time, 0,
+ x, y, WL_TOUCH_MOTION);
+ } else
+ notify_motion_absolute(master, time, x, y);
device->pending_events &= ~EVDEV_ABSOLUTE_MOTION;
}
}
static void
fallback_process(struct evdev_dispatch *dispatch,
- struct evdev_input_device *device,
+ struct evdev_device *device,
struct input_event *event,
uint32_t time)
{
case EV_KEY:
evdev_process_key(device, event, time);
break;
+ case EV_SYN:
+ device->pending_events |= EVDEV_SYN;
+ break;
}
}
}
static void
-evdev_process_events(struct evdev_input_device *device,
+evdev_process_events(struct evdev_device *device,
struct input_event *ev, int count)
{
struct evdev_dispatch *dispatch = device->dispatch;
}
static int
-evdev_input_device_data(int fd, uint32_t mask, void *data)
+evdev_device_data(int fd, uint32_t mask, void *data)
{
struct weston_compositor *ec;
- struct evdev_input_device *device = data;
+ struct evdev_device *device = data;
struct input_event ev[32];
int len;
len = read(fd, &ev, sizeof ev);
if (len < 0 || len % sizeof ev[0] != 0) {
- /* FIXME: call evdev_input_device_destroy when errno is ENODEV. */
+ /* FIXME: call evdev_device_destroy when errno is ENODEV. */
return 1;
}
}
static int
-evdev_configure_device(struct evdev_input_device *device)
+evdev_handle_device(struct evdev_device *device)
{
struct input_absinfo absinfo;
unsigned long ev_bits[NBITS(EV_MAX)];
device->abs.max_y = absinfo.maximum;
device->caps |= EVDEV_MOTION_ABS;
}
- if (TEST_BIT(abs_bits, ABS_MT_SLOT)) {
+ /* We only handle the slotted Protocol B in weston.
+ Devices with ABS_MT_POSITION_* but not ABS_MT_SLOT
+ require mtdev for conversion. */
+ if (TEST_BIT(abs_bits, ABS_MT_POSITION_X) &&
+ TEST_BIT(abs_bits, ABS_MT_POSITION_Y)) {
ioctl(device->fd, EVIOCGABS(ABS_MT_POSITION_X),
&absinfo);
device->abs.min_x = absinfo.minimum;
break;
}
}
+ if (TEST_BIT(key_bits, BTN_TOUCH)) {
+ device->caps |= EVDEV_TOUCH;
+ }
+
}
if (TEST_BIT(ev_bits, EV_LED)) {
device->caps |= EVDEV_KEYBOARD;
weston_log("input device %s, %s "
"ignored: unsupported device type\n",
device->devname, device->devnode);
- return -1;
+ return 0;
}
+ return 1;
+}
+
+static int
+evdev_configure_device(struct evdev_device *device)
+{
if ((device->caps &
(EVDEV_MOTION_ABS | EVDEV_MOTION_REL | EVDEV_BUTTON))) {
weston_seat_init_pointer(device->seat);
- weston_log("input device %s, %s is a pointer\n",
- device->devname, device->devnode);
+ weston_log("input device %s, %s is a pointer caps =%s%s%s\n",
+ device->devname, device->devnode,
+ device->caps & EVDEV_MOTION_ABS ? " absolute-motion" : "",
+ device->caps & EVDEV_MOTION_REL ? " relative-motion": "",
+ device->caps & EVDEV_BUTTON ? " button" : "");
}
if ((device->caps & EVDEV_KEYBOARD)) {
- weston_seat_init_keyboard(device->seat, NULL);
+ if (weston_seat_init_keyboard(device->seat, NULL) < 0)
+ return -1;
weston_log("input device %s, %s is a keyboard\n",
device->devname, device->devnode);
}
return 0;
}
-struct evdev_input_device *
-evdev_input_device_create(struct weston_seat *seat,
- const char *path, int device_fd)
+struct evdev_device *
+evdev_device_create(struct weston_seat *seat, const char *path, int device_fd)
{
- struct evdev_input_device *device;
+ struct evdev_device *device;
struct weston_compositor *ec;
char devname[256] = "unknown";
- device = malloc(sizeof *device);
+ device = zalloc(sizeof *device);
if (device == NULL)
return NULL;
- memset(device, 0, sizeof *device);
ec = seat->compositor;
device->output =
device->fd = device_fd;
ioctl(device->fd, EVIOCGNAME(sizeof(devname)), devname);
+ devname[sizeof(devname) - 1] = '\0';
device->devname = strdup(devname);
+ if (!evdev_handle_device(device)) {
+ free(device->devnode);
+ free(device->devname);
+ free(device);
+ return EVDEV_UNHANDLED_DEVICE;
+ }
+
if (evdev_configure_device(device) == -1)
goto err1;
device->source = wl_event_loop_add_fd(ec->input_loop, device->fd,
WL_EVENT_READABLE,
- evdev_input_device_data, device);
+ evdev_device_data, device);
if (device->source == NULL)
goto err2;
}
void
-evdev_input_device_destroy(struct evdev_input_device *device)
+evdev_device_destroy(struct evdev_device *device)
{
struct evdev_dispatch *dispatch;
evdev_notify_keyboard_focus(struct weston_seat *seat,
struct wl_list *evdev_devices)
{
- struct evdev_input_device *device;
+ struct evdev_device *device;
struct wl_array keys;
unsigned int i, set;
char evdev_keys[(KEY_CNT + 7) / 8];
uint32_t *k;
int ret;
- if (!seat->seat.keyboard)
+ if (!seat->keyboard)
return;
memset(all_keys, 0, sizeof all_keys);
}
}
- notify_keyboard_focus_in(&seat->seat, &keys, STATE_UPDATE_AUTOMATIC);
+ notify_keyboard_focus_in(seat, &keys, STATE_UPDATE_AUTOMATIC);
wl_array_release(&keys);
}
projects / platform / upstream / libinput.git / blobdiff