98 lines
3.7 KiB
Diff
98 lines
3.7 KiB
Diff
|
diff -Nur dde-daemon-3.2.6/misc/dde-daemon/gesture.json dde-daemon-3.2.6-new/misc/dde-daemon/gesture.json
|
||
|
|
--- dde-daemon-3.2.6/misc/dde-daemon/gesture.json 2017-11-16 20:32:17.000000000 +0800
|
||
|
|
+++ dde-daemon-3.2.6-new/misc/dde-daemon/gesture.json 2017-11-29 23:16:08.696136900 +0800
|
||
|
|
@@ -54,15 +54,6 @@
|
||
|
|
}
|
||
|
|
},
|
||
|
|
{
|
||
|
|
- "Name": "tap",
|
||
|
|
- "Direction": "none",
|
||
|
|
- "Fingers": 3,
|
||
|
|
- "Action": {
|
||
|
|
- "Type": "built-in",
|
||
|
|
- "Action": "MoveWindow"
|
||
|
|
- }
|
||
|
|
- },
|
||
|
|
- {
|
||
|
|
"Name": "swipe",
|
||
|
|
"Direction": "up",
|
||
|
|
"Fingers": 4,
|
||
|
|
diff -Nur dde-daemon-3.2.6/system/gesture/core.c dde-daemon-3.2.6-new/system/gesture/core.c
|
||
|
|
--- dde-daemon-3.2.6/system/gesture/core.c 2017-11-16 20:32:17.000000000 +0800
|
||
|
|
+++ dde-daemon-3.2.6-new/system/gesture/core.c 2017-11-29 23:20:21.688875700 +0800
|
||
|
|
@@ -211,16 +211,16 @@
|
||
|
|
}
|
||
|
|
raw_event_reset(raw);
|
||
|
|
break;
|
||
|
|
- case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
|
||
|
|
- break;
|
||
|
|
- case LIBINPUT_EVENT_GESTURE_TAP_END:
|
||
|
|
- if (libinput_event_gesture_get_cancelled(gesture)) {
|
||
|
|
- break;
|
||
|
|
- }
|
||
|
|
- raw->fingers = libinput_event_gesture_get_finger_count(gesture);
|
||
|
|
- printf("[Tap] fingers: %d\n", raw->fingers);
|
||
|
|
- handleGestureEvent(GESTURE_TYPE_TAP, GESTURE_DIRECTION_NONE, raw->fingers);
|
||
|
|
- break;
|
||
|
|
+ /* case LIBINPUT_EVENT_GESTURE_TAP_BEGIN: */
|
||
|
|
+ /* break; */
|
||
|
|
+ /* case LIBINPUT_EVENT_GESTURE_TAP_END: */
|
||
|
|
+ /* if (libinput_event_gesture_get_cancelled(gesture)) { */
|
||
|
|
+ /* break; */
|
||
|
|
+ /* } */
|
||
|
|
+ /* raw->fingers = libinput_event_gesture_get_finger_count(gesture); */
|
||
|
|
+ /* printf("[Tap] fingers: %d\n", raw->fingers); */
|
||
|
|
+ /* handleGestureEvent(GESTURE_TYPE_TAP, GESTURE_DIRECTION_NONE, raw->fingers); */
|
||
|
|
+ /* break; */
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -278,13 +278,10 @@
|
||
|
|
}
|
||
|
|
case LIBINPUT_EVENT_GESTURE_PINCH_BEGIN:
|
||
|
|
case LIBINPUT_EVENT_GESTURE_PINCH_UPDATE:
|
||
|
|
- case LIBINPUT_EVENT_GESTURE_PINCH_END:
|
||
|
|
- case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
|
||
|
|
- case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE:
|
||
|
|
- case LIBINPUT_EVENT_GESTURE_SWIPE_END:
|
||
|
|
- case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
|
||
|
|
- case LIBINPUT_EVENT_GESTURE_TAP_UPDATE:
|
||
|
|
- case LIBINPUT_EVENT_GESTURE_TAP_END:{
|
||
|
|
+ /* case LIBINPUT_EVENT_GESTURE_TAP_BEGIN: */
|
||
|
|
+ /* case LIBINPUT_EVENT_GESTURE_TAP_UPDATE: */
|
||
|
|
+ /* case LIBINPUT_EVENT_GESTURE_TAP_END: */
|
||
|
|
+ case LIBINPUT_EVENT_GESTURE_SWIPE_END:{
|
||
|
|
handle_gesture_events(ev, type);
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
diff -Nur dde-daemon-3.2.6/system/gesture/gesture.go dde-daemon-3.2.6-new/system/gesture/gesture.go
|
||
|
|
--- dde-daemon-3.2.6/system/gesture/gesture.go 2017-11-16 20:32:17.000000000 +0800
|
||
|
|
+++ dde-daemon-3.2.6-new/system/gesture/gesture.go 2017-11-29 23:11:14.265531500 +0800
|
||
|
|
@@ -42,9 +42,9 @@
|
||
|
|
var (
|
||
|
|
GestureTypeSwipe = GestureType(C.GESTURE_TYPE_SWIPE)
|
||
|
|
GestureTypePinch = GestureType(C.GESTURE_TYPE_PINCH)
|
||
|
|
- GestureTypeTap = GestureType(C.GESTURE_TYPE_TAP)
|
||
|
|
+ // GestureTypeTap = GestureType(C.GESTURE_TYPE_TAP)
|
||
|
|
|
||
|
|
- GestureDirectionNone = GestureType(C.GESTURE_DIRECTION_NONE)
|
||
|
|
+ // GestureDirectionNone = GestureType(C.GESTURE_DIRECTION_NONE)
|
||
|
|
GestureDirectionUp = GestureType(C.GESTURE_DIRECTION_UP)
|
||
|
|
GestureDirectionDown = GestureType(C.GESTURE_DIRECTION_DOWN)
|
||
|
|
GestureDirectionLeft = GestureType(C.GESTURE_DIRECTION_LEFT)
|
||
|
|
@@ -59,10 +59,10 @@
|
||
|
|
return "swipe"
|
||
|
|
case GestureTypePinch:
|
||
|
|
return "pinch"
|
||
|
|
- case GestureTypeTap:
|
||
|
|
- return "tap"
|
||
|
|
- case GestureDirectionNone:
|
||
|
|
- return "none"
|
||
|
|
+ // case GestureTypeTap:
|
||
|
|
+ // return "tap"
|
||
|
|
+ // case GestureDirectionNone:
|
||
|
|
+ // return "none"
|
||
|
|
case GestureDirectionUp:
|
||
|
|
return "up"
|
||
|
|
case GestureDirectionDown:
|