From: Jihoon Kim Date: Fri, 10 Jan 2025 04:20:06 +0000 (+0900) Subject: Rename E_Comp_Wl_Seat to E_Seat X-Git-Tag: accepted/tizen/unified/20250114.031921~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c56795825bcad4e629bee81b7ca26f62d646b22f;p=platform%2Fupstream%2Fenlightenment.git Rename E_Comp_Wl_Seat to E_Seat Change-Id: I727caa3a4ab58ba04894f4ed0ca314cda8bdb6cd Signed-off-by: Jihoon Kim --- diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c index a0784caef0..fd5567e340 100644 --- a/src/bin/e_comp_screen.c +++ b/src/bin/e_comp_screen.c @@ -303,7 +303,7 @@ _e_comp_screen_cb_input_device_add(void *data, int type, void *event) { Ecore_Event_Device_Info *e; E_Comp *comp = data; - E_Comp_Wl_Seat *seat; + E_Seat *seat; if (!(e = event)) goto end; ELOGF("COMP_SCREEN", "Input Device Add. name:%s(%s), seat:%s", NULL, e->name, e->identifier, e->seatname); @@ -342,7 +342,7 @@ end: } static void -_e_comp_screen_pointer_renew(E_Comp_Wl_Seat *seat) +_e_comp_screen_pointer_renew(E_Seat *seat) { E_Comp_Wl_Data *comp_wl; @@ -382,7 +382,7 @@ _e_comp_screen_cb_input_device_del(void *data, int type, void *event) { Ecore_Event_Device_Info *e; E_Comp *comp = data; - E_Comp_Wl_Seat *seat; + E_Seat *seat; if (!(e = event)) goto end; ELOGF("COMP_SCREEN", "Input Device Del. name:%s(%s), seat:%s", NULL, e->name, e->identifier, e->seatname); diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c index e230ce1264..14d3fa1d33 100644 --- a/src/bin/server/e_comp_wl.c +++ b/src/bin/server/e_comp_wl.c @@ -86,11 +86,11 @@ struct _E_Comp_Data static Eina_Bool _e_comp_wl_cursor_timer_control(Evas_Callback_Type type, E_Comp_Wl_Data *comp_wl, E_Client *ec); static void _e_comp_wl_surface_state_serial_update(E_Client *ec, E_Comp_Wl_Surface_State *state); -static void _e_comp_wl_seat_pointer_send_axis(E_Comp_Wl_Seat *seat, struct wl_client *wc, +static void _e_comp_wl_seat_pointer_send_axis(E_Seat *seat, struct wl_client *wc, uint32_t axis, uint32_t dir, uint32_t timestamp); -static void _e_comp_wl_seat_touch_send_cancel(E_Comp_Wl_Seat *seat, struct wl_client *wc, E_Client *ec); -static void _e_comp_wl_seat_touch_send_frame(E_Comp_Wl_Seat *seat, struct wl_client *wc); +static void _e_comp_wl_seat_touch_send_cancel(E_Seat *seat, struct wl_client *wc, E_Client *ec); +static void _e_comp_wl_seat_touch_send_frame(E_Seat *seat, struct wl_client *wc); /* local variables */ typedef struct _E_Comp_Wl_Key_Data @@ -6244,12 +6244,12 @@ e_comp_wl_ptr_ec_get(void) } static void -_e_comp_wl_seat_touch_send_cancel(E_Comp_Wl_Seat *seat, struct wl_client *wc, E_Client *ec) +_e_comp_wl_seat_touch_send_cancel(E_Seat *seat, struct wl_client *wc, E_Client *ec) { Eina_List *l, *ll; struct wl_resource *res; E_Comp_Wl_Data *comp_wl = e_comp_wl_get(); - E_Comp_Wl_Seat *s; + E_Seat *s; if (!seat) goto iterate; @@ -6280,12 +6280,12 @@ iterate: } static void -_e_comp_wl_seat_touch_send_frame(E_Comp_Wl_Seat *seat, struct wl_client *wc) +_e_comp_wl_seat_touch_send_frame(E_Seat *seat, struct wl_client *wc) { Eina_List *l, *ll; struct wl_resource *res; E_Comp_Wl_Data *comp_wl = e_comp_wl_get(); - E_Comp_Wl_Seat *s; + E_Seat *s; if (!seat) goto iterate; @@ -6311,7 +6311,7 @@ iterate: } EINTERN void -e_comp_wl_seat_touch_send_downup(E_Comp_Wl_Seat *seat, struct wl_client *wc, +e_comp_wl_seat_touch_send_downup(E_Seat *seat, struct wl_client *wc, struct wl_resource *surface, int idx, int x, int y, uint32_t timestamp, Eina_Bool pressed) { @@ -6319,7 +6319,7 @@ e_comp_wl_seat_touch_send_downup(E_Comp_Wl_Seat *seat, struct wl_client *wc, struct wl_resource *res; uint32_t serial; E_Comp_Wl_Data *comp_wl = e_comp_wl_get(); - E_Comp_Wl_Seat *s; + E_Seat *s; serial = wl_display_next_serial(comp_wl->wl.disp); @@ -6370,13 +6370,13 @@ iterate: } EINTERN void -e_comp_wl_seat_touch_send_motion(E_Comp_Wl_Seat *seat, struct wl_client *wc, +e_comp_wl_seat_touch_send_motion(E_Seat *seat, struct wl_client *wc, int idx, int x, int y, uint32_t timestamp) { Eina_List *l, *ll; struct wl_resource *res; E_Comp_Wl_Data *comp_wl = e_comp_wl_get(); - E_Comp_Wl_Seat *s; + E_Seat *s; if (!seat) goto iterate; @@ -6403,14 +6403,14 @@ iterate: } EINTERN void -e_comp_wl_seat_pointer_send_enter(E_Comp_Wl_Seat *seat, struct wl_client *wc, E_Client *ec, +e_comp_wl_seat_pointer_send_enter(E_Seat *seat, struct wl_client *wc, E_Client *ec, struct wl_resource *surface, int x, int y) { Eina_List *l, *ll; struct wl_resource *res; uint32_t serial; E_Comp_Wl_Data *comp_wl = e_comp_wl_get(); - E_Comp_Wl_Seat *s; + E_Seat *s; serial = wl_display_next_serial(comp_wl->wl.disp); @@ -6447,14 +6447,14 @@ iterate: } EINTERN void -e_comp_wl_seat_pointer_send_leave(E_Comp_Wl_Seat *seat, struct wl_client *wc, E_Client *ec, +e_comp_wl_seat_pointer_send_leave(E_Seat *seat, struct wl_client *wc, E_Client *ec, struct wl_resource *surface) { Eina_List *l, *ll; struct wl_resource *res; uint32_t serial; E_Comp_Wl_Data *comp_wl = e_comp_wl_get(); - E_Comp_Wl_Seat *s; + E_Seat *s; serial = wl_display_next_serial(comp_wl->wl.disp); @@ -6491,13 +6491,13 @@ iterate: } EINTERN void -e_comp_wl_seat_pointer_send_motion(E_Comp_Wl_Seat *seat, struct wl_client *wc, +e_comp_wl_seat_pointer_send_motion(E_Seat *seat, struct wl_client *wc, int x, int y, uint32_t timestamp) { Eina_List *l, *ll; struct wl_resource *res; E_Comp_Wl_Data *comp_wl = e_comp_wl_get(); - E_Comp_Wl_Seat *s; + E_Seat *s; if (!seat) goto iterate; @@ -6528,14 +6528,14 @@ iterate: } EINTERN void -e_comp_wl_seat_pointer_send_button(E_Comp_Wl_Seat *seat, struct wl_client *wc, +e_comp_wl_seat_pointer_send_button(E_Seat *seat, struct wl_client *wc, uint32_t button, uint32_t state, uint32_t timestamp) { Eina_List *l, *ll; struct wl_resource *res; uint32_t serial; E_Comp_Wl_Data *comp_wl = e_comp_wl_get(); - E_Comp_Wl_Seat *s; + E_Seat *s; serial = wl_display_next_serial(comp_wl->wl.disp); @@ -6569,13 +6569,13 @@ iterate: } static void -_e_comp_wl_seat_pointer_send_axis(E_Comp_Wl_Seat *seat, struct wl_client *wc, +_e_comp_wl_seat_pointer_send_axis(E_Seat *seat, struct wl_client *wc, uint32_t axis, uint32_t dir, uint32_t timestamp) { Eina_List *l, *ll; struct wl_resource *res; E_Comp_Wl_Data *comp_wl = e_comp_wl_get(); - E_Comp_Wl_Seat *s; + E_Seat *s; if (!seat) goto iterate; diff --git a/src/bin/server/e_comp_wl_input.c b/src/bin/server/e_comp_wl_input.c index 0e6e9811b3..68aa15a0da 100644 --- a/src/bin/server/e_comp_wl_input.c +++ b/src/bin/server/e_comp_wl_input.c @@ -88,7 +88,7 @@ _e_comp_wl_input_is_position_inside_constraint_region(E_Comp_Wl_Pointer_Constrai wl_fixed_t fy); static void -_e_comp_wl_input_update_seat_caps(E_Comp_Wl_Seat *seat, struct wl_client *wc) +_e_comp_wl_input_update_seat_caps(E_Seat *seat, struct wl_client *wc) { Eina_List *l; struct wl_resource *res; @@ -176,7 +176,7 @@ _e_comp_wl_input_pointer_cb_cursor_set(struct wl_client *client, struct wl_resou Eina_Bool got_mouse = EINA_FALSE; struct wl_resource *surface; E_Pointer *comp_pointer = e_comp_pointer_get(); - E_Comp_Wl_Seat *seat; + E_Seat *seat; seat = wl_resource_get_user_data(resource); if (!seat) return; @@ -299,7 +299,7 @@ static void _e_comp_wl_input_cb_pointer_unbind(struct wl_resource *resource) { E_Comp_Wl_Data *comp_wl; - E_Comp_Wl_Seat *seat; + E_Seat *seat; seat = wl_resource_get_user_data(resource); if (!seat) return; @@ -317,7 +317,7 @@ _e_comp_wl_input_cb_pointer_get(struct wl_client *client, struct wl_resource *re struct wl_client *ptr_client = NULL; E_Comp_Wl_Client_Data *cdata = NULL; E_Comp_Wl_Data *comp_wl; - E_Comp_Wl_Seat *seat; + E_Seat *seat; seat = wl_resource_get_user_data(resource); if (!seat) return; @@ -577,7 +577,7 @@ _e_comp_wl_input_cb_keyboard_get(struct wl_client *client, struct wl_resource *r static void _e_comp_wl_input_cb_touch_unbind(struct wl_resource *resource) { - E_Comp_Wl_Seat *seat; + E_Seat *seat; seat = wl_resource_get_user_data(resource); if (!seat) return; @@ -589,7 +589,7 @@ static void _e_comp_wl_input_cb_touch_get(struct wl_client *client EINA_UNUSED, struct wl_resource *resource, uint32_t id EINA_UNUSED) { struct wl_resource *res; - E_Comp_Wl_Seat *seat; + E_Seat *seat; seat = wl_resource_get_user_data(resource); if (!seat) return; @@ -622,7 +622,7 @@ static const struct wl_seat_interface _e_seat_interface = static void _e_comp_wl_input_cb_unbind_seat(struct wl_resource *resource) { - E_Comp_Wl_Seat *seat; + E_Seat *seat; seat = wl_resource_get_user_data(resource); if (!seat) return; @@ -636,7 +636,7 @@ static void _e_comp_wl_input_cb_bind_seat(struct wl_client *client, void *data, uint32_t version, uint32_t id) { struct wl_resource *res; - E_Comp_Wl_Seat *seat; + E_Seat *seat; if (!(seat = data)) return; @@ -1562,12 +1562,12 @@ err_keymap_string: static Eina_Bool _e_comp_wl_input_seat_init(const char *seat_name) { - E_Comp_Wl_Seat *seat; + E_Seat *seat; E_Comp_Wl_Data *comp_wl = e_comp_wl_get(); seat = e_comp_wl_input_seat_get(seat_name); if (seat) return EINA_FALSE; - if (!(seat = E_NEW(E_Comp_Wl_Seat, 1))) return EINA_FALSE; + if (!(seat = E_NEW(E_Seat, 1))) return EINA_FALSE; /* set default seat name */ if (!seat_name) @@ -1753,7 +1753,7 @@ e_comp_wl_input_shutdown(void) wl_global_destroy(comp_wl->ptr_constraints.global); comp_wl->ptr_constraints.global = NULL; - E_Comp_Wl_Seat *seat; + E_Seat *seat; EINA_LIST_FREE(comp_wl->seats, seat) { EINA_LIST_FREE(seat->ptr.resources, res) @@ -1890,7 +1890,7 @@ e_comp_wl_input_keyboard_state_update(uint32_t keycode, Eina_Bool pressed) } EINTERN void -e_comp_wl_input_pointer_enabled_set(E_Comp_Wl_Seat *seat, Eina_Bool enabled) +e_comp_wl_input_pointer_enabled_set(E_Seat *seat, Eina_Bool enabled) { if (!seat) return; @@ -2179,7 +2179,7 @@ e_comp_wl_input_keymap_keycode_repeat_set(uint32_t keycode, Eina_Bool enable) } EINTERN void -e_comp_wl_input_touch_enabled_set(E_Comp_Wl_Seat *seat, Eina_Bool enabled) +e_comp_wl_input_touch_enabled_set(E_Seat *seat, Eina_Bool enabled) { if (!seat) return; @@ -2191,7 +2191,7 @@ EINTERN void e_comp_wl_input_seat_caps_set(unsigned int caps) { Eina_Bool need_update = EINA_FALSE; - E_Comp_Wl_Seat *seat; + E_Seat *seat; seat = e_comp_wl_input_seat_get("default"); @@ -2465,11 +2465,11 @@ e_comp_wl_input_kbd_resource_list_unlock() g_rec_mutex_unlock(&e_comp_input_key->kbd.resources_mutex); } -EINTERN E_Comp_Wl_Seat * +EINTERN E_Seat * e_comp_wl_input_seat_get(const char *name) { Eina_List *l; - E_Comp_Wl_Seat *seat; + E_Seat *seat; E_Comp_Wl_Data *comp_wl = e_comp_wl_get(); EINA_LIST_FOREACH(comp_wl->seats, l, seat) @@ -2482,7 +2482,7 @@ e_comp_wl_input_seat_get(const char *name) } EINTERN Eina_Bool -e_comp_wl_input_seat_pointer_is_empty(E_Comp_Wl_Seat *seat) +e_comp_wl_input_seat_pointer_is_empty(E_Seat *seat) { if (!seat) goto iterate; @@ -2502,7 +2502,7 @@ iterate: } EINTERN Eina_Bool -e_comp_wl_input_seat_touch_is_empty(E_Comp_Wl_Seat *seat) +e_comp_wl_input_seat_touch_is_empty(E_Seat *seat) { if (!seat) goto iterate; @@ -2522,7 +2522,7 @@ iterate: } EINTERN Eina_Bool -e_comp_wl_input_seat_pointer_enabled_get(E_Comp_Wl_Seat *seat) +e_comp_wl_input_seat_pointer_enabled_get(E_Seat *seat) { if (!seat) goto iterate; diff --git a/src/bin/server/e_comp_wl_input_intern.h b/src/bin/server/e_comp_wl_input_intern.h index 2135b6dba2..35da6417e5 100644 --- a/src/bin/server/e_comp_wl_input_intern.h +++ b/src/bin/server/e_comp_wl_input_intern.h @@ -11,10 +11,10 @@ EINTERN void e_comp_wl_input_seat_caps_set(unsigned int caps); EINTERN Eina_Bool e_comp_wl_input_relative_pointer_check(struct wl_resource *res); EINTERN Eina_Bool e_comp_wl_input_pointer_check(struct wl_resource *res); -EINTERN void e_comp_wl_input_pointer_enabled_set(E_Comp_Wl_Seat *seat, Eina_Bool enabled); +EINTERN void e_comp_wl_input_pointer_enabled_set(E_Seat *seat, Eina_Bool enabled); EINTERN Eina_Bool e_comp_wl_input_touch_check(struct wl_resource *res); -EINTERN void e_comp_wl_input_touch_enabled_set(E_Comp_Wl_Seat *seat, Eina_Bool enabled); +EINTERN void e_comp_wl_input_touch_enabled_set(E_Seat *seat, Eina_Bool enabled); EINTERN Eina_Bool e_comp_wl_input_keyboard_check(struct wl_resource *res); EINTERN Eina_Bool e_comp_wl_input_keyboard_modifiers_serialize(void); @@ -33,9 +33,9 @@ EINTERN void e_comp_wl_input_keymap_keycode_repeat_set(uint32_t ke EINTERN void e_comp_wl_input_keymap_init(void); -EINTERN E_Comp_Wl_Seat *e_comp_wl_input_seat_get(const char *name); -EINTERN Eina_Bool e_comp_wl_input_seat_pointer_is_empty(E_Comp_Wl_Seat *seat); -EINTERN Eina_Bool e_comp_wl_input_seat_touch_is_empty(E_Comp_Wl_Seat *seat); -EINTERN Eina_Bool e_comp_wl_input_seat_pointer_enabled_get(E_Comp_Wl_Seat *seat); +EINTERN E_Seat *e_comp_wl_input_seat_get(const char *name); +EINTERN Eina_Bool e_comp_wl_input_seat_pointer_is_empty(E_Seat *seat); +EINTERN Eina_Bool e_comp_wl_input_seat_touch_is_empty(E_Seat *seat); +EINTERN Eina_Bool e_comp_wl_input_seat_pointer_enabled_get(E_Seat *seat); #endif diff --git a/src/bin/server/e_comp_wl_input_thread.c b/src/bin/server/e_comp_wl_input_thread.c index 8442eaeaac..0a26408a50 100644 --- a/src/bin/server/e_comp_wl_input_thread.c +++ b/src/bin/server/e_comp_wl_input_thread.c @@ -142,7 +142,7 @@ _e_comp_wl_device_input_thread_send_event_device(E_Input_Thread_Client *iec, E_D } static void -_e_comp_wl_input_thread_send_mouse_in(E_Comp_Wl_Seat *seat, E_Input_Thread_Client *iec, int x, int y, int client_x, int client_y, int timestamp) +_e_comp_wl_input_thread_send_mouse_in(E_Seat *seat, E_Input_Thread_Client *iec, int x, int y, int client_x, int client_y, int timestamp) { struct wl_client *wc; struct wl_resource *surface; @@ -168,7 +168,7 @@ _e_comp_wl_input_thread_send_mouse_in(E_Comp_Wl_Seat *seat, E_Input_Thread_Clien } static void -_e_comp_wl_input_thread_send_mouse_out(E_Comp_Wl_Seat *seat, E_Input_Thread_Client *iec, int timestamp) +_e_comp_wl_input_thread_send_mouse_out(E_Seat *seat, E_Input_Thread_Client *iec, int timestamp) { struct wl_client *wc; struct wl_resource *surface; @@ -190,7 +190,7 @@ _e_comp_wl_input_thread_send_mouse_out(E_Comp_Wl_Seat *seat, E_Input_Thread_Clie } static void -_e_comp_wl_input_thread_check_mouse_out(E_Comp_Wl_Seat *seat, E_Input_Thread_Client *hit_iec, int timestamp) +_e_comp_wl_input_thread_check_mouse_out(E_Seat *seat, E_Input_Thread_Client *hit_iec, int timestamp) { E_Input_Thread_Client *iec = NULL; for (iec = e_input_thread_client_top_get(); iec; iec = e_input_thread_client_below_get(iec)) @@ -218,7 +218,7 @@ _e_comp_wl_cb_mouse_move_thread_mode(void *d EINA_UNUSED, int t EINA_UNUSED, voi E_Comp_Wl_Data *comp_wl; struct wl_resource *surface; struct wl_client *wc; - E_Comp_Wl_Seat *seat; + E_Seat *seat; comp_wl = e_comp_wl_get(); comp_wl->ptr.x = wl_fixed_from_int(ev->x); @@ -331,7 +331,7 @@ _e_comp_wl_cb_mouse_button_down_thread_mode(void *d EINA_UNUSED, int t EINA_UNUS struct wl_resource *surface = NULL; E_Comp_Wl_Data *comp_wl; struct wl_client *wc; - E_Comp_Wl_Seat *seat; + E_Seat *seat; uint32_t btn; ELOGF("Mouse", "E Event Mouse Down (time: %d, x:%d y:%d)", NULL, ev->timestamp, ev->x, ev->y); @@ -412,7 +412,7 @@ _e_comp_wl_cb_mouse_button_up_thread_mode(void *d EINA_UNUSED, int t EINA_UNUSED int client_x = 0, client_y = 0; E_Comp_Wl_Data *comp_wl; struct wl_client *wc; - E_Comp_Wl_Seat *seat; + E_Seat *seat; uint32_t btn; if (!need_send_released) diff --git a/src/bin/server/e_comp_wl_intern.h b/src/bin/server/e_comp_wl_intern.h index 0965402c32..67ded8de33 100644 --- a/src/bin/server/e_comp_wl_intern.h +++ b/src/bin/server/e_comp_wl_intern.h @@ -113,18 +113,18 @@ EINTERN void e_comp_wl_surface_handle_mouse_button_to_touch(E_Comp_Wl_Data EINTERN E_Devicemgr_Input_Device *e_comp_wl_device_last_device_get(Ecore_Device_Class dev_class); EINTERN void e_comp_wl_device_last_device_set(Ecore_Device_Class dev_class, E_Devicemgr_Input_Device *device); -EINTERN void e_comp_wl_seat_touch_send_motion(E_Comp_Wl_Seat *seat, struct wl_client *wc, +EINTERN void e_comp_wl_seat_touch_send_motion(E_Seat *seat, struct wl_client *wc, int idx, int x, int y, uint32_t timestamp); -EINTERN void e_comp_wl_seat_touch_send_downup(E_Comp_Wl_Seat *seat, struct wl_client *wc, +EINTERN void e_comp_wl_seat_touch_send_downup(E_Seat *seat, struct wl_client *wc, struct wl_resource *surface, int idx, int x, int y, uint32_t timestamp, Eina_Bool pressed); -EINTERN void e_comp_wl_seat_pointer_send_motion(E_Comp_Wl_Seat *seat, struct wl_client *wc, +EINTERN void e_comp_wl_seat_pointer_send_motion(E_Seat *seat, struct wl_client *wc, int x, int y, unsigned int timestamp); -EINTERN void e_comp_wl_seat_pointer_send_enter(E_Comp_Wl_Seat *seat, struct wl_client *wc, E_Client *ec, +EINTERN void e_comp_wl_seat_pointer_send_enter(E_Seat *seat, struct wl_client *wc, E_Client *ec, struct wl_resource *surface, int x, int y); -EINTERN void e_comp_wl_seat_pointer_send_leave(E_Comp_Wl_Seat *seat, struct wl_client *wc, E_Client *ec, +EINTERN void e_comp_wl_seat_pointer_send_leave(E_Seat *seat, struct wl_client *wc, E_Client *ec, struct wl_resource *surface); -EINTERN void e_comp_wl_seat_pointer_send_button(E_Comp_Wl_Seat *seat, struct wl_client *wc, +EINTERN void e_comp_wl_seat_pointer_send_button(E_Seat *seat, struct wl_client *wc, uint32_t button, uint32_t state, uint32_t timestamp); #endif diff --git a/src/bin/server/e_devicemgr_wl.c b/src/bin/server/e_devicemgr_wl.c index 05f86484f1..57a61b5321 100644 --- a/src/bin/server/e_devicemgr_wl.c +++ b/src/bin/server/e_devicemgr_wl.c @@ -177,7 +177,7 @@ e_devicemgr_wl_device_add(E_Devicemgr_Input_Device *dev) E_Tizen_Devicemgr_User_Data *device_user_data; struct wl_array axes; E_Comp_Wl_Data *comp_wl; - E_Comp_Wl_Seat *seat; + E_Seat *seat; seat = e_comp_wl_input_seat_get(dev->seat_name); if (!seat) @@ -336,7 +336,7 @@ e_devicemgr_wl_touch_max_count_send(int slot, struct wl_resource *res, struct wl } else { - E_Comp_Wl_Seat *seat; + E_Seat *seat; Eina_List *lll; EINA_LIST_FOREACH(comp_wl->seats, lll, seat) { @@ -749,7 +749,7 @@ _e_devicemgr_wl_cb_bind(struct wl_client *client, void *data, uint32_t version, g_tizen_devicemgr->mgr_resources = eina_list_append(g_tizen_devicemgr->mgr_resources, res); comp_wl = e_comp_wl_get(); - E_Comp_Wl_Seat *seat; + E_Seat *seat; Eina_List *lll; EINA_LIST_FOREACH(comp_wl->seats, lll, seat) { diff --git a/src/bin/windowmgr/services/e_service_volume.c b/src/bin/windowmgr/services/e_service_volume.c index 5678537884..9faaff937d 100644 --- a/src/bin/windowmgr/services/e_service_volume.c +++ b/src/bin/windowmgr/services/e_service_volume.c @@ -450,7 +450,7 @@ _volume_wl_touch_resource_get(void) struct wl_client *wc; struct wl_resource *res; E_Comp_Wl_Data *comp_wl; - E_Comp_Wl_Seat *seat; + E_Seat *seat; E_Comp_Wl_Client_Data *volume_cdata = e_client_cdata_get(_volume_ec); diff --git a/src/include/e_comp_wl.h b/src/include/e_comp_wl.h index ebbc8d9d12..1a1dd3b7f5 100644 --- a/src/include/e_comp_wl.h +++ b/src/include/e_comp_wl.h @@ -59,7 +59,7 @@ typedef struct _E_Comp_Wl_Data E_Comp_Wl_Data; typedef struct _E_Comp_Wl_Output E_Comp_Wl_Output; typedef struct _E_Comp_Wl_Intercept_Hook E_Comp_Wl_Intercept_Hook; typedef struct _E_Comp_Wl_Pointer_Constraint E_Comp_Wl_Pointer_Constraint; -typedef struct _E_Comp_Wl_Seat E_Comp_Wl_Seat; +typedef struct _E_Seat E_Seat; typedef enum _E_Comp_Wl_Buffer_Type { @@ -534,7 +534,7 @@ struct _E_Comp_Wl_Output void *data; }; -struct _E_Comp_Wl_Seat +struct _E_Seat { struct wl_global *global; Eina_List *resources;