summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2016-07-08 10:35:03 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2016-07-11 11:00:51 +1000
commit3c113111facf231212fa1cc7c18b6171ed4509c7 (patch)
tree5b7219f95be38c697fa93ec218893d61853f755c
parentaa4fd585f4c7847ca3c7f9e98118c5e378806511 (diff)
Remove LIBINPUT_EVENT_TABLET_PAD_MODE event
Unimplemented and it wasn't supposed to be in the series. https://lists.freedesktop.org/archives/wayland-devel/2016-June/029376.html Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Carlos Garnacho <carlosg@gnome.org>
-rw-r--r--src/libinput.c2
-rw-r--r--src/libinput.h13
-rw-r--r--test/litest.c3
-rw-r--r--tools/event-debug.c22
-rw-r--r--tools/event-gui.c1
5 files changed, 0 insertions, 41 deletions
diff --git a/src/libinput.c b/src/libinput.c
index cf0ed5bf..a8240bde 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1691,7 +1691,6 @@ libinput_event_destroy(struct libinput_event *event)
case LIBINPUT_EVENT_TABLET_PAD_RING:
case LIBINPUT_EVENT_TABLET_PAD_STRIP:
case LIBINPUT_EVENT_TABLET_PAD_BUTTON:
- case LIBINPUT_EVENT_TABLET_PAD_MODE:
libinput_event_tablet_pad_destroy(
libinput_event_get_tablet_pad_event(event));
break;
@@ -2613,7 +2612,6 @@ event_type_to_str(enum libinput_event_type type)
CASE_RETURN_STRING(LIBINPUT_EVENT_TABLET_PAD_BUTTON);
CASE_RETURN_STRING(LIBINPUT_EVENT_TABLET_PAD_RING);
CASE_RETURN_STRING(LIBINPUT_EVENT_TABLET_PAD_STRIP);
- CASE_RETURN_STRING(LIBINPUT_EVENT_TABLET_PAD_MODE);
CASE_RETURN_STRING(LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN);
CASE_RETURN_STRING(LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE);
CASE_RETURN_STRING(LIBINPUT_EVENT_GESTURE_SWIPE_END);
diff --git a/src/libinput.h b/src/libinput.h
index dc0f5b0c..83e58b66 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -740,19 +740,6 @@ enum libinput_event_type {
*/
LIBINPUT_EVENT_TABLET_PAD_STRIP,
- /**
- * A mode change on a device with the @ref
- * LIBINPUT_DEVICE_CAP_TABLET_PAD capability.
- *
- * This event is triggered when the mode is changed through
- * external means. The event reflects a mode change (see @ref
- * tablet-pad-modes) occurring as a result other than that of
- * pressing a mode toggle button.
- *
- * @note Support for this event is not yet implemented.
- */
- LIBINPUT_EVENT_TABLET_PAD_MODE,
-
LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN = 800,
LIBINPUT_EVENT_GESTURE_SWIPE_UPDATE,
LIBINPUT_EVENT_GESTURE_SWIPE_END,
diff --git a/test/litest.c b/test/litest.c
index 0df480ef..83ebc741 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -2150,9 +2150,6 @@ litest_event_type_str(struct libinput_event *event)
case LIBINPUT_EVENT_TABLET_PAD_STRIP:
str = "TABLET PAD STRIP";
break;
- case LIBINPUT_EVENT_TABLET_PAD_MODE:
- str = "TABLET PAD MODE";
- break;
}
return str;
}
diff --git a/tools/event-debug.c b/tools/event-debug.c
index 70f4268f..67432b71 100644
--- a/tools/event-debug.c
+++ b/tools/event-debug.c
@@ -130,9 +130,6 @@ print_event_header(struct libinput_event *ev)
case LIBINPUT_EVENT_TABLET_PAD_STRIP:
type = "TABLET_PAD_STRIP";
break;
- case LIBINPUT_EVENT_TABLET_PAD_MODE:
- type = "TABLET_PAD_MODE";
- break;
}
printf("%-7s %-16s ", libinput_device_get_sysname(dev), type);
@@ -682,22 +679,6 @@ print_tablet_pad_strip_event(struct libinput_event *ev)
mode);
}
-static void
-print_tablet_pad_mode_event(struct libinput_event *ev)
-{
- struct libinput_event_tablet_pad *p = libinput_event_get_tablet_pad_event(ev);
- struct libinput_tablet_pad_mode_group *group;
- unsigned int mode;
-
- print_event_time(libinput_event_tablet_pad_get_time(p));
-
- group = libinput_event_tablet_pad_get_mode_group(p);
- mode = libinput_event_tablet_pad_get_mode(p);
- printf("group %d mode %d\n",
- libinput_tablet_pad_mode_group_get_index(group),
- mode);
-}
-
static int
handle_and_print_events(struct libinput *li)
{
@@ -786,9 +767,6 @@ handle_and_print_events(struct libinput *li)
case LIBINPUT_EVENT_TABLET_PAD_STRIP:
print_tablet_pad_strip_event(ev);
break;
- case LIBINPUT_EVENT_TABLET_PAD_MODE:
- print_tablet_pad_mode_event(ev);
- break;
}
libinput_event_destroy(ev);
diff --git a/tools/event-gui.c b/tools/event-gui.c
index 8b4e3e95..b67ca452 100644
--- a/tools/event-gui.c
+++ b/tools/event-gui.c
@@ -843,7 +843,6 @@ handle_event_libinput(GIOChannel *source, GIOCondition condition, gpointer data)
case LIBINPUT_EVENT_TABLET_PAD_BUTTON:
case LIBINPUT_EVENT_TABLET_PAD_RING:
case LIBINPUT_EVENT_TABLET_PAD_STRIP:
- case LIBINPUT_EVENT_TABLET_PAD_MODE:
break;
}