diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ecore_wl2/Ecore_Wl2.h | 285 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2.c | 100 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_api.h | 34 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_buffer.c | 30 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_display.c | 42 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_dnd.c | 36 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_input.c | 24 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_internal.h | 189 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_output.c | 4 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_private.h | 20 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_subsurf.c | 18 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_surface.c | 24 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_window.c | 146 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/meson.build | 3 |
14 files changed, 468 insertions, 487 deletions
diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index 6a7d2507ec..25672dbbd8 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -10,19 +10,7 @@ # define WL_HIDE_DEPRECATED # include <wayland-server.h> -# ifdef EAPI -# undef EAPI -# endif - -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# else -# define EAPI -# endif -# else -# define EAPI -# endif +#include <ecore_wl2_api.h> /* # ifdef __cplusplus */ /* extern "C" { */ @@ -391,46 +379,46 @@ typedef void (*Ecore_Wl2_Unbind_Cb)(struct wl_resource *resource); typedef void (*Ecore_Wl2_Frame_Cb)(Ecore_Wl2_Window *win, uint32_t timestamp, void *data); typedef struct _Ecore_Wl2_Frame_Cb_Handle Ecore_Wl2_Frame_Cb_Handle; -EAPI extern int ECORE_WL2_EVENT_DISCONNECT; /** @since 1.18 */ -EAPI extern int ECORE_WL2_EVENT_CONNECT; /** @since 1.18 */ -EAPI extern int ECORE_WL2_EVENT_GLOBAL_ADDED; /** @since 1.17 */ -EAPI extern int ECORE_WL2_EVENT_GLOBAL_REMOVED; /** @since 1.17 */ -EAPI extern int ECORE_WL2_EVENT_FOCUS_IN; /** @since 1.17 */ -EAPI extern int ECORE_WL2_EVENT_FOCUS_OUT; /** @since 1.17 */ -EAPI extern int ECORE_WL2_EVENT_DND_ENTER; /** @since 1.17 */ -EAPI extern int ECORE_WL2_EVENT_DND_LEAVE; /** @since 1.17 */ -EAPI extern int ECORE_WL2_EVENT_DND_MOTION; /** @since 1.17 */ -EAPI extern int ECORE_WL2_EVENT_DND_DROP; /** @since 1.17 */ -EAPI extern int ECORE_WL2_EVENT_DND_END; /** @since 1.17 */ -EAPI extern int ECORE_WL2_EVENT_DATA_SOURCE_END; /** @since 1.18 */ -EAPI extern int ECORE_WL2_EVENT_DATA_SOURCE_DROP; /** @since 1.18 */ -EAPI extern int ECORE_WL2_EVENT_DATA_SOURCE_ACTION; /** @since 1.18 */ -EAPI extern int ECORE_WL2_EVENT_DATA_SOURCE_TARGET; /** @since 1.17 */ -EAPI extern int ECORE_WL2_EVENT_DATA_SOURCE_SEND; /** @since 1.17 */ -EAPI extern int ECORE_WL2_EVENT_WINDOW_CONFIGURE; /** @since 1.17 */ -EAPI extern int ECORE_WL2_EVENT_SYNC_DONE; /** @since 1.17 */ -EAPI extern int ECORE_WL2_EVENT_OFFER_DATA_READY; /** @since 1.19 */ -EAPI extern int ECORE_WL2_EVENT_SEAT_NAME_CHANGED; /** @since 1.19 */ -EAPI extern int ECORE_WL2_EVENT_SEAT_CAPABILITIES_CHANGED; /** @since 1.19 */ -EAPI extern int ECORE_WL2_EVENT_DEVICE_ADDED; /** @since 1.19 */ -EAPI extern int ECORE_WL2_EVENT_DEVICE_REMOVED; /** @since 1.19 */ -EAPI extern int ECORE_WL2_EVENT_WINDOW_CONFIGURE_COMPLETE; /** @since 1.19 */ -EAPI extern int ECORE_WL2_EVENT_SEAT_KEYMAP_CHANGED; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_SEAT_KEYBOARD_REPEAT_CHANGED; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_SEAT_SELECTION; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_OUTPUT_TRANSFORM; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATE; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_AUX_HINT_ALLOWED; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_AUX_HINT_SUPPORTED; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_AUX_MESSAGE; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_WINDOW_SHOW; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_WINDOW_HIDE; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_WINDOW_ACTIVATE; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_WINDOW_DEACTIVATE; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE; /** @since 1.21 */ -EAPI extern int ECORE_WL2_EVENT_WINDOW_OFFSCREEN; /** @since 1.21 */ -EAPI extern int ECORE_WL2_EVENT_WINDOW_CREATE; /** @since 1.25 */ -EAPI extern int ECORE_WL2_EVENT_WINDOW_DESTROY; /** @since 1.25 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_DISCONNECT; /** @since 1.18 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_CONNECT; /** @since 1.18 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_GLOBAL_ADDED; /** @since 1.17 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_GLOBAL_REMOVED; /** @since 1.17 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_FOCUS_IN; /** @since 1.17 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_FOCUS_OUT; /** @since 1.17 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_DND_ENTER; /** @since 1.17 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_DND_LEAVE; /** @since 1.17 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_DND_MOTION; /** @since 1.17 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_DND_DROP; /** @since 1.17 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_DND_END; /** @since 1.17 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_DATA_SOURCE_END; /** @since 1.18 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_DATA_SOURCE_DROP; /** @since 1.18 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_DATA_SOURCE_ACTION; /** @since 1.18 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_DATA_SOURCE_TARGET; /** @since 1.17 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_DATA_SOURCE_SEND; /** @since 1.17 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_CONFIGURE; /** @since 1.17 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_SYNC_DONE; /** @since 1.17 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_OFFER_DATA_READY; /** @since 1.19 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_SEAT_NAME_CHANGED; /** @since 1.19 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_SEAT_CAPABILITIES_CHANGED; /** @since 1.19 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_DEVICE_ADDED; /** @since 1.19 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_DEVICE_REMOVED; /** @since 1.19 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_CONFIGURE_COMPLETE; /** @since 1.19 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_SEAT_KEYMAP_CHANGED; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_SEAT_KEYBOARD_REPEAT_CHANGED; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_SEAT_SELECTION; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_OUTPUT_TRANSFORM; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_ROTATE; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_AUX_HINT_ALLOWED; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_AUX_HINT_SUPPORTED; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_AUX_MESSAGE; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_SHOW; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_HIDE; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_ACTIVATE; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_DEACTIVATE; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE; /** @since 1.21 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_OFFSCREEN; /** @since 1.21 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_CREATE; /** @since 1.25 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_DESTROY; /** @since 1.25 */ typedef struct _Ecore_Wl2_Surface_Interface { @@ -480,7 +468,7 @@ typedef struct _Ecore_Wl2_Surface_Interface * @ingroup Ecore_Wl2_Init_Group * @since 1.17 */ -EAPI int ecore_wl2_init(void); +ECORE_WL2_API int ecore_wl2_init(void); /** * Shutdown the Ecore_Wl2 Library @@ -491,7 +479,7 @@ EAPI int ecore_wl2_init(void); * @ingroup Ecore_Wl2_Init_Group * @since 1.17 */ -EAPI int ecore_wl2_shutdown(void); +ECORE_WL2_API int ecore_wl2_shutdown(void); /** * @defgroup Ecore_Wl2_Display_Group Wayland Library Display Functions @@ -515,7 +503,7 @@ EAPI int ecore_wl2_shutdown(void); * @ingroup Ecore_Wl2_Display_Group * @since 1.17 */ -EAPI Ecore_Wl2_Display *ecore_wl2_display_create(const char *name); +ECORE_WL2_API Ecore_Wl2_Display *ecore_wl2_display_create(const char *name); /** * Destroy an existing Wayland display @@ -528,7 +516,7 @@ EAPI Ecore_Wl2_Display *ecore_wl2_display_create(const char *name); * @ingroup Ecore_Wl2_Display_Group * @since 1.17 */ -EAPI void ecore_wl2_display_destroy(Ecore_Wl2_Display *display); +ECORE_WL2_API void ecore_wl2_display_destroy(Ecore_Wl2_Display *display); /** * Connect to an existing Wayland display @@ -544,7 +532,7 @@ EAPI void ecore_wl2_display_destroy(Ecore_Wl2_Display *display); * @ingroup Ecore_Wl2_Display_Group * @since 1.17 */ -EAPI Ecore_Wl2_Display *ecore_wl2_display_connect(const char *name); +ECORE_WL2_API Ecore_Wl2_Display *ecore_wl2_display_connect(const char *name); /** * Disconnect an existing Wayland display @@ -557,7 +545,7 @@ EAPI Ecore_Wl2_Display *ecore_wl2_display_connect(const char *name); * @ingroup Ecore_Wl2_Display_Group * @since 1.17 */ -EAPI void ecore_wl2_display_disconnect(Ecore_Wl2_Display *display); +ECORE_WL2_API void ecore_wl2_display_disconnect(Ecore_Wl2_Display *display); /** * Retrieve the existing Wayland display @@ -570,7 +558,7 @@ EAPI void ecore_wl2_display_disconnect(Ecore_Wl2_Display *display); * @ingroup Ecore_Wl2_Display_Group * @since 1.17 */ -EAPI struct wl_display *ecore_wl2_display_get(Ecore_Wl2_Display *display); +ECORE_WL2_API struct wl_display *ecore_wl2_display_get(Ecore_Wl2_Display *display); /** * Retrieve the wl_shm from a given Ecore_Wl2_Display @@ -583,7 +571,7 @@ EAPI struct wl_display *ecore_wl2_display_get(Ecore_Wl2_Display *display); * @ingroup Ecore_Wl2_Display_Group * @since 1.17 */ -EAPI struct wl_shm *ecore_wl2_display_shm_get(Ecore_Wl2_Display *display); +ECORE_WL2_API struct wl_shm *ecore_wl2_display_shm_get(Ecore_Wl2_Display *display); /** * Retrieve the wl_dmabuf from a given Ecore_Wl2_Display @@ -604,7 +592,7 @@ EAPI struct wl_shm *ecore_wl2_display_shm_get(Ecore_Wl2_Display *display); * * @since 1.18 */ -EAPI void *ecore_wl2_display_dmabuf_get(Ecore_Wl2_Display *display); +ECORE_WL2_API void *ecore_wl2_display_dmabuf_get(Ecore_Wl2_Display *display); /** * Return an Eina_Iterator that can be used to iterate through globals @@ -617,7 +605,7 @@ EAPI void *ecore_wl2_display_dmabuf_get(Ecore_Wl2_Display *display); * @ingroup Ecore_Wl2_Display_Group * @since 1.17 */ -EAPI Eina_Iterator *ecore_wl2_display_globals_get(Ecore_Wl2_Display *display); +ECORE_WL2_API Eina_Iterator *ecore_wl2_display_globals_get(Ecore_Wl2_Display *display); /** * Retrieves the size of the current screen. @@ -629,7 +617,7 @@ EAPI Eina_Iterator *ecore_wl2_display_globals_get(Ecore_Wl2_Display *display); * @ingroup Ecore_Wl2_Display_Group * @since 1.17 */ -EAPI void ecore_wl2_display_screen_size_get(Ecore_Wl2_Display *display, int *w, int *h); +ECORE_WL2_API void ecore_wl2_display_screen_size_get(Ecore_Wl2_Display *display, int *w, int *h); /** * Get all the Ecore_Wl2_Input from the display. @@ -641,7 +629,7 @@ EAPI void ecore_wl2_display_screen_size_get(Ecore_Wl2_Display *display, int *w, * @ingroup Ecore_Wl2_Display_Group * @since 1.19 */ -EAPI Eina_Iterator *ecore_wl2_display_inputs_get(Ecore_Wl2_Display *display); +ECORE_WL2_API Eina_Iterator *ecore_wl2_display_inputs_get(Ecore_Wl2_Display *display); /** * Find a seat for a given display object using the seat id @@ -654,7 +642,7 @@ EAPI Eina_Iterator *ecore_wl2_display_inputs_get(Ecore_Wl2_Display *display); * @ingroup Ecore_Wl2_Display_Group * @since 1.20 */ -EAPI Ecore_Wl2_Input *ecore_wl2_display_input_find(const Ecore_Wl2_Display *display, unsigned int id); +ECORE_WL2_API Ecore_Wl2_Input *ecore_wl2_display_input_find(const Ecore_Wl2_Display *display, unsigned int id); /** * Find a seat for a given display object using the seat id @@ -667,7 +655,7 @@ EAPI Ecore_Wl2_Input *ecore_wl2_display_input_find(const Ecore_Wl2_Display *disp * @ingroup Ecore_Wl2_Display_Group * @since 1.20 */ -EAPI Ecore_Wl2_Input *ecore_wl2_display_input_find_by_name(const Ecore_Wl2_Display *display, const char *name); +ECORE_WL2_API Ecore_Wl2_Input *ecore_wl2_display_input_find_by_name(const Ecore_Wl2_Display *display, const char *name); /** * Retrieves the Wayland Registry used for the current Wayland display. @@ -679,7 +667,7 @@ EAPI Ecore_Wl2_Input *ecore_wl2_display_input_find_by_name(const Ecore_Wl2_Displ * @ingroup Ecore_Wl2_Display_Group * @since 1.17 */ -EAPI struct wl_registry *ecore_wl2_display_registry_get(Ecore_Wl2_Display *display); +ECORE_WL2_API struct wl_registry *ecore_wl2_display_registry_get(Ecore_Wl2_Display *display); /** * Check if the display has performed a sync @@ -692,7 +680,7 @@ EAPI struct wl_registry *ecore_wl2_display_registry_get(Ecore_Wl2_Display *displ * @ingroup Ecore_Wl2_Display_Group * @since 1.20 */ -EAPI Eina_Bool ecore_wl2_display_sync_is_done(const Ecore_Wl2_Display *display); +ECORE_WL2_API Eina_Bool ecore_wl2_display_sync_is_done(const Ecore_Wl2_Display *display); /** * Get the name of the display object @@ -704,7 +692,7 @@ EAPI Eina_Bool ecore_wl2_display_sync_is_done(const Ecore_Wl2_Display *display); * @ingroup Ecore_Wl2_Display_Group * @since 1.20 */ -EAPI const char *ecore_wl2_display_name_get(const Ecore_Wl2_Display *display); +ECORE_WL2_API const char *ecore_wl2_display_name_get(const Ecore_Wl2_Display *display); /** * Finds an Ecore_Wl2_Window based on wl_surface @@ -717,7 +705,7 @@ EAPI const char *ecore_wl2_display_name_get(const Ecore_Wl2_Display *display); * @ingroup Ecore_Wl2_Display_Group * @since 1.24 */ -EAPI Ecore_Wl2_Window *ecore_wl2_display_window_find_by_surface(Ecore_Wl2_Display *display, struct wl_surface *surface); +ECORE_WL2_API Ecore_Wl2_Window *ecore_wl2_display_window_find_by_surface(Ecore_Wl2_Display *display, struct wl_surface *surface); /** * Gets the connected display object @@ -733,7 +721,7 @@ EAPI Ecore_Wl2_Window *ecore_wl2_display_window_find_by_surface(Ecore_Wl2_Displa * @ingroup Ecore_Wl2_Display_Group * @since 1.24 */ -EAPI Ecore_Wl2_Display *ecore_wl2_connected_display_get(const char *name); +ECORE_WL2_API Ecore_Wl2_Display *ecore_wl2_connected_display_get(const char *name); /** * Gets the wl_compositor which belongs to this display @@ -745,7 +733,7 @@ EAPI Ecore_Wl2_Display *ecore_wl2_connected_display_get(const char *name); * @ingroup Ecore_Wl2_Display_Group * @since 1.24 */ -EAPI struct wl_compositor *ecore_wl2_display_compositor_get(Ecore_Wl2_Display *display); +ECORE_WL2_API struct wl_compositor *ecore_wl2_display_compositor_get(Ecore_Wl2_Display *display); /** * @defgroup Ecore_Wl2_Window_Group Wayland Library Window Functions @@ -768,7 +756,7 @@ EAPI struct wl_compositor *ecore_wl2_display_compositor_get(Ecore_Wl2_Display *d * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI Ecore_Wl2_Window *ecore_wl2_window_new(Ecore_Wl2_Display *display, Ecore_Wl2_Window *parent, int x, int y, int w, int h); +ECORE_WL2_API Ecore_Wl2_Window *ecore_wl2_window_new(Ecore_Wl2_Display *display, Ecore_Wl2_Window *parent, int x, int y, int w, int h); /** * Set a callback to be caleld just before the window is closed and freed @@ -780,7 +768,7 @@ EAPI Ecore_Wl2_Window *ecore_wl2_window_new(Ecore_Wl2_Display *display, Ecore_Wl * @ingroup Ecore_Wl2_Window_Group * @since 1.24 */ -EAPI void ecore_wl2_window_close_callback_set(Ecore_Wl2_Window *window, void (*cb) (void *data, Ecore_Wl2_Window *win), void *data); +ECORE_WL2_API void ecore_wl2_window_close_callback_set(Ecore_Wl2_Window *window, void (*cb) (void *data, Ecore_Wl2_Window *win), void *data); /** * Get the wl_surface which belongs to this window @@ -792,7 +780,7 @@ EAPI void ecore_wl2_window_close_callback_set(Ecore_Wl2_Window *window, void (*c * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI struct wl_surface *ecore_wl2_window_surface_get(Ecore_Wl2_Window *window); +ECORE_WL2_API struct wl_surface *ecore_wl2_window_surface_get(Ecore_Wl2_Window *window); /** * Get the id of a given Ecore_Wl2_Window @@ -804,21 +792,21 @@ EAPI struct wl_surface *ecore_wl2_window_surface_get(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI int ecore_wl2_window_surface_id_get(Ecore_Wl2_Window *window); +ECORE_WL2_API int ecore_wl2_window_surface_id_get(Ecore_Wl2_Window *window); /** * @see evas_object_size_hint_aspect_set * @ingroup Ecore_Wl2_Window_Group * @since 1.21 */ -EAPI void ecore_wl2_window_aspect_set(Ecore_Wl2_Window *window, int w, int h, unsigned int aspect); +ECORE_WL2_API void ecore_wl2_window_aspect_set(Ecore_Wl2_Window *window, int w, int h, unsigned int aspect); /** * @see evas_object_size_hint_aspect_get * @ingroup Ecore_Wl2_Window_Group * @since 1.24 */ -EAPI void ecore_wl2_window_aspect_get(Ecore_Wl2_Window *window, int *w, int *h, unsigned int *aspect); +ECORE_WL2_API void ecore_wl2_window_aspect_get(Ecore_Wl2_Window *window, int *w, int *h, unsigned int *aspect); /** * Show a given Ecore_Wl2_Window @@ -828,7 +816,7 @@ EAPI void ecore_wl2_window_aspect_get(Ecore_Wl2_Window *window, int *w, int *h, * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_show(Ecore_Wl2_Window *window); +ECORE_WL2_API void ecore_wl2_window_show(Ecore_Wl2_Window *window); /** * Hide a given Ecore_Wl2_Window @@ -838,7 +826,7 @@ EAPI void ecore_wl2_window_show(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_hide(Ecore_Wl2_Window *window); +ECORE_WL2_API void ecore_wl2_window_hide(Ecore_Wl2_Window *window); /** * Free a given Ecore_Wl2_Window @@ -848,7 +836,7 @@ EAPI void ecore_wl2_window_hide(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_free(Ecore_Wl2_Window *window); +ECORE_WL2_API void ecore_wl2_window_free(Ecore_Wl2_Window *window); /** * @brief Begin moving a given Ecore_Wl2_Window @@ -859,7 +847,7 @@ EAPI void ecore_wl2_window_free(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI void ecore_wl2_window_move(Ecore_Wl2_Window *window, Ecore_Wl2_Input *input); +ECORE_WL2_API void ecore_wl2_window_move(Ecore_Wl2_Window *window, Ecore_Wl2_Input *input); /** * @brief Begin resizing a given window @@ -871,7 +859,7 @@ EAPI void ecore_wl2_window_move(Ecore_Wl2_Window *window, Ecore_Wl2_Input *input * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI void ecore_wl2_window_resize(Ecore_Wl2_Window *window, Ecore_Wl2_Input *input, int location); +ECORE_WL2_API void ecore_wl2_window_resize(Ecore_Wl2_Window *window, Ecore_Wl2_Input *input, int location); /** * Get if a given window is alpha @@ -883,7 +871,7 @@ EAPI void ecore_wl2_window_resize(Ecore_Wl2_Window *window, Ecore_Wl2_Input *inp * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI Eina_Bool ecore_wl2_window_alpha_get(Ecore_Wl2_Window *window); +ECORE_WL2_API Eina_Bool ecore_wl2_window_alpha_get(Ecore_Wl2_Window *window); /** * Set a given window's alpha property @@ -894,7 +882,7 @@ EAPI Eina_Bool ecore_wl2_window_alpha_get(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_alpha_set(Ecore_Wl2_Window *window, Eina_Bool alpha); +ECORE_WL2_API void ecore_wl2_window_alpha_set(Ecore_Wl2_Window *window, Eina_Bool alpha); /** * Set the opaque region of the Ecore_Wl2_Window @@ -908,7 +896,7 @@ EAPI void ecore_wl2_window_alpha_set(Ecore_Wl2_Window *window, Eina_Bool alpha); * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_opaque_region_set(Ecore_Wl2_Window *window, int x, int y, int w, int h); +ECORE_WL2_API void ecore_wl2_window_opaque_region_set(Ecore_Wl2_Window *window, int x, int y, int w, int h); /** * Get the opaque region of the Ecore_Wl2_Window @@ -922,7 +910,7 @@ EAPI void ecore_wl2_window_opaque_region_set(Ecore_Wl2_Window *window, int x, in * @ingroup Ecore_Wl2_Window_Group * @since 1.24 */ -EAPI void ecore_wl2_window_opaque_region_get(Ecore_Wl2_Window *window, int *x, int *y, int *w, int *h); +ECORE_WL2_API void ecore_wl2_window_opaque_region_get(Ecore_Wl2_Window *window, int *x, int *y, int *w, int *h); /** * Set the input region of the Ecore_Wl2_Window. @@ -940,7 +928,7 @@ EAPI void ecore_wl2_window_opaque_region_get(Ecore_Wl2_Window *window, int *x, i * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_input_region_set(Ecore_Wl2_Window *window, int x, int y, int w, int h); +ECORE_WL2_API void ecore_wl2_window_input_region_set(Ecore_Wl2_Window *window, int x, int y, int w, int h); /** * Get the input region of the Ecore_Wl2_Window. @@ -954,7 +942,7 @@ EAPI void ecore_wl2_window_input_region_set(Ecore_Wl2_Window *window, int x, int * @ingroup Ecore_Wl2_Window_Group * @since 1.24 */ -EAPI void ecore_wl2_window_input_region_get(Ecore_Wl2_Window *window, int *x, int *y, int *w, int *h); +ECORE_WL2_API void ecore_wl2_window_input_region_get(Ecore_Wl2_Window *window, int *x, int *y, int *w, int *h); /** * Get if a given window is maximized @@ -966,7 +954,7 @@ EAPI void ecore_wl2_window_input_region_get(Ecore_Wl2_Window *window, int *x, in * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI Eina_Bool ecore_wl2_window_maximized_get(Ecore_Wl2_Window *window); +ECORE_WL2_API Eina_Bool ecore_wl2_window_maximized_get(Ecore_Wl2_Window *window); /** * Set the maximized state of a given window @@ -977,7 +965,7 @@ EAPI Eina_Bool ecore_wl2_window_maximized_get(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_maximized_set(Ecore_Wl2_Window *window, Eina_Bool maximized); +ECORE_WL2_API void ecore_wl2_window_maximized_set(Ecore_Wl2_Window *window, Eina_Bool maximized); /** * Get if a given window is fullscreen @@ -989,7 +977,7 @@ EAPI void ecore_wl2_window_maximized_set(Ecore_Wl2_Window *window, Eina_Bool max * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI Eina_Bool ecore_wl2_window_fullscreen_get(Ecore_Wl2_Window *window); +ECORE_WL2_API Eina_Bool ecore_wl2_window_fullscreen_get(Ecore_Wl2_Window *window); /** * Set the fullscreen state of a given window @@ -1000,7 +988,7 @@ EAPI Eina_Bool ecore_wl2_window_fullscreen_get(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_fullscreen_set(Ecore_Wl2_Window *window, Eina_Bool fullscreen); +ECORE_WL2_API void ecore_wl2_window_fullscreen_set(Ecore_Wl2_Window *window, Eina_Bool fullscreen); /** * Get if a given window is rotated @@ -1012,7 +1000,7 @@ EAPI void ecore_wl2_window_fullscreen_set(Ecore_Wl2_Window *window, Eina_Bool fu * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI int ecore_wl2_window_rotation_get(Ecore_Wl2_Window *window); +ECORE_WL2_API int ecore_wl2_window_rotation_get(Ecore_Wl2_Window *window); /** * Set the rotation of a given window @@ -1023,7 +1011,7 @@ EAPI int ecore_wl2_window_rotation_get(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_rotation_set(Ecore_Wl2_Window *window, int rotation); +ECORE_WL2_API void ecore_wl2_window_rotation_set(Ecore_Wl2_Window *window, int rotation); /** * Set the title of a given window @@ -1034,7 +1022,7 @@ EAPI void ecore_wl2_window_rotation_set(Ecore_Wl2_Window *window, int rotation); * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_title_set(Ecore_Wl2_Window *window, const char *title); +ECORE_WL2_API void ecore_wl2_window_title_set(Ecore_Wl2_Window *window, const char *title); /** * Get the title of a given window @@ -1046,7 +1034,7 @@ EAPI void ecore_wl2_window_title_set(Ecore_Wl2_Window *window, const char *title * @ingroup Ecore_Wl2_Window_Group * @since 1.24 */ -EAPI const char *ecore_wl2_window_title_get(Ecore_Wl2_Window *window); +ECORE_WL2_API const char *ecore_wl2_window_title_get(Ecore_Wl2_Window *window); /** * Set the class of a given window @@ -1057,7 +1045,7 @@ EAPI const char *ecore_wl2_window_title_get(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_class_set(Ecore_Wl2_Window *window, const char *clas); +ECORE_WL2_API void ecore_wl2_window_class_set(Ecore_Wl2_Window *window, const char *clas); /** @@ -1070,7 +1058,7 @@ EAPI void ecore_wl2_window_class_set(Ecore_Wl2_Window *window, const char *clas) * @ingroup Ecore_Wl2_Window_Group * @since 1.24 */ -EAPI const char *ecore_wl2_window_class_get(Ecore_Wl2_Window *window); +ECORE_WL2_API const char *ecore_wl2_window_class_get(Ecore_Wl2_Window *window); /** * Get the geometry of a given window @@ -1088,7 +1076,7 @@ EAPI const char *ecore_wl2_window_class_get(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_geometry_get(Ecore_Wl2_Window *window, int *x, int *y, int *w, int *h); +ECORE_WL2_API void ecore_wl2_window_geometry_get(Ecore_Wl2_Window *window, int *x, int *y, int *w, int *h); /** * Set the geometry of a given window @@ -1106,7 +1094,7 @@ EAPI void ecore_wl2_window_geometry_get(Ecore_Wl2_Window *window, int *x, int *y * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_geometry_set(Ecore_Wl2_Window *window, int x, int y, int w, int h); +ECORE_WL2_API void ecore_wl2_window_geometry_set(Ecore_Wl2_Window *window, int x, int y, int w, int h); /** * Set the type of a given window @@ -1117,7 +1105,7 @@ EAPI void ecore_wl2_window_geometry_set(Ecore_Wl2_Window *window, int x, int y, * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_type_set(Ecore_Wl2_Window *window, Ecore_Wl2_Window_Type type); +ECORE_WL2_API void ecore_wl2_window_type_set(Ecore_Wl2_Window *window, Ecore_Wl2_Window_Type type); /** * Get the type of a given window @@ -1127,7 +1115,7 @@ EAPI void ecore_wl2_window_type_set(Ecore_Wl2_Window *window, Ecore_Wl2_Window_T * @ingroup Ecore_Wl2_Window_Group * @since 1.24 */ -EAPI Ecore_Wl2_Window_Type ecore_wl2_window_type_get(Ecore_Wl2_Window *window); +ECORE_WL2_API Ecore_Wl2_Window_Type ecore_wl2_window_type_get(Ecore_Wl2_Window *window); /** * Find the output that a given window is on @@ -1139,7 +1127,7 @@ EAPI Ecore_Wl2_Window_Type ecore_wl2_window_type_get(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI Ecore_Wl2_Output *ecore_wl2_window_output_find(Ecore_Wl2_Window *window); +ECORE_WL2_API Ecore_Wl2_Output *ecore_wl2_window_output_find(Ecore_Wl2_Window *window); /** * Set if window rotation is supported by the window manager @@ -1150,7 +1138,7 @@ EAPI Ecore_Wl2_Output *ecore_wl2_window_output_find(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI void ecore_wl2_window_wm_rotation_supported_set(Ecore_Wl2_Window *window, Eina_Bool enabled); +ECORE_WL2_API void ecore_wl2_window_wm_rotation_supported_set(Ecore_Wl2_Window *window, Eina_Bool enabled); /** * Get if window rotation is supported by the window manager @@ -1162,7 +1150,7 @@ EAPI void ecore_wl2_window_wm_rotation_supported_set(Ecore_Wl2_Window *window, E * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI Eina_Bool ecore_wl2_window_wm_rotation_supported_get(Ecore_Wl2_Window *window); +ECORE_WL2_API Eina_Bool ecore_wl2_window_wm_rotation_supported_get(Ecore_Wl2_Window *window); /** * Set if an application has set window rotation @@ -1173,7 +1161,7 @@ EAPI Eina_Bool ecore_wl2_window_wm_rotation_supported_get(Ecore_Wl2_Window *wind * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI void ecore_wl2_window_rotation_app_set(Ecore_Wl2_Window *window, Eina_Bool set); +ECORE_WL2_API void ecore_wl2_window_rotation_app_set(Ecore_Wl2_Window *window, Eina_Bool set); /** * Get if an application has set window rotation @@ -1185,7 +1173,7 @@ EAPI void ecore_wl2_window_rotation_app_set(Ecore_Wl2_Window *window, Eina_Bool * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI Eina_Bool ecore_wl2_window_rotation_app_get(Ecore_Wl2_Window *window); +ECORE_WL2_API Eina_Bool ecore_wl2_window_rotation_app_get(Ecore_Wl2_Window *window); /** * Set preferred rotation on a given window @@ -1196,7 +1184,7 @@ EAPI Eina_Bool ecore_wl2_window_rotation_app_get(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI void ecore_wl2_window_preferred_rotation_set(Ecore_Wl2_Window *window, int rot); +ECORE_WL2_API void ecore_wl2_window_preferred_rotation_set(Ecore_Wl2_Window *window, int rot); /** * Get preferred rotation for a given window @@ -1208,7 +1196,7 @@ EAPI void ecore_wl2_window_preferred_rotation_set(Ecore_Wl2_Window *window, int * @ingroup Ecore_Wl2_Window * @since 1.20 */ -EAPI int ecore_wl2_window_preferred_rotation_get(Ecore_Wl2_Window *window); +ECORE_WL2_API int ecore_wl2_window_preferred_rotation_get(Ecore_Wl2_Window *window); /** * Set a windows available rotations @@ -1220,7 +1208,7 @@ EAPI int ecore_wl2_window_preferred_rotation_get(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI void ecore_wl2_window_available_rotations_set(Ecore_Wl2_Window *window, const int *rots, unsigned int count); +ECORE_WL2_API void ecore_wl2_window_available_rotations_set(Ecore_Wl2_Window *window, const int *rots, unsigned int count); /** * Get a windows available rotations @@ -1234,7 +1222,7 @@ EAPI void ecore_wl2_window_available_rotations_set(Ecore_Wl2_Window *window, con * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI Eina_Bool ecore_wl2_window_available_rotations_get(Ecore_Wl2_Window *window, int **rots, unsigned int *count); +ECORE_WL2_API Eina_Bool ecore_wl2_window_available_rotations_get(Ecore_Wl2_Window *window, int **rots, unsigned int *count); /** * @brief Get the activated state of a window @@ -1246,7 +1234,7 @@ EAPI Eina_Bool ecore_wl2_window_available_rotations_get(Ecore_Wl2_Window *window * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI Eina_Bool ecore_wl2_window_activated_get(const Ecore_Wl2_Window *window); +ECORE_WL2_API Eina_Bool ecore_wl2_window_activated_get(const Ecore_Wl2_Window *window); /** * @brief Set the seat for a popup window to be used with grab @@ -1260,7 +1248,7 @@ EAPI Eina_Bool ecore_wl2_window_activated_get(const Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI void ecore_wl2_window_popup_input_set(Ecore_Wl2_Window *window, Ecore_Wl2_Input *input); +ECORE_WL2_API void ecore_wl2_window_popup_input_set(Ecore_Wl2_Window *window, Ecore_Wl2_Input *input); /** * @brief Get the seat for a popup window to be used with grab @@ -1272,7 +1260,7 @@ EAPI void ecore_wl2_window_popup_input_set(Ecore_Wl2_Window *window, Ecore_Wl2_I * @ingroup Ecore_Wl2_Window_Group * @since 1.24 */ -EAPI Ecore_Wl2_Input *ecore_wl2_window_popup_input_get(Ecore_Wl2_Window *window); +ECORE_WL2_API Ecore_Wl2_Input *ecore_wl2_window_popup_input_get(Ecore_Wl2_Window *window); /** * Check if a window has a shell surface - without one it can't be visible. @@ -1284,7 +1272,7 @@ EAPI Ecore_Wl2_Input *ecore_wl2_window_popup_input_get(Ecore_Wl2_Window *window) * @ingroup Ecore_Wl2_Window_Group * @since 1.19 */ -EAPI Eina_Bool ecore_wl2_window_shell_surface_exists(Ecore_Wl2_Window *win); +ECORE_WL2_API Eina_Bool ecore_wl2_window_shell_surface_exists(Ecore_Wl2_Window *win); /** * Get which display a given window is using @@ -1296,7 +1284,7 @@ EAPI Eina_Bool ecore_wl2_window_shell_surface_exists(Ecore_Wl2_Window *win); * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI Ecore_Wl2_Display *ecore_wl2_window_display_get(const Ecore_Wl2_Window *window); +ECORE_WL2_API Ecore_Wl2_Display *ecore_wl2_window_display_get(const Ecore_Wl2_Window *window); /** * Set if this window should ignore focus requests @@ -1307,7 +1295,7 @@ EAPI Ecore_Wl2_Display *ecore_wl2_window_display_get(const Ecore_Wl2_Window *win * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI void ecore_wl2_window_focus_skip_set(Ecore_Wl2_Window *window, Eina_Bool focus_skip); +ECORE_WL2_API void ecore_wl2_window_focus_skip_set(Ecore_Wl2_Window *window, Eina_Bool focus_skip); /** * Get if this window ignores focus requests @@ -1319,7 +1307,7 @@ EAPI void ecore_wl2_window_focus_skip_set(Ecore_Wl2_Window *window, Eina_Bool fo * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI Eina_Bool ecore_wl2_window_focus_skip_get(Ecore_Wl2_Window *window); +ECORE_WL2_API Eina_Bool ecore_wl2_window_focus_skip_get(Ecore_Wl2_Window *window); /** * Set the role of a given window @@ -1330,7 +1318,7 @@ EAPI Eina_Bool ecore_wl2_window_focus_skip_get(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI void ecore_wl2_window_role_set(Ecore_Wl2_Window *window, const char *role); +ECORE_WL2_API void ecore_wl2_window_role_set(Ecore_Wl2_Window *window, const char *role); /** * Get the role of a given window @@ -1342,7 +1330,7 @@ EAPI void ecore_wl2_window_role_set(Ecore_Wl2_Window *window, const char *role); * @ingroup Ecore_Wl2_Window_Group * @since 1.24 */ -EAPI const char *ecore_wl2_window_role_get(Ecore_Wl2_Window *window); +ECORE_WL2_API const char *ecore_wl2_window_role_get(Ecore_Wl2_Window *window); /** * Set if a given window is in floating mode @@ -1353,7 +1341,7 @@ EAPI const char *ecore_wl2_window_role_get(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI void ecore_wl2_window_floating_mode_set(Ecore_Wl2_Window *window, Eina_Bool floating); +ECORE_WL2_API void ecore_wl2_window_floating_mode_set(Ecore_Wl2_Window *window, Eina_Bool floating); /** * Get if a given window is in floating mode @@ -1365,7 +1353,7 @@ EAPI void ecore_wl2_window_floating_mode_set(Ecore_Wl2_Window *window, Eina_Bool * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI Eina_Bool ecore_wl2_window_floating_mode_get(Ecore_Wl2_Window *window); +ECORE_WL2_API Eina_Bool ecore_wl2_window_floating_mode_get(Ecore_Wl2_Window *window); /** * Finds a window by surface @@ -1375,7 +1363,7 @@ EAPI Eina_Bool ecore_wl2_window_floating_mode_get(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Window_Group * @since 1.24 */ -EAPI Ecore_Wl2_Window *ecore_wl2_window_surface_find(struct wl_surface *surface); +ECORE_WL2_API Ecore_Wl2_Window *ecore_wl2_window_surface_find(struct wl_surface *surface); /** * @defgroup Ecore_Wl2_Input_Group Wayland Library Input Functions @@ -1395,7 +1383,7 @@ EAPI Ecore_Wl2_Window *ecore_wl2_window_surface_find(struct wl_surface *surface) * @ingroup Ecore_Wl2_Input_Group * @since 1.17 */ -EAPI struct wl_seat *ecore_wl2_input_seat_get(Ecore_Wl2_Input *input); +ECORE_WL2_API struct wl_seat *ecore_wl2_input_seat_get(Ecore_Wl2_Input *input); /** * Get the seat capabilities for a given input. @@ -1405,7 +1393,7 @@ EAPI struct wl_seat *ecore_wl2_input_seat_get(Ecore_Wl2_Input *input); * @ingroup Ecore_Wl2_Input_Group * @since 1.19 */ -EAPI Ecore_Wl2_Seat_Capabilities ecore_wl2_input_seat_capabilities_get(Ecore_Wl2_Input *input); +ECORE_WL2_API Ecore_Wl2_Seat_Capabilities ecore_wl2_input_seat_capabilities_get(Ecore_Wl2_Input *input); /** * Get the wayland's seat id from an input. @@ -1417,7 +1405,7 @@ EAPI Ecore_Wl2_Seat_Capabilities ecore_wl2_input_seat_capabilities_get(Ecore_Wl2 * @ingroup Ecore_Wl2_Input_Group * @since 1.19 */ -EAPI unsigned int ecore_wl2_input_seat_id_get(Ecore_Wl2_Input *input) EINA_WARN_UNUSED_RESULT; +ECORE_WL2_API unsigned int ecore_wl2_input_seat_id_get(Ecore_Wl2_Input *input) EINA_WARN_UNUSED_RESULT; /** * Get the display object of an input @@ -1429,7 +1417,7 @@ EAPI unsigned int ecore_wl2_input_seat_id_get(Ecore_Wl2_Input *input) EINA_WARN_ * @ingroup Ecore_Wl2_Input_Group * @since 1.20 */ -EAPI Ecore_Wl2_Display *ecore_wl2_input_display_get(const Ecore_Wl2_Input *input); +ECORE_WL2_API Ecore_Wl2_Display *ecore_wl2_input_display_get(const Ecore_Wl2_Input *input); /** * Get the xkb_keymap object of an input @@ -1441,7 +1429,7 @@ EAPI Ecore_Wl2_Display *ecore_wl2_input_display_get(const Ecore_Wl2_Input *input * @ingroup Ecore_Wl2_Input_Group * @since 1.20 */ -EAPI struct xkb_keymap *ecore_wl2_input_keymap_get(const Ecore_Wl2_Input *input); +ECORE_WL2_API struct xkb_keymap *ecore_wl2_input_keymap_get(const Ecore_Wl2_Input *input); /** * Get the name of an input @@ -1453,7 +1441,7 @@ EAPI struct xkb_keymap *ecore_wl2_input_keymap_get(const Ecore_Wl2_Input *input) * @ingroup Ecore_Wl2_Input_Group * @since 1.20 */ -EAPI Eina_Stringshare *ecore_wl2_input_name_get(Ecore_Wl2_Input *input); +ECORE_WL2_API Eina_Stringshare *ecore_wl2_input_name_get(Ecore_Wl2_Input *input); /** * Get the keyboard repeat rate and delay of an input @@ -1467,7 +1455,7 @@ EAPI Eina_Stringshare *ecore_wl2_input_name_get(Ecore_Wl2_Input *input); * @ingroup Ecore_Wl2_Input_Group * @since 1.20 */ -EAPI Eina_Bool ecore_wl2_input_keyboard_repeat_get(const Ecore_Wl2_Input *input, double *rate, double *delay); +ECORE_WL2_API Eina_Bool ecore_wl2_input_keyboard_repeat_get(const Ecore_Wl2_Input *input, double *rate, double *delay); /** * Set the keyboard repeat rate and delay of an input @@ -1478,7 +1466,7 @@ EAPI Eina_Bool ecore_wl2_input_keyboard_repeat_get(const Ecore_Wl2_Input *input, * @ingroup Ecore_Wl2_Input_Group * @since 1.24 */ -EAPI Eina_Bool ecore_wl2_input_keyboard_repeat_set(Ecore_Wl2_Input *input, double rate, double delay); +ECORE_WL2_API Eina_Bool ecore_wl2_input_keyboard_repeat_set(Ecore_Wl2_Input *input, double rate, double delay); /** * Retrieves the mouse position of the seat @@ -1491,7 +1479,7 @@ EAPI Eina_Bool ecore_wl2_input_keyboard_repeat_set(Ecore_Wl2_Input *input, doubl * @ingroup Ecore_Wl2_Input_Group * @since 1.20 */ -EAPI Eina_Bool ecore_wl2_input_pointer_xy_get(const Ecore_Wl2_Input *input, int *x, int *y); +ECORE_WL2_API Eina_Bool ecore_wl2_input_pointer_xy_get(const Ecore_Wl2_Input *input, int *x, int *y); /** * Set a given wl_surface to use as the pointer on a seat @@ -1504,7 +1492,7 @@ EAPI Eina_Bool ecore_wl2_input_pointer_xy_get(const Ecore_Wl2_Input *input, int * @ingroup Ecore_Wl2_Input_Group * @since 1.20 */ -EAPI void ecore_wl2_input_pointer_set(Ecore_Wl2_Input *input, struct wl_surface *surface, int hot_x, int hot_y); +ECORE_WL2_API void ecore_wl2_input_pointer_set(Ecore_Wl2_Input *input, struct wl_surface *surface, int hot_x, int hot_y); /** * Set a specific cursor on a given seat @@ -1519,7 +1507,7 @@ EAPI void ecore_wl2_input_pointer_set(Ecore_Wl2_Input *input, struct wl_surface * @ingroup Ecore_Wl2_Input_Group * @since 1.20 */ -EAPI void ecore_wl2_input_cursor_from_name_set(Ecore_Wl2_Input *input, const char *cursor); +ECORE_WL2_API void ecore_wl2_input_cursor_from_name_set(Ecore_Wl2_Input *input, const char *cursor); /** * Gets default input of a given display @@ -1529,7 +1517,7 @@ EAPI void ecore_wl2_input_cursor_from_name_set(Ecore_Wl2_Input *input, const cha * @ingroup Ecore_Wl2_Input_Group * @since 1.24 */ -EAPI Ecore_Wl2_Input *ecore_wl2_input_default_input_get(const Ecore_Wl2_Display *ewd); +ECORE_WL2_API Ecore_Wl2_Input *ecore_wl2_input_default_input_get(const Ecore_Wl2_Display *ewd); /** * @defgroup Ecore_Wl2_Output_Group Wayland Library Output Functions @@ -1553,7 +1541,7 @@ EAPI Ecore_Wl2_Input *ecore_wl2_input_default_input_get(const Ecore_Wl2_Display * @ingroup Ecore_Wl2_Output_Group * @since 1.17 */ -EAPI int ecore_wl2_output_dpi_get(Ecore_Wl2_Output *output); +ECORE_WL2_API int ecore_wl2_output_dpi_get(Ecore_Wl2_Output *output); /** * Get the current transform of a given output @@ -1565,7 +1553,7 @@ EAPI int ecore_wl2_output_dpi_get(Ecore_Wl2_Output *output); * @ingroup Ecore_Wl2_Output_Group * @since 1.20 */ -EAPI int ecore_wl2_output_transform_get(Ecore_Wl2_Output *output); +ECORE_WL2_API int ecore_wl2_output_transform_get(Ecore_Wl2_Output *output); /** * Return the version of the display's compositor object @@ -1577,7 +1565,7 @@ EAPI int ecore_wl2_output_transform_get(Ecore_Wl2_Output *output); * @ingroup Ecore_Wl2_Display_Group * @since 1.17 */ -EAPI int ecore_wl2_display_compositor_version_get(Ecore_Wl2_Display *disp); +ECORE_WL2_API int ecore_wl2_display_compositor_version_get(Ecore_Wl2_Display *disp); /** * Disable session recovery for any further connections. Must be called @@ -1586,7 +1574,7 @@ EAPI int ecore_wl2_display_compositor_version_get(Ecore_Wl2_Display *disp); * * @since 1.19 */ -EAPI void ecore_wl2_session_recovery_disable(void); +ECORE_WL2_API void ecore_wl2_session_recovery_disable(void); /** * Commit the surface of a wayland window. @@ -1603,7 +1591,7 @@ EAPI void ecore_wl2_session_recovery_disable(void); * * @since 1.21 */ -EAPI void ecore_wl2_window_commit(Ecore_Wl2_Window *window, Eina_Bool flush); +ECORE_WL2_API void ecore_wl2_window_commit(Ecore_Wl2_Window *window, Eina_Bool flush); /** * Add a callback that fires when the window's surface_frame callback fires @@ -1614,7 +1602,7 @@ EAPI void ecore_wl2_window_commit(Ecore_Wl2_Window *window, Eina_Bool flush); * * @since 1.21 */ -EAPI Ecore_Wl2_Frame_Cb_Handle *ecore_wl2_window_frame_callback_add(Ecore_Wl2_Window *window, Ecore_Wl2_Frame_Cb cb, void *data); +ECORE_WL2_API Ecore_Wl2_Frame_Cb_Handle *ecore_wl2_window_frame_callback_add(Ecore_Wl2_Window *window, Ecore_Wl2_Frame_Cb cb, void *data); /** * Delete a callback that fires when the window's surface_frame callback fires @@ -1623,7 +1611,7 @@ EAPI Ecore_Wl2_Frame_Cb_Handle *ecore_wl2_window_frame_callback_add(Ecore_Wl2_Wi * * @since 1.21 */ -EAPI void ecore_wl2_window_frame_callback_del(Ecore_Wl2_Frame_Cb_Handle *handle); +ECORE_WL2_API void ecore_wl2_window_frame_callback_del(Ecore_Wl2_Frame_Cb_Handle *handle); /** * Push buffered wayland protocol to compositor @@ -1636,7 +1624,7 @@ EAPI void ecore_wl2_window_frame_callback_del(Ecore_Wl2_Frame_Cb_Handle *handle) * * @since 1.21 */ -EAPI void ecore_wl2_display_flush(Ecore_Wl2_Display *display); +ECORE_WL2_API void ecore_wl2_display_flush(Ecore_Wl2_Display *display); /** * Get if a given window is resizing @@ -1648,7 +1636,7 @@ EAPI void ecore_wl2_display_flush(Ecore_Wl2_Display *display); * @ingroup Ecore_Wl2_Window_Group * @since 1.21 */ -EAPI Eina_Bool ecore_wl2_window_resizing_get(Ecore_Wl2_Window *window); +ECORE_WL2_API Eina_Bool ecore_wl2_window_resizing_get(Ecore_Wl2_Window *window); /** * Latch window state at the start of an update @@ -1664,13 +1652,10 @@ EAPI Eina_Bool ecore_wl2_window_resizing_get(Ecore_Wl2_Window *window); * * @since 1.21 */ -EAPI void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); +ECORE_WL2_API void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window); # endif -# undef EAPI -# define EAPI - /* # ifdef __cplusplus */ /* } */ /* # endif */ diff --git a/src/lib/ecore_wl2/ecore_wl2.c b/src/lib/ecore_wl2/ecore_wl2.c index f9dbda85f4..4762736d7c 100644 --- a/src/lib/ecore_wl2/ecore_wl2.c +++ b/src/lib/ecore_wl2/ecore_wl2.c @@ -16,53 +16,53 @@ Eina_Bool no_session_recovery; int _ecore_wl2_log_dom = -1; /* public API variables */ -EAPI int ECORE_WL2_EVENT_CONNECT = 0; -EAPI int ECORE_WL2_EVENT_DISCONNECT = 0; -EAPI int ECORE_WL2_EVENT_GLOBAL_ADDED = 0; -EAPI int ECORE_WL2_EVENT_GLOBAL_REMOVED = 0; -EAPI int ECORE_WL2_EVENT_FOCUS_IN = 0; -EAPI int ECORE_WL2_EVENT_FOCUS_OUT = 0; -EAPI int ECORE_WL2_EVENT_DND_ENTER = 0; -EAPI int ECORE_WL2_EVENT_DND_LEAVE = 0; -EAPI int ECORE_WL2_EVENT_DND_MOTION = 0; -EAPI int ECORE_WL2_EVENT_DND_DROP = 0; -EAPI int ECORE_WL2_EVENT_DND_END = 0; -EAPI int ECORE_WL2_EVENT_DATA_SOURCE_END = 0; -EAPI int ECORE_WL2_EVENT_DATA_SOURCE_DROP = 0; -EAPI int ECORE_WL2_EVENT_DATA_SOURCE_ACTION = 0; -EAPI int ECORE_WL2_EVENT_DATA_SOURCE_TARGET = 0; -EAPI int ECORE_WL2_EVENT_DATA_SOURCE_SEND = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_CONFIGURE = 0; -EAPI int ECORE_WL2_EVENT_SYNC_DONE = 0; -EAPI int ECORE_WL2_EVENT_OFFER_DATA_READY = 0; -EAPI int ECORE_WL2_EVENT_SEAT_NAME_CHANGED = 0; -EAPI int ECORE_WL2_EVENT_SEAT_CAPABILITIES_CHANGED = 0; -EAPI int ECORE_WL2_EVENT_DEVICE_ADDED = 0; -EAPI int ECORE_WL2_EVENT_DEVICE_REMOVED = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_CONFIGURE_COMPLETE = 0; -EAPI int ECORE_WL2_EVENT_SEAT_KEYMAP_CHANGED = 0; -EAPI int ECORE_WL2_EVENT_SEAT_KEYBOARD_REPEAT_CHANGED = 0; -EAPI int ECORE_WL2_EVENT_SEAT_SELECTION = 0; -EAPI int ECORE_WL2_EVENT_OUTPUT_TRANSFORM = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_ROTATE = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE_DONE = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_REQUEST = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_DONE = 0; -EAPI int ECORE_WL2_EVENT_AUX_HINT_ALLOWED = 0; -EAPI int ECORE_WL2_EVENT_AUX_HINT_SUPPORTED = 0; -EAPI int ECORE_WL2_EVENT_AUX_MESSAGE = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_SHOW = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_HIDE = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_ACTIVATE = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_DEACTIVATE = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_OFFSCREEN = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_CREATE = 0; -EAPI int ECORE_WL2_EVENT_WINDOW_DESTROY = 0; - -EAPI int _ecore_wl2_event_window_www = -1; -EAPI int _ecore_wl2_event_window_www_drag = -1; +ECORE_WL2_API int ECORE_WL2_EVENT_CONNECT = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_DISCONNECT = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_GLOBAL_ADDED = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_GLOBAL_REMOVED = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_FOCUS_IN = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_FOCUS_OUT = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_DND_ENTER = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_DND_LEAVE = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_DND_MOTION = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_DND_DROP = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_DND_END = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_DATA_SOURCE_END = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_DATA_SOURCE_DROP = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_DATA_SOURCE_ACTION = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_DATA_SOURCE_TARGET = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_DATA_SOURCE_SEND = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_CONFIGURE = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_SYNC_DONE = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_OFFER_DATA_READY = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_SEAT_NAME_CHANGED = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_SEAT_CAPABILITIES_CHANGED = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_DEVICE_ADDED = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_DEVICE_REMOVED = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_CONFIGURE_COMPLETE = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_SEAT_KEYMAP_CHANGED = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_SEAT_KEYBOARD_REPEAT_CHANGED = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_SEAT_SELECTION = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_OUTPUT_TRANSFORM = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_ROTATE = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE_DONE = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_REQUEST = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_DONE = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_AUX_HINT_ALLOWED = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_AUX_HINT_SUPPORTED = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_AUX_MESSAGE = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_SHOW = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_HIDE = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_ACTIVATE = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_DEACTIVATE = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_OFFSCREEN = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_CREATE = 0; +ECORE_WL2_API int ECORE_WL2_EVENT_WINDOW_DESTROY = 0; + +ECORE_WL2_API int _ecore_wl2_event_window_www = -1; +ECORE_WL2_API int _ecore_wl2_event_window_www_drag = -1; static Eina_Array *supplied_modules = NULL; static Eina_Array *local_modules = NULL; @@ -123,7 +123,7 @@ _ecore_wl2_surface_modules_unload(void) } /* public API functions */ -EAPI int +ECORE_WL2_API int ecore_wl2_init(void) { if (++_ecore_wl2_init_count != 1) return _ecore_wl2_init_count; @@ -228,7 +228,7 @@ eina_err: return --_ecore_wl2_init_count; } -EAPI int +ECORE_WL2_API int ecore_wl2_shutdown(void) { if (_ecore_wl2_init_count < 1) @@ -303,7 +303,7 @@ ecore_wl2_shutdown(void) return _ecore_wl2_init_count; } -EAPI void +ECORE_WL2_API void ecore_wl2_session_recovery_disable(void) { no_session_recovery = EINA_TRUE; diff --git a/src/lib/ecore_wl2/ecore_wl2_api.h b/src/lib/ecore_wl2/ecore_wl2_api.h new file mode 100644 index 0000000000..2bf500d943 --- /dev/null +++ b/src/lib/ecore_wl2/ecore_wl2_api.h @@ -0,0 +1,34 @@ +#ifndef _EFL_ECORE_WL2_API_H +#define _EFL_ECORE_WL2_API_H + +#ifdef ECORE_WL2_API +#error ECORE_WL2_API should not be already defined +#endif + +#ifdef _WIN32 +# ifndef ECORE_WL2_STATIC +# ifdef ECORE_WL2_BUILD +# define ECORE_WL2_API __declspec(dllexport) +# else +# define ECORE_WL2_API __declspec(dllimport) +# endif +# else +# define ECORE_WL2_API +# endif +# define ECORE_WL2_API_WEAK +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define ECORE_WL2_API __attribute__ ((visibility("default"))) +# define ECORE_WL2_API_WEAK __attribute__ ((weak)) +# else +# define ECORE_WL2_API +# define ECORE_WL2_API_WEAK +# endif +# else +# define ECORE_WL2_API +# define ECORE_WL2_API_WEAK +# endif +#endif + +#endif diff --git a/src/lib/ecore_wl2/ecore_wl2_buffer.c b/src/lib/ecore_wl2/ecore_wl2_buffer.c index 386eff294f..27f6622173 100644 --- a/src/lib/ecore_wl2/ecore_wl2_buffer.c +++ b/src/lib/ecore_wl2/ecore_wl2_buffer.c @@ -595,7 +595,7 @@ err: return EINA_FALSE; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_buffer_init(Ecore_Wl2_Display *ewd, Ecore_Wl2_Buffer_Type types) { int fd = -1; @@ -678,13 +678,13 @@ _buffer_manager_alloc(const char *name, int w, int h, unsigned long *stride, int return out; } -EAPI struct wl_buffer * +ECORE_WL2_API struct wl_buffer * ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Buffer *buf) { return buf->wl_buffer; } -EAPI void * +ECORE_WL2_API void * ecore_wl2_buffer_map(Ecore_Wl2_Buffer *buf, int *w, int *h, int *stride) { void *out; @@ -716,21 +716,21 @@ ecore_wl2_buffer_map(Ecore_Wl2_Buffer *buf, int *w, int *h, int *stride) return out; } -EAPI void +ECORE_WL2_API void ecore_wl2_buffer_unmap(Ecore_Wl2_Buffer *buf) { buffer_manager->unmap(buf); _buffer_manager_deref(); } -EAPI void +ECORE_WL2_API void ecore_wl2_buffer_discard(Ecore_Wl2_Buffer *buf) { buffer_manager->discard(buf); _buffer_manager_deref(); } -EAPI void +ECORE_WL2_API void ecore_wl2_buffer_lock(Ecore_Wl2_Buffer *b) { if (b->locked) ERR("Buffer already locked\n"); @@ -738,7 +738,7 @@ ecore_wl2_buffer_lock(Ecore_Wl2_Buffer *b) b->locked = EINA_TRUE; } -EAPI void +ECORE_WL2_API void ecore_wl2_buffer_unlock(Ecore_Wl2_Buffer *b) { if (!b->locked) ERR("Buffer already unlocked\n"); @@ -746,7 +746,7 @@ ecore_wl2_buffer_unlock(Ecore_Wl2_Buffer *b) b->locked = EINA_FALSE; } -EAPI void +ECORE_WL2_API void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b) { if (!b) return; @@ -764,7 +764,7 @@ ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b) free(b); } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer) { EINA_SAFETY_ON_NULL_RETURN_VAL(buffer, EINA_FALSE); @@ -772,7 +772,7 @@ ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer) return (buffer->locked) || (buffer->busy); } -EAPI void +ECORE_WL2_API void ecore_wl2_buffer_busy_set(Ecore_Wl2_Buffer *buffer) { EINA_SAFETY_ON_NULL_RETURN(buffer); @@ -780,7 +780,7 @@ ecore_wl2_buffer_busy_set(Ecore_Wl2_Buffer *buffer) buffer->busy = EINA_TRUE; } -EAPI int +ECORE_WL2_API int ecore_wl2_buffer_age_get(Ecore_Wl2_Buffer *buffer) { EINA_SAFETY_ON_NULL_RETURN_VAL(buffer, 0); @@ -788,14 +788,14 @@ ecore_wl2_buffer_age_get(Ecore_Wl2_Buffer *buffer) return buffer->age; } -EAPI void ecore_wl2_buffer_age_set(Ecore_Wl2_Buffer *buffer, int age) +ECORE_WL2_API void ecore_wl2_buffer_age_set(Ecore_Wl2_Buffer *buffer, int age) { EINA_SAFETY_ON_NULL_RETURN(buffer); buffer->age = age; } -EAPI void +ECORE_WL2_API void ecore_wl2_buffer_age_inc(Ecore_Wl2_Buffer *buffer) { EINA_SAFETY_ON_NULL_RETURN(buffer); @@ -814,7 +814,7 @@ ecore_wl2_buffer_age_inc(Ecore_Wl2_Buffer *buffer) * This is currently beta api - don't move it out of beta * with no users... */ -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_buffer_fit(Ecore_Wl2_Buffer *b, int w, int h) { int stride; @@ -854,7 +854,7 @@ _ecore_wl2_buffer_partial_create(int w, int h, Eina_Bool alpha) return out; } -EAPI Ecore_Wl2_Buffer * +ECORE_WL2_API Ecore_Wl2_Buffer * ecore_wl2_buffer_create(Ecore_Wl2_Display *ewd, int w, int h, Eina_Bool alpha) { Ecore_Wl2_Buffer *out; diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c index 7344cf8b74..93fa0e841b 100644 --- a/src/lib/ecore_wl2/ecore_wl2_display.c +++ b/src/lib/ecore_wl2/ecore_wl2_display.c @@ -791,7 +791,7 @@ _ecore_wl2_display_window_surface_find(Ecore_Wl2_Display *display, struct wl_sur return NULL; } -EAPI Ecore_Wl2_Display * +ECORE_WL2_API Ecore_Wl2_Display * ecore_wl2_display_create(const char *name) { Ecore_Wl2_Display *ewd; @@ -884,7 +884,7 @@ _ecore_wl2_display_sync_get(void) return !_server_displays || !eina_hash_population(_server_displays); } -EAPI Ecore_Wl2_Display * +ECORE_WL2_API Ecore_Wl2_Display * ecore_wl2_display_connect(const char *name) { Ecore_Wl2_Display *ewd; @@ -961,7 +961,7 @@ found: return ewd; } -EAPI void +ECORE_WL2_API void ecore_wl2_display_disconnect(Ecore_Wl2_Display *display) { EINA_SAFETY_ON_NULL_RETURN(display); @@ -987,7 +987,7 @@ ecore_wl2_display_disconnect(Ecore_Wl2_Display *display) } } -EAPI void +ECORE_WL2_API void ecore_wl2_display_destroy(Ecore_Wl2_Display *display) { EINA_SAFETY_ON_NULL_RETURN(display); @@ -1010,35 +1010,35 @@ ecore_wl2_display_destroy(Ecore_Wl2_Display *display) } } -EAPI void +ECORE_WL2_API void ecore_wl2_display_terminate(Ecore_Wl2_Display *display) { EINA_SAFETY_ON_NULL_RETURN(display); wl_display_terminate(display->wl.display); } -EAPI struct wl_display * +ECORE_WL2_API struct wl_display * ecore_wl2_display_get(Ecore_Wl2_Display *display) { EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL); return display->wl.display; } -EAPI struct wl_shm * +ECORE_WL2_API struct wl_shm * ecore_wl2_display_shm_get(Ecore_Wl2_Display *display) { EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL); return display->wl.shm; } -EAPI void * +ECORE_WL2_API void * ecore_wl2_display_dmabuf_get(Ecore_Wl2_Display *display) { EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL); return display->wl.dmabuf; } -EAPI Eina_Iterator * +ECORE_WL2_API Eina_Iterator * ecore_wl2_display_globals_get(Ecore_Wl2_Display *display) { EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL); @@ -1047,7 +1047,7 @@ ecore_wl2_display_globals_get(Ecore_Wl2_Display *display) return eina_hash_iterator_data_new(display->globals); } -EAPI void +ECORE_WL2_API void ecore_wl2_display_screen_size_get(Ecore_Wl2_Display *display, int *w, int *h) { Ecore_Wl2_Output *output; @@ -1080,7 +1080,7 @@ ecore_wl2_display_screen_size_get(Ecore_Wl2_Display *display, int *w, int *h) if (h) *h = oh; } -EAPI struct wl_registry * +ECORE_WL2_API struct wl_registry * ecore_wl2_display_registry_get(Ecore_Wl2_Display *display) { EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL); @@ -1088,7 +1088,7 @@ ecore_wl2_display_registry_get(Ecore_Wl2_Display *display) return display->wl.registry; } -EAPI int +ECORE_WL2_API int ecore_wl2_display_compositor_version_get(Ecore_Wl2_Display *display) { EINA_SAFETY_ON_NULL_RETURN_VAL(display, 0); @@ -1096,7 +1096,7 @@ ecore_wl2_display_compositor_version_get(Ecore_Wl2_Display *display) return display->wl.compositor_version; } -EAPI Eina_Iterator * +ECORE_WL2_API Eina_Iterator * ecore_wl2_display_inputs_get(Ecore_Wl2_Display *display) { EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL); @@ -1104,7 +1104,7 @@ ecore_wl2_display_inputs_get(Ecore_Wl2_Display *display) return eina_inlist_iterator_new(display->inputs); } -EAPI Ecore_Wl2_Input * +ECORE_WL2_API Ecore_Wl2_Input * ecore_wl2_display_input_find(const Ecore_Wl2_Display *display, unsigned int id) { Ecore_Wl2_Input *input; @@ -1116,7 +1116,7 @@ ecore_wl2_display_input_find(const Ecore_Wl2_Display *display, unsigned int id) return NULL; } -EAPI Ecore_Wl2_Input * +ECORE_WL2_API Ecore_Wl2_Input * ecore_wl2_display_input_find_by_name(const Ecore_Wl2_Display *display, const char *name) { Ecore_Wl2_Input *input; @@ -1128,21 +1128,21 @@ ecore_wl2_display_input_find_by_name(const Ecore_Wl2_Display *display, const cha return NULL; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_display_sync_is_done(const Ecore_Wl2_Display *display) { EINA_SAFETY_ON_NULL_RETURN_VAL(display, EINA_FALSE); return display->sync_done; } -EAPI const char * +ECORE_WL2_API const char * ecore_wl2_display_name_get(const Ecore_Wl2_Display *display) { EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL); return display->name; } -EAPI void +ECORE_WL2_API void ecore_wl2_display_flush(Ecore_Wl2_Display *display) { int ret, code; @@ -1163,13 +1163,13 @@ ecore_wl2_display_flush(Ecore_Wl2_Display *display) _begin_recovery_maybe(display, code); } -EAPI Ecore_Wl2_Window * +ECORE_WL2_API Ecore_Wl2_Window * ecore_wl2_display_window_find_by_surface(Ecore_Wl2_Display *display, struct wl_surface *surface) { return _ecore_wl2_display_window_surface_find(display, surface); } -EAPI Ecore_Wl2_Display * +ECORE_WL2_API Ecore_Wl2_Display * ecore_wl2_connected_display_get(const char *name) { Ecore_Wl2_Display *ewd; @@ -1200,7 +1200,7 @@ ecore_wl2_connected_display_get(const char *name) return ewd; } -EAPI struct wl_compositor * +ECORE_WL2_API struct wl_compositor * ecore_wl2_display_compositor_get(Ecore_Wl2_Display *display) { EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL); diff --git a/src/lib/ecore_wl2/ecore_wl2_dnd.c b/src/lib/ecore_wl2/ecore_wl2_dnd.c index c9ac71fba5..14999141e0 100644 --- a/src/lib/ecore_wl2/ecore_wl2_dnd.c +++ b/src/lib/ecore_wl2/ecore_wl2_dnd.c @@ -420,7 +420,7 @@ _ecore_wl2_dnd_del(Ecore_Wl2_Dnd_Source *source) free(source); } -EAPI void +ECORE_WL2_API void ecore_wl2_dnd_drag_types_set(Ecore_Wl2_Input *input, const char **types) { struct wl_data_device_manager *manager; @@ -462,7 +462,7 @@ ecore_wl2_dnd_drag_types_set(Ecore_Wl2_Input *input, const char **types) } } -EAPI uint32_t +ECORE_WL2_API uint32_t ecore_wl2_dnd_drag_start(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, Ecore_Wl2_Window *drag_window) { struct wl_surface *dsurface = NULL, *osurface; @@ -493,7 +493,7 @@ ecore_wl2_dnd_drag_start(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, Ecore return input->data.drag.serial; } -EAPI void +ECORE_WL2_API void ecore_wl2_dnd_set_actions(Ecore_Wl2_Input *input) { EINA_SAFETY_ON_NULL_RETURN(input); @@ -504,7 +504,7 @@ ecore_wl2_dnd_set_actions(Ecore_Wl2_Input *input) WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE | WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY); } -EAPI void +ECORE_WL2_API void ecore_wl2_dnd_drag_end(Ecore_Wl2_Input *input) { Ecore_Wl2_Event_Dnd_End *ev; @@ -536,7 +536,7 @@ ecore_wl2_dnd_drag_end(Ecore_Wl2_Input *input) ecore_event_add(ECORE_WL2_EVENT_DND_END, ev, _display_event_free, ev->display); } -EAPI Ecore_Wl2_Offer* +ECORE_WL2_API Ecore_Wl2_Offer* ecore_wl2_dnd_selection_get(Ecore_Wl2_Input *input) { EINA_SAFETY_ON_NULL_RETURN_VAL(input, NULL); @@ -544,7 +544,7 @@ ecore_wl2_dnd_selection_get(Ecore_Wl2_Input *input) return input->selection.offer; } -EAPI uint32_t +ECORE_WL2_API uint32_t ecore_wl2_dnd_selection_set(Ecore_Wl2_Input *input, const char **types) { struct wl_data_device_manager *manager; @@ -594,7 +594,7 @@ ecore_wl2_dnd_selection_set(Ecore_Wl2_Input *input, const char **types) return input->display->serial; } -EAPI uint32_t +ECORE_WL2_API uint32_t ecore_wl2_dnd_selection_clear(Ecore_Wl2_Input *input) { EINA_SAFETY_ON_NULL_RETURN_VAL(input, 0); @@ -697,13 +697,13 @@ _ecore_wl2_dnd_add(Ecore_Wl2_Input *input, struct wl_data_offer *offer) wl_data_offer_add_listener(offer, &_offer_listener, result); } -EAPI Ecore_Wl2_Drag_Action +ECORE_WL2_API Ecore_Wl2_Drag_Action ecore_wl2_offer_actions_get(Ecore_Wl2_Offer *offer) { return offer->actions; } -EAPI void +ECORE_WL2_API void ecore_wl2_offer_actions_set(Ecore_Wl2_Offer *offer, Ecore_Wl2_Drag_Action actions, Ecore_Wl2_Drag_Action action) { uint32_t val = 0; @@ -722,14 +722,14 @@ ecore_wl2_offer_actions_set(Ecore_Wl2_Offer *offer, Ecore_Wl2_Drag_Action action wl_data_offer_set_actions(offer->offer, val, offer->action); } -EAPI Ecore_Wl2_Drag_Action +ECORE_WL2_API Ecore_Wl2_Drag_Action ecore_wl2_offer_action_get(Ecore_Wl2_Offer *offer) { EINA_SAFETY_ON_NULL_RETURN_VAL(offer, ECORE_WL2_DRAG_ACTION_NONE); return offer->action; } -EAPI Eina_Array* +ECORE_WL2_API Eina_Array* ecore_wl2_offer_mimes_get(Ecore_Wl2_Offer *offer) { EINA_SAFETY_ON_NULL_RETURN_VAL(offer, NULL); @@ -746,7 +746,7 @@ _emit_mime(const void *container EINA_UNUSED, void *elem, void *data) return 1; } -EAPI void +ECORE_WL2_API void ecore_wl2_offer_mimes_set(Ecore_Wl2_Offer *offer, Eina_Array *mimes) { EINA_SAFETY_ON_NULL_RETURN(offer); @@ -757,7 +757,7 @@ ecore_wl2_offer_mimes_set(Ecore_Wl2_Offer *offer, Eina_Array *mimes) wl_data_offer_accept(offer->offer, offer->serial, NULL); } -EAPI void +ECORE_WL2_API void ecore_wl2_offer_accept(Ecore_Wl2_Offer *offer, const char *mime_type) { EINA_SAFETY_ON_NULL_RETURN(offer); @@ -831,7 +831,7 @@ _offer_receive_fd_cb(void *data, Ecore_Fd_Handler *fdh) } } -EAPI void +ECORE_WL2_API void ecore_wl2_offer_receive(Ecore_Wl2_Offer *offer, char *mime) { Read_Buffer *buffer; @@ -863,7 +863,7 @@ ecore_wl2_offer_receive(Ecore_Wl2_Offer *offer, char *mime) return; } -EAPI void +ECORE_WL2_API void ecore_wl2_offer_proxy_receive(Ecore_Wl2_Offer *offer, const char *mime, int fd) { EINA_SAFETY_ON_NULL_RETURN(offer); @@ -873,7 +873,7 @@ ecore_wl2_offer_proxy_receive(Ecore_Wl2_Offer *offer, const char *mime, int fd) wl_data_offer_receive(offer->offer, mime, fd); } -EAPI void +ECORE_WL2_API void ecore_wl2_offer_proxy_receive_end(Ecore_Wl2_Offer *offer) { EINA_SAFETY_ON_NULL_RETURN(offer); @@ -883,7 +883,7 @@ ecore_wl2_offer_proxy_receive_end(Ecore_Wl2_Offer *offer) _ecore_wl2_offer_unref(offer); } -EAPI void +ECORE_WL2_API void ecore_wl2_offer_finish(Ecore_Wl2_Offer *offer) { EINA_SAFETY_ON_NULL_RETURN(offer); @@ -926,7 +926,7 @@ _compare(const void *container EINA_UNUSED, void *elem, void *data) return EINA_TRUE; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_offer_supports_mime(Ecore_Wl2_Offer *offer, const char *mime) { EINA_SAFETY_ON_NULL_RETURN_VAL(offer, EINA_FALSE); diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c b/src/lib/ecore_wl2/ecore_wl2_input.c index 0d7aaaa727..d93aa3b38d 100644 --- a/src/lib/ecore_wl2/ecore_wl2_input.c +++ b/src/lib/ecore_wl2/ecore_wl2_input.c @@ -1761,7 +1761,7 @@ _ecore_wl2_input_window_remove(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window) } } -EAPI struct wl_seat * +ECORE_WL2_API struct wl_seat * ecore_wl2_input_seat_get(Ecore_Wl2_Input *input) { EINA_SAFETY_ON_NULL_RETURN_VAL(input, NULL); @@ -1769,7 +1769,7 @@ ecore_wl2_input_seat_get(Ecore_Wl2_Input *input) return input->wl.seat; } -EAPI Ecore_Wl2_Seat_Capabilities +ECORE_WL2_API Ecore_Wl2_Seat_Capabilities ecore_wl2_input_seat_capabilities_get(Ecore_Wl2_Input *input) { Ecore_Wl2_Seat_Capabilities cap = ECORE_WL2_SEAT_CAPABILITIES_NONE; @@ -1785,14 +1785,14 @@ ecore_wl2_input_seat_capabilities_get(Ecore_Wl2_Input *input) return cap; } -EAPI Eina_Stringshare * +ECORE_WL2_API Eina_Stringshare * ecore_wl2_input_name_get(Ecore_Wl2_Input *input) { EINA_SAFETY_ON_NULL_RETURN_VAL(input, NULL); return input->name; } -EAPI unsigned int +ECORE_WL2_API unsigned int ecore_wl2_input_seat_id_get(Ecore_Wl2_Input *input) { EINA_SAFETY_ON_NULL_RETURN_VAL(input, 0); @@ -1800,7 +1800,7 @@ ecore_wl2_input_seat_id_get(Ecore_Wl2_Input *input) return input->id; } -EAPI Ecore_Wl2_Display * +ECORE_WL2_API Ecore_Wl2_Display * ecore_wl2_input_display_get(const Ecore_Wl2_Input *input) { EINA_SAFETY_ON_NULL_RETURN_VAL(input, NULL); @@ -1808,7 +1808,7 @@ ecore_wl2_input_display_get(const Ecore_Wl2_Input *input) return input->display; } -EAPI struct xkb_keymap * +ECORE_WL2_API struct xkb_keymap * ecore_wl2_input_keymap_get(const Ecore_Wl2_Input *input) { EINA_SAFETY_ON_NULL_RETURN_VAL(input, NULL); @@ -1817,7 +1817,7 @@ ecore_wl2_input_keymap_get(const Ecore_Wl2_Input *input) return input->xkb.keymap; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_input_keyboard_repeat_set(Ecore_Wl2_Input *input, double rate, double delay) { EINA_SAFETY_ON_NULL_RETURN_VAL(input, EINA_FALSE); @@ -1829,7 +1829,7 @@ ecore_wl2_input_keyboard_repeat_set(Ecore_Wl2_Input *input, double rate, double return input->repeat.enabled; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_input_keyboard_repeat_get(const Ecore_Wl2_Input *input, double *rate, double *delay) { EINA_SAFETY_ON_NULL_RETURN_VAL(input, EINA_FALSE); @@ -1840,7 +1840,7 @@ ecore_wl2_input_keyboard_repeat_get(const Ecore_Wl2_Input *input, double *rate, return input->repeat.enabled; } -EAPI void +ECORE_WL2_API void ecore_wl2_input_pointer_set(Ecore_Wl2_Input *input, struct wl_surface *surface, int hot_x, int hot_y) { EINA_SAFETY_ON_NULL_RETURN(input); @@ -1852,14 +1852,14 @@ ecore_wl2_input_pointer_set(Ecore_Wl2_Input *input, struct wl_surface *surface, _ecore_wl2_input_cursor_update(input); } -EAPI void +ECORE_WL2_API void ecore_wl2_input_cursor_from_name_set(Ecore_Wl2_Input *input, const char *cursor) { EINA_SAFETY_ON_NULL_RETURN(input); _ecore_wl2_input_cursor_set(input, cursor); } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_input_pointer_xy_get(const Ecore_Wl2_Input *input, int *x, int *y) { EINA_SAFETY_ON_NULL_RETURN_VAL(input, EINA_FALSE); @@ -1872,7 +1872,7 @@ ecore_wl2_input_pointer_xy_get(const Ecore_Wl2_Input *input, int *x, int *y) return EINA_TRUE; } -EAPI Ecore_Wl2_Input * +ECORE_WL2_API Ecore_Wl2_Input * ecore_wl2_input_default_input_get(const Ecore_Wl2_Display *ewd) { Ecore_Wl2_Input *input; diff --git a/src/lib/ecore_wl2/ecore_wl2_internal.h b/src/lib/ecore_wl2/ecore_wl2_internal.h index eb292ea67d..499ee7be18 100644 --- a/src/lib/ecore_wl2/ecore_wl2_internal.h +++ b/src/lib/ecore_wl2/ecore_wl2_internal.h @@ -1,75 +1,51 @@ #ifndef _ECORE_WL2_INTERNAL_H # define _ECORE_WL2_INTERNAL_H -# ifdef EAPI -# undef EAPI -# endif - -# ifdef _WIN32 -# ifdef EFL_BUILD -# ifdef DLL_EXPORT -# define EAPI __declspec(dllexport) -# else -# define EAPI -# endif -# else -# define EAPI __declspec(dllimport) -# endif -# else -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# else -# define EAPI -# endif -# else -# define EAPI -# endif -# endif - -EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE_DONE; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_REQUEST; /** @since 1.20 */ -EAPI extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_DONE; /** @since 1.20 */ - -EAPI void ecore_wl2_window_rotation_change_prepare_send(Ecore_Wl2_Window *window, int rot, int w, int h, Eina_Bool resize); -EAPI void ecore_wl2_window_rotation_change_prepare_done_send(Ecore_Wl2_Window *window, int rot); -EAPI void ecore_wl2_window_rotation_change_request_send(Ecore_Wl2_Window *window, int rot); -EAPI void ecore_wl2_window_rotation_change_done_send(Ecore_Wl2_Window *window, int rot, int w, int h); - -EAPI void ecore_wl2_window_false_commit(Ecore_Wl2_Window *window); -EAPI Eina_Bool ecore_wl2_buffer_fit(Ecore_Wl2_Buffer *b, int w, int h); - -EAPI void ecore_wl2_window_damage(Ecore_Wl2_Window *window, Eina_Rectangle *rects, unsigned int count); -EAPI Eina_Bool ecore_wl2_buffer_init(Ecore_Wl2_Display *ewd, Ecore_Wl2_Buffer_Type types); -EAPI Ecore_Wl2_Buffer *ecore_wl2_buffer_create(Ecore_Wl2_Display *ewd, int w, int h, Eina_Bool alpha); -EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); -EAPI struct wl_buffer *ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Buffer *buf); -EAPI void *ecore_wl2_buffer_map(Ecore_Wl2_Buffer *buf, int *w, int *h, int *stride); -EAPI void ecore_wl2_buffer_unmap(Ecore_Wl2_Buffer *buf); -EAPI void ecore_wl2_buffer_discard(Ecore_Wl2_Buffer *buf); -EAPI void ecore_wl2_buffer_lock(Ecore_Wl2_Buffer *b); -EAPI void ecore_wl2_buffer_unlock(Ecore_Wl2_Buffer *b); -EAPI void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); -EAPI Eina_Bool ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer); -EAPI void ecore_wl2_buffer_busy_set(Ecore_Wl2_Buffer *buffer); -EAPI int ecore_wl2_buffer_age_get(Ecore_Wl2_Buffer *buffer); -EAPI void ecore_wl2_buffer_age_set(Ecore_Wl2_Buffer *buffer, int age); -EAPI void ecore_wl2_buffer_age_inc(Ecore_Wl2_Buffer *buffer); - -EAPI Ecore_Wl2_Surface *ecore_wl2_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha); -EAPI void ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface); -EAPI void ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags, Eina_Bool alpha); -EAPI void *ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h); -EAPI int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface); -EAPI void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count); -EAPI void ecore_wl2_surface_flush(Ecore_Wl2_Surface *surface, Eina_Bool purge); -EAPI void ecore_wl2_window_surface_flush(Ecore_Wl2_Window *window, Eina_Bool purge); -EAPI Ecore_Wl2_Buffer *ecore_wl2_surface_buffer_create(Ecore_Wl2_Surface *surface); -EAPI int ecore_wl2_surface_manager_add(Ecore_Wl2_Surface_Interface *intf); -EAPI void ecore_wl2_surface_manager_del(Ecore_Wl2_Surface_Interface *intf); -EAPI Ecore_Wl2_Window *ecore_wl2_surface_window_get(Ecore_Wl2_Surface *surface); -EAPI Eina_Bool ecore_wl2_surface_alpha_get(Ecore_Wl2_Surface *surface); +#include <ecore_wl2_api.h> + +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE_DONE; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_REQUEST; /** @since 1.20 */ +ECORE_WL2_API extern int ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_DONE; /** @since 1.20 */ + +ECORE_WL2_API void ecore_wl2_window_rotation_change_prepare_send(Ecore_Wl2_Window *window, int rot, int w, int h, Eina_Bool resize); +ECORE_WL2_API void ecore_wl2_window_rotation_change_prepare_done_send(Ecore_Wl2_Window *window, int rot); +ECORE_WL2_API void ecore_wl2_window_rotation_change_request_send(Ecore_Wl2_Window *window, int rot); +ECORE_WL2_API void ecore_wl2_window_rotation_change_done_send(Ecore_Wl2_Window *window, int rot, int w, int h); + +ECORE_WL2_API void ecore_wl2_window_false_commit(Ecore_Wl2_Window *window); +ECORE_WL2_API Eina_Bool ecore_wl2_buffer_fit(Ecore_Wl2_Buffer *b, int w, int h); + +ECORE_WL2_API void ecore_wl2_window_damage(Ecore_Wl2_Window *window, Eina_Rectangle *rects, unsigned int count); +ECORE_WL2_API Eina_Bool ecore_wl2_buffer_init(Ecore_Wl2_Display *ewd, Ecore_Wl2_Buffer_Type types); +ECORE_WL2_API Ecore_Wl2_Buffer *ecore_wl2_buffer_create(Ecore_Wl2_Display *ewd, int w, int h, Eina_Bool alpha); +ECORE_WL2_API void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); +ECORE_WL2_API struct wl_buffer *ecore_wl2_buffer_wl_buffer_get(Ecore_Wl2_Buffer *buf); +ECORE_WL2_API void *ecore_wl2_buffer_map(Ecore_Wl2_Buffer *buf, int *w, int *h, int *stride); +ECORE_WL2_API void ecore_wl2_buffer_unmap(Ecore_Wl2_Buffer *buf); +ECORE_WL2_API void ecore_wl2_buffer_discard(Ecore_Wl2_Buffer *buf); +ECORE_WL2_API void ecore_wl2_buffer_lock(Ecore_Wl2_Buffer *b); +ECORE_WL2_API void ecore_wl2_buffer_unlock(Ecore_Wl2_Buffer *b); +ECORE_WL2_API void ecore_wl2_buffer_destroy(Ecore_Wl2_Buffer *b); +ECORE_WL2_API Eina_Bool ecore_wl2_buffer_busy_get(Ecore_Wl2_Buffer *buffer); +ECORE_WL2_API void ecore_wl2_buffer_busy_set(Ecore_Wl2_Buffer *buffer); +ECORE_WL2_API int ecore_wl2_buffer_age_get(Ecore_Wl2_Buffer *buffer); +ECORE_WL2_API void ecore_wl2_buffer_age_set(Ecore_Wl2_Buffer *buffer, int age); +ECORE_WL2_API void ecore_wl2_buffer_age_inc(Ecore_Wl2_Buffer *buffer); + +ECORE_WL2_API Ecore_Wl2_Surface *ecore_wl2_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha); +ECORE_WL2_API void ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface); +ECORE_WL2_API void ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags, Eina_Bool alpha); +ECORE_WL2_API void *ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h); +ECORE_WL2_API int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface); +ECORE_WL2_API void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count); +ECORE_WL2_API void ecore_wl2_surface_flush(Ecore_Wl2_Surface *surface, Eina_Bool purge); +ECORE_WL2_API void ecore_wl2_window_surface_flush(Ecore_Wl2_Window *window, Eina_Bool purge); +ECORE_WL2_API Ecore_Wl2_Buffer *ecore_wl2_surface_buffer_create(Ecore_Wl2_Surface *surface); +ECORE_WL2_API int ecore_wl2_surface_manager_add(Ecore_Wl2_Surface_Interface *intf); +ECORE_WL2_API void ecore_wl2_surface_manager_del(Ecore_Wl2_Surface_Interface *intf); +ECORE_WL2_API Ecore_Wl2_Window *ecore_wl2_surface_window_get(Ecore_Wl2_Surface *surface); +ECORE_WL2_API Eina_Bool ecore_wl2_surface_alpha_get(Ecore_Wl2_Surface *surface); /** * Attach a buffer to a window @@ -87,7 +63,7 @@ EAPI Eina_Bool ecore_wl2_surface_alpha_get(Ecore_Wl2_Surface *surface); * * @since 1.21 */ -EAPI void ecore_wl2_window_buffer_attach(Ecore_Wl2_Window *win, void *buffer, int x, int y, Eina_Bool implicit); +ECORE_WL2_API void ecore_wl2_window_buffer_attach(Ecore_Wl2_Window *win, void *buffer, int x, int y, Eina_Bool implicit); /** * Set a buffer transform on a given window @@ -98,7 +74,7 @@ EAPI void ecore_wl2_window_buffer_attach(Ecore_Wl2_Window *win, void *buffer, in * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI void ecore_wl2_window_buffer_transform_set(Ecore_Wl2_Window *window, int transform); +ECORE_WL2_API void ecore_wl2_window_buffer_transform_set(Ecore_Wl2_Window *window, int transform); /** * Iconify a window @@ -109,7 +85,7 @@ EAPI void ecore_wl2_window_buffer_transform_set(Ecore_Wl2_Window *window, int tr * @ingroup Ecore_Wl2_Window_Group * @since 1.17 */ -EAPI void ecore_wl2_window_iconified_set(Ecore_Wl2_Window *window, Eina_Bool iconified); +ECORE_WL2_API void ecore_wl2_window_iconified_set(Ecore_Wl2_Window *window, Eina_Bool iconified); /** * Check if a wayland window's surface is in the pending state. @@ -123,7 +99,7 @@ EAPI void ecore_wl2_window_iconified_set(Ecore_Wl2_Window *window, Eina_Bool ico * * @since 1.21 */ -EAPI Eina_Bool ecore_wl2_window_pending_get(Ecore_Wl2_Window *window); +ECORE_WL2_API Eina_Bool ecore_wl2_window_pending_get(Ecore_Wl2_Window *window); /** * @defgroup Ecore_Wl2_Dnd_Group Wayland Library Drag-n-Drop Functions @@ -143,7 +119,7 @@ EAPI Eina_Bool ecore_wl2_window_pending_get(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Dnd_Group * @since 1.17 */ -EAPI void ecore_wl2_dnd_drag_types_set(Ecore_Wl2_Input *input, const char **types); +ECORE_WL2_API void ecore_wl2_dnd_drag_types_set(Ecore_Wl2_Input *input, const char **types); /** * Start a drag on the given input @@ -157,7 +133,7 @@ EAPI void ecore_wl2_dnd_drag_types_set(Ecore_Wl2_Input *input, const char **type * @ingroup Ecore_Wl2_Dnd_Group * @since 1.17 */ -EAPI uint32_t ecore_wl2_dnd_drag_start(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, Ecore_Wl2_Window *drag_window); +ECORE_WL2_API uint32_t ecore_wl2_dnd_drag_start(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, Ecore_Wl2_Window *drag_window); /** * Call wl_data_source.set_actions on an existing source @@ -169,7 +145,7 @@ EAPI uint32_t ecore_wl2_dnd_drag_start(Ecore_Wl2_Input *input, Ecore_Wl2_Window * @ingroup Ecore_Wl2_Dnd_Group * @since 1.20 */ -EAPI void ecore_wl2_dnd_set_actions(Ecore_Wl2_Input *input); +ECORE_WL2_API void ecore_wl2_dnd_set_actions(Ecore_Wl2_Input *input); /** * End a drag started by a call to ecore_wl2_dnd_drag_start @@ -179,7 +155,7 @@ EAPI void ecore_wl2_dnd_set_actions(Ecore_Wl2_Input *input); * @ingroup Ecore_Wl2_Dnd_Group * @since 1.17 */ -EAPI void ecore_wl2_dnd_drag_end(Ecore_Wl2_Input *input); +ECORE_WL2_API void ecore_wl2_dnd_drag_end(Ecore_Wl2_Input *input); /** * Get the offer which is currently resposible for the clipboard @@ -189,7 +165,7 @@ EAPI void ecore_wl2_dnd_drag_end(Ecore_Wl2_Input *input); * @ingroup Ecore_Wl2_Dnd_Group * @since 1.19 */ -EAPI Ecore_Wl2_Offer* ecore_wl2_dnd_selection_get(Ecore_Wl2_Input *input); +ECORE_WL2_API Ecore_Wl2_Offer* ecore_wl2_dnd_selection_get(Ecore_Wl2_Input *input); /** * Set the types which are available from this client @@ -204,7 +180,7 @@ EAPI Ecore_Wl2_Offer* ecore_wl2_dnd_selection_get(Ecore_Wl2_Input *input); * @ingroup Ecore_Wl2_Dnd_Group * @since 1.17 */ -EAPI uint32_t ecore_wl2_dnd_selection_set(Ecore_Wl2_Input *input, const char **types); +ECORE_WL2_API uint32_t ecore_wl2_dnd_selection_set(Ecore_Wl2_Input *input, const char **types); /** * Clear the selection currently setted on this input. @@ -216,7 +192,7 @@ EAPI uint32_t ecore_wl2_dnd_selection_set(Ecore_Wl2_Input *input, const char **t * @ingroup Ecore_Wl2_Dnd_Group * @since 1.17 */ -EAPI uint32_t ecore_wl2_dnd_selection_clear(Ecore_Wl2_Input *input); +ECORE_WL2_API uint32_t ecore_wl2_dnd_selection_clear(Ecore_Wl2_Input *input); /** * Get the actions available from the data source @@ -228,7 +204,7 @@ EAPI uint32_t ecore_wl2_dnd_selection_clear(Ecore_Wl2_Input *input); * @ingroup Ecore_Wl2_Dnd_Group * @since 1.19 */ -EAPI Ecore_Wl2_Drag_Action ecore_wl2_offer_actions_get(Ecore_Wl2_Offer *offer); +ECORE_WL2_API Ecore_Wl2_Drag_Action ecore_wl2_offer_actions_get(Ecore_Wl2_Offer *offer); /** * Set the actions which are supported by you @@ -240,7 +216,7 @@ EAPI Ecore_Wl2_Drag_Action ecore_wl2_offer_actions_get(Ecore_Wl2_Offer *offer); * @ingroup Ecore_Wl2_Dnd_Group * @since 1.19 */ -EAPI void ecore_wl2_offer_actions_set(Ecore_Wl2_Offer *offer, Ecore_Wl2_Drag_Action actions, Ecore_Wl2_Drag_Action action); +ECORE_WL2_API void ecore_wl2_offer_actions_set(Ecore_Wl2_Offer *offer, Ecore_Wl2_Drag_Action actions, Ecore_Wl2_Drag_Action action); /** * Get action which is set by either the data source or in the last call of actions_set @@ -252,7 +228,7 @@ EAPI void ecore_wl2_offer_actions_set(Ecore_Wl2_Offer *offer, Ecore_Wl2_Drag_Act * @ingroup Ecore_Wl2_Dnd_Group * @since 1.19 */ -EAPI Ecore_Wl2_Drag_Action ecore_wl2_offer_action_get(Ecore_Wl2_Offer *offer); +ECORE_WL2_API Ecore_Wl2_Drag_Action ecore_wl2_offer_action_get(Ecore_Wl2_Offer *offer); /** * Get the mime types which are given by the source @@ -264,7 +240,7 @@ EAPI Ecore_Wl2_Drag_Action ecore_wl2_offer_action_get(Ecore_Wl2_Offer *offer); * @ingroup Ecore_Wl2_Dnd_Group * @since 1.19 */ -EAPI Eina_Array* ecore_wl2_offer_mimes_get(Ecore_Wl2_Offer *offer); +ECORE_WL2_API Eina_Array* ecore_wl2_offer_mimes_get(Ecore_Wl2_Offer *offer); /** * Set mimetypes you are accepting under this offer @@ -274,7 +250,7 @@ EAPI Eina_Array* ecore_wl2_offer_mimes_get(Ecore_Wl2_Offer *offer); * @ingroup Ecore_Wl2_Dnd_Group * @since 1.19 */ -EAPI void ecore_wl2_offer_mimes_set(Ecore_Wl2_Offer *offer, Eina_Array *mimes); +ECORE_WL2_API void ecore_wl2_offer_mimes_set(Ecore_Wl2_Offer *offer, Eina_Array *mimes); /** * Accept a single mime type for an offer @@ -285,7 +261,7 @@ EAPI void ecore_wl2_offer_mimes_set(Ecore_Wl2_Offer *offer, Eina_Array *mimes); * @ingroup Ecore_Wl2_Dnd_Group * @since 1.20 */ -EAPI void ecore_wl2_offer_accept(Ecore_Wl2_Offer *offer, const char *mime_type); +ECORE_WL2_API void ecore_wl2_offer_accept(Ecore_Wl2_Offer *offer, const char *mime_type); /** * Request the data from this offer. @@ -298,7 +274,7 @@ EAPI void ecore_wl2_offer_accept(Ecore_Wl2_Offer *offer, const char *mime_type); * @ingroup Ecore_Wl2_Dnd_Group * @since 1.19 */ -EAPI void ecore_wl2_offer_receive(Ecore_Wl2_Offer *offer, char *mime); +ECORE_WL2_API void ecore_wl2_offer_receive(Ecore_Wl2_Offer *offer, char *mime); /** * Request the data from this offer on an externally managed fd. @@ -312,7 +288,7 @@ EAPI void ecore_wl2_offer_receive(Ecore_Wl2_Offer *offer, char *mime); * @ingroup Ecore_Wl2_Dnd_Group * @since 1.20 */ -EAPI void ecore_wl2_offer_proxy_receive(Ecore_Wl2_Offer *offer, const char *mime, int fd); +ECORE_WL2_API void ecore_wl2_offer_proxy_receive(Ecore_Wl2_Offer *offer, const char *mime, int fd); /** * End the use of a proxy received offer. This may invalidate the offer object @@ -322,7 +298,7 @@ EAPI void ecore_wl2_offer_proxy_receive(Ecore_Wl2_Offer *offer, const char *mime * @ingroup Ecore_Wl2_Dnd_Group * @since 1.20 */ -EAPI void ecore_wl2_offer_proxy_receive_end(Ecore_Wl2_Offer *offer); +ECORE_WL2_API void ecore_wl2_offer_proxy_receive_end(Ecore_Wl2_Offer *offer); /** * Check if the given offer supports the given mimetype @@ -335,7 +311,7 @@ EAPI void ecore_wl2_offer_proxy_receive_end(Ecore_Wl2_Offer *offer); * @ingroup Ecore_Wl2_Dnd_Group * @since 1.19 */ -EAPI Eina_Bool ecore_wl2_offer_supports_mime(Ecore_Wl2_Offer *offer, const char *mime); +ECORE_WL2_API Eina_Bool ecore_wl2_offer_supports_mime(Ecore_Wl2_Offer *offer, const char *mime); /** * Mark this offer as finished @@ -346,7 +322,7 @@ EAPI Eina_Bool ecore_wl2_offer_supports_mime(Ecore_Wl2_Offer *offer, const char * @ingroup Ecore_Wl2_Dnd_Group * @since 1.19 */ -EAPI void ecore_wl2_offer_finish(Ecore_Wl2_Offer *offer); +ECORE_WL2_API void ecore_wl2_offer_finish(Ecore_Wl2_Offer *offer); /** * @defgroup Ecore_Wl2_Subsurface_Group Functions to manipulate subsurfaces. @@ -377,7 +353,7 @@ EAPI void ecore_wl2_offer_finish(Ecore_Wl2_Offer *offer); * @ingroup Ecore_Wl2_Subsurface_Group * @since 1.17 */ -EAPI Ecore_Wl2_Subsurface *ecore_wl2_subsurface_new(Ecore_Wl2_Window *window); +ECORE_WL2_API Ecore_Wl2_Subsurface *ecore_wl2_subsurface_new(Ecore_Wl2_Window *window); /** * Destroy the given subsurface, as well as the surface associated with it. @@ -387,7 +363,7 @@ EAPI Ecore_Wl2_Subsurface *ecore_wl2_subsurface_new(Ecore_Wl2_Window *window); * @ingroup Ecore_Wl2_Subsurface_Group * @since 1.17 */ -EAPI void ecore_wl2_subsurface_del(Ecore_Wl2_Subsurface *subsurface); +ECORE_WL2_API void ecore_wl2_subsurface_del(Ecore_Wl2_Subsurface *subsurface); /** * Get the wl_surface for this subsurface @@ -399,7 +375,7 @@ EAPI void ecore_wl2_subsurface_del(Ecore_Wl2_Subsurface *subsurface); * @ingroup Ecore_Wl2_Subsurface_Group * @since 1.17 */ -EAPI struct wl_surface *ecore_wl2_subsurface_surface_get(Ecore_Wl2_Subsurface *subsurface); +ECORE_WL2_API struct wl_surface *ecore_wl2_subsurface_surface_get(Ecore_Wl2_Subsurface *subsurface); /** * Set the position of this subsurface, relative to its parent surface. @@ -413,7 +389,7 @@ EAPI struct wl_surface *ecore_wl2_subsurface_surface_get(Ecore_Wl2_Subsurface *s * @ingroup Ecore_Wl2_Subsurface_Group * @since 1.17 */ -EAPI void ecore_wl2_subsurface_position_set(Ecore_Wl2_Subsurface *subsurface, int x, int y); +ECORE_WL2_API void ecore_wl2_subsurface_position_set(Ecore_Wl2_Subsurface *subsurface, int x, int y); /** * Get the position of this subsurface, relative to its parent surface. @@ -426,7 +402,7 @@ EAPI void ecore_wl2_subsurface_position_set(Ecore_Wl2_Subsurface *subsurface, in * @ingroup Ecore_Wl2_Subsurface_Group * @since 1.17 */ -EAPI void ecore_wl2_subsurface_position_get(Ecore_Wl2_Subsurface *subsurface, int *x, int *y); +ECORE_WL2_API void ecore_wl2_subsurface_position_get(Ecore_Wl2_Subsurface *subsurface, int *x, int *y); /** * Place subsurface on layer above a reference surface @@ -442,7 +418,7 @@ EAPI void ecore_wl2_subsurface_position_get(Ecore_Wl2_Subsurface *subsurface, in * @ingroup Ecore_Wl2_Subsurface_Group * @since 1.17 */ -EAPI void ecore_wl2_subsurface_place_above(Ecore_Wl2_Subsurface *subsurface, struct wl_surface *surface); +ECORE_WL2_API void ecore_wl2_subsurface_place_above(Ecore_Wl2_Subsurface *subsurface, struct wl_surface *surface); /** * Place subsurface on layer below a reference surface @@ -455,7 +431,7 @@ EAPI void ecore_wl2_subsurface_place_above(Ecore_Wl2_Subsurface *subsurface, str * @ingroup Ecore_Wl2_Subsurface_Group * @since 1.17 */ -EAPI void ecore_wl2_subsurface_place_below(Ecore_Wl2_Subsurface *subsurface, struct wl_surface *surface); +ECORE_WL2_API void ecore_wl2_subsurface_place_below(Ecore_Wl2_Subsurface *subsurface, struct wl_surface *surface); /** * Enables or disables sub-surface synchronization @@ -483,7 +459,7 @@ EAPI void ecore_wl2_subsurface_place_below(Ecore_Wl2_Subsurface *subsurface, str * @ingroup Ecore_Wl2_Subsurface_Group * @since 1.17 */ -EAPI void ecore_wl2_subsurface_sync_set(Ecore_Wl2_Subsurface *subsurface, Eina_Bool sync); +ECORE_WL2_API void ecore_wl2_subsurface_sync_set(Ecore_Wl2_Subsurface *subsurface, Eina_Bool sync); /** * Set an opaque region for the given subsurface. @@ -503,7 +479,7 @@ EAPI void ecore_wl2_subsurface_sync_set(Ecore_Wl2_Subsurface *subsurface, Eina_B * @ingroup Ecore_Wl2_Subsurface_Group * @since 1.17 */ -EAPI void ecore_wl2_subsurface_opaque_region_set(Ecore_Wl2_Subsurface *subsurface, int x, int y, int w, int h); +ECORE_WL2_API void ecore_wl2_subsurface_opaque_region_set(Ecore_Wl2_Subsurface *subsurface, int x, int y, int w, int h); /** * Get list of supported auxiliary window hints @@ -515,7 +491,7 @@ EAPI void ecore_wl2_subsurface_opaque_region_set(Ecore_Wl2_Subsurface *subsurfac * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI Eina_List *ecore_wl2_window_aux_hints_supported_get(Ecore_Wl2_Window *window); +ECORE_WL2_API Eina_List *ecore_wl2_window_aux_hints_supported_get(Ecore_Wl2_Window *window); /** * Add a supported auxiliary hint to a given window @@ -528,7 +504,7 @@ EAPI Eina_List *ecore_wl2_window_aux_hints_supported_get(Ecore_Wl2_Window *windo * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI void ecore_wl2_window_aux_hint_add(Ecore_Wl2_Window *window, int id, const char *hint, const char *val); +ECORE_WL2_API void ecore_wl2_window_aux_hint_add(Ecore_Wl2_Window *window, int id, const char *hint, const char *val); /** * Change an auxiliary hint on a given window @@ -540,7 +516,7 @@ EAPI void ecore_wl2_window_aux_hint_add(Ecore_Wl2_Window *window, int id, const * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI void ecore_wl2_window_aux_hint_change(Ecore_Wl2_Window *window, int id, const char *val); +ECORE_WL2_API void ecore_wl2_window_aux_hint_change(Ecore_Wl2_Window *window, int id, const char *val); /** * Delete an auxiliary hint on a given window @@ -551,7 +527,7 @@ EAPI void ecore_wl2_window_aux_hint_change(Ecore_Wl2_Window *window, int id, con * @ingroup Ecore_Wl2_Window_Group * @since 1.20 */ -EAPI void ecore_wl2_window_aux_hint_del(Ecore_Wl2_Window *window, int id); +ECORE_WL2_API void ecore_wl2_window_aux_hint_del(Ecore_Wl2_Window *window, int id); /** * Terminate a Wayland display's main loop @@ -565,9 +541,6 @@ EAPI void ecore_wl2_window_aux_hint_del(Ecore_Wl2_Window *window, int id); * @ingroup Ecore_Wl2_Display_Group * @since 1.17 */ -EAPI void ecore_wl2_display_terminate(Ecore_Wl2_Display *display); - -# undef EAPI -# define EAPI +ECORE_WL2_API void ecore_wl2_display_terminate(Ecore_Wl2_Display *display); #endif diff --git a/src/lib/ecore_wl2/ecore_wl2_output.c b/src/lib/ecore_wl2/ecore_wl2_output.c index 0aa8791c12..f38540f1e3 100644 --- a/src/lib/ecore_wl2/ecore_wl2_output.c +++ b/src/lib/ecore_wl2/ecore_wl2_output.c @@ -128,7 +128,7 @@ _ecore_wl2_output_find(Ecore_Wl2_Display *display, struct wl_output *op) return NULL; } -EAPI int +ECORE_WL2_API int ecore_wl2_output_dpi_get(Ecore_Wl2_Output *output) { int w, h, mw, mh, dpi; @@ -151,7 +151,7 @@ ecore_wl2_output_dpi_get(Ecore_Wl2_Output *output) return dpi; } -EAPI int +ECORE_WL2_API int ecore_wl2_output_transform_get(Ecore_Wl2_Output *output) { EINA_SAFETY_ON_NULL_RETURN_VAL(output, 0); diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h b/src/lib/ecore_wl2/ecore_wl2_private.h index e4d19bd1e0..1cd4f91498 100644 --- a/src/lib/ecore_wl2/ecore_wl2_private.h +++ b/src/lib/ecore_wl2/ecore_wl2_private.h @@ -20,19 +20,7 @@ extern int _ecore_wl2_log_dom; extern Eina_Bool no_session_recovery; -# ifdef EAPI -# undef EAPI -# endif - -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# else -# define EAPI -# endif -# else -# define EAPI -# endif +#include <ecore_wl2_api.h> # ifdef ECORE_WL2_DEFAULT_LOG_COLOR # undef ECORE_WL2_DEFAULT_LOG_COLOR @@ -573,8 +561,8 @@ typedef struct _Ecore_Wl2_Surface Eina_Bool alpha : 1; } Ecore_Wl2_Surface; -EAPI extern int _ecore_wl2_event_window_www; -EAPI extern int _ecore_wl2_event_window_www_drag; +ECORE_WL2_API extern int _ecore_wl2_event_window_www; +ECORE_WL2_API extern int _ecore_wl2_event_window_www_drag; Ecore_Wl2_Window *_ecore_wl2_display_window_surface_find(Ecore_Wl2_Display *display, struct wl_surface *wl_surface); void _display_event_free(void *d, void *event EINA_UNUSED); @@ -613,7 +601,7 @@ Eina_Bool _ecore_wl2_display_sync_get(void); void _ecore_wl2_buffer_test(Ecore_Wl2_Display *ewd); -EAPI void ecore_wl2_window_weight_set(Ecore_Wl2_Window *window, double w, double h); +ECORE_WL2_API void ecore_wl2_window_weight_set(Ecore_Wl2_Window *window, double w, double h); Ecore_Wl2_Output *_ecore_wl2_output_find(Ecore_Wl2_Display *dsp, struct wl_output *op); diff --git a/src/lib/ecore_wl2/ecore_wl2_subsurf.c b/src/lib/ecore_wl2/ecore_wl2_subsurf.c index 5409fd2b26..18399e05f4 100644 --- a/src/lib/ecore_wl2/ecore_wl2_subsurf.c +++ b/src/lib/ecore_wl2/ecore_wl2_subsurf.c @@ -30,7 +30,7 @@ _ecore_wl2_subsurf_free(Ecore_Wl2_Subsurface *subsurf) free(subsurf); } -EAPI Ecore_Wl2_Subsurface * +ECORE_WL2_API Ecore_Wl2_Subsurface * ecore_wl2_subsurface_new(Ecore_Wl2_Window *window) { Ecore_Wl2_Display *display; @@ -81,7 +81,7 @@ surf_err: return NULL; } -EAPI void +ECORE_WL2_API void ecore_wl2_subsurface_del(Ecore_Wl2_Subsurface *subsurface) { EINA_SAFETY_ON_NULL_RETURN(subsurface); @@ -89,7 +89,7 @@ ecore_wl2_subsurface_del(Ecore_Wl2_Subsurface *subsurface) _ecore_wl2_subsurf_free(subsurface); } -EAPI struct wl_surface * +ECORE_WL2_API struct wl_surface * ecore_wl2_subsurface_surface_get(Ecore_Wl2_Subsurface *subsurface) { EINA_SAFETY_ON_NULL_RETURN_VAL(subsurface, NULL); @@ -97,7 +97,7 @@ ecore_wl2_subsurface_surface_get(Ecore_Wl2_Subsurface *subsurface) return subsurface->wl.surface; } -EAPI void +ECORE_WL2_API void ecore_wl2_subsurface_position_set(Ecore_Wl2_Subsurface *subsurface, int x, int y) { EINA_SAFETY_ON_NULL_RETURN(subsurface); @@ -111,7 +111,7 @@ ecore_wl2_subsurface_position_set(Ecore_Wl2_Subsurface *subsurface, int x, int y wl_subsurface_set_position(subsurface->wl.subsurface, x, y); } -EAPI void +ECORE_WL2_API void ecore_wl2_subsurface_position_get(Ecore_Wl2_Subsurface *subsurface, int *x, int *y) { EINA_SAFETY_ON_NULL_RETURN(subsurface); @@ -120,7 +120,7 @@ ecore_wl2_subsurface_position_get(Ecore_Wl2_Subsurface *subsurface, int *x, int if (y) *y = subsurface->y; } -EAPI void +ECORE_WL2_API void ecore_wl2_subsurface_place_above(Ecore_Wl2_Subsurface *subsurface, struct wl_surface *surface) { EINA_SAFETY_ON_NULL_RETURN(subsurface); @@ -129,7 +129,7 @@ ecore_wl2_subsurface_place_above(Ecore_Wl2_Subsurface *subsurface, struct wl_sur wl_subsurface_place_above(subsurface->wl.subsurface, surface); } -EAPI void +ECORE_WL2_API void ecore_wl2_subsurface_place_below(Ecore_Wl2_Subsurface *subsurface, struct wl_surface *surface) { EINA_SAFETY_ON_NULL_RETURN(subsurface); @@ -138,7 +138,7 @@ ecore_wl2_subsurface_place_below(Ecore_Wl2_Subsurface *subsurface, struct wl_sur wl_subsurface_place_below(subsurface->wl.subsurface, surface); } -EAPI void +ECORE_WL2_API void ecore_wl2_subsurface_sync_set(Ecore_Wl2_Subsurface *subsurface, Eina_Bool sync) { EINA_SAFETY_ON_NULL_RETURN(subsurface); @@ -155,7 +155,7 @@ ecore_wl2_subsurface_sync_set(Ecore_Wl2_Subsurface *subsurface, Eina_Bool sync) wl_subsurface_set_desync(subsurface->wl.subsurface); } -EAPI void +ECORE_WL2_API void ecore_wl2_subsurface_opaque_region_set(Ecore_Wl2_Subsurface *subsurface, int x, int y, int w, int h) { EINA_SAFETY_ON_NULL_RETURN(subsurface); diff --git a/src/lib/ecore_wl2/ecore_wl2_surface.c b/src/lib/ecore_wl2/ecore_wl2_surface.c index b2029d11f6..6d38df4f1c 100644 --- a/src/lib/ecore_wl2/ecore_wl2_surface.c +++ b/src/lib/ecore_wl2/ecore_wl2_surface.c @@ -10,7 +10,7 @@ static Eina_List *_smanagers = NULL; static int _smanager_count = 0; -EAPI void +ECORE_WL2_API void ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface) { EINA_SAFETY_ON_NULL_RETURN(surface); @@ -27,7 +27,7 @@ ecore_wl2_surface_destroy(Ecore_Wl2_Surface *surface) ecore_wl2_shutdown(); } -EAPI void +ECORE_WL2_API void ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t flags, Eina_Bool alpha) { EINA_SAFETY_ON_NULL_RETURN(surface); @@ -38,7 +38,7 @@ ecore_wl2_surface_reconfigure(Ecore_Wl2_Surface *surface, int w, int h, uint32_t surface->alpha = alpha; } -EAPI void * +ECORE_WL2_API void * ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h) { EINA_SAFETY_ON_NULL_RETURN_VAL(surface, NULL); @@ -46,7 +46,7 @@ ecore_wl2_surface_data_get(Ecore_Wl2_Surface *surface, int *w, int *h) return surface->funcs->data_get(surface, surface->private_data, w, h); } -EAPI int +ECORE_WL2_API int ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface) { EINA_SAFETY_ON_NULL_RETURN_VAL(surface, 0); @@ -54,7 +54,7 @@ ecore_wl2_surface_assign(Ecore_Wl2_Surface *surface) return surface->funcs->assign(surface, surface->private_data); } -EAPI void +ECORE_WL2_API void ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsigned int count) { EINA_SAFETY_ON_NULL_RETURN(surface); @@ -62,7 +62,7 @@ ecore_wl2_surface_post(Ecore_Wl2_Surface *surface, Eina_Rectangle *rects, unsign surface->funcs->post(surface, surface->private_data, rects, count); } -EAPI void +ECORE_WL2_API void ecore_wl2_surface_flush(Ecore_Wl2_Surface *surface, Eina_Bool purge) { EINA_SAFETY_ON_NULL_RETURN(surface); @@ -82,7 +82,7 @@ _ecore_wl2_surface_cb_offscreen(void *data, int type EINA_UNUSED, void *event) return ECORE_CALLBACK_RENEW; } -EAPI Ecore_Wl2_Surface * +ECORE_WL2_API Ecore_Wl2_Surface * ecore_wl2_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha) { Ecore_Wl2_Surface *out; @@ -126,7 +126,7 @@ ecore_wl2_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha) return NULL; } -EAPI Ecore_Wl2_Buffer * +ECORE_WL2_API Ecore_Wl2_Buffer * ecore_wl2_surface_buffer_create(Ecore_Wl2_Surface *surface) { Ecore_Wl2_Display *ewd; @@ -139,7 +139,7 @@ ecore_wl2_surface_buffer_create(Ecore_Wl2_Surface *surface) return ecore_wl2_buffer_create(ewd, surface->w, surface->h, surface->alpha); } -EAPI int +ECORE_WL2_API int ecore_wl2_surface_manager_add(Ecore_Wl2_Surface_Interface *intf) { if (intf->version < ECORE_WL2_SURFACE_INTERFACE_VERSION) @@ -150,13 +150,13 @@ ecore_wl2_surface_manager_add(Ecore_Wl2_Surface_Interface *intf) return intf->id; } -EAPI void +ECORE_WL2_API void ecore_wl2_surface_manager_del(Ecore_Wl2_Surface_Interface *intf) { _smanagers = eina_list_remove(_smanagers, intf); } -EAPI Ecore_Wl2_Window * +ECORE_WL2_API Ecore_Wl2_Window * ecore_wl2_surface_window_get(Ecore_Wl2_Surface *surface) { EINA_SAFETY_ON_NULL_RETURN_VAL(surface, NULL); @@ -164,7 +164,7 @@ ecore_wl2_surface_window_get(Ecore_Wl2_Surface *surface) return surface->wl2_win; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_surface_alpha_get(Ecore_Wl2_Surface *surface) { EINA_SAFETY_ON_NULL_RETURN_VAL(surface, EINA_FALSE); diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index e11e2e30a3..d28aeafa04 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -556,7 +556,7 @@ _ecore_wl2_window_create_destroy_send(Ecore_Wl2_Window *window, Eina_Bool create else ecore_event_add(ECORE_WL2_EVENT_WINDOW_DESTROY, ev, NULL, NULL); } -EAPI Ecore_Wl2_Window * +ECORE_WL2_API Ecore_Wl2_Window * ecore_wl2_window_new(Ecore_Wl2_Display *display, Ecore_Wl2_Window *parent, int x, int y, int w, int h) { Ecore_Wl2_Window *win; @@ -593,7 +593,7 @@ ecore_wl2_window_new(Ecore_Wl2_Display *display, Ecore_Wl2_Window *parent, int x return win; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_close_callback_set(Ecore_Wl2_Window *window, void (*cb) (void *data, Ecore_Wl2_Window *win), void *data) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -601,7 +601,7 @@ ecore_wl2_window_close_callback_set(Ecore_Wl2_Window *window, void (*cb) (void * window->cb_close_data = data; } -EAPI struct wl_surface * +ECORE_WL2_API struct wl_surface * ecore_wl2_window_surface_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, NULL); @@ -611,14 +611,14 @@ ecore_wl2_window_surface_get(Ecore_Wl2_Window *window) return window->surface; } -EAPI int +ECORE_WL2_API int ecore_wl2_window_surface_id_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, -1); return window->surface_id; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_show(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -646,7 +646,7 @@ ecore_wl2_window_show(Ecore_Wl2_Window *window) _configure_complete(window); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_hide(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -700,7 +700,7 @@ _ecore_wl2_window_aux_hint_free(Ecore_Wl2_Window *win) if (supported) eina_stringshare_del(supported); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_free(Ecore_Wl2_Window *window) { Ecore_Wl2_Display *display; @@ -749,7 +749,7 @@ ecore_wl2_window_free(Ecore_Wl2_Window *window) free(window); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_move(Ecore_Wl2_Window *window, Ecore_Wl2_Input *input) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -771,7 +771,7 @@ ecore_wl2_window_move(Ecore_Wl2_Window *window, Ecore_Wl2_Input *input) _ecore_wl2_input_ungrab(input); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_resize(Ecore_Wl2_Window *window, Ecore_Wl2_Input *input, int location) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -794,7 +794,7 @@ ecore_wl2_window_resize(Ecore_Wl2_Window *window, Ecore_Wl2_Input *input, int lo _ecore_wl2_input_ungrab(input); } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_window_alpha_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, EINA_FALSE); @@ -802,7 +802,7 @@ ecore_wl2_window_alpha_get(Ecore_Wl2_Window *window) return window->alpha; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_alpha_set(Ecore_Wl2_Window *window, Eina_Bool alpha) { Ecore_Wl2_Surface *surf; @@ -817,7 +817,7 @@ ecore_wl2_window_alpha_set(Ecore_Wl2_Window *window, Eina_Bool alpha) ecore_wl2_surface_reconfigure(surf, surf->w, surf->h, 0, alpha); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_opaque_region_set(Ecore_Wl2_Window *window, int x, int y, int w, int h) { int nx = 0, ny = 0, nw = 0, nh = 0; @@ -866,7 +866,7 @@ ecore_wl2_window_opaque_region_set(Ecore_Wl2_Window *window, int x, int y, int w window->pending.opaque = EINA_TRUE; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_opaque_region_get(Ecore_Wl2_Window *window, int *x, int *y, int *w, int *h) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -877,7 +877,7 @@ ecore_wl2_window_opaque_region_get(Ecore_Wl2_Window *window, int *x, int *y, int if (h) *h = window->opaque.h; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_input_region_set(Ecore_Wl2_Window *window, int x, int y, int w, int h) { int nx = 0, ny = 0, nw = 0, nh = 0; @@ -926,7 +926,7 @@ ecore_wl2_window_input_region_set(Ecore_Wl2_Window *window, int x, int y, int w, window->pending.input = EINA_TRUE; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_input_region_get(Ecore_Wl2_Window *window, int *x, int *y, int *w, int *h) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -937,7 +937,7 @@ ecore_wl2_window_input_region_get(Ecore_Wl2_Window *window, int *x, int *y, int if (h) *h = window->input_rect.h; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_window_maximized_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, EINA_FALSE); @@ -945,7 +945,7 @@ ecore_wl2_window_maximized_get(Ecore_Wl2_Window *window) return window->set_config.maximized; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_maximized_set(Ecore_Wl2_Window *window, Eina_Bool maximized) { Eina_Bool prev; @@ -983,7 +983,7 @@ ecore_wl2_window_maximized_set(Ecore_Wl2_Window *window, Eina_Bool maximized) ecore_wl2_display_flush(window->display); } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_window_fullscreen_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, EINA_FALSE); @@ -991,7 +991,7 @@ ecore_wl2_window_fullscreen_get(Ecore_Wl2_Window *window) return window->set_config.fullscreen; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_fullscreen_set(Ecore_Wl2_Window *window, Eina_Bool fullscreen) { Eina_Bool prev; @@ -1029,7 +1029,7 @@ ecore_wl2_window_fullscreen_set(Ecore_Wl2_Window *window, Eina_Bool fullscreen) ecore_wl2_display_flush(window->display); } -EAPI int +ECORE_WL2_API int ecore_wl2_window_rotation_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, -1); @@ -1037,7 +1037,7 @@ ecore_wl2_window_rotation_get(Ecore_Wl2_Window *window) return window->rotation; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_rotation_set(Ecore_Wl2_Window *window, int rotation) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -1045,7 +1045,7 @@ ecore_wl2_window_rotation_set(Ecore_Wl2_Window *window, int rotation) window->rotation = rotation; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_title_set(Ecore_Wl2_Window *window, const char *title) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -1061,7 +1061,7 @@ ecore_wl2_window_title_set(Ecore_Wl2_Window *window, const char *title) ecore_wl2_display_flush(window->display); } -EAPI const char * +ECORE_WL2_API const char * ecore_wl2_window_title_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, NULL); @@ -1069,7 +1069,7 @@ ecore_wl2_window_title_get(Ecore_Wl2_Window *window) return window->title ? window->title : NULL; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_class_set(Ecore_Wl2_Window *window, const char *clas) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -1085,7 +1085,7 @@ ecore_wl2_window_class_set(Ecore_Wl2_Window *window, const char *clas) ecore_wl2_display_flush(window->display); } -EAPI const char * +ECORE_WL2_API const char * ecore_wl2_window_class_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, NULL); @@ -1093,7 +1093,7 @@ ecore_wl2_window_class_get(Ecore_Wl2_Window *window) return window->class ? window->class : NULL; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_geometry_get(Ecore_Wl2_Window *window, int *x, int *y, int *w, int *h) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -1104,7 +1104,7 @@ ecore_wl2_window_geometry_get(Ecore_Wl2_Window *window, int *x, int *y, int *w, if (h) *h = window->set_config.geometry.h; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_geometry_set(Ecore_Wl2_Window *window, int x, int y, int w, int h) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -1122,7 +1122,7 @@ ecore_wl2_window_geometry_set(Ecore_Wl2_Window *window, int x, int y, int w, int window->pending.geom = EINA_TRUE; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_iconified_set(Ecore_Wl2_Window *window, Eina_Bool iconified) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -1145,14 +1145,14 @@ ecore_wl2_window_iconified_set(Ecore_Wl2_Window *window, Eina_Bool iconified) } } -EAPI void +ECORE_WL2_API void ecore_wl2_window_type_set(Ecore_Wl2_Window *window, Ecore_Wl2_Window_Type type) { EINA_SAFETY_ON_NULL_RETURN(window); window->type = type; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_popup_input_set(Ecore_Wl2_Window *window, Ecore_Wl2_Input *input) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -1161,7 +1161,7 @@ ecore_wl2_window_popup_input_set(Ecore_Wl2_Window *window, Ecore_Wl2_Input *inpu window->grab = input; } -EAPI Ecore_Wl2_Input * +ECORE_WL2_API Ecore_Wl2_Input * ecore_wl2_window_popup_input_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, NULL); @@ -1169,7 +1169,7 @@ ecore_wl2_window_popup_input_get(Ecore_Wl2_Window *window) return window->grab; } -EAPI Ecore_Wl2_Display * +ECORE_WL2_API Ecore_Wl2_Display * ecore_wl2_window_display_get(const Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, NULL); @@ -1180,21 +1180,21 @@ ecore_wl2_window_display_get(const Ecore_Wl2_Window *window) return window->display; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_window_shell_surface_exists(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, EINA_FALSE); return !!window->zxdg_surface || !!window->xdg_surface; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_window_activated_get(const Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, EINA_FALSE); return window->req_config.focused; } -EAPI Ecore_Wl2_Output * +ECORE_WL2_API Ecore_Wl2_Output * ecore_wl2_window_output_find(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, NULL); @@ -1202,7 +1202,7 @@ ecore_wl2_window_output_find(Ecore_Wl2_Window *window) return eina_list_data_get(window->outputs); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_buffer_transform_set(Ecore_Wl2_Window *window, int transform) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -1210,49 +1210,49 @@ ecore_wl2_window_buffer_transform_set(Ecore_Wl2_Window *window, int transform) wl_surface_set_buffer_transform(window->surface, transform); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_wm_rotation_supported_set(Ecore_Wl2_Window *window, Eina_Bool enabled) { EINA_SAFETY_ON_NULL_RETURN(window); window->wm_rot.supported = enabled; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_window_wm_rotation_supported_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, EINA_FALSE); return window->wm_rot.supported; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_rotation_app_set(Ecore_Wl2_Window *window, Eina_Bool set) { EINA_SAFETY_ON_NULL_RETURN(window); window->wm_rot.app_set = set; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_window_rotation_app_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, EINA_FALSE); return window->wm_rot.app_set; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_preferred_rotation_set(Ecore_Wl2_Window *window, int rot) { EINA_SAFETY_ON_NULL_RETURN(window); window->wm_rot.preferred_rot = rot; } -EAPI int +ECORE_WL2_API int ecore_wl2_window_preferred_rotation_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, 0); return window->wm_rot.preferred_rot; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_available_rotations_set(Ecore_Wl2_Window *window, const int *rots, unsigned int count) { unsigned int i = 0; @@ -1275,7 +1275,7 @@ ecore_wl2_window_available_rotations_set(Ecore_Wl2_Window *window, const int *ro } } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_window_available_rotations_get(Ecore_Wl2_Window *window, int **rots, unsigned int *count) { unsigned int i = 0; @@ -1301,7 +1301,7 @@ ecore_wl2_window_available_rotations_get(Ecore_Wl2_Window *window, int **rots, u return EINA_FALSE; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_rotation_change_prepare_send(Ecore_Wl2_Window *window, int rot, int w, int h, Eina_Bool resize) { Ecore_Wl2_Event_Window_Rotation_Change_Prepare *ev; @@ -1320,7 +1320,7 @@ ecore_wl2_window_rotation_change_prepare_send(Ecore_Wl2_Window *window, int rot, ecore_event_add(ECORE_WL2_EVENT_WINDOW_ROTATION_CHANGE_PREPARE, ev, NULL, NULL); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_rotation_change_prepare_done_send(Ecore_Wl2_Window *window, int rot) { Ecore_Wl2_Event_Window_Rotation_Change_Prepare_Done *ev; @@ -1340,7 +1340,7 @@ ecore_wl2_window_rotation_change_prepare_done_send(Ecore_Wl2_Window *window, int ev, NULL, NULL); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_rotation_change_request_send(Ecore_Wl2_Window *window, int rot) { Ecore_Wl2_Event_Window_Rotation_Change_Request *ev; @@ -1360,7 +1360,7 @@ ecore_wl2_window_rotation_change_request_send(Ecore_Wl2_Window *window, int rot) ev, NULL, NULL); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_rotation_change_done_send(Ecore_Wl2_Window *window, int rot, int w, int h) { Ecore_Wl2_Event_Window_Rotation_Change_Done *ev; @@ -1380,7 +1380,7 @@ ecore_wl2_window_rotation_change_done_send(Ecore_Wl2_Window *window, int rot, in ev, NULL, NULL); } -EAPI Eina_List * +ECORE_WL2_API Eina_List * ecore_wl2_window_aux_hints_supported_get(Ecore_Wl2_Window *win) { Eina_List *res = NULL; @@ -1399,7 +1399,7 @@ ecore_wl2_window_aux_hints_supported_get(Ecore_Wl2_Window *win) return res; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_aux_hint_add(Ecore_Wl2_Window *win, int id, const char *hint, const char *val) { if (!win) return; @@ -1409,7 +1409,7 @@ ecore_wl2_window_aux_hint_add(Ecore_Wl2_Window *win, int id, const char *hint, c ecore_wl2_display_flush(win->display); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_aux_hint_change(Ecore_Wl2_Window *win, int id, const char *val) { if (!win) return; @@ -1419,7 +1419,7 @@ ecore_wl2_window_aux_hint_change(Ecore_Wl2_Window *win, int id, const char *val) ecore_wl2_display_flush(win->display); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_aux_hint_del(Ecore_Wl2_Window *win, int id) { if (!win) return; @@ -1429,28 +1429,28 @@ ecore_wl2_window_aux_hint_del(Ecore_Wl2_Window *win, int id) ecore_wl2_display_flush(win->display); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_focus_skip_set(Ecore_Wl2_Window *window, Eina_Bool focus_skip) { EINA_SAFETY_ON_NULL_RETURN(window); window->focus_skip = focus_skip; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_window_focus_skip_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, EINA_FALSE); return window->focus_skip; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_role_set(Ecore_Wl2_Window *window, const char *role) { EINA_SAFETY_ON_NULL_RETURN(window); eina_stringshare_replace(&window->role, role); } -EAPI const char * +ECORE_WL2_API const char * ecore_wl2_window_role_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, NULL); @@ -1458,21 +1458,21 @@ ecore_wl2_window_role_get(Ecore_Wl2_Window *window) return window->role ? window->role : NULL; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_floating_mode_set(Ecore_Wl2_Window *window, Eina_Bool floating) { EINA_SAFETY_ON_NULL_RETURN(window); window->floating = floating; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_window_floating_mode_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, EINA_FALSE); return window->floating; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_aspect_set(Ecore_Wl2_Window *window, int w, int h, unsigned int aspect) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -1494,7 +1494,7 @@ ecore_wl2_window_aspect_set(Ecore_Wl2_Window *window, int w, int h, unsigned int ecore_wl2_display_flush(window->display); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_aspect_get(Ecore_Wl2_Window *window, int *w, int *h, unsigned int *aspect) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -1504,7 +1504,7 @@ ecore_wl2_window_aspect_get(Ecore_Wl2_Window *window, int *w, int *h, unsigned i if (aspect) *aspect = window->aspect.aspect; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_weight_set(Ecore_Wl2_Window *window, double w, double h) { int ww, hh; @@ -1653,7 +1653,7 @@ out: if (region) wl_region_destroy(region); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_commit(Ecore_Wl2_Window *window, Eina_Bool flush) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -1727,7 +1727,7 @@ ecore_wl2_window_commit(Ecore_Wl2_Window *window, Eina_Bool flush) _ecore_wl2_window_configure_send(window); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_false_commit(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -1743,7 +1743,7 @@ ecore_wl2_window_false_commit(Ecore_Wl2_Window *window) window->commit_pending = EINA_TRUE; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_window_pending_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, EINA_FALSE); @@ -1751,7 +1751,7 @@ ecore_wl2_window_pending_get(Ecore_Wl2_Window *window) return window->commit_pending; } -EAPI Ecore_Wl2_Frame_Cb_Handle * +ECORE_WL2_API Ecore_Wl2_Frame_Cb_Handle * ecore_wl2_window_frame_callback_add(Ecore_Wl2_Window *window, Ecore_Wl2_Frame_Cb cb, void *data) { Ecore_Wl2_Frame_Cb_Handle *callback; @@ -1769,7 +1769,7 @@ ecore_wl2_window_frame_callback_add(Ecore_Wl2_Window *window, Ecore_Wl2_Frame_Cb return callback; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_frame_callback_del(Ecore_Wl2_Frame_Cb_Handle *handle) { EINA_SAFETY_ON_NULL_RETURN(handle); @@ -1779,7 +1779,7 @@ ecore_wl2_window_frame_callback_del(Ecore_Wl2_Frame_Cb_Handle *handle) free(handle); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_buffer_attach(Ecore_Wl2_Window *win, void *buffer, int x, int y, Eina_Bool implicit) { EINA_SAFETY_ON_NULL_RETURN(win); @@ -1794,7 +1794,7 @@ ecore_wl2_window_buffer_attach(Ecore_Wl2_Window *win, void *buffer, int x, int y win->has_buffer = EINA_TRUE; } -EAPI Eina_Bool +ECORE_WL2_API Eina_Bool ecore_wl2_window_resizing_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, EINA_FALSE); @@ -1802,7 +1802,7 @@ ecore_wl2_window_resizing_get(Ecore_Wl2_Window *window) return window->req_config.resizing; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_update_begin(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -1811,7 +1811,7 @@ ecore_wl2_window_update_begin(Ecore_Wl2_Window *window) window->updating = EINA_TRUE; } -EAPI void +ECORE_WL2_API void ecore_wl2_window_damage(Ecore_Wl2_Window *window, Eina_Rectangle *rects, unsigned int count) { void (*damage)(struct wl_surface *, int32_t, int32_t, int32_t, int32_t); @@ -1834,7 +1834,7 @@ ecore_wl2_window_damage(Ecore_Wl2_Window *window, Eina_Rectangle *rects, unsigne damage(window->surface, 0, 0, INT_MAX, INT_MAX); } -EAPI void +ECORE_WL2_API void ecore_wl2_window_surface_flush(Ecore_Wl2_Window *window, Eina_Bool purge) { EINA_SAFETY_ON_NULL_RETURN(window); @@ -1843,14 +1843,14 @@ ecore_wl2_window_surface_flush(Ecore_Wl2_Window *window, Eina_Bool purge) ecore_wl2_surface_flush(window->wl2_surface, purge); } -EAPI Ecore_Wl2_Window_Type +ECORE_WL2_API Ecore_Wl2_Window_Type ecore_wl2_window_type_get(Ecore_Wl2_Window *window) { EINA_SAFETY_ON_NULL_RETURN_VAL(window, ECORE_WL2_WINDOW_TYPE_NONE); return window->type; } -EAPI Ecore_Wl2_Window * +ECORE_WL2_API Ecore_Wl2_Window * ecore_wl2_window_surface_find(struct wl_surface *surface) { Ecore_Wl2_Display *ewd; diff --git a/src/lib/ecore_wl2/meson.build b/src/lib/ecore_wl2/meson.build index eb88e47703..cd23a11923 100644 --- a/src/lib/ecore_wl2/meson.build +++ b/src/lib/ecore_wl2/meson.build @@ -5,6 +5,7 @@ ecore_wl2_ext_deps = [dependency('wayland-client'), dependency('wayland-server') ecore_wl2_header_src = [ 'Ecore_Wl2.h' + 'ecore_wl2_api.h' ] ecore_wl2_src = files([ @@ -23,7 +24,7 @@ ecore_wl2_src = files([ ecore_wl2_lib = library('ecore_wl2', ecore_wl2_src, pub_eo_file_target, - c_args : package_c_args, + c_args : [package_c_args, '-DWL2_BUILD'], dependencies: ecore_wl2_deps + ecore_wl2_pub_deps + ecore_wl2_ext_deps, include_directories : config_dir, install: true, |