From fd7b2fd3352a711910a3abe3292d14178e6136a7 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Mon, 15 Jan 2024 19:30:49 +0900 Subject: [PATCH] e_comp_wl_subsurface: make an internal header Move the internal resources and the function declaration to the internal header Change-Id: I88ddd8eb2c33bcc7bfb12e21465c5acc69d8d8fe --- src/bin/Makefile.mk | 1 - src/bin/e_client.c | 1 + src/bin/e_comp_object.c | 1 + src/bin/e_comp_wl.c | 1 + src/bin/e_comp_wl_rsm.c | 1 + src/bin/e_comp_wl_shell.c | 1 + src/bin/e_comp_wl_subsurface.c | 2 +- src/bin/{e_comp_wl_subsurface.h => e_comp_wl_subsurface_intern.h} | 3 +-- src/bin/e_comp_wl_viewport.c | 1 + src/bin/e_compositor.c | 1 + src/bin/e_desk.c | 1 + src/bin/e_desk_area.c | 1 + src/bin/e_eom.c | 1 + src/bin/e_foreign_shell.c | 1 + src/bin/e_hwc_window.c | 1 + src/bin/e_includes.h | 1 - src/bin/e_info_server.c | 1 + src/bin/e_output.c | 1 + src/bin/e_policy.c | 1 + src/bin/e_policy_wl.c | 1 + src/bin/e_process.c | 1 + src/bin/e_zone.c | 1 + src/bin/video/e_client_video.c | 1 + src/bin/video/iface/e_video_hwc.c | 1 + src/bin/video/iface/e_video_hwc_planes.c | 1 + 25 files changed, 23 insertions(+), 5 deletions(-) rename src/bin/{e_comp_wl_subsurface.h => e_comp_wl_subsurface_intern.h} (99%) diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk index 201abb7..4000eb4 100644 --- a/src/bin/Makefile.mk +++ b/src/bin/Makefile.mk @@ -75,7 +75,6 @@ src/bin/e_comp_screen.h \ src/bin/e_info_protocol.h \ src/bin/e_comp_wl_input.h \ src/bin/e_comp_wl.h \ -src/bin/e_comp_wl_subsurface.h \ src/bin/e_hwc.h \ src/bin/e_hwc_planes.h \ src/bin/e_hwc_windows.h \ diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 99e1b70..5af48db 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -7,6 +7,7 @@ #include "e_utils_intern.h" #include "e_comp_canvas_intern.h" #include "e_comp_wl_intern.h" +#include "e_comp_wl_subsurface_intern.h" #define PRI(ec) ((E_Client_Private *)e_object_data_get(E_OBJECT(ec))) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 504f8fc..9b564b7 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -10,6 +10,7 @@ #endif #include "e_comp_cfdata_intern.h" +#include "e_comp_wl_subsurface_intern.h" /* data keys: diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 75119fc..2a06a40 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -18,6 +18,7 @@ #include "e_comp_wl_rsm_intern.h" #include "e_comp_wl_screenshooter_intern.h" #include "e_comp_wl_shell_intern.h" +#include "e_comp_wl_subsurface_intern.h" #include #include diff --git a/src/bin/e_comp_wl_rsm.c b/src/bin/e_comp_wl_rsm.c index 3ca695e..071ee87 100644 --- a/src/bin/e_comp_wl_rsm.c +++ b/src/bin/e_comp_wl_rsm.c @@ -5,6 +5,7 @@ #include "e_client_intern.h" #include "e_process_intern.h" #include "e_comp_wl_intern.h" +#include "e_comp_wl_subsurface_intern.h" #include #include diff --git a/src/bin/e_comp_wl_shell.c b/src/bin/e_comp_wl_shell.c index 8043a3a..4f6a939 100644 --- a/src/bin/e_comp_wl_shell.c +++ b/src/bin/e_comp_wl_shell.c @@ -6,6 +6,7 @@ #include "e_comp_wl_intern.h" #include "e_comp_wl_rsm_intern.h" #include "e_comp_wl_shell_intern.h" +#include "e_comp_wl_subsurface_intern.h" #include #include diff --git a/src/bin/e_comp_wl_subsurface.c b/src/bin/e_comp_wl_subsurface.c index ed98bc7..c8ec743 100644 --- a/src/bin/e_comp_wl_subsurface.c +++ b/src/bin/e_comp_wl_subsurface.c @@ -1,5 +1,5 @@ #include "e.h" -#include "e_comp_wl_intern.h" +#include "e_comp_wl_subsurface_intern.h" #include "e_comp_wl_intern.h" #include diff --git a/src/bin/e_comp_wl_subsurface.h b/src/bin/e_comp_wl_subsurface_intern.h similarity index 99% rename from src/bin/e_comp_wl_subsurface.h rename to src/bin/e_comp_wl_subsurface_intern.h index 95367e6..9f8cb90 100644 --- a/src/bin/e_comp_wl_subsurface.h +++ b/src/bin/e_comp_wl_subsurface_intern.h @@ -1,11 +1,10 @@ #ifndef _E_COMP_WL_SUBSURFACE_H_ #define _E_COMP_WL_SUBSURFACE_H_ -#include "e.h" - #ifndef WL_HIDE_DEPRECATED # define WL_HIDE_DEPRECATED #endif + #include /* To support tizen_policy interface related to wl_subsurface. diff --git a/src/bin/e_comp_wl_viewport.c b/src/bin/e_comp_wl_viewport.c index 0bd73cb..4267479 100644 --- a/src/bin/e_comp_wl_viewport.c +++ b/src/bin/e_comp_wl_viewport.c @@ -5,6 +5,7 @@ #include "e.h" #include "e_compositor.h" #include "e_comp_wl_intern.h" +#include "e_comp_wl_subsurface_intern.h" #include #include diff --git a/src/bin/e_compositor.c b/src/bin/e_compositor.c index a5700a4..a08e42a 100644 --- a/src/bin/e_compositor.c +++ b/src/bin/e_compositor.c @@ -3,6 +3,7 @@ #include "e_comp_wl_private.h" #include "e_comp_wl_data_intern.h" #include "e_comp_wl_rsm_intern.h" +#include "e_comp_wl_subsurface_intern.h" #include #include diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c index 12ce8f4..9964aee 100644 --- a/src/bin/e_desk.c +++ b/src/bin/e_desk.c @@ -6,6 +6,7 @@ #endif #include "e_utils_intern.h" #include "e_comp_screen_intern.h" +#include "e_comp_wl_subsurface_intern.h" #include diff --git a/src/bin/e_desk_area.c b/src/bin/e_desk_area.c index 616aa7d..78f87c0 100644 --- a/src/bin/e_desk_area.c +++ b/src/bin/e_desk_area.c @@ -5,6 +5,7 @@ #include "e_comp_canvas_intern.h" #include "e_comp_wl_rsm_intern.h" #endif +#include "e_comp_wl_subsurface_intern.h" #include diff --git a/src/bin/e_eom.c b/src/bin/e_eom.c index 31ace92..94abd7b 100644 --- a/src/bin/e_eom.c +++ b/src/bin/e_eom.c @@ -6,6 +6,7 @@ #include "e_client_intern.h" #include "e_xdg_shell_v6_intern.h" #include "e_comp_screen_intern.h" +#include "e_comp_wl_subsurface_intern.h" #include #include diff --git a/src/bin/e_foreign_shell.c b/src/bin/e_foreign_shell.c index 94272b5..6e5fec4 100644 --- a/src/bin/e_foreign_shell.c +++ b/src/bin/e_foreign_shell.c @@ -1,5 +1,6 @@ #include "e_foreign_private.h" #include "e_comp_wl_intern.h" +#include "e_comp_wl_subsurface_intern.h" #define ESINF(obj, fmt, x...) \ FINF("EShell:%p| "fmt, es->ec, obj, ##x) diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c index 542b29f..e4eae28 100644 --- a/src/bin/e_hwc_window.c +++ b/src/bin/e_hwc_window.c @@ -1,6 +1,7 @@ #include "e.h" #include "e_comp_wl_buffer_intern.h" #include "e_comp_wl_intern.h" +#include "e_comp_wl_subsurface_intern.h" # include # include diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h index d7deec5..8f79594 100644 --- a/src/bin/e_includes.h +++ b/src/bin/e_includes.h @@ -48,7 +48,6 @@ #include "e_explicit_sync.h" #include "e_egl_sync.h" #include "e_comp_wl.h" -#include "e_comp_wl_subsurface.h" #include "e_comp_wl_input.h" #include "e_comp_wl_tbm.h" #include "e_comp_wl_rsm.h" diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c index d5ddc9a..6ca95d4 100644 --- a/src/bin/e_info_server.c +++ b/src/bin/e_info_server.c @@ -11,6 +11,7 @@ #include "e_comp_screen_intern.h" #include "e_comp_wl_rsm_intern.h" #include "e_explicit_sync_intern.h" +#include "e_comp_wl_subsurface_intern.h" #include #include diff --git a/src/bin/e_output.c b/src/bin/e_output.c index 753df95..79cade0 100644 --- a/src/bin/e_output.c +++ b/src/bin/e_output.c @@ -3,6 +3,7 @@ #include "e_utils_intern.h" #include "e_comp_screen_intern.h" #include "e_comp_wl_intern.h" +#include "e_comp_wl_subsurface_intern.h" #include diff --git a/src/bin/e_policy.c b/src/bin/e_policy.c index f064b03..aea3158 100644 --- a/src/bin/e_policy.c +++ b/src/bin/e_policy.c @@ -4,6 +4,7 @@ #include "e_policy_visibility.h" #include "e_policy_private_data.h" #include "services/e_service_quickpanel.h" +#include "e_comp_wl_subsurface_intern.h" E_Policy *e_policy = NULL; Eina_Hash *hash_policy_desks = NULL; diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c index 99e325f..640eec3 100644 --- a/src/bin/e_policy_wl.c +++ b/src/bin/e_policy_wl.c @@ -20,6 +20,7 @@ #include "e_subsurface_watcher_intern.h" #include "e_comp_wl_data_intern.h" #include "e_comp_wl_intern.h" +#include "e_comp_wl_subsurface_intern.h" #include #include diff --git a/src/bin/e_process.c b/src/bin/e_process.c index 774f03b..0faab64 100644 --- a/src/bin/e_process.c +++ b/src/bin/e_process.c @@ -1,5 +1,6 @@ #include "e.h" #include "e_process_intern.h" +#include "e_comp_wl_subsurface_intern.h" static E_Process *_e_process_find(E_Process_Manager *pm, pid_t pid); static E_Process *_e_process_new(pid_t pid); diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c index 7d38b16..f7e2710 100644 --- a/src/bin/e_zone.c +++ b/src/bin/e_zone.c @@ -6,6 +6,7 @@ #include "e_bg_intern.h" #include "e_bindings_intern.h" #include "e_comp_wl_rsm_intern.h" +#include "e_comp_wl_subsurface_intern.h" #include diff --git a/src/bin/video/e_client_video.c b/src/bin/video/e_client_video.c index ac1a084..37268da 100644 --- a/src/bin/video/e_client_video.c +++ b/src/bin/video/e_client_video.c @@ -1,5 +1,6 @@ #include "e_video_internal.h" #include "e_comp_wl_intern.h" +#include "e_comp_wl_subsurface_intern.h" #define EO_DATA_KEY "E_Client_Video" diff --git a/src/bin/video/iface/e_video_hwc.c b/src/bin/video/iface/e_video_hwc.c index 2eeba4c..b5b4e3f 100644 --- a/src/bin/video/iface/e_video_hwc.c +++ b/src/bin/video/iface/e_video_hwc.c @@ -6,6 +6,7 @@ #include "e_video_hwc.h" #include "e_comp_screen_intern.h" #include "e_comp_wl_intern.h" +#include "e_comp_wl_subsurface_intern.h" #include diff --git a/src/bin/video/iface/e_video_hwc_planes.c b/src/bin/video/iface/e_video_hwc_planes.c index f4b024b..5b1f6c5 100644 --- a/src/bin/video/iface/e_video_hwc_planes.c +++ b/src/bin/video/iface/e_video_hwc_planes.c @@ -6,6 +6,7 @@ #include "e_video_hwc.h" #include "e_comp_screen_intern.h" #include "e_comp_wl_intern.h" +#include "e_comp_wl_subsurface_intern.h" #define CHECKING_PRIMARY_ZPOS -- 2.7.4