fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-03-22 05:40:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add libinput_device_get_context/libinput_seat_get_context

Browse source 
Allow retrieval of the libinput context from the seat and the device.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer 2014-12-01 16:00:13 +10:00
parent 8b7ef91c1a
commit 56b5f846ac
3 changed files with 46 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libinput.c
View file

@ -651,6 +651,12 @@ libinput_seat_get_user_data(struct libinput_seat *seat)
return seat->user_data;
}
LIBINPUT_EXPORT struct libinput *
libinput_seat_get_context(struct libinput_seat *seat)
{
return seat->libinput;
}
LIBINPUT_EXPORT const char *
libinput_seat_get_physical_name(struct libinput_seat *seat)
{
@ -1177,6 +1183,12 @@ libinput_device_get_user_data(struct libinput_device *device)
return device->user_data;
}
LIBINPUT_EXPORT struct libinput *
libinput_device_get_context(struct libinput_device *device)
{
return libinput_seat_get_context(device->seat);
}
LIBINPUT_EXPORT const char *
libinput_device_get_sysname(struct libinput_device *device)
{

22
src/libinput.h
View file

@ -1199,6 +1199,17 @@ libinput_seat_set_user_data(struct libinput_seat *seat, void *user_data);
void *
libinput_seat_get_user_data(struct libinput_seat *seat);
/**
* @ingroup seat
*
* Get the libinput context from the seat.
*
* @param seat A previously obtained seat
* @return The libinput context for this seat.
*/
struct libinput *
libinput_seat_get_context(struct libinput_seat *seat);
/**
* @ingroup seat
*
@ -1288,6 +1299,17 @@ libinput_device_set_user_data(struct libinput_device *device, void *user_data);
void *
libinput_device_get_user_data(struct libinput_device *device);
/**
* @ingroup device
*
* Get the libinput context from the device.
*
* @param device A previously obtained device
* @return The libinput context for this device.
*/
struct libinput *
libinput_device_get_context(struct libinput_device *device);
/**
* @ingroup device
*

12
test/device.c
View file

@ -629,6 +629,17 @@ START_TEST(device_get_udev_handle)
}
END_TEST
START_TEST(device_context)
{
struct litest_device *dev = litest_current_device();
struct libinput_seat *seat;
ck_assert(dev->libinput == libinput_device_get_context(dev->libinput_device));
seat = libinput_device_get_seat(dev->libinput_device);
ck_assert(dev->libinput == libinput_seat_get_context(seat));
}
END_TEST
int main (int argc, char **argv)
{
litest_add("device:sendevents", device_sendevents_config, LITEST_ANY, LITEST_TOUCHPAD);
@ -650,6 +661,7 @@ int main (int argc, char **argv)
litest_add("device:sendevents", device_disable_release_softbutton, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD);
litest_add("device:sendevents", device_disable_topsoftbutton, LITEST_TOPBUTTONPAD, LITEST_ANY);
litest_add("device:id", device_ids, LITEST_ANY, LITEST_ANY);
litest_add_for_device("device:context", device_context, LITEST_SYNAPTICS_CLICKPAD);
litest_add("device:udev", device_get_udev_handle, LITEST_ANY, LITEST_ANY);