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

Fix the failed rebase.

Browse source
This commit is contained in:
Samuel Grahn 2019-01-24 00:50:10 +01:00
parent ba2020aebd
commit 6ccc01e9ef
2 changed files with 2 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,10 +36,6 @@ struct sway_cursor {
struct wl_listener axis; struct wl_listener axis;
struct wl_listener frame; struct wl_listener frame;
<<<<<<< HEAD
=======
>>>>>>> Register touch events in libtouch engine
struct libtouch_engine *gesture_engine; 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;

22
sway/input/cursor.c
View file

@ -361,17 +361,10 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
event->touch_id, sx, sy); event->touch_id, sx, sy);
cursor_set_image(cursor, NULL, NULL); cursor_set_image(cursor, NULL, NULL);
} }
<<<<<<< HEAD
libtouch_engine_register_touch(engine, event->time_msec, event->touch_id,
LIBTOUCH_TOUCH_DOWN, event->x, event->y);
=======
libtouch_engine_register_touch(cursor->gesture_engine, event->time_msec, libtouch_engine_register_touch(cursor->gesture_engine, event->time_msec,
event->touch_id, LIBTOUCH_TOUCH_DOWN, event->touch_id, LIBTOUCH_TOUCH_DOWN,
event->x, event->y); event->x, event->y);
>>>>>>> Register touch events in libtouch engine
} }
static void handle_touch_up(struct wl_listener *listener, void *data) { static void handle_touch_up(struct wl_listener *listener, void *data) {
@ -382,14 +375,8 @@ static void handle_touch_up(struct wl_listener *listener, void *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);
<<<<<<< HEAD
libtouch_engine_register_touch(engine, event->time_msec, event->touch_id,
LIBTOUCH_TOUCH_UP, 0,0);
=======
libtouch_engine_register_touch(cursor->gesture_engine, event->time_msec, libtouch_engine_register_touch(cursor->gesture_engine, event->time_msec,
event->touch_id, LIBTOUCH_TOUCH_UP, 0, 0); event->touch_id, LIBTOUCH_TOUCH_UP, 0, 0);
>>>>>>> Register touch events in libtouch engine
} }
static void handle_touch_motion(struct wl_listener *listener, void *data) { static void handle_touch_motion(struct wl_listener *listener, void *data) {
@ -429,14 +416,9 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
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);
} }
<<<<<<< HEAD
libtouch_engine_register_move(engine, event->time_msec, event->touch_id,
event->x, event->y);
=======
libtouch_engine_register_move(cursor->gesture_engine, event->time_msec, libtouch_engine_register_move(cursor->gesture_engine, event->time_msec,
event->touch_id, event->x, event->y); event->touch_id, event->x, event->y);
>>>>>>> Register touch events in libtouch engine
} }
static double apply_mapping_from_coord(double low, double high, double value) { static double apply_mapping_from_coord(double low, double high, double value) {