diff options
author | Christopher Michael <cp.michael@samsung.com> | 2019-08-06 08:36:50 -0400 |
---|---|---|
committer | Christopher Michael <cp.michael@samsung.com> | 2019-08-06 08:40:41 -0400 |
commit | b273bf7f9ab95c1dbf541938337abc12b06000fc (patch) | |
tree | 26ca4b7b411d08c7bba37d8f1121a81299211f14 | |
parent | ee25c66efffbb0adaff17119a8161ca9daa52eb8 (diff) |
ecore_wl2: Move ecore_wl2_window_rotation_change functions to be
internal
These functions are not used in efl wayland clients nor are they used
in Enlightenment. As such, there is no reason that they need to be
public API so this commit moves them to be Internal and updates
Ecore_Evas engine code to include the internal header.
ref T8013
-rw-r--r-- | src/lib/ecore_wl2/Ecore_Wl2.h | 9 | ||||
-rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_internal.h | 43 | ||||
-rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_private.h | 1 | ||||
-rw-r--r-- | src/lib/ecore_wl2/meson.build | 1 | ||||
-rw-r--r-- | src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h | 1 |
5 files changed, 46 insertions, 9 deletions
diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 59aee96..c7860f1 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h | |||
@@ -412,10 +412,6 @@ EAPI extern int ECORE_WL2_EVENT_SEAT_KEYBOARD_REPEAT_CHANGED; /** @since 1.20 */ | |||
412 | EAPI extern int ECORE_WL2_EVENT_SEAT_SELECTION; /** @since 1.20 */ | 412 | EAPI extern int ECORE_WL2_EVENT_SEAT_SELECTION; /** @since 1.20 */ |
413 | EAPI extern int ECORE_WL2_EVENT_OUTPUT_TRANSFORM; /** @since 1.20 */ | 413 | EAPI extern int ECORE_WL2_EVENT_OUTPUT_TRANSFORM; /** @since 1.20 */ |
414 | EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATE; /** @since 1.20 */ | 414 | EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATE; /** @since 1.20 */ |
415 | EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE; /** @since 1.20 */ | ||
416 | EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE_DONE; /** @since 1.20 */ | ||
417 | EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_REQUEST; /** @since 1.20 */ | ||
418 | EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_DONE; /** @since 1.20 */ | ||
419 | EAPI extern int ECORE_WL2_EVENT_AUX_HINT_ALLOWED; /** @since 1.20 */ | 415 | EAPI extern int ECORE_WL2_EVENT_AUX_HINT_ALLOWED; /** @since 1.20 */ |
420 | EAPI extern int ECORE_WL2_EVENT_AUX_HINT_SUPPORTED; /** @since 1.20 */ | 416 | EAPI extern int ECORE_WL2_EVENT_AUX_HINT_SUPPORTED; /** @since 1.20 */ |
421 | EAPI extern int ECORE_WL2_EVENT_AUX_MESSAGE; /** @since 1.20 */ | 417 | EAPI extern int ECORE_WL2_EVENT_AUX_MESSAGE; /** @since 1.20 */ |
@@ -1137,11 +1133,6 @@ EAPI void ecore_wl2_window_available_rotations_set(Ecore_Wl2_Window *window, con | |||
1137 | */ | 1133 | */ |
1138 | EAPI Eina_Bool ecore_wl2_window_available_rotations_get(Ecore_Wl2_Window *window, int **rots, unsigned int *count); | 1134 | EAPI Eina_Bool ecore_wl2_window_available_rotations_get(Ecore_Wl2_Window *window, int **rots, unsigned int *count); |
1139 | 1135 | ||
1140 | EAPI void ecore_wl2_window_rotation_change_prepare_send(Ecore_Wl2_Window *window, int rot, int w, int h, Eina_Bool resize); | ||
1141 | EAPI void ecore_wl2_window_rotation_change_prepare_done_send(Ecore_Wl2_Window *window, int rot); | ||
1142 | EAPI void ecore_wl2_window_rotation_change_request_send(Ecore_Wl2_Window *window, int rot); | ||
1143 | EAPI void ecore_wl2_window_rotation_change_done_send(Ecore_Wl2_Window *window, int rot, int w, int h); | ||
1144 | |||
1145 | /** | 1136 | /** |
1146 | * Get list of supported auxiliary window hints | 1137 | * Get list of supported auxiliary window hints |
1147 | * | 1138 | * |
diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h new file mode 100644 index 0000000..dbc2e64 --- /dev/null +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h | |||
@@ -0,0 +1,43 @@ | |||
1 | #ifndef _ECORE_WL2_INTERNAL_H | ||
2 | # define _ECORE_WL2_INTERNAL_H | ||
3 | |||
4 | # ifdef EAPI | ||
5 | # undef EAPI | ||
6 | # endif | ||
7 | |||
8 | # ifdef _WIN32 | ||
9 | # ifdef EFL_BUILD | ||
10 | # ifdef DLL_EXPORT | ||
11 | # define EAPI __declspec(dllexport) | ||
12 | # else | ||
13 | # define EAPI | ||
14 | # endif | ||
15 | # else | ||
16 | # define EAPI __declspec(dllimport) | ||
17 | # endif | ||
18 | # else | ||
19 | # ifdef __GNUC__ | ||
20 | # if __GNUC__ >= 4 | ||
21 | # define EAPI __attribute__ ((visibility("default"))) | ||
22 | # else | ||
23 | # define EAPI | ||
24 | # endif | ||
25 | # else | ||
26 | # define EAPI | ||
27 | # endif | ||
28 | # endif | ||
29 | |||
30 | EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE; /** @since 1.20 */ | ||
31 | EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE_DONE; /** @since 1.20 */ | ||
32 | EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_REQUEST; /** @since 1.20 */ | ||
33 | EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_DONE; /** @since 1.20 */ | ||
34 | |||
35 | EAPI void ecore_wl2_window_rotation_change_prepare_send(Ecore_Wl2_Window *window, int rot, int w, int h, Eina_Bool resize); | ||
36 | EAPI void ecore_wl2_window_rotation_change_prepare_done_send(Ecore_Wl2_Window *window, int rot); | ||
37 | EAPI void ecore_wl2_window_rotation_change_request_send(Ecore_Wl2_Window *window, int rot); | ||
38 | EAPI void ecore_wl2_window_rotation_change_done_send(Ecore_Wl2_Window *window, int rot, int w, int h); | ||
39 | |||
40 | # undef EAPI | ||
41 | # define EAPI | ||
42 | |||
43 | #endif | ||
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h b/src/lib/ecore_wl2/ecore_wl2_private.h index 4c19886..4d8420f 100644 --- a/src/lib/ecore_wl2/ecore_wl2_private.h +++ b/src/lib/ecore_wl2/ecore_wl2_private.h | |||
@@ -6,6 +6,7 @@ | |||
6 | # include "Ecore_Input.h" | 6 | # include "Ecore_Input.h" |
7 | # include <xkbcommon/xkbcommon-compose.h> | 7 | # include <xkbcommon/xkbcommon-compose.h> |
8 | # include "www-client-protocol.h" | 8 | # include "www-client-protocol.h" |
9 | # include "ecore_wl2_internal.h" | ||
9 | 10 | ||
10 | # define EFL_TEAMWORK_VERSION 2 | 11 | # define EFL_TEAMWORK_VERSION 2 |
11 | # include "teamwork-client-protocol.h" | 12 | # include "teamwork-client-protocol.h" |
diff --git a/src/lib/ecore_wl2/meson.build b/src/lib/ecore_wl2/meson.build index b455ba5..b053dc4 100644 --- a/src/lib/ecore_wl2/meson.build +++ b/src/lib/ecore_wl2/meson.build | |||
@@ -9,6 +9,7 @@ ecore_wl2_header_src = [ | |||
9 | ] | 9 | ] |
10 | 10 | ||
11 | ecore_wl2_src = [ | 11 | ecore_wl2_src = [ |
12 | 'ecore_wl2_internal.h', | ||
12 | 'ecore_wl2_subsurf.c', | 13 | 'ecore_wl2_subsurf.c', |
13 | 'ecore_wl2_dnd.c', | 14 | 'ecore_wl2_dnd.c', |
14 | 'ecore_wl2_window.c', | 15 | 'ecore_wl2_window.c', |
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h index 1820ef1..e69970f 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h | |||
@@ -26,6 +26,7 @@ | |||
26 | # include <Ecore_Evas.h> | 26 | # include <Ecore_Evas.h> |
27 | # endif | 27 | # endif |
28 | 28 | ||
29 | # include "ecore_wl2_internal.h" | ||
29 | # include "ecore_wl2_private.h" | 30 | # include "ecore_wl2_private.h" |
30 | # include "ecore_private.h" | 31 | # include "ecore_private.h" |
31 | # include "ecore_evas_private.h" | 32 | # include "ecore_evas_private.h" |