summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2016-06-09 11:23:43 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2016-06-10 06:57:41 +1000
commitf71329d0d8c75a397824b7cfcdae9489dc6bff58 (patch)
tree3589ea961b43f9d53947e1f2b69e3eaa5a0fdd64
parent3824e161ed35fbc59e83d8727a3c90ddc9e3d8cd (diff)
pad: add helper function to access the libinput context
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/evdev-tablet-pad.c6
-rw-r--r--src/evdev-tablet-pad.h6
2 files changed, 9 insertions, 3 deletions
diff --git a/src/evdev-tablet-pad.c b/src/evdev-tablet-pad.c
index ff826e7..b7a2950 100644
--- a/src/evdev-tablet-pad.c
+++ b/src/evdev-tablet-pad.c
@@ -132,7 +132,7 @@ pad_process_absolute(struct pad_dispatch *pad,
pad->have_abs_misc_terminator = true;
break;
default:
- log_info(device->base.seat->libinput,
+ log_info(pad_libinput_context(pad),
"Unhandled EV_ABS event code %#x\n", e->code);
break;
}
@@ -408,7 +408,7 @@ pad_process(struct evdev_dispatch *dispatch,
* now */
break;
default:
- log_error(device->base.seat->libinput,
+ log_error(pad_libinput_context(pad),
"Unexpected event type %s (%#x)\n",
libevdev_event_type_get_name(e->type),
e->type);
@@ -421,7 +421,7 @@ pad_suspend(struct evdev_dispatch *dispatch,
struct evdev_device *device)
{
struct pad_dispatch *pad = (struct pad_dispatch *)dispatch;
- struct libinput *libinput = device->base.seat->libinput;
+ struct libinput *libinput = pad_libinput_context(pad);
unsigned int code;
for (code = KEY_ESC; code < KEY_CNT; code++) {
diff --git a/src/evdev-tablet-pad.h b/src/evdev-tablet-pad.h
index 828ded8..84324bc 100644
--- a/src/evdev-tablet-pad.h
+++ b/src/evdev-tablet-pad.h
@@ -66,4 +66,10 @@ struct pad_dispatch {
} sendevents;
};
+static inline struct libinput *
+pad_libinput_context(const struct pad_dispatch *pad)
+{
+ return evdev_libinput_context(pad->device);
+}
+
#endif