mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-27 06:46:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Integrate libtouch into sway and cursor.(c|h)

Browse source
This commit is contained in:
grahnen 2019-01-15 03:45:04 +01:00 • committed by Samuel Grahn
parent 642d7fd8ec
commit 6a099a753e
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sway/input/cursor.h
View file

@ -36,6 +36,8 @@ struct sway_cursor {
struct wl_listener axis; struct wl_listener axis;
struct wl_listener frame; struct wl_listener frame;
struct libtouch_engine *gesture_engine;
struct wl_listener touch_down; struct wl_listener touch_down;
struct wl_listener touch_up; struct wl_listener touch_up;
struct wl_listener touch_motion; struct wl_listener touch_motion;

1
meson.build
View file

@ -37,6 +37,7 @@ if is_freebsd
add_project_arguments('-D_C11_SOURCE', language: 'c') add_project_arguments('-D_C11_SOURCE', language: 'c')
endif endif
libtouch = dependency('libtouch')
jsonc = dependency('json-c', version: '>=0.13') jsonc = dependency('json-c', version: '>=0.13')
pcre = dependency('libpcre') pcre = dependency('libpcre')
wayland_server = dependency('wayland-server') wayland_server = dependency('wayland-server')

20
sway/input/cursor.c
View file

@ -28,6 +28,7 @@
#include "sway/tree/view.h" #include "sway/tree/view.h"
#include "sway/tree/workspace.h" #include "sway/tree/workspace.h"
#include "wlr-layer-shell-unstable-v1-protocol.h" #include "wlr-layer-shell-unstable-v1-protocol.h"
#include "libtouch.h"
static uint32_t get_current_time_msec(void) { static uint32_t get_current_time_msec(void) {
struct timespec now; struct timespec now;
@ -335,7 +336,7 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_down); struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_down);
wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat); wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat);
struct wlr_event_touch_down *event = data; struct wlr_event_touch_down *event = data;
struct libtouch_engine *engine = cursor->gesture_engine;
struct sway_seat *seat = cursor->seat; struct sway_seat *seat = cursor->seat;
struct wlr_seat *wlr_seat = seat->wlr_seat; struct wlr_seat *wlr_seat = seat->wlr_seat;
struct wlr_surface *surface = NULL; struct wlr_surface *surface = NULL;
@ -354,21 +355,29 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
return; return;
} }
// TODO: fall back to cursor simulation if client has not bound to touch // TODO: fall back to cursor simulation if client has not bound to touch
if (seat_is_input_allowed(seat, surface)) { if (seat_is_input_allowed(seat, surface)) {
wlr_seat_touch_notify_down(wlr_seat, surface, event->time_msec, wlr_seat_touch_notify_down(wlr_seat, surface, event->time_msec,
event->touch_id, sx, sy); event->touch_id, sx, sy);
cursor_set_image(cursor, NULL, NULL); cursor_set_image(cursor, NULL, NULL);
} }
libtouch_engine_register_touch(engine, event->time_msec, event->touch_id,
LIBTOUCH_TOUCH_DOWN, event->x, event->y);
} }
static void handle_touch_up(struct wl_listener *listener, void *data) { static void handle_touch_up(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_up); struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_up);
struct libtouch_engine *engine = cursor->gesture_engine;
wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat); wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat);
struct wlr_event_touch_up *event = data; struct wlr_event_touch_up *event = data;
struct wlr_seat *seat = cursor->seat->wlr_seat; struct wlr_seat *seat = cursor->seat->wlr_seat;
// TODO: fall back to cursor simulation if client has not bound to touch // TODO: fall back to cursor simulation if client has not bound to touch
wlr_seat_touch_notify_up(seat, event->time_msec, event->touch_id); wlr_seat_touch_notify_up(seat, event->time_msec, event->touch_id);
libtouch_engine_register_touch(engine, event->time_msec, event->touch_id,
LIBTOUCH_TOUCH_UP, 0,0);
} }
static void handle_touch_motion(struct wl_listener *listener, void *data) { static void handle_touch_motion(struct wl_listener *listener, void *data) {
@ -376,7 +385,7 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
wl_container_of(listener, cursor, touch_motion); wl_container_of(listener, cursor, touch_motion);
wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat); wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat);
struct wlr_event_touch_motion *event = data; struct wlr_event_touch_motion *event = data;
struct libtouch_engine *engine = cursor->gesture_engine;
struct sway_seat *seat = cursor->seat; struct sway_seat *seat = cursor->seat;
struct wlr_seat *wlr_seat = seat->wlr_seat; struct wlr_seat *wlr_seat = seat->wlr_seat;
struct wlr_surface *surface = NULL; struct wlr_surface *surface = NULL;
@ -402,12 +411,15 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
if (!surface) { if (!surface) {
return; return;
} }
// TODO: fall back to cursor simulation if client has not bound to touch // TODO: fall back to cursor simulation if client has not bound to touch
if (seat_is_input_allowed(cursor->seat, surface)) { if (seat_is_input_allowed(cursor->seat, surface)) {
wlr_seat_touch_notify_motion(wlr_seat, event->time_msec, wlr_seat_touch_notify_motion(wlr_seat, event->time_msec,
event->touch_id, sx, sy); event->touch_id, sx, sy);
} }
libtouch_engine_register_move(engine, event->time_msec, event->touch_id,
event->x, event->y);
} }
static double apply_mapping_from_coord(double low, double high, double value) { static double apply_mapping_from_coord(double low, double high, double value) {

1
sway/meson.build
View file

@ -185,6 +185,7 @@ sway_sources = files(
) )
sway_deps = [ sway_deps = [
libtouch,
cairo, cairo,
gdk_pixbuf, gdk_pixbuf,
jsonc, jsonc,