From 813568a4d23fd5dd9aba4e665001cbbbc175e9de Mon Sep 17 00:00:00 2001
From: pengyanggit <yangpeng177@huawei.com>
Date: Mon, 1 Aug 2022 10:52:14 +0800
Subject: [PATCH] Signed-off-by:pengyanggit<yangpeng177@huawei.com>

Signed-off-by: pengyanggit <yangpeng177@huawei.com>
Change-Id: Ica602e99ac300da55a03cf4de9cf596f84cc838d
---
 .../libinput/libinput_0000.diff               | 128 ++++++++++--------
 1 file changed, 73 insertions(+), 55 deletions(-)

diff --git a/patch/diff_libinput_mmi/libinput/libinput_0000.diff b/patch/diff_libinput_mmi/libinput/libinput_0000.diff
index 3ea7767ecb..45d9232b22 100644
--- a/patch/diff_libinput_mmi/libinput/libinput_0000.diff
+++ b/patch/diff_libinput_mmi/libinput/libinput_0000.diff
@@ -12,8 +12,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 diff -Naur old/BUILD.gn new/BUILD.gn
---- old/BUILD.gn	2022-07-22 11:39:19.874382986 +0800
-+++ new/BUILD.gn	2022-07-22 17:14:54.741463517 +0800
+--- old/BUILD.gn	2021-01-01 00:00:00.000000000 +0800
++++ new/BUILD.gn	2022-08-01 10:14:41.491359042 +0800
 @@ -21,9 +21,16 @@
  config("libinput-third_public_config") {
    include_dirs = [
@@ -77,8 +77,8 @@ diff -Naur old/BUILD.gn new/BUILD.gn
  }
 \ No newline at end of file
 diff -Naur old/export_include/libinput.h new/export_include/libinput.h
---- old/export_include/libinput.h	2022-07-22 11:39:19.890383165 +0800
-+++ new/export_include/libinput.h	2022-07-22 17:14:54.741463517 +0800
+--- old/export_include/libinput.h	2021-01-01 00:00:00.000000000 +0800
++++ new/export_include/libinput.h	2022-08-01 10:14:41.491359042 +0800
 @@ -196,6 +196,22 @@
  	LIBINPUT_DEVICE_CAP_TABLET_PAD = 4,
  	LIBINPUT_DEVICE_CAP_GESTURE = 5,
@@ -792,7 +792,7 @@ diff -Naur old/export_include/libinput.h new/export_include/libinput.h
 +
 diff -Naur old/hm_src/hm_missing.c new/hm_src/hm_missing.c
 --- old/hm_src/hm_missing.c	1970-01-01 08:00:00.000000000 +0800
-+++ new/hm_src/hm_missing.c	2022-07-22 17:14:54.741463517 +0800
++++ new/hm_src/hm_missing.c	2022-08-01 10:14:41.491359042 +0800
 @@ -0,0 +1,22 @@
 +/*
 + * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
@@ -819,7 +819,7 @@ diff -Naur old/hm_src/hm_missing.c new/hm_src/hm_missing.c
 \ No newline at end of file
 diff -Naur old/hm_src/hm_missing.h new/hm_src/hm_missing.h
 --- old/hm_src/hm_missing.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/hm_src/hm_missing.h	2022-07-22 17:14:54.741463517 +0800
++++ new/hm_src/hm_missing.h	2022-08-01 10:14:41.491359042 +0800
 @@ -0,0 +1,25 @@
 +/*
 + * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
@@ -847,8 +847,8 @@ diff -Naur old/hm_src/hm_missing.h new/hm_src/hm_missing.h
 +
 +#endif
 diff -Naur old/include/config.h new/include/config.h
---- old/include/config.h	2022-07-22 11:39:19.890383165 +0800
-+++ new/include/config.h	2022-07-22 17:14:54.741463517 +0800
+--- old/include/config.h	2021-01-01 00:00:00.000000000 +0800
++++ new/include/config.h	2022-08-01 10:14:41.491359042 +0800
 @@ -18,14 +18,17 @@
  #endif
  #define HTTP_DOC_LINK "https://wayland.freedesktop.org/libinput/doc/latest"
@@ -884,7 +884,7 @@ diff -Naur old/include/config.h new/include/config.h
 +
 +
 diff -Naur old/include/linux/linux/input-event-codes.h new/include/linux/linux/input-event-codes.h
---- old/include/linux/linux/input-event-codes.h	2022-07-22 11:39:19.890383165 +0800
+--- old/include/linux/linux/input-event-codes.h	2021-01-01 00:00:00.000000000 +0800
 +++ new/include/linux/linux/input-event-codes.h	1970-01-01 08:00:00.000000000 +0800
 @@ -1,945 +0,0 @@
 -/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
@@ -1833,8 +1833,8 @@ diff -Naur old/include/linux/linux/input-event-codes.h new/include/linux/linux/i
 -
 -#endif
 diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
---- old/src/evdev-fallback.c	2022-07-22 11:39:19.894383209 +0800
-+++ new/src/evdev-fallback.c	2022-07-22 17:14:54.741463517 +0800
+--- old/src/evdev-fallback.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-fallback.c	2022-08-01 10:14:41.491359042 +0800
 @@ -284,8 +284,11 @@
  	struct libinput_device *base = &device->base;
  	struct libinput_seat *seat = base->seat;
@@ -2056,8 +2056,8 @@ diff -Naur old/src/evdev-fallback.c new/src/evdev-fallback.c
 +	return hw_is_key_down(dispatch, btnToolType);
 +}
 diff -Naur old/src/evdev-fallback.h new/src/evdev-fallback.h
---- old/src/evdev-fallback.h	2022-07-22 11:39:19.894383209 +0800
-+++ new/src/evdev-fallback.h	2022-07-22 17:14:54.741463517 +0800
+--- old/src/evdev-fallback.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-fallback.h	2022-08-01 10:14:41.491359042 +0800
 @@ -66,6 +66,10 @@
  	struct device_coords point;
  	struct device_coords hysteresis_center;
@@ -2096,7 +2096,7 @@ diff -Naur old/src/evdev-fallback.h new/src/evdev-fallback.h
  
 diff -Naur old/src/evdev-joystick.c new/src/evdev-joystick.c
 --- old/src/evdev-joystick.c	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/evdev-joystick.c	2022-07-22 17:14:54.745463564 +0800
++++ new/src/evdev-joystick.c	2022-08-01 10:14:41.495360036 +0800
 @@ -0,0 +1,580 @@
 +/*
 + * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
@@ -2680,7 +2680,7 @@ diff -Naur old/src/evdev-joystick.c new/src/evdev-joystick.c
 +
 diff -Naur old/src/evdev-joystick.h new/src/evdev-joystick.h
 --- old/src/evdev-joystick.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/evdev-joystick.h	2022-07-22 17:14:54.745463564 +0800
++++ new/src/evdev-joystick.h	2022-08-01 10:14:41.495360036 +0800
 @@ -0,0 +1,77 @@
 +/*
 + * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
@@ -2760,8 +2760,8 @@ diff -Naur old/src/evdev-joystick.h new/src/evdev-joystick.h
 +
 +#endif
 diff -Naur old/src/evdev-mt-touchpad-gestures.c new/src/evdev-mt-touchpad-gestures.c
---- old/src/evdev-mt-touchpad-gestures.c	2022-07-22 11:39:19.894383209 +0800
-+++ new/src/evdev-mt-touchpad-gestures.c	2022-07-22 17:14:54.745463564 +0800
+--- old/src/evdev-mt-touchpad-gestures.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-mt-touchpad-gestures.c	2022-08-01 10:14:41.495360036 +0800
 @@ -80,6 +80,37 @@
  }
  
@@ -2832,8 +2832,8 @@ diff -Naur old/src/evdev-mt-touchpad-gestures.c new/src/evdev-mt-touchpad-gestur
  
  	return GESTURE_STATE_SWIPE;
 diff -Naur old/src/evdev-mt-touchpad-tap.c new/src/evdev-mt-touchpad-tap.c
---- old/src/evdev-mt-touchpad-tap.c	2022-07-22 11:39:19.894383209 +0800
-+++ new/src/evdev-mt-touchpad-tap.c	2022-07-22 17:14:54.745463564 +0800
+--- old/src/evdev-mt-touchpad-tap.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-mt-touchpad-tap.c	2022-08-01 10:14:41.495360036 +0800
 @@ -72,6 +72,7 @@
  	CASE_RETURN_STRING(TAP_STATE_DRAGGING_OR_TAP);
  	CASE_RETURN_STRING(TAP_STATE_DRAGGING_2);
@@ -3002,8 +3002,8 @@ diff -Naur old/src/evdev-mt-touchpad-tap.c new/src/evdev-mt-touchpad-tap.c
 +}
 \ No newline at end of file
 diff -Naur old/src/evdev-mt-touchpad.c new/src/evdev-mt-touchpad.c
---- old/src/evdev-mt-touchpad.c	2022-07-22 11:39:19.894383209 +0800
-+++ new/src/evdev-mt-touchpad.c	2022-07-22 17:14:54.745463564 +0800
+--- old/src/evdev-mt-touchpad.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-mt-touchpad.c	2022-08-01 10:14:41.495360036 +0800
 @@ -308,6 +308,35 @@
  }
  
@@ -3293,8 +3293,8 @@ diff -Naur old/src/evdev-mt-touchpad.c new/src/evdev-mt-touchpad.c
 +}
 \ No newline at end of file
 diff -Naur old/src/evdev-mt-touchpad.h new/src/evdev-mt-touchpad.h
---- old/src/evdev-mt-touchpad.h	2022-07-22 11:39:19.894383209 +0800
-+++ new/src/evdev-mt-touchpad.h	2022-07-22 17:14:54.745463564 +0800
+--- old/src/evdev-mt-touchpad.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-mt-touchpad.h	2022-08-01 10:14:41.495360036 +0800
 @@ -118,6 +118,7 @@
  	TAP_STATE_DRAGGING_WAIT,
  	TAP_STATE_DRAGGING_2,
@@ -3370,8 +3370,8 @@ diff -Naur old/src/evdev-mt-touchpad.h new/src/evdev-mt-touchpad.h
 +
  #endif
 diff -Naur old/src/evdev-tablet.c new/src/evdev-tablet.c
---- old/src/evdev-tablet.c	2022-07-22 11:39:19.898383254 +0800
-+++ new/src/evdev-tablet.c	2022-07-22 17:17:27.891233802 +0800
+--- old/src/evdev-tablet.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-tablet.c	2022-08-01 10:14:41.495360036 +0800
 @@ -219,6 +219,7 @@
  	case ABS_TILT_Y:
  	case ABS_DISTANCE:
@@ -3440,8 +3440,8 @@ diff -Naur old/src/evdev-tablet.c new/src/evdev-tablet.c
  	if (tablet_reject_device(device))
  		return -1;
 diff -Naur old/src/evdev-tablet.h new/src/evdev-tablet.h
---- old/src/evdev-tablet.h	2022-07-22 11:39:19.898383254 +0800
-+++ new/src/evdev-tablet.h	2022-07-22 17:14:54.745463564 +0800
+--- old/src/evdev-tablet.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev-tablet.h	2022-08-01 10:14:41.495360036 +0800
 @@ -151,6 +151,9 @@
  	case ABS_WHEEL:
  		axis = LIBINPUT_TABLET_TOOL_AXIS_SLIDER;
@@ -3463,8 +3463,8 @@ diff -Naur old/src/evdev-tablet.h new/src/evdev-tablet.h
  		evcode = ABS_MT_TOUCH_MINOR;
  		break;
 diff -Naur old/src/evdev.c new/src/evdev.c
---- old/src/evdev.c	2022-07-22 11:39:19.898383254 +0800
-+++ new/src/evdev.c	2022-07-22 17:14:54.749463609 +0800
+--- old/src/evdev.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev.c	2022-08-01 10:14:41.495360036 +0800
 @@ -54,25 +54,7 @@
  #define DEFAULT_BUTTON_SCROLL_TIMEOUT ms2us(200)
  #define MAX_RETRY_OPEN_DEVICE_COUNT 10
@@ -3691,8 +3691,8 @@ diff -Naur old/src/evdev.c new/src/evdev.c
 +    return 0;
 +}
 diff -Naur old/src/evdev.h new/src/evdev.h
---- old/src/evdev.h	2022-07-22 11:39:19.898383254 +0800
-+++ new/src/evdev.h	2022-07-22 17:14:54.749463609 +0800
+--- old/src/evdev.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/evdev.h	2022-08-01 10:15:28.085369787 +0800
 @@ -61,6 +61,7 @@
  	EVDEV_DEVICE_TABLET_PAD		= bit(4),
  	EVDEV_DEVICE_GESTURE		= bit(5),
@@ -3805,7 +3805,25 @@ diff -Naur old/src/evdev.h new/src/evdev.h
  	double value = v - absinfo->minimum;
  	return value/absinfo->resolution;
  }
-@@ -1005,7 +1041,8 @@
+@@ -764,12 +800,15 @@
+ 
+ 	if (!is_logged(evdev_libinput_context(device), priority))
+ 		return;
+-
++	const char *name = evdev_device_get_sysname(device);
++	if (strchr(name, '%') != NULL) {
++		return;
++	}
+ 	/* Anything info and above is user-visible, use the device name */
+ 	snprintf(buf,
+ 		 sizeof(buf),
+ 		 "%-7s - %s%s%s",
+-		 evdev_device_get_sysname(device),
++		 name,
+ 		 (priority > LIBINPUT_LOG_PRIORITY_DEBUG) ?  device->devname : "",
+ 		 (priority > LIBINPUT_LOG_PRIORITY_DEBUG) ?  ": " : "",
+ 		 format);
+@@ -1005,7 +1044,8 @@
  				   "Axis %#x value %d is outside expected range [%d, %d]\n"
  				   "See %sabsolute_coordinate_ranges.html for details\n",
  				   code, value, min, max,
@@ -3817,14 +3835,14 @@ diff -Naur old/src/evdev.h new/src/evdev.h
  
 diff -Naur old/src/libinput-git-version.h new/src/libinput-git-version.h
 --- old/src/libinput-git-version.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-git-version.h	2022-07-22 17:14:54.749463609 +0800
++++ new/src/libinput-git-version.h	2022-08-01 10:14:41.495360036 +0800
 @@ -0,0 +1,3 @@
 +#pragma once
 +
 +#define LIBINPUT_GIT_VERSION "@VCS_TAG@"
 diff -Naur old/src/libinput-private.h new/src/libinput-private.h
---- old/src/libinput-private.h	2022-07-22 11:39:19.898383254 +0800
-+++ new/src/libinput-private.h	2022-07-22 17:14:54.749463609 +0800
+--- old/src/libinput-private.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/libinput-private.h	2022-08-01 10:14:41.495360036 +0800
 @@ -48,6 +48,12 @@
  	int x, y;
  };
@@ -3936,7 +3954,7 @@ diff -Naur old/src/libinput-private.h new/src/libinput-private.h
  gesture_notify_swipe_end(struct libinput_device *device,
 diff -Naur old/src/libinput-util.c new/src/libinput-util.c
 --- old/src/libinput-util.c	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-util.c	2022-07-22 17:14:54.749463609 +0800
++++ new/src/libinput-util.c	2022-08-01 10:14:41.495360036 +0800
 @@ -0,0 +1,102 @@
 +/*
 + * Copyright © 2008-2011 Kristian Høgsberg
@@ -4041,8 +4059,8 @@ diff -Naur old/src/libinput-util.c new/src/libinput-util.c
 +}
 +#endif
 diff -Naur old/src/libinput-util.h new/src/libinput-util.h
---- old/src/libinput-util.h	2022-07-22 11:39:19.898383254 +0800
-+++ new/src/libinput-util.h	2022-07-22 17:14:54.749463609 +0800
+--- old/src/libinput-util.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/libinput-util.h	2022-08-01 10:14:41.495360036 +0800
 @@ -27,10 +27,9 @@
  
  #include "config.h"
@@ -4075,7 +4093,7 @@ diff -Naur old/src/libinput-util.h new/src/libinput-util.h
  	printf("%s() - \033[0;31m", __func__); \
 diff -Naur old/src/libinput-version.h new/src/libinput-version.h
 --- old/src/libinput-version.h	1970-01-01 08:00:00.000000000 +0800
-+++ new/src/libinput-version.h	2022-07-22 17:14:54.749463609 +0800
++++ new/src/libinput-version.h	2022-08-01 10:14:41.495360036 +0800
 @@ -0,0 +1,32 @@
 +/*
 + * Copyright © 2013 Jonas Ådahl
@@ -4110,8 +4128,8 @@ diff -Naur old/src/libinput-version.h new/src/libinput-version.h
 +
 +#endif
 diff -Naur old/src/libinput.c new/src/libinput.c
---- old/src/libinput.c	2022-07-22 11:39:19.898383254 +0800
-+++ new/src/libinput.c	2022-07-22 17:14:54.749463609 +0800
+--- old/src/libinput.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/libinput.c	2022-08-01 10:14:41.495360036 +0800
 @@ -39,6 +39,7 @@
  #include "evdev.h"
  #include "timer.h"
@@ -5341,8 +5359,8 @@ diff -Naur old/src/libinput.c new/src/libinput.c
 +}
 +
 diff -Naur old/src/libinput.h new/src/libinput.h
---- old/src/libinput.h	2022-07-22 11:39:19.898383254 +0800
-+++ new/src/libinput.h	2022-07-22 17:14:54.749463609 +0800
+--- old/src/libinput.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/libinput.h	2022-08-01 10:14:41.495360036 +0800
 @@ -196,6 +196,22 @@
  	LIBINPUT_DEVICE_CAP_TABLET_PAD = 4,
  	LIBINPUT_DEVICE_CAP_GESTURE = 5,
@@ -6055,8 +6073,8 @@ diff -Naur old/src/libinput.h new/src/libinput.h
  #endif /* LIBINPUT_H */
 +
 diff -Naur old/src/udev-seat.c new/src/udev-seat.c
---- old/src/udev-seat.c	2022-07-22 11:39:19.902383299 +0800
-+++ new/src/udev-seat.c	2022-07-22 17:14:54.749463609 +0800
+--- old/src/udev-seat.c	2021-01-01 00:00:00.000000000 +0800
++++ new/src/udev-seat.c	2022-08-01 10:14:41.495360036 +0800
 @@ -189,6 +189,7 @@
  
  		/* Skip unconfigured device. udev will send an event
@@ -6080,8 +6098,8 @@ diff -Naur old/src/udev-seat.c new/src/udev-seat.c
  		if (device_added(device, input, NULL) < 0) {
  			udev_device_unref(device);
 diff -Naur old/src/util-strings.h new/src/util-strings.h
---- old/src/util-strings.h	2022-07-22 11:39:19.902383299 +0800
-+++ new/src/util-strings.h	2022-07-22 17:14:54.749463609 +0800
+--- old/src/util-strings.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/util-strings.h	2022-08-01 10:14:41.495360036 +0800
 @@ -281,7 +281,7 @@
  	if (npairs == 0)
  		goto error;
@@ -6092,8 +6110,8 @@ diff -Naur old/src/util-strings.h new/src/util-strings.h
  	for (pair = pairs; *pair; pair++) {
  		char **kv = strv_from_string(*pair, kv_separator);
 diff -Naur old/src/util-time.h new/src/util-time.h
---- old/src/util-time.h	2022-07-22 11:39:19.902383299 +0800
-+++ new/src/util-time.h	2022-07-22 17:14:54.749463609 +0800
+--- old/src/util-time.h	2021-01-01 00:00:00.000000000 +0800
++++ new/src/util-time.h	2022-08-01 10:14:41.495360036 +0800
 @@ -97,7 +97,8 @@
  static inline struct human_time
  to_human_time(uint64_t us)
@@ -6123,8 +6141,8 @@ diff -Naur old/src/util-time.h new/src/util-time.h
 +	//assert(1);
  }
 diff -Naur old/tools/libinput-debug-events.c new/tools/libinput-debug-events.c
---- old/tools/libinput-debug-events.c	2022-07-22 11:39:19.918383477 +0800
-+++ new/tools/libinput-debug-events.c	2022-07-22 17:14:54.749463609 +0800
+--- old/tools/libinput-debug-events.c	2021-01-01 00:00:00.000000000 +0800
++++ new/tools/libinput-debug-events.c	2022-08-01 10:14:41.495360036 +0800
 @@ -101,6 +101,15 @@
  	case LIBINPUT_EVENT_TOUCH_FRAME:
  		type = "TOUCH_FRAME";
@@ -6207,8 +6225,8 @@ diff -Naur old/tools/libinput-debug-events.c new/tools/libinput-debug-events.c
  			print_gesture_event_without_coords(ev);
  			break;
 diff -Naur old/tools/libinput-record.c new/tools/libinput-record.c
---- old/tools/libinput-record.c	2022-07-22 11:39:19.918383477 +0800
-+++ new/tools/libinput-record.c	2022-07-22 17:14:54.749463609 +0800
+--- old/tools/libinput-record.c	2021-01-01 00:00:00.000000000 +0800
++++ new/tools/libinput-record.c	2022-08-01 10:14:41.495360036 +0800
 @@ -50,6 +50,7 @@
  #include "util-time.h"
  #include "util-input-event.h"
@@ -6218,8 +6236,8 @@ diff -Naur old/tools/libinput-record.c new/tools/libinput-record.c
  static const int FILE_VERSION_NUMBER = 1;
  
 diff -Naur old/udev/libinput-device-group.c new/udev/libinput-device-group.c
---- old/udev/libinput-device-group.c	2022-07-22 11:39:19.918383477 +0800
-+++ new/udev/libinput-device-group.c	2022-07-22 17:14:54.749463609 +0800
+--- old/udev/libinput-device-group.c	2021-01-01 00:00:00.000000000 +0800
++++ new/udev/libinput-device-group.c	2022-08-01 10:14:41.499361029 +0800
 @@ -138,7 +138,7 @@
  				*product_id = pid;
  				best_dist = dist;
-- 
Gitee