moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2025-07-03 00:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix missed merging conflicts

Browse Source 
Fixes commit 4711129
This commit is contained in:
Iwan Timmer 2020-04-19 11:37:02 +02:00
parent 4711129d14
commit 95104759ab
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/input/evdev.c
View File

@ -57,11 +57,8 @@ struct input_device {
struct libevdev *dev; struct libevdev *dev;
bool is_keyboard; bool is_keyboard;
bool is_mouse; bool is_mouse;
<<<<<<< HEAD
int rotate;
=======
bool is_touchscreen; bool is_touchscreen;
>>>>>>> tomblind/touchscreen int rotate;
struct mapping* map; struct mapping* map;
int key_map[KEY_MAX]; int key_map[KEY_MAX];
int abs_map[ABS_MAX]; int abs_map[ABS_MAX];
@ -606,13 +603,10 @@ void evdev_create(const char* device, struct mapping* mappings, bool verbose, in
memset(&devices[dev].abs_map, -2, sizeof(devices[dev].abs_map)); memset(&devices[dev].abs_map, -2, sizeof(devices[dev].abs_map));
devices[dev].is_keyboard = is_keyboard; devices[dev].is_keyboard = is_keyboard;
devices[dev].is_mouse = is_mouse; devices[dev].is_mouse = is_mouse;
<<<<<<< HEAD
devices[dev].rotate = rotate;
=======
devices[dev].is_touchscreen = is_touchscreen; devices[dev].is_touchscreen = is_touchscreen;
devices[dev].rotate = rotate;
devices[dev].touchDownX = TOUCH_UP; devices[dev].touchDownX = TOUCH_UP;
devices[dev].touchDownY = TOUCH_UP; devices[dev].touchDownY = TOUCH_UP;
>>>>>>> tomblind/touchscreen
int nbuttons = 0; int nbuttons = 0;
for (int i = BTN_JOYSTICK; i < KEY_MAX; ++i) { for (int i = BTN_JOYSTICK; i < KEY_MAX; ++i) {