From 31e0bb006c325b1479a38393282ac6f684770498 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Thu, 24 Sep 2020 10:07:45 +0900 Subject: [PATCH] e_comp_wl: change the variable name of E_Comp_Wl_Data type from cdata to wl_cdata E20 is going to use the naming rule for E_Comp_Wl_Data and E_Comp_Client_Wl_Data below. The local var_name for E_Comp_Wl_Data is wl_cdata. The local var_name for E_Comp_Client_Wl_Data is cdata. Change-Id: I8a7051d9829670ea5bac4252c64a2859586160a2 --- src/bin/e_comp_wl.c | 44 ++++++++++++++++++------------------ src/bin/e_hwc_window.c | 6 ++--- src/bin/e_hwc_window_queue.c | 10 ++++---- src/bin/e_info_server.c | 17 +++++++------- src/bin/e_plane.c | 4 ++-- src/bin/e_plane_renderer.c | 22 +++++++++--------- 6 files changed, 51 insertions(+), 52 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 3e76459685..a9aa5e4f26 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -4179,30 +4179,30 @@ _e_comp_wl_gl_idle(void *data) static Eina_Bool _e_comp_wl_compositor_create(void) { - E_Comp_Wl_Data *cdata; + E_Comp_Wl_Data *wl_cdata; const char *name; int fd = 0; Eina_Bool res; /* create new compositor data */ - if (!(cdata = E_NEW(E_Comp_Wl_Data, 1))) + if (!(wl_cdata = E_NEW(E_Comp_Wl_Data, 1))) { ERR("Could not create compositor data: %m"); return EINA_FALSE; } /* set compositor wayland data */ - e_comp_wl = e_comp->wl_comp_data = cdata; + e_comp_wl = e_comp->wl_comp_data = wl_cdata; /* try to create a wayland display */ - if (!(cdata->wl.disp = wl_display_create())) + if (!(wl_cdata->wl.disp = wl_display_create())) { ERR("Could not create a Wayland display: %m"); goto disp_err; } /* try to setup wayland socket */ - if (!(name = wl_display_add_socket_auto(cdata->wl.disp))) + if (!(name = wl_display_add_socket_auto(wl_cdata->wl.disp))) { ERR("Could not create Wayland display socket: %m"); PRCTL("[Winsys] Could not create Wayland display socket: /run/wayland-0"); @@ -4217,15 +4217,15 @@ _e_comp_wl_compositor_create(void) e_env_set("WAYLAND_DISPLAY", name); /* initialize compositor signals */ - wl_signal_init(&cdata->signals.surface.create); - wl_signal_init(&cdata->signals.surface.activate); - wl_signal_init(&cdata->signals.surface.kill); + wl_signal_init(&wl_cdata->signals.surface.create); + wl_signal_init(&wl_cdata->signals.surface.activate); + wl_signal_init(&wl_cdata->signals.surface.kill); - /* cdata->output.transform = WL_OUTPUT_TRANSFORM_NORMAL; */ - /* cdata->output.scale = e_scale; */ + /* wl_cdata->output.transform = WL_OUTPUT_TRANSFORM_NORMAL; */ + /* wl_cdata->output.scale = e_scale; */ /* try to add compositor to wayland globals */ - if (!wl_global_create(cdata->wl.disp, &wl_compositor_interface, + if (!wl_global_create(wl_cdata->wl.disp, &wl_compositor_interface, COMPOSITOR_VERSION, e_comp, _e_comp_wl_compositor_cb_bind)) { @@ -4233,14 +4233,14 @@ _e_comp_wl_compositor_create(void) goto comp_global_err; } - if (!e_comp_wl_subsurfaces_init(cdata)) + if (!e_comp_wl_subsurfaces_init(wl_cdata)) { ERR("Failed to init subsurfaces"); goto comp_global_err; } /* try to add session_recovery to wayland globals */ - if (!wl_global_create(cdata->wl.disp, &session_recovery_interface, 1, + if (!wl_global_create(wl_cdata->wl.disp, &session_recovery_interface, 1, e_comp, _e_comp_wl_session_recovery_cb_bind)) { ERR("Could not add session_recovery to wayland globals: %m"); @@ -4248,7 +4248,7 @@ _e_comp_wl_compositor_create(void) } /* initialize shm mechanism */ - wl_display_init_shm(cdata->wl.disp); + wl_display_init_shm(wl_cdata->wl.disp); /* _e_comp_wl_cb_randr_change(NULL, 0, NULL); */ @@ -4270,17 +4270,17 @@ _e_comp_wl_compositor_create(void) _e_comp_wl_gl_init(NULL); /* get the wayland display loop */ - cdata->wl.loop = wl_display_get_event_loop(cdata->wl.disp); + wl_cdata->wl.loop = wl_display_get_event_loop(wl_cdata->wl.disp); /* get the file descriptor of the wayland event loop */ - fd = wl_event_loop_get_fd(cdata->wl.loop); + fd = wl_event_loop_get_fd(wl_cdata->wl.loop); /* create a listener for wayland main loop events */ - cdata->fd_hdlr = + wl_cdata->fd_hdlr = ecore_main_fd_handler_add(fd, (ECORE_FD_READ | ECORE_FD_ERROR), - _e_comp_wl_cb_read, cdata, NULL, NULL); - ecore_main_fd_handler_prepare_callback_set(cdata->fd_hdlr, - _e_comp_wl_cb_prepare, cdata); + _e_comp_wl_cb_read, wl_cdata, NULL, NULL); + ecore_main_fd_handler_prepare_callback_set(wl_cdata->fd_hdlr, + _e_comp_wl_cb_prepare, wl_cdata); return EINA_TRUE; @@ -4290,9 +4290,9 @@ data_err: comp_global_err: e_env_unset("WAYLAND_DISPLAY"); sock_err: - wl_display_destroy(cdata->wl.disp); + wl_display_destroy(wl_cdata->wl.disp); disp_err: - free(cdata); + free(wl_cdata); return EINA_FALSE; } diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c index 6aa018d38a..f2cb599b8b 100644 --- a/src/bin/e_hwc_window.c +++ b/src/bin/e_hwc_window.c @@ -163,10 +163,10 @@ _get_wayland_tbm_client_queue(E_Client *ec) { struct wayland_tbm_client_queue * cqueue = NULL; struct wl_resource *wl_surface = NULL; - E_Comp_Wl_Data *wl_comp_data = (E_Comp_Wl_Data *)e_comp->wl_comp_data; + E_Comp_Wl_Data *wl_cdata = (E_Comp_Wl_Data *)e_comp->wl_comp_data; E_Comp_Wl_Client_Data *cdata = NULL; - EINA_SAFETY_ON_NULL_RETURN_VAL(wl_comp_data, NULL); + EINA_SAFETY_ON_NULL_RETURN_VAL(wl_cdata, NULL); if (!ec) return NULL; @@ -176,7 +176,7 @@ _get_wayland_tbm_client_queue(E_Client *ec) wl_surface = cdata->wl_surface; EINA_SAFETY_ON_NULL_RETURN_VAL(wl_surface, NULL); - cqueue = wayland_tbm_server_client_queue_get(wl_comp_data->tbm.server, wl_surface); + cqueue = wayland_tbm_server_client_queue_get(wl_cdata->tbm.server, wl_surface); if (!cqueue) { EHWINF("has no wl_tbm_server_client_queue. -- {%25s}, state:%s, zpos:%d, deleted:%s", diff --git a/src/bin/e_hwc_window_queue.c b/src/bin/e_hwc_window_queue.c index 1df43d8b1c..1c82f8575a 100644 --- a/src/bin/e_hwc_window_queue.c +++ b/src/bin/e_hwc_window_queue.c @@ -109,10 +109,10 @@ _user_cqueue_get(E_Client *ec) { struct wayland_tbm_client_queue * cqueue = NULL; struct wl_resource *wl_surface = NULL; - E_Comp_Wl_Data *wl_comp_data = (E_Comp_Wl_Data *)e_comp->wl_comp_data; + E_Comp_Wl_Data *wl_cdata = (E_Comp_Wl_Data *)e_comp->wl_comp_data; E_Comp_Wl_Client_Data *cdata = NULL; - EINA_SAFETY_ON_NULL_RETURN_VAL(wl_comp_data, NULL); + EINA_SAFETY_ON_NULL_RETURN_VAL(wl_cdata, NULL); if (!ec) return NULL; @@ -122,7 +122,7 @@ _user_cqueue_get(E_Client *ec) wl_surface = cdata->wl_surface; if (!wl_surface) return NULL; - cqueue = wayland_tbm_server_client_queue_get(wl_comp_data->tbm.server, wl_surface); + cqueue = wayland_tbm_server_client_queue_get(wl_cdata->tbm.server, wl_surface); return cqueue; } @@ -130,7 +130,7 @@ _user_cqueue_get(E_Client *ec) static uint32_t _comp_wl_buffer_flags_get(E_Comp_Wl_Buffer *buffer) { - E_Comp_Wl_Data *wl_comp_data = (E_Comp_Wl_Data *)e_comp->wl_comp_data; + E_Comp_Wl_Data *wl_cdata = (E_Comp_Wl_Data *)e_comp->wl_comp_data; uint32_t flags = 0; if (!buffer) return 0; @@ -141,7 +141,7 @@ _comp_wl_buffer_flags_get(E_Comp_Wl_Buffer *buffer) case E_COMP_WL_BUFFER_TYPE_VIDEO: case E_COMP_WL_BUFFER_TYPE_TBM: if (buffer->resource) - flags = wayland_tbm_server_get_buffer_flags(wl_comp_data->tbm.server, buffer->resource); + flags = wayland_tbm_server_get_buffer_flags(wl_cdata->tbm.server, buffer->resource); else flags = 0; break; diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c index f1023bebb9..4319816b66 100644 --- a/src/bin/e_info_server.c +++ b/src/bin/e_info_server.c @@ -957,8 +957,7 @@ _msg_clients_res_list_append(Eldbus_Message_Iter *iter, uint32_t mode, int id) struct wl_list * client_list; struct wl_client *client; - //E_Comp_Data *cdata; - E_Comp_Wl_Data *cdata; + E_Comp_Wl_Data *wl_cdata; int pid = -1; enum { @@ -969,10 +968,10 @@ _msg_clients_res_list_append(Eldbus_Message_Iter *iter, uint32_t mode, int id) eldbus_message_iter_arguments_append(iter, "a("VALUE_TYPE_REPLY_RESLIST")", &array_of_res); if (!e_comp) return; - if (!(cdata = e_comp->wl_comp_data)) return; - if (!cdata->wl.disp) return; + if (!(wl_cdata = e_comp->wl_comp_data)) return; + if (!wl_cdata->wl.disp) return; - client_list = wl_display_get_client_list(cdata->wl.disp); + client_list = wl_display_get_client_list(wl_cdata->wl.disp); wl_client_for_each(client, client_list) { @@ -5591,15 +5590,15 @@ _e_info_server_pid_kill(pid_t id, Eldbus_Message_Iter *array_of_string) pid_t pid = -1; char result[128]; - E_Comp_Wl_Data *cdata; + E_Comp_Wl_Data *wl_cdata; struct wl_list * client_list; struct wl_client *client; if (!e_comp) return 0; - if (!(cdata = e_comp->wl_comp_data)) return 0; - if (!cdata->wl.disp) return 0; + if (!(wl_cdata = e_comp->wl_comp_data)) return 0; + if (!wl_cdata->wl.disp) return 0; - client_list = wl_display_get_client_list(cdata->wl.disp); + client_list = wl_display_get_client_list(wl_cdata->wl.disp); wl_client_for_each(client, client_list) { diff --git a/src/bin/e_plane.c b/src/bin/e_plane.c index 9eb249a003..a2ddfb4e0b 100644 --- a/src/bin/e_plane.c +++ b/src/bin/e_plane.c @@ -486,7 +486,7 @@ _e_plane_surface_from_client_acquire(E_Plane *plane) { E_Client *ec = plane->ec; E_Comp_Wl_Buffer *buffer = _get_comp_wl_buffer(ec); - E_Comp_Wl_Data *wl_comp_data = (E_Comp_Wl_Data *)e_comp->wl_comp_data; + E_Comp_Wl_Data *wl_cdata = (E_Comp_Wl_Data *)e_comp->wl_comp_data; E_Plane_Renderer *renderer = plane->renderer; tbm_surface_h tsurface = NULL; @@ -509,7 +509,7 @@ _e_plane_surface_from_client_acquire(E_Plane *plane) switch (buffer->type) { case E_COMP_WL_BUFFER_TYPE_NATIVE: - tsurface = wayland_tbm_server_get_surface(wl_comp_data->tbm.server, buffer->resource); + tsurface = wayland_tbm_server_get_surface(wl_cdata->tbm.server, buffer->resource); break; case E_COMP_WL_BUFFER_TYPE_TBM: tsurface = buffer->tbm_surface; diff --git a/src/bin/e_plane_renderer.c b/src/bin/e_plane_renderer.c index f03bce381e..aa0b890885 100644 --- a/src/bin/e_plane_renderer.c +++ b/src/bin/e_plane_renderer.c @@ -219,10 +219,10 @@ _e_plane_renderer_wayland_tbm_client_queue_get(E_Client *ec) { struct wayland_tbm_client_queue * cqueue = NULL; struct wl_resource *wl_surface = NULL; - E_Comp_Wl_Data *wl_comp_data = (E_Comp_Wl_Data *)e_comp->wl_comp_data; + E_Comp_Wl_Data *wl_cdata = (E_Comp_Wl_Data *)e_comp->wl_comp_data; E_Comp_Wl_Client_Data *cdata = NULL; - EINA_SAFETY_ON_NULL_RETURN_VAL(wl_comp_data, NULL); + EINA_SAFETY_ON_NULL_RETURN_VAL(wl_cdata, NULL); cdata = e_pixmap_cdata_get(ec->pixmap); EINA_SAFETY_ON_NULL_RETURN_VAL(cdata, NULL); @@ -230,7 +230,7 @@ _e_plane_renderer_wayland_tbm_client_queue_get(E_Client *ec) wl_surface = cdata->wl_surface; EINA_SAFETY_ON_NULL_RETURN_VAL(wl_surface, NULL); - cqueue = wayland_tbm_server_client_queue_get(wl_comp_data->tbm.server, wl_surface); + cqueue = wayland_tbm_server_client_queue_get(wl_cdata->tbm.server, wl_surface); EINA_SAFETY_ON_NULL_RETURN_VAL(cqueue, NULL); return cqueue; @@ -243,7 +243,7 @@ _e_plane_renderer_client_copied_surface_create(E_Plane_Renderer_Client *renderer tbm_surface_h new_tsurface = NULL; E_Comp_Wl_Buffer *buffer = NULL; tbm_surface_info_s src_info, dst_info; - E_Comp_Wl_Data *wl_comp_data = (E_Comp_Wl_Data *)e_comp->wl_comp_data; + E_Comp_Wl_Data *wl_cdata = (E_Comp_Wl_Data *)e_comp->wl_comp_data; int ret = TBM_SURFACE_ERROR_NONE; E_Client *ec = renderer_client->ec; E_Plane_Renderer *renderer = renderer_client->renderer; @@ -255,7 +255,7 @@ _e_plane_renderer_client_copied_surface_create(E_Plane_Renderer_Client *renderer buffer = _get_comp_wl_buffer(ec); if (buffer) { - tsurface = wayland_tbm_server_get_surface(wl_comp_data->tbm.server, buffer->resource); + tsurface = wayland_tbm_server_get_surface(wl_cdata->tbm.server, buffer->resource); EINA_SAFETY_ON_NULL_RETURN_VAL(tsurface, NULL); } else @@ -752,7 +752,7 @@ static uint32_t _e_plane_renderer_client_surface_flags_get(E_Plane_Renderer_Client *renderer_client) { tbm_surface_h tsurface = NULL; - E_Comp_Wl_Data *wl_comp_data = (E_Comp_Wl_Data *)e_comp->wl_comp_data; + E_Comp_Wl_Data *wl_cdata = (E_Comp_Wl_Data *)e_comp->wl_comp_data; E_Client *ec = renderer_client->ec; uint32_t flags = 0; E_Comp_Wl_Buffer *buffer = NULL; @@ -766,10 +766,10 @@ _e_plane_renderer_client_surface_flags_get(E_Plane_Renderer_Client *renderer_cli case E_COMP_WL_BUFFER_TYPE_NATIVE: case E_COMP_WL_BUFFER_TYPE_VIDEO: case E_COMP_WL_BUFFER_TYPE_TBM: - tsurface = wayland_tbm_server_get_surface(wl_comp_data->tbm.server, buffer->resource); + tsurface = wayland_tbm_server_get_surface(wl_cdata->tbm.server, buffer->resource); EINA_SAFETY_ON_NULL_RETURN_VAL(tsurface, 0); - flags = wayland_tbm_server_get_buffer_flags(wl_comp_data->tbm.server, buffer->resource); + flags = wayland_tbm_server_get_buffer_flags(wl_cdata->tbm.server, buffer->resource); break; default: flags = 0; @@ -2216,7 +2216,7 @@ EINTERN tbm_surface_h e_plane_renderer_client_surface_recieve(E_Plane_Renderer_Client *renderer_client) { tbm_surface_h tsurface = NULL; - E_Comp_Wl_Data *wl_comp_data = (E_Comp_Wl_Data *)e_comp->wl_comp_data; + E_Comp_Wl_Data *wl_cdata = (E_Comp_Wl_Data *)e_comp->wl_comp_data; E_Client *ec = NULL; uint32_t flags = 0; E_Comp_Wl_Buffer *buffer = NULL; @@ -2235,7 +2235,7 @@ e_plane_renderer_client_surface_recieve(E_Plane_Renderer_Client *renderer_client switch (buffer->type) { case E_COMP_WL_BUFFER_TYPE_NATIVE: - tsurface = wayland_tbm_server_get_surface(wl_comp_data->tbm.server, buffer->resource); + tsurface = wayland_tbm_server_get_surface(wl_cdata->tbm.server, buffer->resource); break; case E_COMP_WL_BUFFER_TYPE_TBM: tsurface = buffer->tbm_surface; @@ -2252,7 +2252,7 @@ e_plane_renderer_client_surface_recieve(E_Plane_Renderer_Client *renderer_client } if (buffer->resource) - flags = wayland_tbm_server_get_buffer_flags(wl_comp_data->tbm.server, buffer->resource); + flags = wayland_tbm_server_get_buffer_flags(wl_cdata->tbm.server, buffer->resource); if (renderer_trace_debug) ELOGF("E_PLANE_RENDERER", "Receive Renderer(%p) tsurface(%p) tqueue(%p) wl_buffer(%p) flags(%d)", -- 2.34.1