Rename event types for consistency

The event type names should be prefixed with `ds_{submodule}_event_`.

Change-Id: I72dd9ee5df04042dd061a9c5a0641a6c120dca22

diff --git a/examples/input-device-test.c b/examples/input-device-test.c
index 62fe8b0..c71426d 100644 (file)
--- a/examples/input-device-test.c
+++ b/examples/input-device-test.c
@@ -165,7 +165,7 @@ pointer_handle_device_destroy(struct wl_listener *listener, void *data)
 static void
 pointer_handle_motion_absolute(struct wl_listener *listener, void *data)
 {
-    struct ds_event_pointer_motion_absolute *event = data;
+    struct ds_pointer_event_motion_absolute *event = data;
 
     ds_inf("Pointer device(%p): motion absolute (%f, %f) time(%d ms)",
             event->device, event->x, event->y, event->time_msec);
@@ -174,7 +174,7 @@ pointer_handle_motion_absolute(struct wl_listener *listener, void *data)
 static void
 pointer_handle_button(struct wl_listener *listener, void *data)
 {
-    struct ds_event_pointer_button *event = data;
+    struct ds_pointer_event_button *event = data;
 
     ds_inf("Pointer Device(%p): button(%d) state(%d) time(%d ms)",
             event->device, event->button, event->state, event->time_msec);
@@ -255,7 +255,7 @@ keyboard_handle_modifiers(struct wl_listener *listener, void *data)
 static void
 keyboard_handle_key(struct wl_listener *listener, void *data)
 {
-    struct ds_event_keyboard_key *event = data;
+    struct ds_keyboard_event_key *event = data;
     struct keyboard_device *keyboard;
     struct xkb_state *xkb_state;
     const xkb_keysym_t *syms;

diff --git a/examples/libinput-backend.c b/examples/libinput-backend.c
index 19a21af..02b257f 100644 (file)
--- a/examples/libinput-backend.c
+++ b/examples/libinput-backend.c
@@ -141,7 +141,7 @@ keyboard_handle_device_destroy(struct wl_listener *listener, void *data)
 static void
 keyboard_handle_key(struct wl_listener *listener, void *data)
 {
-    struct ds_event_keyboard_key *event = data;
+    struct ds_keyboard_event_key *event = data;
     struct keyboard_device *keyboard;
 
     keyboard = wl_container_of(listener, keyboard, key);
@@ -191,7 +191,7 @@ pointer_handle_device_destroy(struct wl_listener *listener, void *data)
 static void
 pointer_handle_motion(struct wl_listener *listener, void *data)
 {
-    struct ds_event_pointer_motion *event = data;
+    struct ds_pointer_event_motion *event = data;
     struct pointer_device *pointer;
 
     pointer = wl_container_of(listener, pointer, motion);
@@ -204,7 +204,7 @@ pointer_handle_motion(struct wl_listener *listener, void *data)
 static void
 pointer_handle_button(struct wl_listener *listener, void *data)
 {
-    struct ds_event_pointer_button *event = data;
+    struct ds_pointer_event_button *event = data;
     struct pointer_device *pointer;
 
     pointer = wl_container_of(listener, pointer, button);
@@ -256,7 +256,7 @@ touch_handle_device_destroy(struct wl_listener *listener, void *data)
 static void
 touch_handle_down(struct wl_listener *listener, void *data)
 {
-    struct ds_event_touch_down *event = data;
+    struct ds_touch_event_down *event = data;
     struct touch_device *touch;
 
     touch = wl_container_of(listener, touch, down);
@@ -268,7 +268,7 @@ touch_handle_down(struct wl_listener *listener, void *data)
 static void
 touch_handle_up(struct wl_listener *listener, void *data)
 {
-    struct ds_event_touch_up *event = data;
+    struct ds_touch_event_up *event = data;
     struct touch_device *touch;
 
     touch = wl_container_of(listener, touch, up);
@@ -280,7 +280,7 @@ touch_handle_up(struct wl_listener *listener, void *data)
 static void
 touch_handle_motion(struct wl_listener *listener, void *data)
 {
-    struct ds_event_touch_motion *event = data;
+    struct ds_touch_event_motion *event = data;
     struct touch_device *touch;
 
     touch = wl_container_of(listener, touch, motion);

diff --git a/examples/tinyds.c b/examples/tinyds.c
index 32087e6..fa0a854 100644 (file)
--- a/examples/tinyds.c
+++ b/examples/tinyds.c
@@ -462,7 +462,7 @@ server_handle_new_xdg_surface(struct wl_listener *listener, void *data)
 static void
 server_handle_request_set_selection(struct wl_listener *listener, void *data)
 {
-    struct ds_event_request_set_selection *event = data;
+    struct ds_data_device_manager_event_request_set_selection *event = data;
 
     ds_seat_set_selection(event->seat, event->source, event->serial);
 }
@@ -470,7 +470,7 @@ server_handle_request_set_selection(struct wl_listener *listener, void *data)
 static void
 server_handle_request_start_drag(struct wl_listener *listener, void *data)
 {
-    struct ds_event_request_start_drag *event = data;
+    struct ds_data_device_manager_event_request_start_drag *event = data;
 
     ds_drag_start_pointer_drag(event->drag, event->serial);
 }
@@ -478,7 +478,7 @@ server_handle_request_start_drag(struct wl_listener *listener, void *data)
 static void
 server_handle_request_data_offer_receive(struct wl_listener *listener, void *data)
 {
-    struct ds_event_request_data_offer_receive *event = data;
+    struct ds_data_device_manager_event_request_data_offer_receive *event = data;
 
     ds_data_offer_send(event->offer, event->mime_type, event->fd);
 }
@@ -871,7 +871,7 @@ static void
 keyboard_handle_key(struct wl_listener *listener, void *data)
 {
     struct tinyds_keyboard *kbd;
-    struct ds_event_keyboard_key *event = data;
+    struct ds_keyboard_event_key *event = data;
     struct ds_keyboard *ds_keyboard;
     struct xkb_state *xkb_state;
     const xkb_keysym_t *syms;
@@ -992,7 +992,7 @@ static void
 pointer_handle_motion_absolute(struct wl_listener *listener, void *data)
 {
     struct tinyds_pointer *pointer;
-    struct ds_event_pointer_motion_absolute *event = data;
+    struct ds_pointer_event_motion_absolute *event = data;
     struct tinyds_view *view;
     double sx, sy;
 
@@ -1030,7 +1030,7 @@ static void
 pointer_handle_button(struct wl_listener *listener, void *data)
 {
     struct tinyds_pointer *pointer;
-    struct ds_event_pointer_button *event = data;
+    struct ds_pointer_event_button *event = data;
     struct tinyds_view *view;
 
     pointer = wl_container_of(listener, pointer, button);

diff --git a/include/libds/data_device.h b/include/libds/data_device.h
index a34b4c4..917f051 100644 (file)
--- a/include/libds/data_device.h
+++ b/include/libds/data_device.h
@@ -37,14 +37,14 @@ struct ds_drag;
 
 struct ds_touch_point;
 
-struct ds_event_request_set_selection
+struct ds_data_device_manager_event_request_set_selection
 {
     struct ds_seat *seat;
     struct ds_data_source *source;
     uint32_t serial;
 };
 
-struct ds_event_request_start_drag
+struct ds_data_device_manager_event_request_start_drag
 {
     struct ds_seat *seat;
     struct ds_surface *origin;
@@ -52,20 +52,20 @@ struct ds_event_request_start_drag
     uint32_t serial;
 };
 
-struct ds_event_request_data_offer_receive
+struct ds_data_device_manager_event_request_data_offer_receive
 {
     struct ds_data_offer *offer;
     const char *mime_type;
     int32_t fd;
 };
 
-struct ds_event_drag_motion {
+struct ds_drag_event_motion {
     struct ds_drag *drag;
     uint32_t time;
     double sx, sy;
 };
 
-struct ds_event_drag_drop {
+struct ds_drag_event_drop {
     struct ds_drag *drag;
     uint32_t time;
 };

diff --git a/include/libds/interfaces/keyboard.h b/include/libds/interfaces/keyboard.h
index 85a20a5..720098d 100644 (file)
--- a/include/libds/interfaces/keyboard.h
+++ b/include/libds/interfaces/keyboard.h
@@ -59,7 +59,7 @@ void ds_keyboard_init(struct ds_keyboard *keyboard,
 void ds_keyboard_destroy(struct ds_keyboard *keyboard);
 
 void ds_keyboard_notify_key(struct ds_keyboard *keyboard,
-        struct ds_event_keyboard_key *event);
+        struct ds_keyboard_event_key *event);
 
 void ds_keyboard_notify_modifiers(struct ds_keyboard *keyboard,
         uint32_t mods_depressed, uint32_t mods_latched, uint32_t mods_locked,

diff --git a/include/libds/keyboard.h b/include/libds/keyboard.h
index 80165e6..b02369f 100644 (file)
--- a/include/libds/keyboard.h
+++ b/include/libds/keyboard.h
@@ -30,7 +30,7 @@ struct ds_keyboard_modifiers
     xkb_mod_mask_t group;
 };
 
-struct ds_event_keyboard_key
+struct ds_keyboard_event_key
 {
     uint32_t time_msec;
     uint32_t keycode;

diff --git a/include/libds/pointer.h b/include/libds/pointer.h
index 99545df..f347571 100644 (file)
--- a/include/libds/pointer.h
+++ b/include/libds/pointer.h
@@ -7,7 +7,7 @@
 
 struct ds_pointer;
 
-struct ds_event_pointer_motion_absolute
+struct ds_pointer_event_motion_absolute
 {
     struct ds_input_device *device;
     uint32_t time_msec;
@@ -15,14 +15,14 @@ struct ds_event_pointer_motion_absolute
     double x, y;
 };
 
-struct ds_event_pointer_motion
+struct ds_pointer_event_motion
 {
     struct ds_input_device *device;
     uint32_t time_msec;
     double delta_x, delta_y;
 };
 
-struct ds_event_pointer_button
+struct ds_pointer_event_button
 {
     struct ds_input_device *device;
     uint32_t time_msec;

diff --git a/include/libds/seat.h b/include/libds/seat.h
index 42626b6..1237696 100644 (file)
--- a/include/libds/seat.h
+++ b/include/libds/seat.h
@@ -31,14 +31,14 @@ enum ds_axis_source
     DS_AXIS_SOURCE_WHEEL_TILT,
 };
 
-struct ds_event_seat_pointer_focus_change
+struct ds_seat_pointer_event_focus_change
 {
     struct ds_seat *seat;
     struct ds_surface *old_surface, *new_surface;
     double sx, sy;
 };
 
-struct ds_event_seat_keyboard_focus_change
+struct ds_seat_keyboard_event_focus_change
 {
     struct ds_seat *seat;
     struct ds_surface *old_surface, *new_surface;

diff --git a/include/libds/touch.h b/include/libds/touch.h
index 4b69b90..986dca8 100644 (file)
--- a/include/libds/touch.h
+++ b/include/libds/touch.h
@@ -7,7 +7,7 @@
 
 struct ds_touch;
 
-struct ds_event_touch_down
+struct ds_touch_event_down
 {
     struct ds_input_device *device;
     uint32_t time_msec;
@@ -16,14 +16,14 @@ struct ds_event_touch_down
     double x, y;
 };
 
-struct ds_event_touch_up
+struct ds_touch_event_up
 {
     struct ds_input_device *device;
     uint32_t time_msec;
     uint32_t id;
 };
 
-struct ds_event_touch_motion
+struct ds_touch_event_motion
 {
     struct ds_input_device *device;
     uint32_t time_msec;

diff --git a/src/backend/libinput/keyboard.c b/src/backend/libinput/keyboard.c
index 9376f11..b93138c 100644 (file)
--- a/src/backend/libinput/keyboard.c
+++ b/src/backend/libinput/keyboard.c
@@ -9,7 +9,7 @@ handle_keyboard_key(struct libinput_event *event,
     uint32_t key;
     enum libinput_key_state li_state;
     enum wl_keyboard_key_state state = WL_KEYBOARD_KEY_STATE_PRESSED;
-    struct ds_event_keyboard_key ds_event = {0};
+    struct ds_keyboard_event_key ds_event = {0};
 
     kbevent = libinput_event_get_keyboard_event(event);
 

diff --git a/src/backend/libinput/pointer.c b/src/backend/libinput/pointer.c
index efdbaa7..7ea13ea 100644 (file)
--- a/src/backend/libinput/pointer.c
+++ b/src/backend/libinput/pointer.c
@@ -7,7 +7,7 @@ handle_pointer_motion(struct libinput_event *event,
 {
     struct libinput_event_pointer *pevent;
     double delta_x, delta_y;
-    struct ds_event_pointer_motion ds_event = { 0 };
+    struct ds_pointer_event_motion ds_event = { 0 };
 
     pevent = libinput_event_get_pointer_event(event);
 
@@ -31,7 +31,7 @@ handle_pointer_motion_abs(struct libinput_event *event,
 {
     struct libinput_event_pointer *pevent;
     double x, y;
-    struct ds_event_pointer_motion_absolute ds_event = { 0 };
+    struct ds_pointer_event_motion_absolute ds_event = { 0 };
 
     pevent = libinput_event_get_pointer_event(event);
 
@@ -56,7 +56,7 @@ handle_pointer_button(struct libinput_event *event,
     uint32_t button;
     enum libinput_button_state li_state = LIBINPUT_BUTTON_STATE_PRESSED;
     enum ds_button_state state = DS_BUTTON_PRESSED;
-    struct ds_event_pointer_button ds_event = { 0 };
+    struct ds_pointer_event_button ds_event = { 0 };
 
     pevent = libinput_event_get_pointer_event(event);
 

diff --git a/src/backend/libinput/touch.c b/src/backend/libinput/touch.c
index fd94c0b..c6b16a1 100644 (file)
--- a/src/backend/libinput/touch.c
+++ b/src/backend/libinput/touch.c
@@ -8,7 +8,7 @@ handle_touch_down(struct libinput_event *event,
     struct libinput_event_touch *tevent;
     uint32_t touch_id;
     double x, y;
-    struct ds_event_touch_down ds_event = { 0 };
+    struct ds_touch_event_down ds_event = { 0 };
 
     tevent = libinput_event_get_touch_event(event);
 
@@ -34,7 +34,7 @@ handle_touch_up(struct libinput_event *event,
 {
     struct libinput_event_touch *tevent;
     uint32_t touch_id;
-    struct ds_event_touch_up ds_event = { 0 };
+    struct ds_touch_event_up ds_event = { 0 };
 
     tevent = libinput_event_get_touch_event(event);
 
@@ -57,7 +57,7 @@ handle_touch_motion(struct libinput_event *event,
     struct libinput_event_touch *tevent;
     uint32_t touch_id;
     double x, y;
-    struct ds_event_touch_motion ds_event = { 0 };
+    struct ds_touch_event_motion ds_event = { 0 };
 
     tevent = libinput_event_get_touch_event(event);
 

diff --git a/src/backend/wayland/seat.c b/src/backend/wayland/seat.c
index 8b9085e..8d5836b 100644 (file)
--- a/src/backend/wayland/seat.c
+++ b/src/backend/wayland/seat.c
@@ -315,7 +315,7 @@ pointer_handle_motion(void *data, struct wl_pointer *wl_pointer,
     ds_output = &seat->output->base;
 
     // FIXME take size size of a output into account
-    struct ds_event_pointer_motion_absolute event = {
+    struct ds_pointer_event_motion_absolute event = {
         .device = seat->pointer_dev,
         .time_msec = time,
         .x = wl_fixed_to_double(sx) / ds_output->width,
@@ -335,7 +335,7 @@ pointer_handle_button(void *data, struct wl_pointer *wl_pointer,
     if (!seat->output)
         return;
 
-    struct ds_event_pointer_button event = {
+    struct ds_pointer_event_button event = {
         .device = seat->pointer_dev,
         .button = button,
         .state = state,
@@ -494,7 +494,7 @@ keyboard_handle_enter(void *data, struct wl_keyboard *wl_keyboard,
     time = get_current_time_msec();
 
     wl_array_for_each(keycode_ptr, keys) {
-        struct ds_event_keyboard_key event = {
+        struct ds_keyboard_event_key event = {
             .keycode = *keycode_ptr,
             .state = WL_KEYBOARD_KEY_STATE_PRESSED,
             .time_msec = time,
@@ -526,7 +526,7 @@ keyboard_handle_leave(void *data, struct wl_keyboard *wl_keyboard,
     for (size_t i = 0; i < num_keycodes; i++) {
         keycode = pressed[i];
 
-        struct ds_event_keyboard_key event = {
+        struct ds_keyboard_event_key event = {
             .keycode = keycode,
             .state = WL_KEYBOARD_KEY_STATE_RELEASED,
             .time_msec = time,
@@ -545,7 +545,7 @@ keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard,
 
     ds_dbg("wl_keyboard: key");
 
-    struct ds_event_keyboard_key event = {
+    struct ds_keyboard_event_key event = {
         .keycode = key,
         .state = state,
         .time_msec = time,
@@ -639,7 +639,7 @@ touch_handle_down(void *data, struct wl_touch *wl_touch,
 
     ds_dbg("wl_touch: down");
 
-    struct ds_event_touch_down event = {
+    struct ds_touch_event_down event = {
         .device = seat->touch_dev,
         .id = id,
         .x = fixed_x,
@@ -657,7 +657,7 @@ touch_handle_up(void *data, struct wl_touch *wl_touch,
 
     ds_dbg("wl_touch: up");
 
-    struct ds_event_touch_up event = {
+    struct ds_touch_event_up event = {
         .device = seat->touch_dev,
         .id = id,
     };

diff --git a/src/data_device/data_device.c b/src/data_device/data_device.c
index 345958c..6902404 100644 (file)
--- a/src/data_device/data_device.c
+++ b/src/data_device/data_device.c
@@ -301,7 +301,7 @@ data_device_handle_start_drag(struct wl_client *client,
     if (source_client)
         source_client->finalized = true;
 
-    struct ds_event_request_start_drag event = {
+    struct ds_data_device_manager_event_request_start_drag event = {
         .seat = data_device->seat,
         .drag = drag,
         .origin = ds_surface_from_resource(origin_resource),
@@ -329,7 +329,7 @@ data_device_handle_set_selection(struct wl_client *client,
             source->finalized = true;
     }
 
-    struct ds_event_request_set_selection event = {
+    struct ds_data_device_manager_event_request_set_selection event = {
         .seat = data_device->seat,
         .source = &source->base,
         .serial = serial,

diff --git a/src/data_device/data_offer.c b/src/data_device/data_offer.c
index fc17b66..3be7829 100644 (file)
--- a/src/data_device/data_offer.c
+++ b/src/data_device/data_offer.c
@@ -178,7 +178,7 @@ data_offer_handle_receive(struct wl_client *client,
     if (!offer)
         return;
 
-    struct ds_event_request_data_offer_receive event = {
+    struct ds_data_device_manager_event_request_data_offer_receive event = {
         .offer = offer,
         .mime_type = mime_type,
         .fd = fd,

diff --git a/src/data_device/drag.c b/src/data_device/drag.c
index 1500682..cd7cddf 100644 (file)
--- a/src/data_device/drag.c
+++ b/src/data_device/drag.c
@@ -326,7 +326,7 @@ drag_pointer_grab_iface_motion(struct ds_seat_pointer_grab *grab,
     if (data_device) 
         data_device_send_drag_motion(data_device, time, sx, sy);
 
-    struct ds_event_drag_motion event = {
+    struct ds_drag_event_motion event = {
         .drag = drag,
         .time = time,
         .sx = sx,
@@ -546,7 +546,7 @@ drag_drop(struct ds_drag *drag, uint32_t time)
     if (drag->source)
         ds_data_source_dnd_drop(drag->source);
 
-    struct ds_event_drag_drop event = {
+    struct ds_drag_event_drop event = {
         .drag = drag,
         .time = time,
     };

diff --git a/src/keyboard.c b/src/keyboard.c
index 30668c4..550d72f 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11,7 +11,7 @@
 
 static bool keyboard_modifier_update(struct ds_keyboard *keyboard);
 static void keyboard_key_update(struct ds_keyboard *keyboard,
-        struct ds_event_keyboard_key *event);
+        struct ds_keyboard_event_key *event);
 static void keyboard_led_update(struct ds_keyboard *keyboard);
 
 WL_EXPORT bool
@@ -157,7 +157,7 @@ ds_keyboard_get_xkb_state(struct ds_keyboard *keyboard)
 
 WL_EXPORT void
 ds_keyboard_notify_key(struct ds_keyboard *keyboard,
-        struct ds_event_keyboard_key *event)
+        struct ds_keyboard_event_key *event)
 {
     uint32_t keycode;
     enum xkb_key_direction dir;
@@ -333,7 +333,7 @@ keyboard_modifier_update(struct ds_keyboard *keyboard)
 }
 
 static void keyboard_key_update(struct ds_keyboard *keyboard,
-        struct ds_event_keyboard_key *event)
+        struct ds_keyboard_event_key *event)
 {
     // TODO
 }

diff --git a/src/seat/seat_keyboard.c b/src/seat/seat_keyboard.c
index 85cf672..302e887 100644 (file)
--- a/src/seat/seat_keyboard.c
+++ b/src/seat/seat_keyboard.c
@@ -643,7 +643,7 @@ static void
 seat_keyboard_emit_focus_change(struct ds_seat_keyboard *keyboard,
         struct ds_surface *old_surface, struct ds_surface *new_surface)
 {
-    struct ds_event_seat_keyboard_focus_change event = {
+    struct ds_seat_keyboard_event_focus_change event = {
         .seat = keyboard->seat,
         .old_surface = old_surface,
         .new_surface = new_surface,

diff --git a/src/seat/seat_pointer.c b/src/seat/seat_pointer.c
index fc18769..ce6bd0d 100644 (file)
--- a/src/seat/seat_pointer.c
+++ b/src/seat/seat_pointer.c
@@ -504,7 +504,7 @@ seat_pointer_emit_focus_change(struct ds_seat_pointer *pointer,
         struct ds_surface *old_surface, struct ds_surface *new_surface,
         double sx, double sy)
 {
-    struct ds_event_seat_pointer_focus_change event = {
+    struct ds_seat_pointer_event_focus_change event = {
         .seat = pointer->seat,
         .new_surface = new_surface,
         .old_surface = old_surface,