fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-25 21:00:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce keyboard events to one single type

Browse source 
Provide one top-level event for keyboard events: libinput_event_keyboard. The
event type specifies which subtype the event is anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2013-12-19 16:40:48 +10:00
parent 54db6527ae
commit 34013b8bfc
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/libinput.c
View file

@ -58,7 +58,7 @@ struct libinput_event_device_notify {
struct libinput_device *device;
};
struct libinput_event_keyboard_key {
struct libinput_event_keyboard {
struct libinput_event base;
uint32_t time;
uint32_t key;
@ -125,22 +125,22 @@ libinput_event_get_device(struct libinput_event *event)
}
LIBINPUT_EXPORT uint32_t
libinput_event_keyboard_key_get_time(
struct libinput_event_keyboard_key *event)
libinput_event_keyboard_get_time(
struct libinput_event_keyboard *event)
{
return event->time;
}
LIBINPUT_EXPORT uint32_t
libinput_event_keyboard_key_get_key(
struct libinput_event_keyboard_key *event)
libinput_event_keyboard_get_key(
struct libinput_event_keyboard *event)
{
return event->key;
}
LIBINPUT_EXPORT enum libinput_keyboard_key_state
libinput_event_keyboard_key_get_state(
struct libinput_event_keyboard_key *event)
libinput_event_keyboard_get_key_state(
struct libinput_event_keyboard *event)
{
return event->state;
}
@ -632,13 +632,13 @@ keyboard_notify_key(struct libinput_device *device,
uint32_t key,
enum libinput_keyboard_key_state state)
{
struct libinput_event_keyboard_key *key_event;
struct libinput_event_keyboard *key_event;
key_event = malloc(sizeof *key_event);
if (!key_event)
return;
*key_event = (struct libinput_event_keyboard_key) {
*key_event = (struct libinput_event_keyboard) {
.time = time,
.key = key,
.state = state,

14
src/libinput.h
View file

@ -143,7 +143,7 @@ struct libinput_seat;
struct libinput_event;
struct libinput_event_device_notify;
struct libinput_event_keyboard_key;
struct libinput_event_keyboard;
struct libinput_event_pointer_motion;
struct libinput_event_pointer_motion_absolute;
struct libinput_event_pointer_button;
@ -245,16 +245,16 @@ libinput_event_get_device(struct libinput_event *event);
*/
uint32_t
libinput_event_keyboard_key_get_time(
struct libinput_event_keyboard_key *event);
libinput_event_keyboard_get_time(
struct libinput_event_keyboard *event);
uint32_t
libinput_event_keyboard_key_get_key(
struct libinput_event_keyboard_key *event);
libinput_event_keyboard_get_key(
struct libinput_event_keyboard *event);
enum libinput_keyboard_key_state
libinput_event_keyboard_key_get_state(
struct libinput_event_keyboard_key *event);
libinput_event_keyboard_get_key_state(
struct libinput_event_keyboard *event);
/**
* @defgroup event_pointer_motion Pointer motion event