[PATCH libinput 06/26] tablet: drop LIBINPUT_TOOL_NONE from the public API

Peter Hutterer peter.hutterer at who-t.net
Mon Feb 23 22:21:09 PST 2015


This is only used internally.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/evdev-tablet.h  | 1 +
 src/libinput.h      | 1 -
 tools/event-debug.c | 3 ---
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/evdev-tablet.h b/src/evdev-tablet.h
index df6e17f..eee6904 100644
--- a/src/evdev-tablet.h
+++ b/src/evdev-tablet.h
@@ -27,6 +27,7 @@
 #include "evdev.h"
 
 #define LIBINPUT_TABLET_AXIS_NONE 0
+#define LIBINPUT_TOOL_NONE 0
 
 enum tablet_status {
 	TABLET_NONE = 0,
diff --git a/src/libinput.h b/src/libinput.h
index 279fec4..41ecb83 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -159,7 +159,6 @@ struct libinput_tool;
  * LIBINPUT_DEVICE_CAP_TABLET capability.
  */
 enum libinput_tool_type {
-	LIBINPUT_TOOL_NONE = -1,
 	LIBINPUT_TOOL_PEN = 0x140, /* Matches BTN_TOOL_PEN */
 	LIBINPUT_TOOL_ERASER,
 	LIBINPUT_TOOL_BRUSH,
diff --git a/tools/event-debug.c b/tools/event-debug.c
index f74344e..09f208c 100644
--- a/tools/event-debug.c
+++ b/tools/event-debug.c
@@ -340,9 +340,6 @@ print_proximity_event(struct libinput_event *ev)
 	double dist, pressure;
 
 	switch (libinput_tool_get_type(tool)) {
-	case LIBINPUT_TOOL_NONE:
-		tool_str = "none";
-		break;
 	case LIBINPUT_TOOL_PEN:
 		tool_str = "pen";
 		break;
-- 
2.1.0



More information about the wayland-devel mailing list