From: Seunghun Lee <shiin.lee@samsung.com>
Date: Thu, 27 Oct 2022 06:00:25 +0000 (+0900)
Subject: Rename event types for consistency
X-Git-Tag: accepted/tizen/unified/20230106.165108^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5eb1cf7bc662880402bbf7aa9c78a773e7c8cc7;p=platform%2Fcore%2Fuifw%2Flibds-tizen.git

Rename event types for consistency

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

Change-Id: I0dcfa36d901b5a89b78af172ce664a81bd1e40a5
---

diff --git a/examples/tinyds-dpms.c b/examples/tinyds-dpms.c
index b8fabb4..2915bde 100644
--- a/examples/tinyds-dpms.c
+++ b/examples/tinyds-dpms.c
@@ -37,7 +37,7 @@ static void
 dpms_handle_set_dpms(struct wl_listener *listener, void *data)
 {
     struct tinyds_dpms *dpms;
-    struct ds_tizen_dpms_event *event = data;
+    struct ds_tizen_dpms_event_set_dpms *event = data;
 
     dpms = wl_container_of(listener, dpms, set_dpms);
 
diff --git a/examples/tinyds-policy.c b/examples/tinyds-policy.c
index 30146c7..07c0b55 100644
--- a/examples/tinyds-policy.c
+++ b/examples/tinyds-policy.c
@@ -205,10 +205,10 @@ policy_surface_handle_new_visibility(struct wl_listener *listener, void *data)
 {
     struct tinyds_policy_surface *policy_surface;
     struct tinyds_policy_visibility *visibility;
-    struct ds_tizen_event_policy_surface_new_visibility *event;
+    struct ds_tizen_policy_surface_event_new_visibility *event;
 
     policy_surface = wl_container_of(listener, policy_surface, new_visibility);
-    event = (struct ds_tizen_event_policy_surface_new_visibility *)data;
+    event = (struct ds_tizen_policy_surface_event_new_visibility *)data;
 
     ds_inf("Policy Info(%p) new_visibility", policy_surface);
 
@@ -230,10 +230,10 @@ policy_surface_handle_new_position(struct wl_listener *listener, void *data)
 {
     struct tinyds_policy_surface *policy_surface;
     struct tinyds_policy_position *position;
-    struct ds_tizen_event_policy_surface_new_position *event;
+    struct ds_tizen_policy_surface_event_new_position *event;
 
     policy_surface = wl_container_of(listener, policy_surface, new_position);
-    event = (struct ds_tizen_event_policy_surface_new_position *)data;
+    event = (struct ds_tizen_policy_surface_event_new_position *)data;
 
     ds_inf("Policy Info(%p) new_position", policy_surface);
 
@@ -523,10 +523,10 @@ policy_surface_handle_new_subsurface_watcher(struct wl_listener *listener, void
 {
     struct tinyds_policy_surface *policy_surface;
     struct tinyds_policy_subsurface_watcher*subsurface_watcher;
-    struct ds_tizen_event_policy_surface_new_subsurface_watcher *event;
+    struct ds_tizen_policy_surface_event_new_subsurface_watcher *event;
 
     policy_surface = wl_container_of(listener, policy_surface, new_subsurface_watcher);
-    event = (struct ds_tizen_event_policy_surface_new_subsurface_watcher *)data;
+    event = (struct ds_tizen_policy_surface_event_new_subsurface_watcher *)data;
 
     ds_inf("Policy Info(%p) new_subsurface_watcher", policy_surface);
 
@@ -648,10 +648,10 @@ policy_handle_new_surface(struct wl_listener *listener, void *data)
 {
     struct tinyds_policy *policy;
     struct tinyds_policy_surface *policy_surface;
-    struct ds_tizen_event_policy_new_surface *event;
+    struct ds_tizen_policy_event_new_surface *event;
 
     policy = wl_container_of(listener, policy, new_surface);
-    event = (struct ds_tizen_event_policy_new_surface *)data;
+    event = (struct ds_tizen_policy_event_new_surface *)data;
 
     ds_inf("Policy(%p) new_surface", policy);
 
diff --git a/examples/tinyds-tdm.c b/examples/tinyds-tdm.c
index 31c1e2d..d7d4ac8 100644
--- a/examples/tinyds-tdm.c
+++ b/examples/tinyds-tdm.c
@@ -1099,7 +1099,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;
@@ -1227,7 +1227,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 tinyds_touch *touch;
     struct tinyds_view *view;
     struct tinyds_server *server;
@@ -1260,7 +1260,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 tinyds_touch *touch;
 
     touch = wl_container_of(listener, touch, up);
@@ -1274,7 +1274,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 tinyds_touch *touch;
     struct tinyds_view *view;
     struct tinyds_server *server;
@@ -1369,7 +1369,7 @@ static void
 pointer_handle_motion(struct wl_listener *listener, void *data)
 {
     struct tinyds_pointer *pointer;
-    struct ds_event_pointer_motion *event = data;
+    struct ds_pointer_event_motion *event = data;
     struct tinyds_view *view;
     struct tinyds_server *server;
     int ow = 0, oh = 0;
@@ -1433,7 +1433,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;
 
     pointer = wl_container_of(listener, pointer, button);
 
@@ -2192,4 +2192,4 @@ tinyds_server_get_output_size(struct tinyds_server *server,
 {
     *output_w = server->output->width;
     *output_h = server->output->height;
-}
\ No newline at end of file
+}
diff --git a/include/libds-tizen/dpms.h b/include/libds-tizen/dpms.h
index af2ce93..77073a3 100644
--- a/include/libds-tizen/dpms.h
+++ b/include/libds-tizen/dpms.h
@@ -28,7 +28,7 @@ enum ds_tizen_dpms_error
     DS_TIZEN_DPMS_ERROR_ALREADY_DONE,
 };
 
-struct ds_tizen_dpms_event
+struct ds_tizen_dpms_event_set_dpms
 {
     struct ds_output *output;
     enum ds_tizen_dpms_mode mode;
diff --git a/include/libds-tizen/policy.h b/include/libds-tizen/policy.h
index 5066e41..1151dff 100644
--- a/include/libds-tizen/policy.h
+++ b/include/libds-tizen/policy.h
@@ -83,77 +83,77 @@ enum ds_tizen_policy_visibility_type
 };
 
 // policy event structures
-struct ds_tizen_event_policy_new_surface
+struct ds_tizen_policy_event_new_surface
 {
     struct ds_tizen_policy *policy;
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_activate_below_by_univeral_id
+struct ds_tizen_policy_event_activate_below_by_univeral_id
 {
     struct ds_tizen_policy *policy;
     uint32_t universal_id;
     uint32_t below_universal_id;
 };
 
-struct ds_tizen_event_policy_lower_by_universal_id
+struct ds_tizen_policy_event_lower_by_universal_id
 {
     struct ds_tizen_policy *policy;
     uint32_t universal_id;
 };
 
-struct ds_tizen_event_policy_set_transient_for
+struct ds_tizen_policy_event_set_transient_for
 {
     struct ds_tizen_policy *policy;
     uint32_t child_universal_id;
     uint32_t parent_universal_id;
 };
 
-struct ds_tizen_event_policy_unset_transient_for
+struct ds_tizen_policy_event_unset_transient_for
 {
     struct ds_tizen_policy *policy;
     uint32_t child_universal_id;
 };
 
-struct ds_tizen_event_policy_place_subsurface_below_parent
+struct ds_tizen_policy_event_place_subsurface_below_parent
 {
     struct ds_tizen_policy *policy;
     struct ds_subsurface *subsurface;
 };
 
-struct ds_tizen_event_policy_set_subsurface_stand_alone
+struct ds_tizen_policy_event_set_subsurface_stand_alone
 {
     struct ds_tizen_policy *policy;
     struct ds_subsurface *subsurface;
 };
 
-struct ds_tizen_event_policy_set_background_state
+struct ds_tizen_policy_event_set_background_state
 {
     struct ds_tizen_policy *policy;
     int32_t pid;
 };
 
-struct ds_tizen_event_policy_unset_background_state
+struct ds_tizen_policy_event_unset_background_state
 {
     struct ds_tizen_policy *policy;
     int32_t pid;
 };
 
-struct ds_tizen_event_policy_activate_above_by_universal_id
+struct ds_tizen_policy_event_activate_above_by_universal_id
 {
     struct ds_tizen_policy *policy;
     uint32_t universal_id;
     uint32_t above_universal_id;
 };
 
-struct ds_tizen_event_policy_set_appid
+struct ds_tizen_policy_event_set_appid
 {
     struct ds_tizen_policy *policy;
     int32_t pid;
     const char *appid;
 };
 
-struct ds_tizen_event_policy_set_transient_for_below
+struct ds_tizen_policy_event_set_transient_for_below
 {
     struct ds_tizen_policy *policy;
     uint32_t universal_id;
@@ -161,99 +161,99 @@ struct ds_tizen_event_policy_set_transient_for_below
 };
 
 // policy policy_surface event structures
-struct ds_tizen_event_policy_surface_new_visibility
+struct ds_tizen_policy_surface_event_new_visibility
 {
     struct ds_tizen_policy_surface *policy_surface;
     struct ds_tizen_policy_visibility *visibility;
 };
 
-struct ds_tizen_event_policy_surface_new_position
+struct ds_tizen_policy_surface_event_new_position
 {
     struct ds_tizen_policy_surface *policy_surface;
     struct ds_tizen_policy_position *position;
 };
 
-struct ds_tizen_event_policy_surface_activate
+struct ds_tizen_policy_surface_event_activate
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_raise
+struct ds_tizen_policy_surface_event_raise
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_lower
+struct ds_tizen_policy_surface_event_lower
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_set_focus_skip
+struct ds_tizen_policy_surface_event_set_focus_skip
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_unset_focus_skip
+struct ds_tizen_policy_surface_event_unset_focus_skip
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_set_role
+struct ds_tizen_policy_surface_event_set_role
 {
     struct ds_tizen_policy_surface *policy_surface;
     const char *role;
 };
 
-struct ds_tizen_event_policy_surface_set_window_type
+struct ds_tizen_policy_surface_event_set_window_type
 {
     struct ds_tizen_policy_surface *policy_surface;
     enum ds_tizen_policy_window_type win_type;
 };
 
-struct ds_tizen_event_policy_surface_set_conformant
+struct ds_tizen_policy_surface_event_set_conformant
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_unset_conformant
+struct ds_tizen_policy_surface_event_unset_conformant
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_get_conformant
+struct ds_tizen_policy_surface_event_get_conformant
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_set_notification_level
+struct ds_tizen_policy_surface_event_set_notification_level
 {
     struct ds_tizen_policy_surface *policy_surface;
     enum ds_tizen_policy_notification_level level;
 };
 
-struct ds_tizen_event_policy_surface_set_window_screen_mode
+struct ds_tizen_policy_surface_event_set_window_screen_mode
 {
     struct ds_tizen_policy_surface *policy_surface;
     enum ds_tizen_policy_window_screen_mode mode;
 };
 
-struct ds_tizen_event_policy_surface_get_subsurface
+struct ds_tizen_policy_surface_event_get_subsurface
 {
     struct ds_tizen_policy_surface *policy_surface;
     uint32_t parent_universal_id;
 };
 
-struct ds_tizen_event_policy_surface_iconify
+struct ds_tizen_policy_surface_event_iconify
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_uniconify
+struct ds_tizen_policy_surface_event_uniconify
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_add_aux_hint
+struct ds_tizen_policy_surface_event_add_aux_hint
 {
     struct ds_tizen_policy_surface *policy_surface;
     int32_t id;
@@ -261,82 +261,82 @@ struct ds_tizen_event_policy_surface_add_aux_hint
     const char *value;
 };
 
-struct ds_tizen_event_policy_surface_change_aux_hint
+struct ds_tizen_policy_surface_event_change_aux_hint
 {
     struct ds_tizen_policy_surface *policy_surface;
     int32_t id;
     const char *value;
 };
 
-struct ds_tizen_event_policy_surface_delete_aux_hint
+struct ds_tizen_policy_surface_event_delete_aux_hint
 {
     struct ds_tizen_policy_surface *policy_surface;
     int32_t id;
 };
 
-struct ds_tizen_event_policy_surface_get_supported_aux_hints
+struct ds_tizen_policy_surface_event_get_supported_aux_hints
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_set_floating_mode
+struct ds_tizen_policy_surface_event_set_floating_mode
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_unset_floating_mode
+struct ds_tizen_policy_surface_event_unset_floating_mode
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_set_stack_mode
+struct ds_tizen_policy_surface_event_set_stack_mode
 {
     struct ds_tizen_policy_surface *policy_surface;
     enum ds_tizen_policy_stack_mode mode;
 };
 
-struct ds_tizen_event_policy_surface_new_subsurface_watcher
+struct ds_tizen_policy_surface_event_new_subsurface_watcher
 {
     struct ds_tizen_policy_surface *policy_surface;
     struct ds_tizen_policy_subsurface_watcher *subsurface_watcher;
 };
 
-struct ds_tizen_event_policy_surface_set_parent
+struct ds_tizen_policy_surface_event_set_parent
 {
     struct ds_tizen_policy_surface *policy_surface;
     struct ds_surface *parent_surface;
 };
 
-struct ds_tizen_event_policy_surface_ack_conformant_region
+struct ds_tizen_policy_surface_event_ack_conformant_region
 {
     struct ds_tizen_policy_surface *policy_surface;
     uint32_t serial;
 };
 
-struct ds_tizen_event_policy_surface_set_video
+struct ds_tizen_policy_surface_event_set_video
 {
     struct ds_tizen_policy_surface *policy_surface;
     bool video;
 };
 
-struct ds_tizen_event_policy_surface_show
+struct ds_tizen_policy_surface_event_show
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_hide
+struct ds_tizen_policy_surface_event_hide
 {
     struct ds_tizen_policy_surface *policy_surface;
 };
 
-struct ds_tizen_event_policy_surface_set_parent_with_below
+struct ds_tizen_policy_surface_event_set_parent_with_below
 {
     struct ds_tizen_policy_surface *policy_surface;
     struct ds_surface *parent_surface;
 };
 
 // policy policy_surface event structures
-struct ds_tizen_event_policy_position_set
+struct ds_tizen_policy_event_position_set
 {
     struct ds_tizen_policy_position *position;
     int32_t x;
diff --git a/include/libds-tizen/remote_surface.h b/include/libds-tizen/remote_surface.h
index 7e8cf2c..72a409c 100644
--- a/include/libds-tizen/remote_surface.h
+++ b/include/libds-tizen/remote_surface.h
@@ -72,12 +72,12 @@ enum ds_tizen_remote_surface_changed_buffer_event_filter {
     DS_TIZEN_REMOTE_SURFACE_CHANGED_BUFFER_EVENT_FILTER_IMAGE_FILE = 0x00000002,
 };
 
-struct ds_tizen_remote_surface_manager_bind_surface_event {
+struct ds_tizen_remote_surface_manager_event_bind_surface {
     struct ds_tizen_remote_surface *remote_surface;
     struct ds_surface *surface;
 };
 
-struct ds_tizen_remote_surface_transfer_mouse_event {
+struct ds_tizen_remote_surface_event_transfer_mouse {
     struct ds_tizen_remote_surface *remote_surface;
     enum ds_tizen_remote_surface_input_event_type event_type;
     int32_t device;
@@ -94,7 +94,7 @@ struct ds_tizen_remote_surface_transfer_mouse_event {
     uint32_t time;
 };
 
-struct ds_tizen_remote_surface_transfer_mouse_wheel_event {
+struct ds_tizen_remote_surface_event_transfer_mouse_wheel {
     struct ds_tizen_remote_surface *remote_surface;
     uint32_t direction;
     int32_t z;
@@ -104,7 +104,7 @@ struct ds_tizen_remote_surface_transfer_mouse_wheel_event {
     uint32_t time;
 };
 
-struct ds_tizen_remote_surface_transfer_touch_event {
+struct ds_tizen_remote_surface_event_transfer_touch {
     struct ds_tizen_remote_surface *remote_surface;
     enum ds_tizen_remote_surface_input_event_type event_type;
     int32_t device;
@@ -121,11 +121,11 @@ struct ds_tizen_remote_surface_transfer_touch_event {
     uint32_t time;
 };
 
-struct ds_tizen_remote_surface_transfer_touch_cancel_event {
+struct ds_tizen_remote_surface_event_transfer_touch_cancel {
     struct ds_tizen_remote_surface *remote_surface;
 };
 
-struct ds_tizen_remote_surface_transfer_key_event {
+struct ds_tizen_remote_surface_event_transfer_key {
     struct ds_tizen_remote_surface *remote_surface;
     enum ds_tizen_remote_surface_input_event_type event_type;
     int32_t keycode;
@@ -135,17 +135,17 @@ struct ds_tizen_remote_surface_transfer_key_event {
     uint32_t time;
 };
 
-struct ds_tizen_remote_surface_transfer_visibility_event {
+struct ds_tizen_remote_surface_event_transfer_visibility {
     struct ds_tizen_remote_surface *remote_surface;
     enum ds_tizen_remote_surface_visibility_type visibility;
 };
 
-struct ds_tizen_remote_surface_buffer_release_event {
+struct ds_tizen_remote_surface_event_buffer_release {
     struct ds_tizen_remote_surface *remote_surface;
     struct ds_buffer *buffer;
 };
 
-struct ds_tizen_remote_surface_current_buffer_event {
+struct ds_tizen_remote_surface_event_current_buffer {
     struct ds_tizen_remote_surface *remote_surface;
     enum ds_tizen_remote_surface_buffer_type buffer_type;
     uint32_t request_serial;
diff --git a/include/libds-tizen/screenshooter.h b/include/libds-tizen/screenshooter.h
index d16b899..1452699 100644
--- a/include/libds-tizen/screenshooter.h
+++ b/include/libds-tizen/screenshooter.h
@@ -24,7 +24,7 @@ enum ds_tizen_screenmirror_content
     DS_TIZEN_SCREENMIRROR_CONTENT_VIDEO,
 };
 
-struct ds_tizen_screenshooter_shoot_event
+struct ds_tizen_screenshooter_event_shoot
 {
     struct ds_output *output;
     struct ds_buffer *buffer;
diff --git a/include/libds-tizen/video.h b/include/libds-tizen/video.h
index 7358fc8..62736ba 100644
--- a/include/libds-tizen/video.h
+++ b/include/libds-tizen/video.h
@@ -82,7 +82,7 @@ struct ds_tizen_viewport_state {
     bool follow_parent_transform;
 };
 
-struct ds_event_tizen_video_request_set_property {
+struct ds_tizen_video_object_event_request_set_property {
     struct ds_tizen_video_object *object;
     const char *name;
     int32_t value;
@@ -119,7 +119,7 @@ struct ds_surface *ds_tizen_video_object_get_surface(
 void ds_tizen_video_object_add_destroy_listener(
         struct ds_tizen_video_object *object, struct wl_listener *listener);
 
-/* @data: struct ds_event_tizen_video_request_set_property */
+/* @data: struct ds_tizen_video_object_event_request_set_property */
 void ds_tizen_video_object_add_request_set_property_listener(
         struct ds_tizen_video_object *object, struct wl_listener *listener);
 
diff --git a/src/dpms/dpms.c b/src/dpms/dpms.c
index c63f175..5bedcee 100644
--- a/src/dpms/dpms.c
+++ b/src/dpms/dpms.c
@@ -201,7 +201,7 @@ _tizen_dpms_manager_handle_set_dpms(struct wl_client *client,
 
     output = wl_resource_get_user_data(wl_output);
     ds_mode = _ds_tizen_dpms_get_ds_dpms_mode(mode);
-    struct ds_tizen_dpms_event event = {
+    struct ds_tizen_dpms_event_set_dpms event = {
         .output = output,
         .mode = ds_mode,
     };
diff --git a/src/input_devicemgr/input_devicemgr.c b/src/input_devicemgr/input_devicemgr.c
index d410fa7..2d7e6fb 100644
--- a/src/input_devicemgr/input_devicemgr.c
+++ b/src/input_devicemgr/input_devicemgr.c
@@ -1124,7 +1124,7 @@ static bool
 tz_devicemgr_generate_key(struct ds_input_device *device, int keycode,
         int pressed)
 {
-    struct ds_event_keyboard_key ds_event;
+    struct ds_keyboard_event_key ds_event;
     struct timeval time;
     unsigned int timestamp;
     struct ds_keyboard *kbd;
@@ -1222,7 +1222,7 @@ static bool
 tz_devicemgr_generate_touch_move(struct ds_input_device *device, double x, double y,
         uint32_t finger)
 {
-    struct ds_event_touch_motion ds_event;
+    struct ds_touch_event_motion ds_event;
     struct timeval time;
     unsigned int timestamp;
     struct ds_touch *touch;
@@ -1251,7 +1251,7 @@ static bool
 tz_devicemgr_generate_touch_down(struct ds_input_device *device, double x, double y,
         uint32_t finger)
 {
-    struct ds_event_touch_down ds_event;
+    struct ds_touch_event_down ds_event;
     struct timeval time;
     unsigned int timestamp;
     struct ds_touch *touch;
@@ -1279,7 +1279,7 @@ tz_devicemgr_generate_touch_down(struct ds_input_device *device, double x, doubl
 static bool
 tz_devicemgr_generate_touch_up(struct ds_input_device *device, uint32_t finger)
 {
-    struct ds_event_touch_up ds_event;
+    struct ds_touch_event_up ds_event;
     struct timeval time;
     unsigned int timestamp;
     struct ds_touch *touch;
@@ -1305,7 +1305,7 @@ tz_devicemgr_generate_touch_up(struct ds_input_device *device, uint32_t finger)
 static bool
 tz_devicemgr_generate_mouse_move(struct ds_input_device *device, double x, double y)
 {
-    struct ds_event_pointer_motion ds_event;
+    struct ds_pointer_event_motion ds_event;
     struct timeval time;
     unsigned int timestamp;
     struct ds_pointer *pointer;
@@ -1332,7 +1332,7 @@ tz_devicemgr_generate_mouse_move(struct ds_input_device *device, double x, doubl
 static bool
 tz_devicemgr_generate_mouse_button(struct ds_input_device *device, uint32_t button, bool state)
 {
-    struct ds_event_pointer_button ds_event;
+    struct ds_pointer_event_button ds_event;
     struct timeval time;
     unsigned int timestamp;
     struct ds_pointer *pointer;
diff --git a/src/policy/policy.c b/src/policy/policy.c
index 95b9e02..632bb7d 100644
--- a/src/policy/policy.c
+++ b/src/policy/policy.c
@@ -989,7 +989,7 @@ tizen_policy_client_get_surface(struct wl_resource *resource,
 
     wl_list_insert(&client->policy_surfaces, &policy_surface->link);
 
-    struct ds_tizen_event_policy_new_surface event = {
+    struct ds_tizen_policy_event_new_surface event = {
         .policy = client->policy,
         .policy_surface = policy_surface,
     };
@@ -1084,7 +1084,7 @@ policy_handle_get_visibility(struct wl_client *wl_client, struct wl_resource *re
         &visibility_impl, visibility,
         _tizen_policy_visibility_handle_destroy);
 
-    struct ds_tizen_event_policy_surface_new_visibility event = {
+    struct ds_tizen_policy_surface_event_new_visibility event = {
         .policy_surface = policy_surface,
         .visibility = visibility,
     };
@@ -1105,7 +1105,7 @@ position_handle_set(struct wl_client *wl_client, struct wl_resource *resource,
 
     position = wl_resource_get_user_data(resource);
 
-    struct ds_tizen_event_policy_position_set event = {
+    struct ds_tizen_policy_event_position_set event = {
         .position = position,
         .x = x,
         .y = y,
@@ -1175,7 +1175,7 @@ policy_handle_get_position(struct wl_client *wl_client, struct wl_resource *reso
         &position_impl, position,
         _tizen_policy_position_handle_destroy);
 
-    struct ds_tizen_event_policy_surface_new_position event = {
+    struct ds_tizen_policy_surface_event_new_position event = {
         .policy_surface = policy_surface,
         .position = position,
     };
@@ -1195,7 +1195,7 @@ policy_handle_activate(struct wl_client *wl_client,
         return;
     }
 
-    struct ds_tizen_event_policy_surface_activate event = {
+    struct ds_tizen_policy_surface_event_activate event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.activate, &event);
@@ -1210,7 +1210,7 @@ policy_handle_activate_below_by_res_id(struct wl_client *wl_client,
 
     client = wl_resource_get_user_data(resource);
 
-    struct ds_tizen_event_policy_activate_below_by_univeral_id event = {
+    struct ds_tizen_policy_event_activate_below_by_univeral_id event = {
         .policy = client->policy,
         .universal_id = universal_id,
         .below_universal_id = below_universal_id,
@@ -1231,7 +1231,7 @@ policy_handle_raise(struct wl_client *wl_client, struct wl_resource *resource,
         return;
     }
 
-    struct ds_tizen_event_policy_surface_raise event = {
+    struct ds_tizen_policy_surface_event_raise event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.raise, &event);
@@ -1250,7 +1250,7 @@ policy_handle_lower(struct wl_client *wl_client, struct wl_resource *resource,
         return;
     }
 
-    struct ds_tizen_event_policy_surface_lower event = {
+    struct ds_tizen_policy_surface_event_lower event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.lower, &event);
@@ -1264,7 +1264,7 @@ policy_handle_lower_by_res_id(struct wl_client *wl_client,
 
     client = wl_resource_get_user_data(resource);
 
-    struct ds_tizen_event_policy_lower_by_universal_id event = {
+    struct ds_tizen_policy_event_lower_by_universal_id event = {
         .policy = client->policy,
         .universal_id = universal_id,
     };
@@ -1284,7 +1284,7 @@ policy_handle_set_focus_skip(struct wl_client *wl_client,
         return;
     }
 
-    struct ds_tizen_event_policy_surface_set_focus_skip event = {
+    struct ds_tizen_policy_surface_event_set_focus_skip event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.set_focus_skip, &event);
@@ -1303,7 +1303,7 @@ policy_handle_unset_focus_skip(struct wl_client *wl_client,
         return;
     }
 
-    struct ds_tizen_event_policy_surface_unset_focus_skip event = {
+    struct ds_tizen_policy_surface_event_unset_focus_skip event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.unset_focus_skip, &event);
@@ -1322,7 +1322,7 @@ policy_handle_set_role(struct wl_client *wl_client, struct wl_resource *resource
         return;
     }
 
-    struct ds_tizen_event_policy_surface_set_role event = {
+    struct ds_tizen_policy_surface_event_set_role event = {
         .policy_surface = policy_surface,
         .role = role,
     };
@@ -1391,7 +1391,7 @@ policy_handle_set_type(struct wl_client *wl_client, struct wl_resource *resource
             break;
     }
 
-    struct ds_tizen_event_policy_surface_set_window_type event = {
+    struct ds_tizen_policy_surface_event_set_window_type event = {
         .policy_surface = policy_surface,
         .win_type = win_type,
     };
@@ -1414,7 +1414,7 @@ policy_handle_set_conformant(struct wl_client *wl_client,
     if (!policy_surface->conformant)
         policy_surface->conformant = true;
 
-    struct ds_tizen_event_policy_surface_set_conformant event = {
+    struct ds_tizen_policy_surface_event_set_conformant event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.set_conformant, &event);
@@ -1436,7 +1436,7 @@ policy_handle_unset_conformant(struct wl_client *wl_client,
     if (policy_surface->conformant)
         policy_surface->conformant = false;
 
-    struct ds_tizen_event_policy_surface_unset_conformant event = {
+    struct ds_tizen_policy_surface_event_unset_conformant event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.unset_conformant, &event);
@@ -1455,7 +1455,7 @@ policy_handle_get_conformant(struct wl_client *wl_client,
         return;
     }
 
-    struct ds_tizen_event_policy_surface_get_conformant event = {
+    struct ds_tizen_policy_surface_event_get_conformant event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.get_conformant, &event);
@@ -1519,7 +1519,7 @@ policy_handle_set_notification_level(struct wl_client *wl_client,
             break;
     }
 
-    struct ds_tizen_event_policy_surface_set_notification_level event = {
+    struct ds_tizen_policy_surface_event_set_notification_level event = {
         .policy_surface = policy_surface,
         .level = noti_level,
     };
@@ -1534,7 +1534,7 @@ policy_handle_set_transient_for(struct wl_client *wl_client,
 
     client = wl_resource_get_user_data(resource);
 
-    struct ds_tizen_event_policy_set_transient_for event = {
+    struct ds_tizen_policy_event_set_transient_for event = {
         .policy = client->policy,
         .child_universal_id = child_id,
         .parent_universal_id = parent_id,
@@ -1552,7 +1552,7 @@ policy_handle_unset_transient_for(struct wl_client *wl_client,
 
     client = wl_resource_get_user_data(resource);
 
-    struct ds_tizen_event_policy_unset_transient_for event = {
+    struct ds_tizen_policy_event_unset_transient_for event = {
         .policy = client->policy,
         .child_universal_id = child_id,
     };
@@ -1599,7 +1599,7 @@ policy_handle_set_window_screen_mode(struct wl_client *wl_client,
             break;
     }
 
-    struct ds_tizen_event_policy_surface_set_window_screen_mode event = {
+    struct ds_tizen_policy_surface_event_set_window_screen_mode event = {
         .policy_surface = policy_surface,
         .mode = screen_mode,
     };
@@ -1616,7 +1616,7 @@ policy_handle_place_subsurface_below_parent(struct wl_client *wl_client,
     client = wl_resource_get_user_data(resource);
     subsurface = ds_subsurface_from_resource(subsurface_resource);
 
-    struct ds_tizen_event_policy_place_subsurface_below_parent event = {
+    struct ds_tizen_policy_event_place_subsurface_below_parent event = {
         .policy = client->policy,
         .subsurface = subsurface,
     };
@@ -1635,7 +1635,7 @@ policy_handle_set_subsurface_stand_alone(struct wl_client *wl_client,
     client = wl_resource_get_user_data(resource);
     subsurface = ds_subsurface_from_resource(subsurface_resource);
 
-    struct ds_tizen_event_policy_set_subsurface_stand_alone event = {
+    struct ds_tizen_policy_event_set_subsurface_stand_alone event = {
         .policy = client->policy,
         .subsurface = subsurface,
     };
@@ -1660,7 +1660,7 @@ policy_handle_get_subsurface(struct wl_client *wl_client,
 
     // TODO: How to create the ds_subsurface with a parent_universal_id.
 
-    struct ds_tizen_event_policy_surface_get_subsurface event = {
+    struct ds_tizen_policy_surface_event_get_subsurface event = {
         .policy_surface = policy_surface,
         .parent_universal_id = parent_id,
     };
@@ -1701,7 +1701,7 @@ policy_handle_iconify(struct wl_client *wl_client, struct wl_resource *resource,
     if (!policy_surface->iconified)
         policy_surface->iconified = true;
 
-    struct ds_tizen_event_policy_surface_iconify event = {
+    struct ds_tizen_policy_surface_event_iconify event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.iconify, &event);
@@ -1723,7 +1723,7 @@ policy_handle_uniconify(struct wl_client *wl_client, struct wl_resource *resourc
     if (policy_surface->iconified)
         policy_surface->iconified = false;
 
-    struct ds_tizen_event_policy_surface_uniconify event = {
+    struct ds_tizen_policy_surface_event_uniconify event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.uniconify, &event);
@@ -1743,7 +1743,7 @@ policy_handle_add_aux_hint(struct wl_client *wl_client,
         return;
     }
 
-    struct ds_tizen_event_policy_surface_add_aux_hint event = {
+    struct ds_tizen_policy_surface_event_add_aux_hint event = {
         .policy_surface = policy_surface,
         .id = id,
         .name = name,
@@ -1766,7 +1766,7 @@ policy_handle_change_aux_hint(struct wl_client *wl_client,
         return;
     }
 
-    struct ds_tizen_event_policy_surface_change_aux_hint event = {
+    struct ds_tizen_policy_surface_event_change_aux_hint event = {
         .policy_surface = policy_surface,
         .id = id,
         .value = value,
@@ -1788,7 +1788,7 @@ policy_handle_delete_aux_hint(struct wl_client *wl_client,
         return;
     }
 
-    struct ds_tizen_event_policy_surface_delete_aux_hint event = {
+    struct ds_tizen_policy_surface_event_delete_aux_hint event = {
         .policy_surface = policy_surface,
         .id = id,
     };
@@ -1808,7 +1808,7 @@ policy_handle_get_supported_aux_hints(struct wl_client *wl_client,
         return;
     }
 
-    struct ds_tizen_event_policy_surface_get_supported_aux_hints event = {
+    struct ds_tizen_policy_surface_event_get_supported_aux_hints event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.get_supported_aux_hints, &event);
@@ -1826,7 +1826,7 @@ policy_handle_set_background_state(struct wl_client *wl_client,
 
     wl_list_for_each(client, &policy->clients, link) {
         if (pid == client->pid) {
-            struct ds_tizen_event_policy_set_background_state event = {
+            struct ds_tizen_policy_event_set_background_state event = {
                 .policy = client->policy,
                 .pid = pid,
             };
@@ -1847,7 +1847,7 @@ policy_handle_unset_background_state(struct wl_client *wl_client,
 
     wl_list_for_each(client, &policy->clients, link) {
         if (pid == client->pid) {
-            struct ds_tizen_event_policy_unset_background_state event = {
+            struct ds_tizen_policy_event_unset_background_state event = {
                 .policy = client->policy,
                 .pid = pid,
             };
@@ -1874,7 +1874,7 @@ policy_handle_set_floating_mode(struct wl_client *wl_client,
 
     policy_surface->floating_mode = false;
 
-    struct ds_tizen_event_policy_surface_set_floating_mode event = {
+    struct ds_tizen_policy_surface_event_set_floating_mode event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.set_floating_mode, &event);
@@ -1898,7 +1898,7 @@ policy_handle_unset_floating_mode(struct wl_client *wl_client,
 
     policy_surface->floating_mode = false;
 
-    struct ds_tizen_event_policy_surface_unset_floating_mode event = {
+    struct ds_tizen_policy_surface_event_unset_floating_mode event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.unset_floating_mode, &event);
@@ -1936,7 +1936,7 @@ policy_handle_set_stack_mode(struct wl_client *wl_client,
 
     policy_surface->stack_mode = stack_mode;
 
-    struct ds_tizen_event_policy_surface_set_stack_mode event = {
+    struct ds_tizen_policy_surface_event_set_stack_mode event = {
         .policy_surface = policy_surface,
         .mode = stack_mode,
     };
@@ -1952,7 +1952,7 @@ policy_handle_activate_above_by_res_id(struct wl_client *wl_client,
 
     client = wl_resource_get_user_data(resource);
 
-    struct ds_tizen_event_policy_activate_above_by_universal_id event = {
+    struct ds_tizen_policy_event_activate_above_by_universal_id event = {
         .policy = client->policy,
         .universal_id = universal_id,
         .above_universal_id = above_universal_id,
@@ -2026,7 +2026,7 @@ policy_handle_get_subsurface_watcher(struct wl_client *wl_client,
         &subsurface_watcher_impl, subsurface_watcher,
         _tizen_policy_subsurface_watcher_handle_destroy);
 
-    struct ds_tizen_event_policy_surface_new_subsurface_watcher event = {
+    struct ds_tizen_policy_surface_event_new_subsurface_watcher event = {
         .policy_surface = policy_surface,
         .subsurface_watcher = subsurface_watcher,
     };
@@ -2050,7 +2050,7 @@ policy_handle_set_parent(struct wl_client *wl_client,
 
     parent_surface = ds_surface_from_resource(parent_surface_resource);
 
-    struct ds_tizen_event_policy_surface_set_parent event = {
+    struct ds_tizen_policy_surface_event_set_parent event = {
         .policy_surface = policy_surface,
         .parent_surface = parent_surface,
     };
@@ -2071,7 +2071,7 @@ policy_handle_ack_conformant_region(struct wl_client *wl_client,
         return;
     }
 
-    struct ds_tizen_event_policy_surface_ack_conformant_region event = {
+    struct ds_tizen_policy_surface_event_ack_conformant_region event = {
         .policy_surface = policy_surface,
         .serial = serial,
     };
@@ -2112,7 +2112,7 @@ policy_handle_has_video(struct wl_client *wl_client,
 
     policy_surface->video = has;
 
-    struct ds_tizen_event_policy_surface_set_video event = {
+    struct ds_tizen_policy_surface_event_set_video event = {
         .policy_surface = policy_surface,
         .video = has,
     };
@@ -2127,7 +2127,7 @@ policy_handle_set_appid(struct wl_client *wl_client,
 
     client = wl_resource_get_user_data(resource);
 
-    struct ds_tizen_event_policy_set_appid event = {
+    struct ds_tizen_policy_event_set_appid event = {
         .policy = client->policy,
         .pid = pid,
         .appid = appid,
@@ -2148,7 +2148,7 @@ policy_handle_show(struct wl_client *wl_client, struct wl_resource *resource,
         return;
     }
 
-    struct ds_tizen_event_policy_surface_show event = {
+    struct ds_tizen_policy_surface_event_show event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.show, &event);
@@ -2167,7 +2167,7 @@ policy_handle_hide(struct wl_client *wl_client, struct wl_resource *resource,
         return;
     }
 
-    struct ds_tizen_event_policy_surface_hide event = {
+    struct ds_tizen_policy_surface_event_hide event = {
         .policy_surface = policy_surface,
     };
     wl_signal_emit(&policy_surface->events.hide, &event);
@@ -2182,7 +2182,7 @@ policy_handle_set_transient_for_below(struct wl_client *wl_client,
 
     client = wl_resource_get_user_data(resource);
 
-    struct ds_tizen_event_policy_set_transient_for_below event = {
+    struct ds_tizen_policy_event_set_transient_for_below event = {
         .policy = client->policy,
         .universal_id = universal_id,
         .parent_universal_id = parent_universal_id,
@@ -2207,7 +2207,7 @@ policy_handle_set_parent_with_below(struct wl_client *wl_client,
 
     parent_surface = ds_surface_from_resource(parent_surface_resource);
 
-    struct ds_tizen_event_policy_surface_set_parent_with_below event = {
+    struct ds_tizen_policy_surface_event_set_parent_with_below event = {
         .policy_surface = policy_surface,
         .parent_surface = parent_surface,
     };
diff --git a/src/remote_surface/remote_surface.c b/src/remote_surface/remote_surface.c
index a16e34c..a391d4a 100644
--- a/src/remote_surface/remote_surface.c
+++ b/src/remote_surface/remote_surface.c
@@ -354,7 +354,7 @@ remote_surface_handle_transfer_mouse_event(struct wl_client *wl_client,
     const char *identifier, uint32_t time)
 {
     struct ds_tizen_remote_surface *remote_surface;
-    struct ds_tizen_remote_surface_transfer_mouse_event event;
+    struct ds_tizen_remote_surface_event_transfer_mouse event;
 
     remote_surface = wl_resource_get_user_data(remote_surface_resource);
 
@@ -383,7 +383,7 @@ remote_surface_handle_transfer_mouse_wheel(struct wl_client *wl_client,
     const char *identifier, uint32_t time)
 {
     struct ds_tizen_remote_surface *remote_surface;
-    struct ds_tizen_remote_surface_transfer_mouse_wheel_event event;
+    struct ds_tizen_remote_surface_event_transfer_mouse_wheel event;
 
     remote_surface = wl_resource_get_user_data(remote_surface_resource);
 
@@ -406,7 +406,7 @@ remote_surface_handle_transfer_touch_event(struct wl_client *wl_client,
     uint32_t clas, uint32_t subclas, const char *identifier, uint32_t time)
 {
     struct ds_tizen_remote_surface *remote_surface;
-    struct ds_tizen_remote_surface_transfer_touch_event event;
+    struct ds_tizen_remote_surface_event_transfer_touch event;
 
     remote_surface = wl_resource_get_user_data(remote_surface_resource);
 
@@ -433,7 +433,7 @@ remote_surface_handle_transfer_touch_cancel(struct wl_client *wl_client,
     struct wl_resource *remote_surface_resource)
 {
     struct ds_tizen_remote_surface *remote_surface;
-    struct ds_tizen_remote_surface_transfer_touch_cancel_event event;
+    struct ds_tizen_remote_surface_event_transfer_touch_cancel event;
 
     remote_surface = wl_resource_get_user_data(remote_surface_resource);
 
@@ -449,7 +449,7 @@ remote_surface_handle_transfer_key_event(struct wl_client *wl_client,
     const char *identifier, uint32_t time)
 {
     struct ds_tizen_remote_surface *remote_surface;
-    struct ds_tizen_remote_surface_transfer_key_event event;
+    struct ds_tizen_remote_surface_event_transfer_key event;
 
     remote_surface = wl_resource_get_user_data(remote_surface_resource);
 
@@ -470,7 +470,7 @@ remote_surface_handle_transfer_visibility(struct wl_client *wl_client,
     uint32_t visibility_type)
 {
     struct ds_tizen_remote_surface *remote_surface;
-    struct ds_tizen_remote_surface_transfer_visibility_event event;
+    struct ds_tizen_remote_surface_event_transfer_visibility event;
 
     remote_surface = wl_resource_get_user_data(remote_surface_resource);
 
@@ -599,7 +599,7 @@ remote_surface_handle_release(struct wl_client *wl_client,
 {
     struct ds_tizen_remote_surface *remote_surface;
     struct ds_buffer *buffer;
-    struct ds_tizen_remote_surface_buffer_release_event event;
+    struct ds_tizen_remote_surface_event_buffer_release event;
 
     remote_surface = wl_resource_get_user_data(remote_surface_resource);
     buffer = ds_buffer_from_resource(remote_buffer_resource);
@@ -648,7 +648,7 @@ remote_surface_handle_get_current_buffer(struct wl_client *wl_client,
     uint32_t req_serial)
 {
     struct ds_tizen_remote_surface *remote_surface;
-    struct ds_tizen_remote_surface_current_buffer_event event;
+    struct ds_tizen_remote_surface_event_current_buffer event;
 
     remote_surface = wl_resource_get_user_data(remote_surface_resource);
 
@@ -813,7 +813,7 @@ remote_surface_manager_handle_bind_surface(struct wl_client *wl_client,
     struct wl_resource *surface_resource,
     struct wl_resource *remote_surface_resource)
 {
-    struct ds_tizen_remote_surface_manager_bind_surface_event event;
+    struct ds_tizen_remote_surface_manager_event_bind_surface event;
     struct ds_tizen_remote_surface_client *remote_client;
     struct ds_tizen_remote_surface *remote_surface;
     struct ds_surface *surface;
diff --git a/src/screenshooter/screenshooter.c b/src/screenshooter/screenshooter.c
index 890bd2f..3c8e623 100644
--- a/src/screenshooter/screenshooter.c
+++ b/src/screenshooter/screenshooter.c
@@ -151,7 +151,7 @@ _tizen_screenshooter_handle_shoot(struct wl_client *client,
         return;
     }
 
-    struct ds_tizen_screenshooter_shoot_event event = {
+    struct ds_tizen_screenshooter_event_shoot event = {
         .output = output,
         .buffer = buffer,
         .client = shot_client,
diff --git a/src/video/video.c b/src/video/video.c
index 0a258f4..56f62f1 100644
--- a/src/video/video.c
+++ b/src/video/video.c
@@ -424,7 +424,7 @@ video_object_handle_set_attribute(struct wl_client *client,
     if (!object)
         return;
 
-    struct ds_event_tizen_video_request_set_property event = {
+    struct ds_tizen_video_object_event_request_set_property event = {
         .object = object,
         .name = name,
         .value = value,
diff --git a/tests/tc_policy.cpp b/tests/tc_policy.cpp
index c96c629..4f8a2cf 100644
--- a/tests/tc_policy.cpp
+++ b/tests/tc_policy.cpp
@@ -133,8 +133,8 @@ public:
     {
         MockPolicyPosition *mockPosition =
             reinterpret_cast<SetListener *>(listener)->parent;
-        struct ds_tizen_event_policy_position_set *event =
-            static_cast<struct ds_tizen_event_policy_position_set *>(data);
+        struct ds_tizen_policy_event_position_set *event =
+            static_cast<struct ds_tizen_policy_event_position_set *>(data);
 
         EXPECT_TRUE(mockPosition->mPosition == event->position);
         mockPosition->mX = event->x;
@@ -444,8 +444,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<NewVisibilityListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_new_visibility *event =
-            static_cast<struct ds_tizen_event_policy_surface_new_visibility *>(data);
+        struct ds_tizen_policy_surface_event_new_visibility *event =
+            static_cast<struct ds_tizen_policy_surface_event_new_visibility *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
         EXPECT_TRUE(event->visibility != NULL);
@@ -462,8 +462,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<NewPositionListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_new_position *event =
-            static_cast<struct ds_tizen_event_policy_surface_new_position *>(data);
+        struct ds_tizen_policy_surface_event_new_position *event =
+            static_cast<struct ds_tizen_policy_surface_event_new_position *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
         EXPECT_TRUE(event->position != NULL);
@@ -480,8 +480,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<ActivateListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_activate *event =
-            static_cast<struct ds_tizen_event_policy_surface_activate *>(data);
+        struct ds_tizen_policy_surface_event_activate *event =
+            static_cast<struct ds_tizen_policy_surface_event_activate *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -492,8 +492,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<RaiseListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_raise *event =
-            static_cast<struct ds_tizen_event_policy_surface_raise *>(data);
+        struct ds_tizen_policy_surface_event_raise *event =
+            static_cast<struct ds_tizen_policy_surface_event_raise *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -504,8 +504,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<LowerListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_lower *event =
-            static_cast<struct ds_tizen_event_policy_surface_lower *>(data);
+        struct ds_tizen_policy_surface_event_lower *event =
+            static_cast<struct ds_tizen_policy_surface_event_lower *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -516,8 +516,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<SetFocusSkipListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_set_focus_skip *event =
-            static_cast<struct ds_tizen_event_policy_surface_set_focus_skip *>(data);
+        struct ds_tizen_policy_surface_event_set_focus_skip *event =
+            static_cast<struct ds_tizen_policy_surface_event_set_focus_skip *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -528,8 +528,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<UnsetFocusSkipListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_unset_focus_skip *event =
-            static_cast<struct ds_tizen_event_policy_surface_unset_focus_skip *>(data);
+        struct ds_tizen_policy_surface_event_unset_focus_skip *event =
+            static_cast<struct ds_tizen_policy_surface_event_unset_focus_skip *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -540,8 +540,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<SetRoleListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_set_role *event =
-            static_cast<struct ds_tizen_event_policy_surface_set_role *>(data);
+        struct ds_tizen_policy_surface_event_set_role *event =
+            static_cast<struct ds_tizen_policy_surface_event_set_role *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
         policySurface->mRole = event->role; // char -> string
@@ -551,8 +551,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<WindowTypeListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_set_window_type *event =
-            static_cast<struct ds_tizen_event_policy_surface_set_window_type *>(data);
+        struct ds_tizen_policy_surface_event_set_window_type *event =
+            static_cast<struct ds_tizen_policy_surface_event_set_window_type *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -563,8 +563,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<SetConformantListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_set_conformant *event =
-            static_cast<struct ds_tizen_event_policy_surface_set_conformant *>(data);
+        struct ds_tizen_policy_surface_event_set_conformant *event =
+            static_cast<struct ds_tizen_policy_surface_event_set_conformant *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -575,8 +575,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<UnsetConformantListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_unset_conformant *event =
-            static_cast<struct ds_tizen_event_policy_surface_unset_conformant *>(data);
+        struct ds_tizen_policy_surface_event_unset_conformant *event =
+            static_cast<struct ds_tizen_policy_surface_event_unset_conformant *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -587,8 +587,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<GetConformantListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_get_conformant *event =
-            static_cast<struct ds_tizen_event_policy_surface_get_conformant *>(data);
+        struct ds_tizen_policy_surface_event_get_conformant *event =
+            static_cast<struct ds_tizen_policy_surface_event_get_conformant *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -599,8 +599,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<SetNotificationLevelListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_set_notification_level *event =
-            static_cast<struct ds_tizen_event_policy_surface_set_notification_level *>(data);
+        struct ds_tizen_policy_surface_event_set_notification_level *event =
+            static_cast<struct ds_tizen_policy_surface_event_set_notification_level *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -611,8 +611,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<SetWindowScreenModeListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_set_window_screen_mode *event =
-            static_cast<struct ds_tizen_event_policy_surface_set_window_screen_mode *>(data);
+        struct ds_tizen_policy_surface_event_set_window_screen_mode *event =
+            static_cast<struct ds_tizen_policy_surface_event_set_window_screen_mode *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -623,8 +623,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<GetSubsurfaceListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_get_subsurface *event =
-            static_cast<struct ds_tizen_event_policy_surface_get_subsurface *>(data);
+        struct ds_tizen_policy_surface_event_get_subsurface *event =
+            static_cast<struct ds_tizen_policy_surface_event_get_subsurface *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -635,8 +635,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<IconifyListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_iconify *event =
-            static_cast<struct ds_tizen_event_policy_surface_iconify *>(data);
+        struct ds_tizen_policy_surface_event_iconify *event =
+            static_cast<struct ds_tizen_policy_surface_event_iconify *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -647,8 +647,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<UniconifyListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_uniconify *event =
-            static_cast<struct ds_tizen_event_policy_surface_uniconify *>(data);
+        struct ds_tizen_policy_surface_event_uniconify *event =
+            static_cast<struct ds_tizen_policy_surface_event_uniconify *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -659,8 +659,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<AddAuxHintListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_add_aux_hint *event =
-            static_cast<struct ds_tizen_event_policy_surface_add_aux_hint *>(data);
+        struct ds_tizen_policy_surface_event_add_aux_hint *event =
+            static_cast<struct ds_tizen_policy_surface_event_add_aux_hint *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -673,8 +673,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<ChangeAuxHintListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_change_aux_hint *event =
-            static_cast<struct ds_tizen_event_policy_surface_change_aux_hint *>(data);
+        struct ds_tizen_policy_surface_event_change_aux_hint *event =
+            static_cast<struct ds_tizen_policy_surface_event_change_aux_hint *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -686,8 +686,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<DeleteAuxHintListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_delete_aux_hint *event =
-            static_cast<struct ds_tizen_event_policy_surface_delete_aux_hint *>(data);
+        struct ds_tizen_policy_surface_event_delete_aux_hint *event =
+            static_cast<struct ds_tizen_policy_surface_event_delete_aux_hint *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -698,8 +698,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<GetSupportAuxHintsListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_get_supported_aux_hints *event =
-            static_cast<struct ds_tizen_event_policy_surface_get_supported_aux_hints *>(data);
+        struct ds_tizen_policy_surface_event_get_supported_aux_hints *event =
+            static_cast<struct ds_tizen_policy_surface_event_get_supported_aux_hints *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -710,8 +710,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<SetFloatingModeListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_set_floating_mode *event =
-            static_cast<struct ds_tizen_event_policy_surface_set_floating_mode *>(data);
+        struct ds_tizen_policy_surface_event_set_floating_mode *event =
+            static_cast<struct ds_tizen_policy_surface_event_set_floating_mode *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -722,8 +722,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<UnsetFloatingModeListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_unset_floating_mode *event =
-            static_cast<struct ds_tizen_event_policy_surface_unset_floating_mode *>(data);
+        struct ds_tizen_policy_surface_event_unset_floating_mode *event =
+            static_cast<struct ds_tizen_policy_surface_event_unset_floating_mode *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -734,8 +734,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<SetStackModeListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_set_stack_mode *event =
-            static_cast<struct ds_tizen_event_policy_surface_set_stack_mode *>(data);
+        struct ds_tizen_policy_surface_event_set_stack_mode *event =
+            static_cast<struct ds_tizen_policy_surface_event_set_stack_mode *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -746,8 +746,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<NewSubsurfaceWatcherListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_new_subsurface_watcher *event =
-            static_cast<struct ds_tizen_event_policy_surface_new_subsurface_watcher *>(data);
+        struct ds_tizen_policy_surface_event_new_subsurface_watcher *event =
+            static_cast<struct ds_tizen_policy_surface_event_new_subsurface_watcher *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
         EXPECT_TRUE(event->subsurface_watcher != NULL);
@@ -764,8 +764,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<SetParentListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_set_parent *event =
-            static_cast<struct ds_tizen_event_policy_surface_set_parent *>(data);
+        struct ds_tizen_policy_surface_event_set_parent *event =
+            static_cast<struct ds_tizen_policy_surface_event_set_parent *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -776,8 +776,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<AckConformantRegionListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_ack_conformant_region *event =
-            static_cast<struct ds_tizen_event_policy_surface_ack_conformant_region *>(data);
+        struct ds_tizen_policy_surface_event_ack_conformant_region *event =
+            static_cast<struct ds_tizen_policy_surface_event_ack_conformant_region *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -788,8 +788,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<SetVideoListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_set_video *event =
-            static_cast<struct ds_tizen_event_policy_surface_set_video *>(data);
+        struct ds_tizen_policy_surface_event_set_video *event =
+            static_cast<struct ds_tizen_policy_surface_event_set_video *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -800,8 +800,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<ShowListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_show *event =
-            static_cast<struct ds_tizen_event_policy_surface_show *>(data);
+        struct ds_tizen_policy_surface_event_show *event =
+            static_cast<struct ds_tizen_policy_surface_event_show *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -812,8 +812,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<HideListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_hide *event =
-            static_cast<struct ds_tizen_event_policy_surface_hide *>(data);
+        struct ds_tizen_policy_surface_event_hide *event =
+            static_cast<struct ds_tizen_policy_surface_event_hide *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -824,8 +824,8 @@ public:
     {
         MockPolicySurface *policySurface =
             reinterpret_cast<SetParentWithBelowListener *>(listener)->parent;
-        struct ds_tizen_event_policy_surface_set_parent_with_below *event =
-            static_cast<struct ds_tizen_event_policy_surface_set_parent_with_below *>(data);
+        struct ds_tizen_policy_surface_event_set_parent_with_below *event =
+            static_cast<struct ds_tizen_policy_surface_event_set_parent_with_below *>(data);
 
         EXPECT_TRUE(policySurface->mPolicySurface == event->policy_surface);
 
@@ -1309,8 +1309,8 @@ public:
 
         MockPolicyCompositor *mockComp =
             reinterpret_cast<NewPolicySurfaceListener *>(listener)->parent;
-        struct ds_tizen_event_policy_new_surface *event =
-            static_cast<struct ds_tizen_event_policy_new_surface *>(data);
+        struct ds_tizen_policy_event_new_surface *event =
+            static_cast<struct ds_tizen_policy_event_new_surface *>(data);
 
         struct ds_tizen_policy_surface *policy_surface = event->policy_surface;
 
@@ -1329,8 +1329,8 @@ public:
 
         MockPolicyCompositor *mockComp =
             reinterpret_cast<ActivateBelowByUniversalIdListener *>(listener)->parent;
-        struct ds_tizen_event_policy_activate_below_by_univeral_id *event =
-            static_cast<struct ds_tizen_event_policy_activate_below_by_univeral_id *>(data);
+        struct ds_tizen_policy_event_activate_below_by_univeral_id *event =
+            static_cast<struct ds_tizen_policy_event_activate_below_by_univeral_id *>(data);
 
         EXPECT_TRUE(mockComp->mPolicy == event->policy);
         mockComp->mUniversalId = event->universal_id;
@@ -1344,8 +1344,8 @@ public:
 
         MockPolicyCompositor *mockComp =
             reinterpret_cast<LowerByUniversalIdListener *>(listener)->parent;
-        struct ds_tizen_event_policy_lower_by_universal_id *event =
-            static_cast<struct ds_tizen_event_policy_lower_by_universal_id *>(data);
+        struct ds_tizen_policy_event_lower_by_universal_id *event =
+            static_cast<struct ds_tizen_policy_event_lower_by_universal_id *>(data);
 
         EXPECT_TRUE(mockComp->mPolicy == event->policy);
         mockComp->mUniversalId = event->universal_id;
@@ -1358,8 +1358,8 @@ public:
 
         MockPolicyCompositor *mockComp =
             reinterpret_cast<SetTransientForListener *>(listener)->parent;
-        struct ds_tizen_event_policy_set_transient_for *event =
-            static_cast<struct ds_tizen_event_policy_set_transient_for *>(data);
+        struct ds_tizen_policy_event_set_transient_for *event =
+            static_cast<struct ds_tizen_policy_event_set_transient_for *>(data);
 
         EXPECT_TRUE(mockComp->mPolicy == event->policy);
         mockComp->mChildUniversalId = event->child_universal_id;
@@ -1373,8 +1373,8 @@ public:
 
         MockPolicyCompositor *mockComp =
             reinterpret_cast<UnsetTransientForListener *>(listener)->parent;
-        struct ds_tizen_event_policy_unset_transient_for *event =
-            static_cast<struct ds_tizen_event_policy_unset_transient_for *>(data);
+        struct ds_tizen_policy_event_unset_transient_for *event =
+            static_cast<struct ds_tizen_policy_event_unset_transient_for *>(data);
 
         EXPECT_TRUE(mockComp->mPolicy == event->policy);
         mockComp->mChildUniversalId = event->child_universal_id;
@@ -1387,8 +1387,8 @@ public:
 
         MockPolicyCompositor *mockComp =
             reinterpret_cast<PlaceSubsurfaceBelowParentListener *>(listener)->parent;
-        struct ds_tizen_event_policy_place_subsurface_below_parent *event =
-            static_cast<struct ds_tizen_event_policy_place_subsurface_below_parent *>(data);
+        struct ds_tizen_policy_event_place_subsurface_below_parent *event =
+            static_cast<struct ds_tizen_policy_event_place_subsurface_below_parent *>(data);
 
         EXPECT_TRUE(mockComp->mPolicy == event->policy);
         mockComp->bPlaceSubsurfaceBelowParent = true;
@@ -1401,8 +1401,8 @@ public:
 
         MockPolicyCompositor *mockComp =
             reinterpret_cast<SetSubsurfaceStandAloneListener *>(listener)->parent;
-        struct ds_tizen_event_policy_set_subsurface_stand_alone *event =
-            static_cast<struct ds_tizen_event_policy_set_subsurface_stand_alone *>(data);
+        struct ds_tizen_policy_event_set_subsurface_stand_alone *event =
+            static_cast<struct ds_tizen_policy_event_set_subsurface_stand_alone *>(data);
 
         EXPECT_TRUE(mockComp->mPolicy == event->policy);
         mockComp->bSetSubsurfaceStandAlone = true;
@@ -1412,8 +1412,8 @@ public:
     {
         MockPolicyCompositor *mockComp =
             reinterpret_cast<SetBackgroundStateListener *>(listener)->parent;
-        struct ds_tizen_event_policy_set_background_state *event =
-            static_cast<struct ds_tizen_event_policy_set_background_state *>(data);
+        struct ds_tizen_policy_event_set_background_state *event =
+            static_cast<struct ds_tizen_policy_event_set_background_state *>(data);
 
         EXPECT_TRUE(mockComp->mPolicy == event->policy);
         mockComp->mPid = event->pid;
@@ -1423,8 +1423,8 @@ public:
     {
         MockPolicyCompositor *mockComp =
             reinterpret_cast<UnsetBackgroundStateListener *>(listener)->parent;
-        struct ds_tizen_event_policy_unset_background_state *event =
-            static_cast<struct ds_tizen_event_policy_unset_background_state *>(data);
+        struct ds_tizen_policy_event_unset_background_state *event =
+            static_cast<struct ds_tizen_policy_event_unset_background_state *>(data);
 
         EXPECT_TRUE(mockComp->mPolicy == event->policy);
         mockComp->mPid = event->pid;
@@ -1437,8 +1437,8 @@ public:
 
         MockPolicyCompositor *mockComp =
             reinterpret_cast<ActivateAboveByUniversalIdListener *>(listener)->parent;
-        struct ds_tizen_event_policy_activate_above_by_universal_id *event =
-            static_cast<struct ds_tizen_event_policy_activate_above_by_universal_id *>(data);
+        struct ds_tizen_policy_event_activate_above_by_universal_id *event =
+            static_cast<struct ds_tizen_policy_event_activate_above_by_universal_id *>(data);
 
         EXPECT_TRUE(mockComp->mPolicy == event->policy);
         mockComp->mUniversalId = event->universal_id;
@@ -1452,8 +1452,8 @@ public:
 
         MockPolicyCompositor *mockComp =
             reinterpret_cast<SetAppIdListener *>(listener)->parent;
-        struct ds_tizen_event_policy_set_appid *event =
-            static_cast<struct ds_tizen_event_policy_set_appid *>(data);
+        struct ds_tizen_policy_event_set_appid *event =
+            static_cast<struct ds_tizen_policy_event_set_appid *>(data);
 
         EXPECT_TRUE(mockComp->mPolicy == event->policy);
         mockComp->mPid = event->pid;
@@ -1467,8 +1467,8 @@ public:
 
         MockPolicyCompositor *mockComp =
             reinterpret_cast<SetTransientForBelowListener *>(listener)->parent;
-        struct ds_tizen_event_policy_set_transient_for_below *event =
-            static_cast<struct ds_tizen_event_policy_set_transient_for_below *>(data);
+        struct ds_tizen_policy_event_set_transient_for_below *event =
+            static_cast<struct ds_tizen_policy_event_set_transient_for_below *>(data);
 
         EXPECT_TRUE(mockComp->mPolicy == event->policy);
         mockComp->mUniversalId = event->universal_id;
diff --git a/tests/tc_screenshooter.cpp b/tests/tc_screenshooter.cpp
index 929ecdf..f2b01f4 100644
--- a/tests/tc_screenshooter.cpp
+++ b/tests/tc_screenshooter.cpp
@@ -190,8 +190,8 @@ public:
 
         MockScreenShooterCompositor *mockComp =
             reinterpret_cast<ScreenShootListener *>(listener)->parent;
-        struct ds_tizen_screenshooter_shoot_event *event =
-            static_cast<struct ds_tizen_screenshooter_shoot_event *>(data);
+        struct ds_tizen_screenshooter_event_shoot *event =
+            static_cast<struct ds_tizen_screenshooter_event_shoot *>(data);
         
 
         ds_inf("%s: mockComp(%p), output(%p), buffer(%p), client(%p), auto_rotate:%d",