|
 |
07b789b |
diff --git a/misc/dde-daemon/gesture.json b/misc/dde-daemon/gesture.json
|
|
|
07b789b |
index 2fc0ce60..9548d8f2 100644
|
|
|
07b789b |
--- a/misc/dde-daemon/gesture.json
|
|
|
07b789b |
+++ b/misc/dde-daemon/gesture.json
|
|
|
07b789b |
@@ -53,15 +53,6 @@
|
|
|
07b789b |
"Action": "ShowWindow"
|
|
|
07b789b |
}
|
|
|
07b789b |
},
|
|
|
07b789b |
- {
|
|
|
07b789b |
- "Name": "tap",
|
|
|
07b789b |
- "Direction": "none",
|
|
|
07b789b |
- "Fingers": 3,
|
|
|
07b789b |
- "Action": {
|
|
|
07b789b |
- "Type": "built-in",
|
|
|
07b789b |
- "Action": "MoveWindow"
|
|
|
07b789b |
- }
|
|
|
07b789b |
- },
|
|
|
07b789b |
{
|
|
|
07b789b |
"Name": "swipe",
|
|
|
07b789b |
"Direction": "up",
|
|
|
07b789b |
diff --git a/system/gesture/core.c b/system/gesture/core.c
|
|
|
07b789b |
index a54190b6..085b5f7c 100644
|
|
|
07b789b |
--- a/system/gesture/core.c
|
|
|
07b789b |
+++ b/system/gesture/core.c
|
|
|
07b789b |
@@ -211,16 +211,16 @@ handle_gesture_events(struct libinput_event *ev, int type)
|
|
|
07b789b |
}
|
|
|
07b789b |
raw_event_reset(raw);
|
|
|
07b789b |
break;
|
|
|
07b789b |
- case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
|
|
|
07b789b |
- break;
|
|
|
07b789b |
- case LIBINPUT_EVENT_GESTURE_TAP_END:
|
|
|
07b789b |
- if (libinput_event_gesture_get_cancelled(gesture)) {
|
|
|
07b789b |
- break;
|
|
|
07b789b |
- }
|
|
|
07b789b |
- raw->fingers = libinput_event_gesture_get_finger_count(gesture);
|
|
|
07b789b |
- printf("[Tap] fingers: %d\n", raw->fingers);
|
|
|
07b789b |
- handleGestureEvent(GESTURE_TYPE_TAP, GESTURE_DIRECTION_NONE, raw->fingers);
|
|
|
07b789b |
- break;
|
|
|
07b789b |
+ /* case LIBINPUT_EVENT_GESTURE_TAP_BEGIN: */
|
|
|
07b789b |
+ /* break; */
|
|
|
07b789b |
+ /* case LIBINPUT_EVENT_GESTURE_TAP_END: */
|
|
|
07b789b |
+ /* if (libinput_event_gesture_get_cancelled(gesture)) { */
|
|
|
07b789b |
+ /* break; */
|
|
|
07b789b |
+ /* } */
|
|
|
07b789b |
+ /* raw->fingers = libinput_event_gesture_get_finger_count(gesture); */
|
|
|
07b789b |
+ /* printf("[Tap] fingers: %d\n", raw->fingers); */
|
|
|
07b789b |
+ /* handleGestureEvent(GESTURE_TYPE_TAP, GESTURE_DIRECTION_NONE, raw->fingers); */
|
|
|
07b789b |
+ /* break; */
|
|
|
07b789b |
}
|
|
|
07b789b |
}
|
|
|
07b789b |
|
|
|
07b789b |
@@ -279,12 +279,12 @@ handle_events(struct libinput *li)
|
|
|
07b789b |
case LIBINPUT_EVENT_GESTURE_PINCH_BEGIN:
|
|
|
07b789b |
case LIBINPUT_EVENT_GESTURE_PINCH_UPDATE:
|
|
|
07b789b |
case LIBINPUT_EVENT_GESTURE_PINCH_END:
|
|
|
07b789b |
+ /* case LIBINPUT_EVENT_GESTURE_TAP_BEGIN: */
|
|
|
07b789b |
+ /* case LIBINPUT_EVENT_GESTURE_TAP_UPDATE: */
|
|
|
07b789b |
+ /* case LIBINPUT_EVENT_GESTURE_TAP_END: */
|
|
|
07b789b |
case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
|
|
|
07b789b |
case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE:
|
|
|
07b789b |
- case LIBINPUT_EVENT_GESTURE_SWIPE_END:
|
|
|
07b789b |
- case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
|
|
|
07b789b |
- case LIBINPUT_EVENT_GESTURE_TAP_UPDATE:
|
|
|
07b789b |
- case LIBINPUT_EVENT_GESTURE_TAP_END:{
|
|
|
07b789b |
+ case LIBINPUT_EVENT_GESTURE_SWIPE_END:{
|
|
|
07b789b |
handle_gesture_events(ev, type);
|
|
|
07b789b |
break;
|
|
|
07b789b |
}
|
|
|
07b789b |
diff --git a/system/gesture/core.h b/system/gesture/core.h
|
|
|
07b789b |
index 78bffce2..cca771b6 100644
|
|
|
07b789b |
--- a/system/gesture/core.h
|
|
|
07b789b |
+++ b/system/gesture/core.h
|
|
|
07b789b |
@@ -22,10 +22,10 @@
|
|
|
07b789b |
|
|
|
07b789b |
#define GESTURE_TYPE_SWIPE 100
|
|
|
07b789b |
#define GESTURE_TYPE_PINCH 101
|
|
|
07b789b |
-#define GESTURE_TYPE_TAP 102
|
|
|
07b789b |
+/* #define GESTURE_TYPE_TAP 102 */
|
|
|
07b789b |
|
|
|
07b789b |
// tap
|
|
|
07b789b |
-#define GESTURE_DIRECTION_NONE 0
|
|
|
07b789b |
+/* #define GESTURE_DIRECTION_NONE 0 */
|
|
|
07b789b |
// swipe
|
|
|
07b789b |
#define GESTURE_DIRECTION_UP 10
|
|
|
07b789b |
#define GESTURE_DIRECTION_DOWN 11
|
|
|
07b789b |
diff --git a/system/gesture/gesture.go b/system/gesture/gesture.go
|
|
|
07b789b |
index adb06d40..dd1e485c 100644
|
|
|
07b789b |
--- a/system/gesture/gesture.go
|
|
|
07b789b |
+++ b/system/gesture/gesture.go
|
|
|
07b789b |
@@ -42,9 +42,9 @@ type GestureType int32
|
|
|
07b789b |
var (
|
|
|
07b789b |
GestureTypeSwipe = GestureType(C.GESTURE_TYPE_SWIPE)
|
|
|
07b789b |
GestureTypePinch = GestureType(C.GESTURE_TYPE_PINCH)
|
|
|
07b789b |
- GestureTypeTap = GestureType(C.GESTURE_TYPE_TAP)
|
|
|
07b789b |
+ // GestureTypeTap = GestureType(C.GESTURE_TYPE_TAP)
|
|
|
07b789b |
|
|
|
07b789b |
- GestureDirectionNone = GestureType(C.GESTURE_DIRECTION_NONE)
|
|
|
07b789b |
+ // GestureDirectionNone = GestureType(C.GESTURE_DIRECTION_NONE)
|
|
|
07b789b |
GestureDirectionUp = GestureType(C.GESTURE_DIRECTION_UP)
|
|
|
07b789b |
GestureDirectionDown = GestureType(C.GESTURE_DIRECTION_DOWN)
|
|
|
07b789b |
GestureDirectionLeft = GestureType(C.GESTURE_DIRECTION_LEFT)
|
|
|
07b789b |
@@ -59,10 +59,10 @@ func (t GestureType) String() string {
|
|
|
07b789b |
return "swipe"
|
|
|
07b789b |
case GestureTypePinch:
|
|
|
07b789b |
return "pinch"
|
|
|
07b789b |
- case GestureTypeTap:
|
|
|
07b789b |
- return "tap"
|
|
|
07b789b |
- case GestureDirectionNone:
|
|
|
07b789b |
- return "none"
|
|
|
07b789b |
+ // case GestureTypeTap:
|
|
|
07b789b |
+ // return "tap"
|
|
|
07b789b |
+ // case GestureDirectionNone:
|
|
|
07b789b |
+ // return "none"
|
|
|
07b789b |
case GestureDirectionUp:
|
|
|
07b789b |
return "up"
|
|
|
07b789b |
case GestureDirectionDown:
|