From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 19 Dec 2013 06:40:48 +0000 (+1000)
Subject: Reduce keyboard events to one single type
X-Git-Tag: 0.1.0~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34013b8bfc74e2b56cb80d97342cf9424a56bbdf;p=platform%2Fupstream%2Flibinput.git

Reduce keyboard events to one single type

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>
---

diff --git a/src/libinput.c b/src/libinput.c
index afe7afca..672517bf 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -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,
diff --git a/src/libinput.h b/src/libinput.h
index 1ecf8bb5..2201d5d2 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -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