diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2015-11-16 15:42:31 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2015-11-18 12:13:53 +1000 |
| commit | cc2b45dd503933b806b44e83f6e9d3e448c8183e (patch) | |
| tree | c825ca6b89e428999aa5566ba981bf318fd42161 /tools | |
| parent | a22b94a22ca2c6e661ebe6903ebefd60100c4e1a (diff) | |
tablet: rename TOOL_PROXIMITY_ to TABLET_TOOL_PROXIMITY
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/event-debug.c | 4 | ||||
| -rw-r--r-- | tools/event-gui.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/event-debug.c b/tools/event-debug.c index af67f61f..5dc75054 100644 --- a/tools/event-debug.c +++ b/tools/event-debug.c @@ -495,10 +495,10 @@ print_proximity_event(struct libinput_event *ev) print_event_time(libinput_event_tablet_get_time(t)); - if (state == LIBINPUT_TOOL_PROXIMITY_IN) { + if (state == LIBINPUT_TABLET_TOOL_PROXIMITY_IN) { print_tablet_axes(t); state_str = "proximity-in"; - } else if (state == LIBINPUT_TOOL_PROXIMITY_OUT) { + } else if (state == LIBINPUT_TABLET_TOOL_PROXIMITY_OUT) { state_str = "proximity-out"; printf("\t"); } else { diff --git a/tools/event-gui.c b/tools/event-gui.c index 1a4f242c..f4f22db0 100644 --- a/tools/event-gui.c +++ b/tools/event-gui.c @@ -605,7 +605,7 @@ handle_event_tablet(struct libinput_event *ev, struct window *w) switch (libinput_event_get_type(ev)) { case LIBINPUT_EVENT_TABLET_PROXIMITY: if (libinput_event_tablet_get_proximity_state(t) == - LIBINPUT_TOOL_PROXIMITY_OUT) { + LIBINPUT_TABLET_TOOL_PROXIMITY_OUT) { w->tool.x_in = 0; w->tool.y_in = 0; w->tool.x_down = 0; |