deepin-daemon/trunk/deepin-daemon-fix-vanilla-libinput.patch

   1 diff --git a/system/gesture/core.c b/system/gesture/core.c
   2 index 85902af6..f9a02551 100644
   3 --- a/system/gesture/core.c
   4 +++ b/system/gesture/core.c
   5 @@ -358,9 +358,7 @@ handle_gesture_events(struct libinput_event *ev, int type)
   6      if (raw->dblclick
   7      && type != LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN
   8      && type != LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE
   9 -    && type != LIBINPUT_EVENT_GESTURE_SWIPE_END
  10 -    && type != LIBINPUT_EVENT_GESTURE_TAP_UPDATE
  11 -    && type != LIBINPUT_EVENT_GESTURE_TAP_END) {
  12 +    && type != LIBINPUT_EVENT_GESTURE_SWIPE_END) {
  13          raw->fingers = libinput_event_gesture_get_finger_count(gesture);
  14          handleSwipeStop(raw->fingers);
  15          raw->dblclick = false;
  16 @@ -438,31 +436,6 @@ handle_gesture_events(struct libinput_event *ev, int type)
  17
  18          raw_event_reset(raw, true);
  19          break;
  20 -    case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
  21 -        g_debug("[Tap begin] time: %u duration: %d fingers: %d \n", raw->t_start_tap, (libinput_event_gesture_get_time_usec(gesture) - raw->t_start_tap) / 1000, raw->fingers);
  22 -        if (raw->t_start_tap > 0
  23 -        &&  (libinput_event_gesture_get_time_usec(gesture) - raw->t_start_tap) / 1000 <= dblclick_duration
  24 -        && raw->fingers == libinput_event_gesture_get_finger_count(gesture)) {
  25 -            handleDbclickDown(raw->fingers);
  26 -            handle_tap_stop();
  27 -            raw_event_reset(raw, true);
  28 -            raw->dblclick = true;
  29 -        }
  30 -        break;
  31 -    case LIBINPUT_EVENT_GESTURE_TAP_END:
  32 -        if (libinput_event_gesture_get_cancelled(gesture)) {
  33 -            raw_event_reset(raw, true);
  34 -            break;
  35 -        }
  36 -
  37 -        if (!raw->dblclick) {
  38 -            raw->fingers = libinput_event_gesture_get_finger_count(gesture);
  39 -            raw->t_start_tap = libinput_event_gesture_get_time_usec(gesture);
  40 -            handle_tap_delay();
  41 -        } else {
  42 -            raw_event_reset(raw, true);
  43 -        }
  44 -        break;
  45      }
  46  }
  47
  48 @@ -591,10 +564,7 @@ handle_events(struct libinput *li, struct movement *m)
  49          case LIBINPUT_EVENT_GESTURE_PINCH_END:
  50          case LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN:
  51          case LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE:
  52 -        case LIBINPUT_EVENT_GESTURE_SWIPE_END:
  53 -        case LIBINPUT_EVENT_GESTURE_TAP_BEGIN:
  54 -        case LIBINPUT_EVENT_GESTURE_TAP_UPDATE:
  55 -        case LIBINPUT_EVENT_GESTURE_TAP_END:{
  56 +        case LIBINPUT_EVENT_GESTURE_SWIPE_END:{
  57              handle_gesture_events(ev, type);
  58              break;
  59          }