pepper: Split input events into device events and core events

Use PEPPER_EVENT_INPUT_DEVICE_XXX for pepper_input_device_t.
Event ID has been removed from pepper_input_event_t structure.

Change-Id: I76eadcf5d8f822b93b7ade94f1fdff62c892d073

diff --git a/src/lib/libinput/libinput.c b/src/lib/libinput/libinput.c
index 6fc49efbd973cb964592da71344da13ac6090557..e20fd0b93253b69e200138050862c6405468160d 100644 (file)
--- a/src/lib/libinput/libinput.c
+++ b/src/lib/libinput/libinput.c
@@ -193,12 +193,12 @@ pointer_motion(struct libinput_device *libinput_device,
     li_device_t            *device = libinput_device_get_user_data(libinput_device);
     pepper_input_event_t    event;
 
-    event.id = PEPPER_EVENT_POINTER_MOTION;
     event.time = libinput_event_pointer_get_time(pointer_event);
     event.x = libinput_event_pointer_get_dx(pointer_event);
     event.y = libinput_event_pointer_get_dy(pointer_event);
 
-    pepper_object_emit_event((pepper_object_t *)device->base, PEPPER_EVENT_POINTER_MOTION, &event);
+    pepper_object_emit_event((pepper_object_t *)device->base,
+                             PEPPER_EVENT_INPUT_DEVICE_POINTER_MOTION, &event);
 }
 
 static void
@@ -208,13 +208,12 @@ pointer_motion_absolute(struct libinput_device *libinput_device,
     li_device_t            *device = libinput_device_get_user_data(libinput_device);
     pepper_input_event_t    event;
 
-    event.id = PEPPER_EVENT_POINTER_MOTION;
     event.time = libinput_event_pointer_get_time(pointer_event);
     event.x = libinput_event_pointer_get_absolute_x_transformed(pointer_event, 1);
     event.y = libinput_event_pointer_get_absolute_y_transformed(pointer_event, 1);
 
     pepper_object_emit_event((pepper_object_t *)device->base,
-                             PEPPER_EVENT_POINTER_MOTION_ABSOLUTE, &event);
+                             PEPPER_EVENT_INPUT_DEVICE_POINTER_MOTION_ABSOLUTE, &event);
 }
 
 static void
@@ -224,12 +223,12 @@ pointer_button(struct libinput_device *libinput_device,
     li_device_t            *device = libinput_device_get_user_data(libinput_device);
     pepper_input_event_t    event;
 
-    event.id = PEPPER_EVENT_POINTER_BUTTON;
     event.time = libinput_event_pointer_get_time(pointer_event);
     event.button = libinput_event_pointer_get_button(pointer_event);
     event.state = libinput_event_pointer_get_button_state(pointer_event);
 
-    pepper_object_emit_event((pepper_object_t *)device->base, PEPPER_EVENT_POINTER_BUTTON, &event);
+    pepper_object_emit_event((pepper_object_t *)device->base,
+                             PEPPER_EVENT_INPUT_DEVICE_POINTER_BUTTON, &event);
 }
 
 static void
@@ -239,7 +238,6 @@ pointer_axis(struct libinput_device *libinput_device,
     li_device_t            *device = libinput_device_get_user_data(libinput_device);
     pepper_input_event_t    event;
 
-    event.id = PEPPER_EVENT_POINTER_AXIS;
     event.time = libinput_event_pointer_get_time(pointer_event);
 
     if (libinput_event_pointer_has_axis(pointer_event, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))
@@ -247,14 +245,16 @@ pointer_axis(struct libinput_device *libinput_device,
         event.axis = PEPPER_POINTER_AXIS_VERTICAL;
         event.value = libinput_event_pointer_get_axis_value(pointer_event,
                                                             LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
-        pepper_object_emit_event((pepper_object_t *)device->base, PEPPER_EVENT_POINTER_AXIS, &event);
+        pepper_object_emit_event((pepper_object_t *)device->base,
+                                 PEPPER_EVENT_INPUT_DEVICE_POINTER_AXIS, &event);
     }
     else if (libinput_event_pointer_has_axis(pointer_event, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL))
     {
         event.axis = PEPPER_POINTER_AXIS_HORIZONTAL;
         event.value = libinput_event_pointer_get_axis_value(pointer_event,
                                                             LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
-        pepper_object_emit_event((pepper_object_t *)device->base, PEPPER_EVENT_POINTER_AXIS, &event);
+        pepper_object_emit_event((pepper_object_t *)device->base,
+                                 PEPPER_EVENT_INPUT_DEVICE_POINTER_AXIS, &event);
     }
 }
 
@@ -265,7 +265,6 @@ keyboard_key(struct libinput_device *libinput_device,
     li_device_t            *device = libinput_device_get_user_data(libinput_device);
     pepper_input_event_t    event;
 
-    event.id = PEPPER_EVENT_KEYBOARD_KEY;
     event.time = libinput_event_keyboard_get_time(keyboard_event);
     event.key = libinput_event_keyboard_get_key(keyboard_event);
 
@@ -274,7 +273,8 @@ keyboard_key(struct libinput_device *libinput_device,
     else
         event.state = PEPPER_KEY_STATE_PRESSED;
 
-    pepper_object_emit_event((pepper_object_t *)device->base, PEPPER_EVENT_KEYBOARD_KEY, &event);
+    pepper_object_emit_event((pepper_object_t *)device->base,
+                             PEPPER_EVENT_INPUT_DEVICE_KEYBOARD_KEY, &event);
 }
 
 static void
@@ -284,13 +284,13 @@ touch_down(struct libinput_device *libinput_device,
     li_device_t            *device = libinput_device_get_user_data(libinput_device);
     pepper_input_event_t    event;
 
-    event.id = PEPPER_EVENT_TOUCH_DOWN;
     event.time = libinput_event_touch_get_time(touch_event);
     event.slot = libinput_event_touch_get_seat_slot(touch_event);
     event.x = libinput_event_touch_get_x_transformed(touch_event, 1);
     event.y = libinput_event_touch_get_y_transformed(touch_event, 1);
 
-    pepper_object_emit_event((pepper_object_t *)device->base, PEPPER_EVENT_TOUCH_DOWN, &event);
+    pepper_object_emit_event((pepper_object_t *)device->base,
+                             PEPPER_EVENT_INPUT_DEVICE_TOUCH_DOWN, &event);
 }
 
 static void
@@ -300,11 +300,11 @@ touch_up(struct libinput_device *libinput_device,
     li_device_t            *device = libinput_device_get_user_data(libinput_device);
     pepper_input_event_t    event;
 
-    event.id = PEPPER_EVENT_TOUCH_UP;
     event.time = libinput_event_touch_get_time(touch_event);
     event.slot = libinput_event_touch_get_seat_slot(touch_event);
 
-    pepper_object_emit_event((pepper_object_t *)device->base, PEPPER_EVENT_TOUCH_UP, &event);
+    pepper_object_emit_event((pepper_object_t *)device->base,
+                             PEPPER_EVENT_INPUT_DEVICE_TOUCH_UP, &event);
 }
 
 static void
@@ -315,13 +315,13 @@ touch_motion(struct libinput_device *libinput_device,
     li_device_t            *device = libinput_device_get_user_data(libinput_device);
     pepper_input_event_t    event;
 
-    event.id = PEPPER_EVENT_TOUCH_MOTION;
     event.time = libinput_event_touch_get_time(touch_event);
     event.slot = libinput_event_touch_get_seat_slot(touch_event);
     event.x = libinput_event_touch_get_x_transformed(touch_event, 1);
     event.y = libinput_event_touch_get_y_transformed(touch_event, 1);
 
-    pepper_object_emit_event((pepper_object_t *)device->base, PEPPER_EVENT_TOUCH_MOTION, &event);
+    pepper_object_emit_event((pepper_object_t *)device->base,
+                             PEPPER_EVENT_INPUT_DEVICE_TOUCH_MOTION, &event);
 }
 
 static void
@@ -329,7 +329,8 @@ touch_frame(struct libinput_device *libinput_device,
             struct libinput_event_touch *touch_event)
 {
     li_device_t            *device = libinput_device_get_user_data(libinput_device);
-    pepper_object_emit_event((pepper_object_t *)device->base, PEPPER_EVENT_TOUCH_FRAME, NULL);
+    pepper_object_emit_event((pepper_object_t *)device->base,
+                             PEPPER_EVENT_INPUT_DEVICE_TOUCH_FRAME, NULL);
 }
 
 static void

diff --git a/src/lib/pepper/input.c b/src/lib/pepper/input.c
index 319db8746b26c1bdd9b82c8f2a42a9bb4a933014..c5488a7aa73793666de3922cb315b92ae22d490f 100644 (file)
--- a/src/lib/pepper/input.c
+++ b/src/lib/pepper/input.c
@@ -223,20 +223,19 @@ seat_handle_device_event(pepper_event_listener_t *listener, pepper_object_t *obj
     case PEPPER_EVENT_OBJECT_DESTROY:
         pepper_seat_remove_input_device(seat, entry->device);
         break;
-    case PEPPER_EVENT_POINTER_MOTION_ABSOLUTE:
-    case PEPPER_EVENT_POINTER_MOTION:
-    case PEPPER_EVENT_POINTER_BUTTON:
-    case PEPPER_EVENT_POINTER_AXIS:
+    case PEPPER_EVENT_INPUT_DEVICE_POINTER_MOTION_ABSOLUTE:
+    case PEPPER_EVENT_INPUT_DEVICE_POINTER_MOTION:
+    case PEPPER_EVENT_INPUT_DEVICE_POINTER_BUTTON:
+    case PEPPER_EVENT_INPUT_DEVICE_POINTER_AXIS:
         pepper_pointer_handle_event(seat->pointer, id, info);
         break;
-    case PEPPER_EVENT_KEYBOARD_KEY:
+    case PEPPER_EVENT_INPUT_DEVICE_KEYBOARD_KEY:
         pepper_keyboard_handle_event(seat->keyboard, id, info);
         break;
-    case PEPPER_EVENT_TOUCH_DOWN:
-    case PEPPER_EVENT_TOUCH_UP:
-    case PEPPER_EVENT_TOUCH_MOTION:
-    case PEPPER_EVENT_TOUCH_FRAME:
-    case PEPPER_EVENT_TOUCH_CANCEL:
+    case PEPPER_EVENT_INPUT_DEVICE_TOUCH_DOWN:
+    case PEPPER_EVENT_INPUT_DEVICE_TOUCH_UP:
+    case PEPPER_EVENT_INPUT_DEVICE_TOUCH_MOTION:
+    case PEPPER_EVENT_INPUT_DEVICE_TOUCH_FRAME:
         pepper_touch_handle_event(seat->touch, id, info);
         break;
     }

diff --git a/src/lib/pepper/keyboard.c b/src/lib/pepper/keyboard.c
index 0922df05b874894f9397e7e45701489025bbbd3d..c50dbc0b0f6f165f2e0dd040b042825bb43933ac 100644 (file)
--- a/src/lib/pepper/keyboard.c
+++ b/src/lib/pepper/keyboard.c
@@ -409,7 +409,6 @@ pepper_keyboard_send_key(pepper_keyboard_t *keyboard, pepper_view_t *view,
             wl_keyboard_send_key(resource, serial, time, key, state);
     }
 
-    event.id = PEPPER_EVENT_KEYBOARD_KEY;
     event.time = time;
     event.key = key;
     event.state = state;

diff --git a/src/lib/pepper/pepper.h b/src/lib/pepper/pepper.h
index 76620dcaa997325d2ab67b6d22bd1b833c6120ff..337dd2f7944b4cc0280859c0ed3ebf659b5a4872 100644 (file)
--- a/src/lib/pepper/pepper.h
+++ b/src/lib/pepper/pepper.h
@@ -516,6 +516,87 @@ enum pepper_built_in_events
      */
     PEPPER_EVENT_SEAT_TOUCH_DEVICE_REMOVE,
 
+    /**
+     * Relative pointer device motion event.
+     *
+     * #pepper_input_device_t
+     *  - when : input backend emits pointer motion event
+     *  - info : #pepper_input_event_t
+     */
+    PEPPER_EVENT_INPUT_DEVICE_POINTER_MOTION,
+
+    /**
+     * Absolute pointer motion event.
+     *
+     * #pepper_input_device_t
+     *  - when : input backend emits pointer motion event
+     *  - info : #pepper_input_event_t
+     */
+    PEPPER_EVENT_INPUT_DEVICE_POINTER_MOTION_ABSOLUTE,
+
+    /**
+     * Pointer button event.
+     *
+     * #pepper_input_device_t
+     *  - when : input backend emits pointer button event
+     *  - info : #pepper_input_event_t
+     */
+    PEPPER_EVENT_INPUT_DEVICE_POINTER_BUTTON,
+
+    /**
+     * Pointer axis event.
+     *
+     * #pepper_input_device_t
+     *  - when : input backend emits pointer axis event
+     *  - info : #pepper_input_event_t
+     */
+    PEPPER_EVENT_INPUT_DEVICE_POINTER_AXIS,
+
+    /**
+     * Keyboard key event.
+     *
+     * #pepper_input_device_t
+     *  - when : input backend emits key event
+     *  - info : #pepper_input_event_t
+     */
+    PEPPER_EVENT_INPUT_DEVICE_KEYBOARD_KEY,
+
+    /**
+     * Touch down event.
+     *
+     * #pepper_input_device_t
+     *  - when : input backend emits touch down event
+     *  - info : #pepper_input_event_t
+     */
+    PEPPER_EVENT_INPUT_DEVICE_TOUCH_DOWN,
+
+    /**
+     * Touch up event.
+     *
+     * #pepper_input_device_t
+     *  - when : input backend emits touch up event
+     *  - info : #pepper_input_event_t
+     */
+    PEPPER_EVENT_INPUT_DEVICE_TOUCH_UP,
+
+    /**
+     * Touch motion event.
+     *
+     * #pepper_input_device_t
+     *  - when : input backend emits touch motion event
+     *  - info : #pepper_input_event_t
+     */
+    PEPPER_EVENT_INPUT_DEVICE_TOUCH_MOTION,
+
+    /**
+     * touch frame event.
+     *
+     * #pepper_input_device_t
+     *  - when : input backend emits touch frame event
+     *  - info : #pepper_input_event_t
+     */
+    PEPPER_EVENT_INPUT_DEVICE_TOUCH_FRAME,
+
     /**
      * #pepper_view_t get an input focus.
      *
@@ -561,10 +642,6 @@ enum pepper_built_in_events
     /**
      * Relative pointer motion event.
      *
-     * #pepper_input_device_t
-     *  - when : input backend emits pointer motion event
-     *  - info : #pepper_input_event_t
-     *
      * #pepper_pointer_t
      *  - when : #pepper_input_device_t emits pointer motion event (to the attached #pepper_seat_t)
      *  - info : #pepper_input_event_t
@@ -574,10 +651,6 @@ enum pepper_built_in_events
     /**
      * Absolute pointer motion event.
      *
-     * #pepper_input_device_t
-     *  - when : input backend emits pointer motion event
-     *  - info : #pepper_input_event_t
-     *
      * #pepper_pointer_t
      *  - when : #pepper_input_device_t emits pointer motion event (to the attached #pepper_seat_t)
      *  - info : #pepper_input_event_t
@@ -587,10 +660,6 @@ enum pepper_built_in_events
     /**
      * Pointer button event.
      *
-     * #pepper_input_device_t
-     *  - when : input backend emits pointer button event
-     *  - info : #pepper_input_event_t
-     *
      * #pepper_pointer_t
      *  - when : #pepper_input_device_t emits pointer button event (to the attached #pepper_seat_t)
      *  - info : #pepper_input_event_t
@@ -600,10 +669,6 @@ enum pepper_built_in_events
     /**
      * Pointer axis event.
      *
-     * #pepper_input_device_t
-     *  - when : input backend emits pointer axis event
-     *  - info : #pepper_input_event_t
-     *
      * #pepper_pointer_t
      *  - when : #pepper_input_device_t emits pointer axis event (to the attached #pepper_seat_t)
      *  - info : #pepper_input_event_t
@@ -613,10 +678,6 @@ enum pepper_built_in_events
     /**
      * Keyboard key event.
      *
-     * #pepper_input_device_t
-     *  - when : input backend emits key event
-     *  - info : #pepper_input_event_t
-     *
      * #pepper_keyboard_t
      *  - when : #pepper_input_device_t emits key event (to the attached #pepper_seat_t)
      *  - info : #pepper_input_event_t
@@ -626,10 +687,6 @@ enum pepper_built_in_events
     /**
      * Touch down event.
      *
-     * #pepper_input_device_t
-     *  - when : input backend emits touch down event
-     *  - info : #pepper_input_event_t
-     *
      * #pepper_touch_t
      *  - when : #pepper_input_device_t emits touch down event (to the attached #pepper_seat_t)
      *  - info : #pepper_input_event_t
@@ -639,10 +696,6 @@ enum pepper_built_in_events
     /**
      * Touch up event.
      *
-     * #pepper_input_device_t
-     *  - when : input backend emits touch up event
-     *  - info : #pepper_input_event_t
-     *
      * #pepper_touch_t
      *  - when : #pepper_input_device_t emits touch up event (to the attached #pepper_seat_t)
      *  - info : #pepper_input_event_t
@@ -652,10 +705,6 @@ enum pepper_built_in_events
     /**
      * Touch motion event.
      *
-     * #pepper_input_device_t
-     *  - when : input backend emits touch motion event
-     *  - info : #pepper_input_event_t
-     *
      * #pepper_touch_t
      *  - when : #pepper_input_device_t emits touch motion event (to the attached #pepper_seat_t)
      *  - info : #pepper_input_event_t
@@ -663,11 +712,7 @@ enum pepper_built_in_events
     PEPPER_EVENT_TOUCH_MOTION,
 
     /**
-     * Touch frame event.
-     *
-     * #pepper_input_device_t
-     *  - when : input backend emits touch frame event
-     *  - info : #pepper_input_event_t
+     * touch frame event.
      *
      * #pepper_touch_t
      *  - when : #pepper_input_device_t emits touch frame event (to the attached #pepper_seat_t)
@@ -678,10 +723,6 @@ enum pepper_built_in_events
     /**
      * Touch calcen event.
      *
-     * #pepper_input_device_t
-     *  - when : input backend emits touch cancel event
-     *  - info : #pepper_input_event_t
-     *
      * #pepper_touch_t
      *  - when : #pepper_input_device_t emits touch cancel event (to the attached #pepper_seat_t)
      *  - info : #pepper_input_event_t
@@ -709,9 +750,7 @@ enum pepper_key_state
 
 struct pepper_input_event
 {
-    uint32_t    id;         /**< event id #pepper_built_in_events */
     uint32_t    time;       /**< time in mili-second with undefined base. */
-
     uint32_t    button;     /**< pointer button flag. */
     uint32_t    state;      /**< pointer and key state flag. */
     uint32_t    axis;       /**< pointer axis. */

diff --git a/src/lib/pepper/pointer.c b/src/lib/pepper/pointer.c
index 1d2eef958e795d3076a4a50a827eadb7899596d6..da6c4cf7bf2b81838ea07712c0c0212b62a68d11 100644 (file)
--- a/src/lib/pepper/pointer.c
+++ b/src/lib/pepper/pointer.c
@@ -70,7 +70,7 @@ pointer_set_position(pepper_pointer_t *pointer, uint32_t time, double x, double
 
     /* Emit motion event. */
     memset(&event, 0x00, sizeof(pepper_input_event_t));
-    event.id = PEPPER_EVENT_POINTER_MOTION;
+
     event.time = time;
     event.x = pointer->x;
     event.y = pointer->y;
@@ -82,19 +82,19 @@ pepper_pointer_handle_event(pepper_pointer_t *pointer, uint32_t id, pepper_input
 {
     switch (id)
     {
-    case PEPPER_EVENT_POINTER_MOTION_ABSOLUTE:
+    case PEPPER_EVENT_INPUT_DEVICE_POINTER_MOTION_ABSOLUTE:
         {
             pointer_set_position(pointer, event->time, event->x, event->y);
         }
         break;
-    case PEPPER_EVENT_POINTER_MOTION:
+    case PEPPER_EVENT_INPUT_DEVICE_POINTER_MOTION:
         {
             pointer_set_position(pointer, event->time,
                                  pointer->x + event->x * pointer->x_velocity,
                                  pointer->y + event->y * pointer->y_velocity);
         }
         break;
-    case PEPPER_EVENT_POINTER_BUTTON:
+    case PEPPER_EVENT_INPUT_DEVICE_POINTER_BUTTON:
         {
             if (pointer->grab)
             {
@@ -102,15 +102,15 @@ pepper_pointer_handle_event(pepper_pointer_t *pointer, uint32_t id, pepper_input
                                       event->time, event->button, event->state);
             }
 
-            pepper_object_emit_event(&pointer->base, id, event);
+            pepper_object_emit_event(&pointer->base, PEPPER_EVENT_POINTER_BUTTON, event);
         }
         break;
-    case PEPPER_EVENT_POINTER_AXIS:
+    case PEPPER_EVENT_INPUT_DEVICE_POINTER_AXIS:
         {
             if (pointer->grab)
                 pointer->grab->axis(pointer, pointer->data, event->time, event->axis, event->value);
 
-            pepper_object_emit_event(&pointer->base, id, event);
+            pepper_object_emit_event(&pointer->base, PEPPER_EVENT_POINTER_AXIS, event);
         }
         break;
     }
@@ -235,7 +235,7 @@ pepper_pointer_set_clamp(pepper_pointer_t *pointer, double x0, double y0, double
             pointer->grab->motion(pointer, pointer->data, pointer->time, pointer->x, pointer->y);
 
         memset(&event, 0x00, sizeof(pepper_input_event_t));
-        event.id = PEPPER_EVENT_POINTER_MOTION;
+
         event.time = pointer->time;
         event.x = pointer->x;
         event.y = pointer->y;
@@ -385,7 +385,6 @@ pepper_pointer_send_motion(pepper_pointer_t *pointer, pepper_view_t *view,
             wl_pointer_send_motion(resource, time, fx, fy);
     }
 
-    event.id = PEPPER_EVENT_POINTER_MOTION;
     event.time = time;
     event.x = x;
     event.y = y;
@@ -413,7 +412,6 @@ pepper_pointer_send_button(pepper_pointer_t *pointer, pepper_view_t *view,
             wl_pointer_send_button(resource, serial, time, button, state);
     }
 
-    event.id = PEPPER_EVENT_POINTER_BUTTON;
     event.time = time;
     event.button = button;
     event.state = state;
@@ -440,7 +438,6 @@ pepper_pointer_send_axis(pepper_pointer_t *pointer, pepper_view_t *view,
             wl_pointer_send_axis(resource, time, axis, v);
     }
 
-    event.id = PEPPER_EVENT_POINTER_AXIS;
     event.time = time;
     event.axis = axis;
     event.value = value;

diff --git a/src/lib/pepper/touch.c b/src/lib/pepper/touch.c
index aa74d1fb8bb78b7a9a833900e335f3400caa0f66..7a3b146b33e13b238cdb8c625053b78362658dbf 100644 (file)
--- a/src/lib/pepper/touch.c
+++ b/src/lib/pepper/touch.c
@@ -72,24 +72,24 @@ pepper_touch_handle_event(pepper_touch_t *touch, uint32_t id, pepper_input_event
     case PEPPER_EVENT_TOUCH_DOWN:
         {
             if (touch->grab)
-                touch->grab->down(touch, touch->data, event->time, event->id, event->x, event->y);
+                touch->grab->down(touch, touch->data, event->time, event->slot, event->x, event->y);
         }
         break;
     case PEPPER_EVENT_TOUCH_UP:
         {
             if (touch->grab)
-                touch->grab->up(touch, touch->data, event->time, event->id);
+                touch->grab->up(touch, touch->data, event->time, event->slot);
         }
         break;
     case PEPPER_EVENT_TOUCH_MOTION:
         {
-            pepper_touch_point_t *point = get_touch_point(touch, event->id);
+            pepper_touch_point_t *point = get_touch_point(touch, event->slot);
 
             point->x = event->x;
             point->y = event->y;
 
             if (touch->grab)
-                touch->grab->motion(touch, touch->data, event->time, event->id, event->x, event->y);
+                touch->grab->motion(touch, touch->data, event->time, event->slot, event->x, event->y);
         }
         break;
     case PEPPER_EVENT_TOUCH_FRAME:
@@ -294,7 +294,6 @@ pepper_touch_send_down(pepper_touch_t *touch, pepper_view_t *view,
             wl_touch_send_down(resource, point->focus_serial, time, surface_resource, id, fx, fy);
     }
 
-    event.id = PEPPER_EVENT_TOUCH_DOWN;
     event.time = time;
     event.x = x;
     event.y = y;
@@ -322,7 +321,6 @@ pepper_touch_send_up(pepper_touch_t *touch, pepper_view_t *view, uint32_t time,
             wl_touch_send_up(resource, serial, time, id);
     }
 
-    event.id = PEPPER_EVENT_TOUCH_UP;
     event.time = time;
     pepper_object_emit_event(&view->base, PEPPER_EVENT_TOUCH_UP, &event);
 }
@@ -348,7 +346,6 @@ pepper_touch_send_motion(pepper_touch_t *touch, pepper_view_t *view, uint32_t ti
             wl_touch_send_motion(resource, time, id, fx, fy);
     }
 
-    event.id = PEPPER_EVENT_TOUCH_MOTION;
     event.time = time;
     event.x = x;
     event.y = y;

diff --git a/src/lib/x11/x11-input.c b/src/lib/x11/x11-input.c
index 347f6db8d5bc3f075f55b044bc68169a4ef742f3..ddb38328298075e5c488e1877a687a314aa97038 100644 (file)
--- a/src/lib/x11/x11-input.c
+++ b/src/lib/x11/x11-input.c
@@ -44,65 +44,60 @@ x11_handle_input_event(x11_seat_t* seat, uint32_t type, xcb_generic_event_t* xev
         {
             xcb_key_press_event_t *kp = (xcb_key_press_event_t *)xev;
 
-            event.id    = PEPPER_EVENT_KEYBOARD_KEY;
             event.time  = kp->time;
             event.key   = kp->detail - 8;
             event.state = PEPPER_KEY_STATE_PRESSED;
 
             pepper_object_emit_event((pepper_object_t *)seat->keyboard,
-                                     PEPPER_EVENT_KEYBOARD_KEY, &event);
+                                     PEPPER_EVENT_INPUT_DEVICE_KEYBOARD_KEY, &event);
         }
         break;
     case XCB_KEY_RELEASE:
         {
             xcb_key_release_event_t *kr = (xcb_key_release_event_t *)xev;
 
-            event.id    = PEPPER_EVENT_KEYBOARD_KEY;
             event.time  = kr->time;
             event.key   = kr->detail - 8;
             event.state = PEPPER_KEY_STATE_RELEASED;
 
             pepper_object_emit_event((pepper_object_t *)seat->keyboard,
-                                     PEPPER_EVENT_KEYBOARD_KEY, &event);
+                                     PEPPER_EVENT_INPUT_DEVICE_KEYBOARD_KEY, &event);
         }
         break;
     case XCB_BUTTON_PRESS:
         {
             xcb_button_press_event_t *bp = (xcb_button_press_event_t *)xev;
 
-            event.id     = PEPPER_EVENT_POINTER_BUTTON;
             event.time   = bp->time;
             event.state  = PEPPER_BUTTON_STATE_PRESSED;
             event.button = get_standard_button(bp->detail);
 
             pepper_object_emit_event((pepper_object_t *)seat->pointer,
-                                     PEPPER_EVENT_POINTER_BUTTON, &event);
+                                     PEPPER_EVENT_INPUT_DEVICE_POINTER_BUTTON, &event);
         }
         break;
     case XCB_BUTTON_RELEASE:
         {
             xcb_button_release_event_t *br = (xcb_button_release_event_t *)xev;
 
-            event.id     = PEPPER_EVENT_POINTER_BUTTON;
             event.time   = br->time;
             event.state  = PEPPER_BUTTON_STATE_RELEASED;
             event.button = get_standard_button(br->detail);
 
             pepper_object_emit_event((pepper_object_t *)seat->pointer,
-                                     PEPPER_EVENT_POINTER_BUTTON, &event);
+                                     PEPPER_EVENT_INPUT_DEVICE_POINTER_BUTTON, &event);
         }
         break;
     case XCB_MOTION_NOTIFY:
         {
             xcb_motion_notify_event_t *motion = (xcb_motion_notify_event_t *)xev;
 
-            event.id   = PEPPER_EVENT_POINTER_MOTION_ABSOLUTE;
             event.time = motion->time;
             event.x    = motion->event_x;
             event.y    = motion->event_y;
 
             pepper_object_emit_event((pepper_object_t *)seat->pointer,
-                                     PEPPER_EVENT_POINTER_MOTION_ABSOLUTE, &event);
+                                     PEPPER_EVENT_INPUT_DEVICE_POINTER_MOTION_ABSOLUTE, &event);
         }
         break;
     default :