From 0a94e8ba71f81db78363e4d4e7df8a8b9020216d Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Thu, 7 May 2015 15:13:10 -0400 Subject: [PATCH] enlightenment: Make E build again with EFL from git sed -i 's/EAPI/E_API/g' Signed-off-by: Chris Michael --- src/bin/e.h | 50 +++--- src/bin/e_about.c | 4 +- src/bin/e_about.h | 4 +- src/bin/e_acpi.c | 6 +- src/bin/e_acpi.h | 6 +- src/bin/e_actions.c | 18 +- src/bin/e_actions.h | 18 +- src/bin/e_alert.c | 6 +- src/bin/e_alert.h | 2 +- src/bin/e_atoms.c | 22 +-- src/bin/e_atoms.h | 22 +-- src/bin/e_auth.c | 4 +- src/bin/e_auth.h | 4 +- src/bin/e_backlight.c | 16 +- src/bin/e_backlight.h | 16 +- src/bin/e_bg.c | 16 +- src/bin/e_bg.h | 20 +-- src/bin/e_bindings.c | 120 +++++++------- src/bin/e_bindings.h | 134 +++++++-------- src/bin/e_client.c | 190 ++++++++++----------- src/bin/e_client.h | 192 +++++++++++----------- src/bin/e_color.h | 6 +- src/bin/e_color_dialog.c | 2 +- src/bin/e_color_dialog.h | 12 +- src/bin/e_comp.c | 66 ++++---- src/bin/e_comp.h | 72 ++++---- src/bin/e_comp_canvas.c | 36 ++-- src/bin/e_comp_canvas.h | 38 ++--- src/bin/e_comp_cfdata.c | 8 +- src/bin/e_comp_cfdata.h | 8 +- src/bin/e_comp_object.c | 94 +++++------ src/bin/e_comp_object.h | 94 +++++------ src/bin/e_comp_wl.c | 10 +- src/bin/e_comp_wl.h | 10 +- src/bin/e_comp_wl_input.c | 6 +- src/bin/e_comp_wl_input.h | 6 +- src/bin/e_comp_x.h | 2 +- src/bin/e_comp_x_randr.c | 14 +- src/bin/e_comp_x_randr.h | 14 +- src/bin/e_config.c | 70 ++++---- src/bin/e_config.h | 88 +++++----- src/bin/e_config_data.c | 6 +- src/bin/e_config_data.h | 6 +- src/bin/e_config_dialog.c | 10 +- src/bin/e_config_dialog.h | 10 +- src/bin/e_configure.c | 20 +-- src/bin/e_configure.h | 20 +-- src/bin/e_confirm_dialog.c | 2 +- src/bin/e_confirm_dialog.h | 2 +- src/bin/e_datastore.c | 6 +- src/bin/e_datastore.h | 6 +- src/bin/e_dbusmenu.c | 10 +- src/bin/e_dbusmenu.h | 10 +- src/bin/e_desk.c | 64 ++++---- src/bin/e_desk.h | 70 ++++---- src/bin/e_deskenv.c | 2 +- src/bin/e_deskenv.h | 2 +- src/bin/e_desklock.c | 24 +-- src/bin/e_desklock.h | 24 +-- src/bin/e_deskmirror.c | 16 +- src/bin/e_deskmirror.h | 16 +- src/bin/e_desktop_editor.c | 6 +- src/bin/e_desktop_editor.h | 6 +- src/bin/e_dialog.c | 26 +-- src/bin/e_dialog.h | 26 +-- src/bin/e_dnd.c | 46 +++--- src/bin/e_dnd.h | 46 +++--- src/bin/e_dpms.c | 4 +- src/bin/e_dpms.h | 4 +- src/bin/e_entry_dialog.c | 2 +- src/bin/e_entry_dialog.h | 2 +- src/bin/e_env.c | 4 +- src/bin/e_env.h | 4 +- src/bin/e_error.c | 2 +- src/bin/e_error.h | 2 +- src/bin/e_exec.c | 32 ++-- src/bin/e_exec.h | 34 ++-- src/bin/e_exehist.c | 24 +-- src/bin/e_exehist.h | 24 +-- src/bin/e_filereg.c | 6 +- src/bin/e_filereg.h | 6 +- src/bin/e_flowlayout.c | 56 +++---- src/bin/e_flowlayout.h | 54 +++--- src/bin/e_fm.c | 132 +++++++-------- src/bin/e_fm.h | 144 ++++++++-------- src/bin/e_fm/e_fm_ipc.h | 19 ++- src/bin/e_fm/e_fm_main.c | 18 +- src/bin/e_fm/e_fm_main.h | 25 +++ src/bin/e_fm/e_fm_main_udisks2.c | 4 +- src/bin/e_fm_cmdline.c | 27 ++- src/bin/e_fm_custom.c | 12 +- src/bin/e_fm_custom.h | 12 +- src/bin/e_fm_device.c | 42 ++--- src/bin/e_fm_device.h | 42 ++--- src/bin/e_fm_mime.c | 30 ++-- src/bin/e_fm_mime.h | 30 ++-- src/bin/e_fm_op_registry.c | 30 ++-- src/bin/e_fm_op_registry.h | 30 ++-- src/bin/e_fm_prop.c | 2 +- src/bin/e_fm_prop.h | 2 +- src/bin/e_focus.c | 12 +- src/bin/e_focus.h | 16 +- src/bin/e_font.c | 36 ++-- src/bin/e_font.h | 36 ++-- src/bin/e_gadcon.c | 170 +++++++++---------- src/bin/e_gadcon.h | 172 +++++++++---------- src/bin/e_gadcon_popup.c | 12 +- src/bin/e_gadcon_popup.h | 12 +- src/bin/e_grab_dialog.c | 2 +- src/bin/e_grab_dialog.h | 2 +- src/bin/e_grabinput.c | 14 +- src/bin/e_grabinput.h | 14 +- src/bin/e_hints.c | 82 ++++----- src/bin/e_hints.h | 74 ++++----- src/bin/e_icon.c | 50 +++--- src/bin/e_icon.h | 50 +++--- src/bin/e_ilist.c | 80 ++++----- src/bin/e_ilist.h | 80 ++++----- src/bin/e_import_config_dialog.c | 2 +- src/bin/e_import_config_dialog.h | 2 +- src/bin/e_import_dialog.c | 2 +- src/bin/e_import_dialog.h | 2 +- src/bin/e_init.c | 18 +- src/bin/e_init.h | 22 +-- src/bin/e_int_client_locks.c | 2 +- src/bin/e_int_client_locks.h | 2 +- src/bin/e_int_client_menu.c | 12 +- src/bin/e_int_client_menu.h | 12 +- src/bin/e_int_client_prop.c | 2 +- src/bin/e_int_client_prop.h | 2 +- src/bin/e_int_client_remember.c | 4 +- src/bin/e_int_client_remember.h | 4 +- src/bin/e_int_config_comp.c | 2 +- src/bin/e_int_config_comp_match.c | 2 +- src/bin/e_int_config_modules.c | 2 +- src/bin/e_int_config_modules.h | 2 +- src/bin/e_int_gadcon_config.c | 6 +- src/bin/e_int_gadcon_config.h | 6 +- src/bin/e_int_menus.c | 26 +-- src/bin/e_int_menus.h | 28 ++-- src/bin/e_int_shelf_config.c | 2 +- src/bin/e_int_shelf_config.h | 2 +- src/bin/e_int_toolbar_config.c | 2 +- src/bin/e_int_toolbar_config.h | 2 +- src/bin/e_intl.c | 20 +-- src/bin/e_intl.h | 26 +-- src/bin/e_intl_data.c | 6 +- src/bin/e_intl_data.h | 6 +- src/bin/e_ipc_codec.c | 84 +++++----- src/bin/e_ipc_codec.h | 102 ++++++------ src/bin/e_layout.c | 42 ++--- src/bin/e_layout.h | 42 ++--- src/bin/e_livethumb.c | 12 +- src/bin/e_livethumb.h | 12 +- src/bin/e_main.c | 18 +- src/bin/e_maximize.c | 8 +- src/bin/e_maximize.h | 8 +- src/bin/e_menu.c | 84 +++++----- src/bin/e_menu.h | 96 +++++------ src/bin/e_module.c | 36 ++-- src/bin/e_module.h | 36 ++-- src/bin/e_mouse.c | 2 +- src/bin/e_mouse.h | 2 +- src/bin/e_moveresize.c | 4 +- src/bin/e_moveresize.h | 4 +- src/bin/e_msg.c | 6 +- src/bin/e_msg.h | 6 +- src/bin/e_msgbus.c | 2 +- src/bin/e_msgbus.h | 2 +- src/bin/e_notification.c | 10 +- src/bin/e_notification.h | 10 +- src/bin/e_obj_dialog.c | 12 +- src/bin/e_obj_dialog.h | 12 +- src/bin/e_object.c | 40 ++--- src/bin/e_object.h | 44 ++--- src/bin/e_open.c | 27 ++- src/bin/e_order.c | 18 +- src/bin/e_order.h | 20 +-- src/bin/e_pan.c | 14 +- src/bin/e_pan.h | 14 +- src/bin/e_path.c | 22 +-- src/bin/e_path.h | 24 +-- src/bin/e_pixmap.c | 70 ++++---- src/bin/e_pixmap.h | 70 ++++---- src/bin/e_place.c | 10 +- src/bin/e_place.h | 10 +- src/bin/e_pointer.c | 20 +-- src/bin/e_pointer.h | 20 +-- src/bin/e_powersave.c | 16 +- src/bin/e_powersave.h | 12 +- src/bin/e_prefix.c | 20 +-- src/bin/e_prefix.h | 20 +-- src/bin/e_randr2.c | 18 +- src/bin/e_randr2.h | 18 +- src/bin/e_remember.c | 26 +-- src/bin/e_remember.h | 26 +-- src/bin/e_resist.c | 4 +- src/bin/e_resist.h | 4 +- src/bin/e_scale.c | 4 +- src/bin/e_scale.h | 4 +- src/bin/e_screensaver.c | 18 +- src/bin/e_screensaver.h | 18 +- src/bin/e_scrollframe.c | 40 ++--- src/bin/e_scrollframe.h | 40 ++--- src/bin/e_sha1.c | 2 +- src/bin/e_sha1.h | 14 +- src/bin/e_shelf.c | 60 +++---- src/bin/e_shelf.h | 60 +++---- src/bin/e_signals.c | 10 +- src/bin/e_signals.h | 10 +- src/bin/e_slidecore.c | 10 +- src/bin/e_slidecore.h | 10 +- src/bin/e_slider.c | 38 ++--- src/bin/e_slider.h | 38 ++--- src/bin/e_slidesel.c | 8 +- src/bin/e_slidesel.h | 8 +- src/bin/e_start_main.c | 29 +++- src/bin/e_startup.c | 2 +- src/bin/e_startup.h | 2 +- src/bin/e_sys.c | 18 +- src/bin/e_sys.h | 18 +- src/bin/e_test.c | 2 +- src/bin/e_test.h | 2 +- src/bin/e_theme.c | 24 +-- src/bin/e_theme.h | 24 +-- src/bin/e_theme_about.c | 4 +- src/bin/e_theme_about.h | 4 +- src/bin/e_thumb.c | 18 +- src/bin/e_thumb.h | 18 +- src/bin/e_toolbar.c | 14 +- src/bin/e_toolbar.h | 14 +- src/bin/e_user.c | 20 +-- src/bin/e_user.h | 20 +-- src/bin/e_utils.c | 104 ++++++------ src/bin/e_utils.h | 90 +++++----- src/bin/e_uuid_store.h | 8 +- src/bin/e_widget.c | 60 +++---- src/bin/e_widget.h | 60 +++---- src/bin/e_widget_aspect.c | 8 +- src/bin/e_widget_aspect.h | 8 +- src/bin/e_widget_bgpreview.c | 8 +- src/bin/e_widget_bgpreview.h | 8 +- src/bin/e_widget_button.c | 6 +- src/bin/e_widget_button.h | 6 +- src/bin/e_widget_check.c | 14 +- src/bin/e_widget_check.h | 14 +- src/bin/e_widget_color_well.h | 6 +- src/bin/e_widget_config_list.c | 12 +- src/bin/e_widget_config_list.h | 12 +- src/bin/e_widget_entry.c | 14 +- src/bin/e_widget_entry.h | 14 +- src/bin/e_widget_filepreview.c | 8 +- src/bin/e_widget_filepreview.h | 8 +- src/bin/e_widget_flist.c | 22 +-- src/bin/e_widget_flist.h | 22 +-- src/bin/e_widget_font_preview.c | 4 +- src/bin/e_widget_font_preview.h | 4 +- src/bin/e_widget_framelist.c | 10 +- src/bin/e_widget_framelist.h | 10 +- src/bin/e_widget_frametable.c | 12 +- src/bin/e_widget_frametable.h | 12 +- src/bin/e_widget_fsel.c | 10 +- src/bin/e_widget_fsel.h | 10 +- src/bin/e_widget_ilist.c | 106 ++++++------ src/bin/e_widget_ilist.h | 106 ++++++------ src/bin/e_widget_image.c | 10 +- src/bin/e_widget_image.h | 10 +- src/bin/e_widget_label.c | 4 +- src/bin/e_widget_label.h | 4 +- src/bin/e_widget_list.c | 10 +- src/bin/e_widget_list.h | 10 +- src/bin/e_widget_preview.c | 18 +- src/bin/e_widget_preview.h | 18 +- src/bin/e_widget_radio.c | 8 +- src/bin/e_widget_radio.h | 8 +- src/bin/e_widget_scrollframe.c | 14 +- src/bin/e_widget_scrollframe.h | 14 +- src/bin/e_widget_slider.c | 18 +- src/bin/e_widget_slider.h | 18 +- src/bin/e_widget_table.c | 10 +- src/bin/e_widget_table.h | 10 +- src/bin/e_widget_textblock.c | 6 +- src/bin/e_widget_textblock.h | 6 +- src/bin/e_widget_toolbar.c | 24 +-- src/bin/e_widget_toolbar.h | 24 +-- src/bin/e_widget_toolbook.c | 6 +- src/bin/e_widget_toolbook.h | 6 +- src/bin/e_win.c | 20 +-- src/bin/e_win.h | 20 +-- src/bin/e_xinerama.c | 12 +- src/bin/e_xinerama.h | 12 +- src/bin/e_xkb.c | 28 ++-- src/bin/e_xkb.h | 28 ++-- src/bin/e_xsettings.c | 2 +- src/bin/e_xsettings.h | 2 +- src/bin/e_zone.c | 78 ++++----- src/bin/e_zone.h | 82 ++++----- src/bin/e_zoomap.c | 22 +-- src/bin/e_zoomap.h | 22 +-- src/modules/access/e_mod_main.c | 8 +- src/modules/appmenu/e_mod_main.c | 8 +- src/modules/backlight/e_mod_main.c | 8 +- src/modules/battery/e_mod_main.c | 8 +- src/modules/battery/e_mod_main.h | 8 +- src/modules/bluez4/e_mod_main.c | 8 +- src/modules/bluez4/e_mod_main.h | 8 +- src/modules/clock/e_mod_main.c | 8 +- src/modules/clock/e_mod_main.h | 8 +- src/modules/conf/e_mod_main.c | 8 +- src/modules/conf_applications/e_mod_main.c | 8 +- src/modules/conf_bindings/e_mod_main.c | 8 +- src/modules/conf_dialogs/e_mod_main.c | 8 +- src/modules/conf_display/e_mod_main.c | 8 +- src/modules/conf_interaction/e_mod_main.c | 8 +- src/modules/conf_intl/e_mod_main.c | 8 +- src/modules/conf_menus/e_mod_main.c | 8 +- src/modules/conf_paths/e_mod_main.c | 8 +- src/modules/conf_performance/e_mod_main.c | 8 +- src/modules/conf_randr/e_mod_main.c | 8 +- src/modules/conf_randr/e_mod_main.h | 8 +- src/modules/conf_shelves/e_mod_main.c | 8 +- src/modules/conf_theme/e_mod_main.c | 6 +- src/modules/conf_window_manipulation/e_mod_main.c | 8 +- src/modules/conf_window_remembers/e_mod_main.c | 8 +- src/modules/connman/e_connman.c | 4 +- src/modules/connman/e_mod_main.c | 8 +- src/modules/connman/e_mod_main.h | 8 +- src/modules/cpufreq/e_mod_main.c | 8 +- src/modules/cpufreq/e_mod_main.h | 8 +- src/modules/everything/e_mod_main.c | 8 +- src/modules/everything/e_mod_main.h | 12 +- src/modules/everything/evry_config.c | 4 +- src/modules/fileman/e_mod_main.c | 8 +- src/modules/fileman_opinfo/e_mod_main.c | 8 +- src/modules/gadman/e_mod_main.c | 8 +- src/modules/geolocation/e_mod_main.c | 8 +- src/modules/ibar/e_mod_main.c | 8 +- src/modules/ibar/e_mod_main.h | 8 +- src/modules/ibox/e_mod_main.c | 8 +- src/modules/ibox/e_mod_main.h | 8 +- src/modules/layout/e_mod_main.c | 8 +- src/modules/lokker/e_mod_main.c | 6 +- src/modules/lokker/e_mod_main.h | 2 +- src/modules/mixer/e_mod_main.c | 8 +- src/modules/mixer/e_mod_main.h | 8 +- src/modules/msgbus/e_mod_main.c | 8 +- src/modules/music-control/e_mod_main.c | 8 +- src/modules/music-control/e_mod_main.h | 8 +- src/modules/notification/e_mod_main.c | 8 +- src/modules/notification/e_mod_main.h | 8 +- src/modules/packagekit/e_mod_main.c | 8 +- src/modules/packagekit/e_mod_main.h | 8 +- src/modules/pager/e_mod_main.c | 8 +- src/modules/pager/e_mod_main.h | 8 +- src/modules/pager_plain/e_mod_main.c | 8 +- src/modules/pager_plain/e_mod_main.h | 8 +- src/modules/policy_mobile/e_mod_main.c | 8 +- src/modules/quickaccess/e_mod_main.c | 8 +- src/modules/quickaccess/e_mod_main.h | 2 +- src/modules/shot/e_mod_main.c | 8 +- src/modules/start/e_mod_main.c | 8 +- src/modules/syscon/e_mod_main.c | 6 +- src/modules/syscon/e_syscon_gadget.c | 2 +- src/modules/systray/e_mod_main.c | 8 +- src/modules/systray/e_mod_main.h | 8 +- src/modules/tasks/e_mod_main.c | 8 +- src/modules/tasks/e_mod_main.h | 8 +- src/modules/teamwork/e_mod_main.c | 8 +- src/modules/teamwork/e_mod_main.h | 2 +- src/modules/temperature/e_mod_main.c | 8 +- src/modules/temperature/e_mod_main.h | 8 +- src/modules/tiling/e_mod_tiling.c | 8 +- src/modules/tiling/e_mod_tiling.h | 8 +- src/modules/winlist/e_mod_main.c | 8 +- src/modules/wizard/e_mod_main.c | 8 +- src/modules/wizard/e_wizard.c | 26 +-- src/modules/wizard/e_wizard.h | 26 +-- src/modules/wizard/page_000.c | 10 +- src/modules/wizard/page_010.c | 10 +- src/modules/wizard/page_011.c | 10 +- src/modules/wizard/page_020.c | 10 +- src/modules/wizard/page_030.c | 10 +- src/modules/wizard/page_040.c | 10 +- src/modules/wizard/page_050.c | 10 +- src/modules/wizard/page_060.c | 10 +- src/modules/wizard/page_070.c | 10 +- src/modules/wizard/page_080.c | 10 +- src/modules/wizard/page_090.c | 10 +- src/modules/wizard/page_100.c | 10 +- src/modules/wizard/page_110.c | 10 +- src/modules/wizard/page_120.c | 10 +- src/modules/wizard/page_130.c | 10 +- src/modules/wizard/page_150.c | 4 +- src/modules/wizard/page_160.c | 10 +- src/modules/wizard/page_170.c | 10 +- src/modules/wizard/page_180.c | 10 +- src/modules/wizard/page_200.c | 10 +- src/modules/wl_desktop_shell/e_mod_main.c | 6 +- src/modules/wl_drm/e_mod_main.c | 6 +- src/modules/wl_fb/e_mod_main.c | 6 +- src/modules/wl_screenshot/e_mod_main.c | 8 +- src/modules/wl_x11/e_mod_main.c | 6 +- src/modules/xkbswitch/e_mod_main.c | 8 +- 403 files changed, 4111 insertions(+), 4004 deletions(-) diff --git a/src/bin/e.h b/src/bin/e.h index f78f6fb..c45078a 100644 --- a/src/bin/e.h +++ b/src/bin/e.h @@ -131,14 +131,14 @@ void *alloca (size_t); # include # endif -# ifdef EAPI -# undef EAPI +# ifdef E_API +# undef E_API # endif # ifdef WIN32 # ifdef BUILDING_DLL -# define EAPI __declspec(dllexport) +# define E_API __declspec(dllexport) # else -# define EAPI __declspec(dllimport) +# define E_API __declspec(dllimport) # endif # else # ifdef __GNUC__ @@ -147,12 +147,12 @@ void *alloca (size_t); # if 0 # pragma GCC visibility push(hidden) # endif -# define EAPI __attribute__ ((visibility("default"))) +# define E_API __attribute__ ((visibility("default"))) # else -# define EAPI +# define E_API # endif # else -# define EAPI +# define E_API # endif # endif @@ -296,30 +296,30 @@ typedef struct _E_Rect E_Rect; # undef E_TYPEDEFS # include "e_includes.h" -EAPI double e_main_ts(const char *str); +E_API double e_main_ts(const char *str); struct _E_Rect { int x, y, w, h; }; -extern EAPI E_Path *path_data; -extern EAPI E_Path *path_images; -extern EAPI E_Path *path_fonts; -extern EAPI E_Path *path_themes; -extern EAPI E_Path *path_icons; -extern EAPI E_Path *path_modules; -extern EAPI E_Path *path_backgrounds; -extern EAPI E_Path *path_messages; -extern EAPI Eina_Bool good; -extern EAPI Eina_Bool evil; -extern EAPI Eina_Bool starting; -extern EAPI Eina_Bool stopping; -extern EAPI Eina_Bool restart; -extern EAPI Eina_Bool e_nopause; - -extern EAPI Eina_Bool e_precache_end; -extern EAPI Eina_Bool x_fatal; +extern E_API E_Path *path_data; +extern E_API E_Path *path_images; +extern E_API E_Path *path_fonts; +extern E_API E_Path *path_themes; +extern E_API E_Path *path_icons; +extern E_API E_Path *path_modules; +extern E_API E_Path *path_backgrounds; +extern E_API E_Path *path_messages; +extern E_API Eina_Bool good; +extern E_API Eina_Bool evil; +extern E_API Eina_Bool starting; +extern E_API Eina_Bool stopping; +extern E_API Eina_Bool restart; +extern E_API Eina_Bool e_nopause; + +extern E_API Eina_Bool e_precache_end; +extern E_API Eina_Bool x_fatal; extern EINTERN const char *e_first_frame; extern EINTERN double e_first_frame_start_time; diff --git a/src/bin/e_about.c b/src/bin/e_about.c index 6b57c9d..242d66b 100644 --- a/src/bin/e_about.c +++ b/src/bin/e_about.c @@ -6,7 +6,7 @@ /* externally accessible functions */ -EAPI E_About * +E_API E_About * e_about_new(void) { E_Obj_Dialog *od; @@ -110,7 +110,7 @@ e_about_new(void) return (E_About *)od; } -EAPI void +E_API void e_about_show(E_About *about) { e_obj_dialog_show((E_Obj_Dialog *)about); diff --git a/src/bin/e_about.h b/src/bin/e_about.h index bff33e3..367d4e0 100644 --- a/src/bin/e_about.h +++ b/src/bin/e_about.h @@ -6,8 +6,8 @@ typedef struct _E_Obj_Dialog E_About; #ifndef E_ABOUT_H #define E_ABOUT_H -EAPI E_About *e_about_new (void); -EAPI void e_about_show (E_About *about); +E_API E_About *e_about_new (void); +E_API void e_about_show (E_About *about); #endif #endif diff --git a/src/bin/e_acpi.c b/src/bin/e_acpi.c index 07e0854..ef67151 100644 --- a/src/bin/e_acpi.c +++ b/src/bin/e_acpi.c @@ -123,7 +123,7 @@ static E_ACPI_Device_Multiplexed _devices_multiplexed[] = }; /* public variables */ -EAPI int E_EVENT_ACPI = 0; +E_API int E_EVENT_ACPI = 0; /* public functions */ EINTERN int @@ -200,13 +200,13 @@ e_acpi_lid_is_closed(void) return lid_is_closed; } -EAPI void +E_API void e_acpi_events_freeze(void) { _e_acpi_events_frozen++; } -EAPI void +E_API void e_acpi_events_thaw(void) { _e_acpi_events_frozen--; diff --git a/src/bin/e_acpi.h b/src/bin/e_acpi.h index f8a5481..edf42d3 100644 --- a/src/bin/e_acpi.h +++ b/src/bin/e_acpi.h @@ -73,10 +73,10 @@ EINTERN int e_acpi_shutdown(void); EINTERN E_Acpi_Lid_Status e_acpi_lid_status_get(void); EINTERN Eina_Bool e_acpi_lid_is_closed(void); -EAPI void e_acpi_events_freeze(void); -EAPI void e_acpi_events_thaw(void); +E_API void e_acpi_events_freeze(void); +E_API void e_acpi_events_thaw(void); -extern EAPI int E_EVENT_ACPI; +extern E_API int E_EVENT_ACPI; # endif #endif diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index 1f62c54..07c8a91 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -3484,13 +3484,13 @@ e_actions_shutdown(void) return 1; } -EAPI Eina_List * +E_API Eina_List * e_action_name_list(void) { return action_names; } -EAPI E_Action * +E_API E_Action * e_action_add(const char *name) { E_Action *act; @@ -3508,7 +3508,7 @@ e_action_add(const char *name) return act; } -EAPI void +E_API void e_action_del(const char *name) { E_Action *act; @@ -3517,7 +3517,7 @@ e_action_del(const char *name) if (act) _e_action_free(act); } -EAPI E_Action * +E_API E_Action * e_action_find(const char *name) { E_Action *act; @@ -3526,7 +3526,7 @@ e_action_find(const char *name) return act; } -EAPI const char * +E_API const char * e_action_predef_label_get(const char *action, const char *params) { E_Action_Group *actg = NULL; @@ -3552,7 +3552,7 @@ e_action_predef_label_get(const char *action, const char *params) return NULL; } -EAPI void +E_API void e_action_predef_name_set(const char *act_grp, const char *act_name, const char *act_cmd, const char *act_params, const char *param_example, int editable) { E_Action_Group *actg = NULL; @@ -3598,7 +3598,7 @@ e_action_predef_name_set(const char *act_grp, const char *act_name, const char * actg->acts = eina_list_append(actg->acts, actd); } -EAPI void +E_API void e_action_predef_name_del(const char *act_grp, const char *act_name) { E_Action_Group *actg = NULL; @@ -3637,7 +3637,7 @@ e_action_predef_name_del(const char *act_grp, const char *act_name) } } -EAPI void +E_API void e_action_predef_name_all_del(void) { E_Action_Group *actg = NULL; @@ -3660,7 +3660,7 @@ e_action_predef_name_all_del(void) action_groups = NULL; } -EAPI Eina_List * +E_API Eina_List * e_action_groups_get(void) { return action_groups; diff --git a/src/bin/e_actions.h b/src/bin/e_actions.h index 5b2ec40..2b8fe80 100644 --- a/src/bin/e_actions.h +++ b/src/bin/e_actions.h @@ -48,17 +48,17 @@ struct _E_Action_Group EINTERN int e_actions_init(void); EINTERN int e_actions_shutdown(void); -EAPI Eina_List *e_action_name_list(void); -EAPI E_Action *e_action_add(const char *name); +E_API Eina_List *e_action_name_list(void); +E_API E_Action *e_action_add(const char *name); /* e_action_del allows, for example, modules to define their own actions dynamically. */ -EAPI void e_action_del(const char *name); -EAPI E_Action *e_action_find(const char *name); +E_API void e_action_del(const char *name); +E_API E_Action *e_action_find(const char *name); -EAPI const char *e_action_predef_label_get(const char *action, const char *params); -EAPI void e_action_predef_name_set(const char *act_grp, const char *act_name, const char *act_cmd, const char *act_params, const char *param_example, int editable); -EAPI void e_action_predef_name_del(const char *act_grp, const char *act_name); -EAPI void e_action_predef_name_all_del(void); -EAPI Eina_List *e_action_groups_get(void); +E_API const char *e_action_predef_label_get(const char *action, const char *params); +E_API void e_action_predef_name_set(const char *act_grp, const char *act_name, const char *act_cmd, const char *act_params, const char *param_example, int editable); +E_API void e_action_predef_name_del(const char *act_grp, const char *act_name); +E_API void e_action_predef_name_all_del(void); +E_API Eina_List *e_action_groups_get(void); #endif #endif diff --git a/src/bin/e_alert.c b/src/bin/e_alert.c index 1868d32..c6a1f0a 100644 --- a/src/bin/e_alert.c +++ b/src/bin/e_alert.c @@ -2,7 +2,7 @@ #include /* public variables */ -EAPI unsigned long _e_alert_composite_win = 0; +E_API unsigned long _e_alert_composite_win = 0; EINTERN int e_alert_init(void) @@ -16,7 +16,7 @@ e_alert_shutdown(void) return 1; } -EAPI void +E_API void e_alert_composite_win(Ecore_X_Window root, Ecore_X_Window comp) { #ifndef HAVE_WAYLAND_ONLY @@ -34,7 +34,7 @@ e_alert_composite_win(Ecore_X_Window root, Ecore_X_Window comp) #endif } -EAPI void +E_API void e_alert_show(void) { if (!e_nopause) diff --git a/src/bin/e_alert.h b/src/bin/e_alert.h index dead6c7..0f1ef3a 100644 --- a/src/bin/e_alert.h +++ b/src/bin/e_alert.h @@ -13,7 +13,7 @@ typedef enum _E_Alert_Op_Type EINTERN int e_alert_init(void); EINTERN int e_alert_shutdown(void); -EAPI void e_alert_show(void); +E_API void e_alert_show(void); #endif #endif diff --git a/src/bin/e_atoms.c b/src/bin/e_atoms.c index a84c759..94e63d8 100644 --- a/src/bin/e_atoms.c +++ b/src/bin/e_atoms.c @@ -2,17 +2,17 @@ /* Atoms */ #ifndef HAVE_WAYLAND_ONLY -EAPI Ecore_X_Atom E_ATOM_MANAGED = 0; -EAPI Ecore_X_Atom E_ATOM_ZONE = 0; -EAPI Ecore_X_Atom E_ATOM_DESK = 0; -EAPI Ecore_X_Atom E_ATOM_MAPPED = 0; -EAPI Ecore_X_Atom E_ATOM_SHADE_DIRECTION = 0; -EAPI Ecore_X_Atom E_ATOM_HIDDEN = 0; -EAPI Ecore_X_Atom E_ATOM_BORDER_SIZE = 0; -EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE = 0; -EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED = 0; -EAPI Ecore_X_Atom E_ATOM_DESKTOP_FILE = 0; -EAPI Ecore_X_Atom E_ATOM_ZONE_GEOMETRY = 0; +E_API Ecore_X_Atom E_ATOM_MANAGED = 0; +E_API Ecore_X_Atom E_ATOM_ZONE = 0; +E_API Ecore_X_Atom E_ATOM_DESK = 0; +E_API Ecore_X_Atom E_ATOM_MAPPED = 0; +E_API Ecore_X_Atom E_ATOM_SHADE_DIRECTION = 0; +E_API Ecore_X_Atom E_ATOM_HIDDEN = 0; +E_API Ecore_X_Atom E_ATOM_BORDER_SIZE = 0; +E_API Ecore_X_Atom E_ATOM_WINDOW_STATE = 0; +E_API Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED = 0; +E_API Ecore_X_Atom E_ATOM_DESKTOP_FILE = 0; +E_API Ecore_X_Atom E_ATOM_ZONE_GEOMETRY = 0; #endif /* externally accessible functions */ diff --git a/src/bin/e_atoms.h b/src/bin/e_atoms.h index d01b364..be94fc5 100644 --- a/src/bin/e_atoms.h +++ b/src/bin/e_atoms.h @@ -4,26 +4,26 @@ #define E_ATOMS_H /* an "overall" atom to see that we recognise the window */ -extern EAPI Ecore_X_Atom E_ATOM_MANAGED; +extern E_API Ecore_X_Atom E_ATOM_MANAGED; /* basic window properties */ -extern EAPI Ecore_X_Atom E_ATOM_ZONE; -extern EAPI Ecore_X_Atom E_ATOM_DESK; -extern EAPI Ecore_X_Atom E_ATOM_MAPPED; -extern EAPI Ecore_X_Atom E_ATOM_SHADE_DIRECTION; -extern EAPI Ecore_X_Atom E_ATOM_HIDDEN; -extern EAPI Ecore_X_Atom E_ATOM_BORDER_SIZE; -extern EAPI Ecore_X_Atom E_ATOM_DESKTOP_FILE; +extern E_API Ecore_X_Atom E_ATOM_ZONE; +extern E_API Ecore_X_Atom E_ATOM_DESK; +extern E_API Ecore_X_Atom E_ATOM_MAPPED; +extern E_API Ecore_X_Atom E_ATOM_SHADE_DIRECTION; +extern E_API Ecore_X_Atom E_ATOM_HIDDEN; +extern E_API Ecore_X_Atom E_ATOM_BORDER_SIZE; +extern E_API Ecore_X_Atom E_ATOM_DESKTOP_FILE; /* extra e window states */ /* if we add more states, we need to fix * * e_hints_window_e_state_get() * * e_hints_window_e_state_set() * * _e_win_state_update() + e_win */ -extern EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE; -extern EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED; +extern E_API Ecore_X_Atom E_ATOM_WINDOW_STATE; +extern E_API Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED; -extern EAPI Ecore_X_Atom E_ATOM_ZONE_GEOMETRY; +extern E_API Ecore_X_Atom E_ATOM_ZONE_GEOMETRY; EINTERN int e_atoms_init(void); EINTERN int e_atoms_shutdown(void); diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c index 6d23d8b..78d171c 100644 --- a/src/bin/e_auth.c +++ b/src/bin/e_auth.c @@ -130,7 +130,7 @@ _auth_pam_init(E_Auth *da) } #endif // HAVE_PAM && !__FreeBSD__ -EAPI int +E_API int #if defined(__FreeBSD__) e_auth_begin(char *passwd) { @@ -225,7 +225,7 @@ e_auth_begin(char *passwd EINA_UNUSED) } #endif -EAPI char * +E_API char * e_auth_hostname_get(void) { return strdup("localhost"); diff --git a/src/bin/e_auth.h b/src/bin/e_auth.h index a106e07..a91f064 100644 --- a/src/bin/e_auth.h +++ b/src/bin/e_auth.h @@ -1,8 +1,8 @@ #ifndef E_AUTH_H #define E_AUTH_H -EAPI int e_auth_begin(char *passwd); -EAPI char *e_auth_hostname_get(void); +E_API int e_auth_begin(char *passwd); +E_API char *e_auth_hostname_get(void); static inline int e_auth_hash_djb2(const char *key, int len) diff --git a/src/bin/e_backlight.c b/src/bin/e_backlight.c index 92c8a0d..9d6418c 100644 --- a/src/bin/e_backlight.c +++ b/src/bin/e_backlight.c @@ -50,7 +50,7 @@ static int bl_mib[CTL_MAXNAME]; static int bl_mib_len = -1; #endif -EAPI int E_EVENT_BACKLIGHT_CHANGE = -1; +E_API int E_EVENT_BACKLIGHT_CHANGE = -1; EINTERN int e_backlight_init(void) @@ -101,14 +101,14 @@ e_backlight_shutdown(void) return 1; } -EAPI Eina_Bool +E_API Eina_Bool e_backlight_exists(void) { if (sysmode == MODE_NONE) return EINA_FALSE; return EINA_TRUE; } -EAPI void +E_API void e_backlight_update(void) { if (bl_avail == EINA_FALSE) return; @@ -116,7 +116,7 @@ e_backlight_update(void) _e_backlight_update(); } -EAPI void +E_API void e_backlight_level_set(E_Zone *zone, double val, double tim) { double bl_now; @@ -154,14 +154,14 @@ e_backlight_level_set(E_Zone *zone, double val, double tim) bl_anim_toval = val; } -EAPI double +E_API double e_backlight_level_get(E_Zone *zone EINA_UNUSED) { // zone == NULL == everything return e_bl_val; } -EAPI void +E_API void e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode) { E_Backlight_Mode pmode; @@ -189,14 +189,14 @@ e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode) e_backlight_level_set(zone, 1.0, -1.0); } -EAPI E_Backlight_Mode +E_API E_Backlight_Mode e_backlight_mode_get(E_Zone *zone EINA_UNUSED) { // zone == NULL == everything return e_config->backlight.mode; } -EAPI const Eina_List * +E_API const Eina_List * e_backlight_devices_get(void) { return bl_devs; diff --git a/src/bin/e_backlight.h b/src/bin/e_backlight.h index bee7c66..0a8b239 100644 --- a/src/bin/e_backlight.h +++ b/src/bin/e_backlight.h @@ -18,7 +18,7 @@ typedef enum _E_Backlight_Mode #ifndef E_BACKLIGHT_H #define E_BACKLIGHT_H -extern EAPI int E_EVENT_BACKLIGHT_CHANGE; +extern E_API int E_EVENT_BACKLIGHT_CHANGE; //struct _E_Screen //{ @@ -28,13 +28,13 @@ extern EAPI int E_EVENT_BACKLIGHT_CHANGE; EINTERN int e_backlight_init(void); EINTERN int e_backlight_shutdown(void); -EAPI Eina_Bool e_backlight_exists(void); -EAPI void e_backlight_update(void); -EAPI void e_backlight_level_set(E_Zone *zone, double val, double tim); -EAPI double e_backlight_level_get(E_Zone *zone); -EAPI void e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode); -EAPI E_Backlight_Mode e_backlight_mode_get(E_Zone *zone); -EAPI const Eina_List *e_backlight_devices_get(void); +E_API Eina_Bool e_backlight_exists(void); +E_API void e_backlight_update(void); +E_API void e_backlight_level_set(E_Zone *zone, double val, double tim); +E_API double e_backlight_level_get(E_Zone *zone); +E_API void e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode); +E_API E_Backlight_Mode e_backlight_mode_get(E_Zone *zone); +E_API const Eina_List *e_backlight_devices_get(void); #endif #endif diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c index 42fe143..5a593ab 100644 --- a/src/bin/e_bg.c +++ b/src/bin/e_bg.c @@ -8,7 +8,7 @@ static int e_bg_handler_test(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS static void _e_bg_handler_image_imported(const char *image_path, void *data); /* local subsystem globals */ -EAPI int E_EVENT_BG_UPDATE = 0; +E_API int E_EVENT_BG_UPDATE = 0; static E_Fm2_Mime_Handler *bg_hdl = NULL; /* externally accessible functions */ @@ -75,7 +75,7 @@ e_bg_shutdown(void) * Use -1 as a wild card for each parameter. * The most specific match will be returned */ -EAPI const E_Config_Desktop_Background * +E_API const E_Config_Desktop_Background * e_bg_config_get(int zone_num, int desk_x, int desk_y) { Eina_List *l, *entries; @@ -140,7 +140,7 @@ e_bg_config_get(int zone_num, int desk_x, int desk_y) return bg; } -EAPI Eina_Stringshare * +E_API Eina_Stringshare * e_bg_file_get(int zone_num, int desk_x, int desk_y) { const E_Config_Desktop_Background *cfbg; @@ -188,7 +188,7 @@ e_bg_file_get(int zone_num, int desk_x, int desk_y) return bgfile; } -EAPI void +E_API void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition) { Evas_Object *o; @@ -289,7 +289,7 @@ end: eina_stringshare_del(bgfile); } -EAPI void +E_API void e_bg_default_set(const char *file) { E_Event_Bg_Update *ev; @@ -325,7 +325,7 @@ e_bg_default_set(const char *file) ecore_event_add(E_EVENT_BG_UPDATE, ev, _e_bg_event_bg_update_free, NULL); } -EAPI void +E_API void e_bg_add(int zone, int desk_x, int desk_y, const char *file) { const Eina_List *l; @@ -364,7 +364,7 @@ e_bg_add(int zone, int desk_x, int desk_y, const char *file) ecore_event_add(E_EVENT_BG_UPDATE, ev, _e_bg_event_bg_update_free, NULL); } -EAPI void +E_API void e_bg_del(int zone, int desk_x, int desk_y) { Eina_List *l; @@ -391,7 +391,7 @@ e_bg_del(int zone, int desk_x, int desk_y) ecore_event_add(E_EVENT_BG_UPDATE, ev, _e_bg_event_bg_update_free, NULL); } -EAPI void +E_API void e_bg_update(void) { const Eina_List *l; diff --git a/src/bin/e_bg.h b/src/bin/e_bg.h index b901e90..65414d3 100644 --- a/src/bin/e_bg.h +++ b/src/bin/e_bg.h @@ -15,7 +15,7 @@ typedef struct _E_Bg_Image_Import_Handle E_Bg_Image_Import_Handle; #ifndef E_BG_H #define E_BG_H -extern EAPI int E_EVENT_BG_UPDATE; +extern E_API int E_EVENT_BG_UPDATE; struct _E_Event_Bg_Update { @@ -27,16 +27,16 @@ struct _E_Event_Bg_Update EINTERN int e_bg_init(void); EINTERN int e_bg_shutdown(void); -EAPI const E_Config_Desktop_Background *e_bg_config_get(int zone_num, int desk_x, int desk_y); -EAPI Eina_Stringshare *e_bg_file_get(int zone_num, int desk_x, int desk_y); -EAPI void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition); -EAPI void e_bg_add(int zone, int desk_x, int desk_y, const char *file); -EAPI void e_bg_del(int zone, int desk_x, int desk_y); -EAPI void e_bg_default_set(const char *file); -EAPI void e_bg_update(void); +E_API const E_Config_Desktop_Background *e_bg_config_get(int zone_num, int desk_x, int desk_y); +E_API Eina_Stringshare *e_bg_file_get(int zone_num, int desk_x, int desk_y); +E_API void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition); +E_API void e_bg_add(int zone, int desk_x, int desk_y, const char *file); +E_API void e_bg_del(int zone, int desk_x, int desk_y); +E_API void e_bg_default_set(const char *file); +E_API void e_bg_update(void); -EAPI E_Bg_Image_Import_Handle *e_bg_image_import_new(const char *image_file, void (*cb)(void *data, const char *edje_file), const void *data); -EAPI void e_bg_image_import_cancel(E_Bg_Image_Import_Handle *handle); +E_API E_Bg_Image_Import_Handle *e_bg_image_import_new(const char *image_file, void (*cb)(void *data, const char *edje_file), const void *data); +E_API void e_bg_image_import_cancel(E_Bg_Image_Import_Handle *handle); #endif #endif diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c index f59e017..fffb68a 100644 --- a/src/bin/e_bindings.c +++ b/src/bin/e_bindings.c @@ -100,7 +100,7 @@ e_bindings_shutdown(void) return 1; } -EAPI int +E_API int e_bindings_modifiers_to_ecore_convert(E_Binding_Modifier modifiers) { int mod = 0; @@ -116,7 +116,7 @@ e_bindings_modifiers_to_ecore_convert(E_Binding_Modifier modifiers) return mod; } -EAPI void +E_API void e_bindings_ecore_event_mouse_wheel_convert(const Ecore_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event) { memset(event, 0, sizeof(E_Binding_Event_Wheel)); @@ -128,7 +128,7 @@ e_bindings_ecore_event_mouse_wheel_convert(const Ecore_Event_Mouse_Wheel *ev, E_ event->modifiers = _e_bindings_modifiers(ev->modifiers); } -EAPI void +E_API void e_bindings_ecore_event_mouse_button_convert(const Ecore_Event_Mouse_Button *ev, E_Binding_Event_Mouse_Button *event) { memset(event, 0, sizeof(E_Binding_Event_Mouse_Button)); @@ -142,7 +142,7 @@ e_bindings_ecore_event_mouse_button_convert(const Ecore_Event_Mouse_Button *ev, event->triple_click = !!ev->triple_click; } -EAPI void +E_API void e_bindings_evas_event_mouse_wheel_convert(const Evas_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event) { memset(event, 0, sizeof(E_Binding_Event_Wheel)); @@ -177,7 +177,7 @@ e_bindings_evas_event_mouse_wheel_convert(const Evas_Event_Mouse_Wheel *ev, E_Bi */ } -EAPI int +E_API int e_bindings_evas_modifiers_convert(Evas_Modifier *modifiers) { int mod = 0; @@ -191,7 +191,7 @@ e_bindings_evas_modifiers_convert(Evas_Modifier *modifiers) return mod; } -EAPI void +E_API void e_bindings_evas_event_mouse_button_convert(const Evas_Event_Mouse_Down *ev, E_Binding_Event_Mouse_Button *event) { memset(event, 0, sizeof(E_Binding_Event_Mouse_Button)); @@ -226,7 +226,7 @@ e_bindings_evas_event_mouse_button_convert(const Evas_Event_Mouse_Down *ev, E_Bi */ } -EAPI void +E_API void e_bindings_signal_reset(void) { E_Config_Binding_Signal *ebs; @@ -255,7 +255,7 @@ e_bindings_signal_reset(void) } } -EAPI void +E_API void e_bindings_acpi_reset(void) { E_Config_Binding_Acpi *eba; @@ -268,7 +268,7 @@ e_bindings_acpi_reset(void) eba->action, eba->params); } -EAPI void +E_API void e_bindings_wheel_reset(void) { E_Config_Binding_Wheel *ebw; @@ -281,7 +281,7 @@ e_bindings_wheel_reset(void) ebw->any_mod, ebw->action, ebw->params); } -EAPI void +E_API void e_bindings_edge_reset(void) { E_Config_Binding_Edge *ebe; @@ -294,7 +294,7 @@ e_bindings_edge_reset(void) ebe->any_mod, ebe->action, ebe->params, ebe->delay); } -EAPI void +E_API void e_bindings_mouse_reset(void) { E_Config_Binding_Mouse *ebm; @@ -307,7 +307,7 @@ e_bindings_mouse_reset(void) ebm->any_mod, ebm->action, ebm->params); } -EAPI void +E_API void e_bindings_key_reset(void) { E_Config_Binding_Key *ebk; @@ -322,7 +322,7 @@ e_bindings_key_reset(void) e_comp_canvas_keys_grab(); } -EAPI void +E_API void e_bindings_reset(void) { e_bindings_signal_reset(); @@ -332,7 +332,7 @@ e_bindings_reset(void) e_bindings_key_reset(); } -EAPI void +E_API void e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params) { E_Binding_Mouse *binding; @@ -347,7 +347,7 @@ e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, mouse_bindings = eina_list_append(mouse_bindings, binding); } -EAPI void +E_API void e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params) { E_Binding_Mouse *binding; @@ -371,7 +371,7 @@ e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, } } -EAPI void +E_API void e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win) { E_Binding_Mouse *binding; @@ -396,7 +396,7 @@ e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win) #endif } -EAPI void +E_API void e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win) { E_Binding_Mouse *binding; @@ -417,7 +417,7 @@ e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win) #endif } -EAPI E_Action * +E_API E_Action * e_bindings_mouse_button_find(E_Binding_Context ctxt, E_Binding_Event_Mouse_Button *ev, E_Binding_Mouse **bind_ret) { E_Binding_Mouse *binding; @@ -441,7 +441,7 @@ e_bindings_mouse_button_find(E_Binding_Context ctxt, E_Binding_Event_Mouse_Butto return NULL; } -EAPI E_Action * +E_API E_Action * e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev) { E_Action *act; @@ -459,7 +459,7 @@ e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Bind return act; } -EAPI E_Action * +E_API E_Action * e_bindings_mouse_down_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Down *ev) { E_Binding_Event_Mouse_Button event; @@ -469,7 +469,7 @@ e_bindings_mouse_down_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, E return e_bindings_mouse_down_event_handle(ctxt, obj, &event); } -EAPI E_Action * +E_API E_Action * e_bindings_mouse_down_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev) { E_Binding_Event_Mouse_Button event; @@ -479,7 +479,7 @@ e_bindings_mouse_down_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, return e_bindings_mouse_down_event_handle(ctxt, obj, &event); } -EAPI E_Action * +E_API E_Action * e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev) { E_Action *act; @@ -497,7 +497,7 @@ e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Bindin return act; } -EAPI E_Action * +E_API E_Action * e_bindings_mouse_up_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Up *ev) { E_Binding_Event_Mouse_Button event; @@ -507,7 +507,7 @@ e_bindings_mouse_up_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Eva return e_bindings_mouse_up_event_handle(ctxt, obj, &event); } -EAPI E_Action * +E_API E_Action * e_bindings_mouse_up_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev) { E_Binding_Event_Mouse_Button event; @@ -517,7 +517,7 @@ e_bindings_mouse_up_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ec return e_bindings_mouse_up_event_handle(ctxt, obj, &event); } -EAPI void +E_API void e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params) { E_Binding_Key *binding; @@ -532,7 +532,7 @@ e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier m key_bindings = eina_list_append(key_bindings, binding); } -EAPI E_Binding_Key * +E_API E_Binding_Key * e_bindings_key_get(const char *action) { E_Binding_Key *binding; @@ -546,7 +546,7 @@ e_bindings_key_get(const char *action) return NULL; } -EAPI E_Binding_Key * +E_API E_Binding_Key * e_bindings_key_find(const char *key, E_Binding_Modifier mod, int any_mod) { E_Binding_Key *binding; @@ -564,7 +564,7 @@ e_bindings_key_find(const char *key, E_Binding_Modifier mod, int any_mod) return NULL; } -EAPI void +E_API void e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params) { E_Binding_Key *binding; @@ -588,7 +588,7 @@ e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier m } } -EAPI void +E_API void e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win) { E_Binding_Key *binding; @@ -612,7 +612,7 @@ e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win) #endif } -EAPI void +E_API void e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win) { E_Binding_Key *binding; @@ -636,7 +636,7 @@ e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win) #endif } -EAPI E_Action * +E_API E_Action * e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev) { E_Binding_Modifier mod = 0; @@ -669,7 +669,7 @@ e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Ev return NULL; } -EAPI E_Action * +E_API E_Action * e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev) { E_Binding_Modifier mod = 0; @@ -702,7 +702,7 @@ e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Even return NULL; } -EAPI E_Action * +E_API E_Action * e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev) { E_Binding_Modifier mod = 0; @@ -727,7 +727,7 @@ e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev) return NULL; } -EAPI E_Action * +E_API E_Action * e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev) { E_Binding_Modifier mod = 0; @@ -752,7 +752,7 @@ e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev) return NULL; } -EAPI Eina_Bool +E_API Eina_Bool e_bindings_key_allowed(const char *key) { if (!key) return EINA_FALSE; @@ -779,7 +779,7 @@ e_bindings_key_allowed(const char *key) } -EAPI void +E_API void e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_only, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay) { E_Binding_Edge *binding; @@ -798,7 +798,7 @@ e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_onl e_zone_edge_new(edge); } -EAPI Eina_Bool +E_API Eina_Bool e_bindings_edge_flippable_get(E_Zone_Edge edge) { E_Binding_Edge *binding; @@ -816,7 +816,7 @@ e_bindings_edge_flippable_get(E_Zone_Edge edge) return EINA_FALSE; } -EAPI Eina_Bool +E_API Eina_Bool e_bindings_edge_non_flippable_get(E_Zone_Edge edge) { E_Binding_Edge *binding; @@ -835,7 +835,7 @@ e_bindings_edge_non_flippable_get(E_Zone_Edge edge) return EINA_FALSE; } -EAPI E_Binding_Edge * +E_API E_Binding_Edge * e_bindings_edge_get(const char *action, E_Zone_Edge edge, int click) { E_Binding_Edge *binding; @@ -853,7 +853,7 @@ e_bindings_edge_get(const char *action, E_Zone_Edge edge, int click) return NULL; } -EAPI void +E_API void e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_only, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay) { E_Binding_Edge *binding; @@ -885,7 +885,7 @@ e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_onl e_zone_edge_free(edge); } -EAPI E_Action * +E_API E_Action * e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev) { E_Binding_Modifier mod = 0; @@ -935,7 +935,7 @@ e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Z return act; } -EAPI E_Action * +E_API E_Action * e_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev) { E_Binding_Modifier mod = 0; @@ -977,7 +977,7 @@ e_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_ return act; } -EAPI E_Action * +E_API E_Action * e_bindings_edge_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev) { E_Binding_Modifier mod = 0; @@ -1014,7 +1014,7 @@ e_bindings_edge_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event return act; } -EAPI E_Action * +E_API E_Action * e_bindings_edge_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev) { E_Binding_Modifier mod = 0; @@ -1042,7 +1042,7 @@ e_bindings_edge_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Z return act; } -EAPI void +E_API void e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params) { E_Binding_Signal *binding; @@ -1058,7 +1058,7 @@ e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src, signal_bindings = eina_list_append(signal_bindings, binding); } -EAPI void +E_API void e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params) { E_Binding_Signal *binding; @@ -1085,7 +1085,7 @@ e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src, } } -EAPI E_Action * +E_API E_Action * e_bindings_signal_find(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Signal **bind_ret) { E_Binding_Modifier mod = 0; @@ -1115,7 +1115,7 @@ e_bindings_signal_find(E_Binding_Context ctxt, const char *sig, const char *src, return NULL; } -EAPI E_Action * +E_API E_Action * e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, const char *sig, const char *src) { E_Action *act; @@ -1136,7 +1136,7 @@ e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, const char *sig, return act; } -EAPI void +E_API void e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params) { E_Binding_Wheel *binding; @@ -1152,7 +1152,7 @@ e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Mod wheel_bindings = eina_list_append(wheel_bindings, binding); } -EAPI void +E_API void e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params) { E_Binding_Wheel *binding; @@ -1177,7 +1177,7 @@ e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Mod } } -EAPI void +E_API void e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win) { E_Binding_Wheel *binding; @@ -1216,7 +1216,7 @@ e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win) #endif } -EAPI void +E_API void e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win) { E_Binding_Wheel *binding; @@ -1254,7 +1254,7 @@ e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win) #endif } -EAPI E_Action * +E_API E_Action * e_bindings_wheel_find(E_Binding_Context ctxt, E_Binding_Event_Wheel *ev, E_Binding_Wheel **bind_ret) { E_Binding_Wheel *binding; @@ -1279,7 +1279,7 @@ e_bindings_wheel_find(E_Binding_Context ctxt, E_Binding_Event_Wheel *ev, E_Bindi return NULL; } -EAPI E_Action * +E_API E_Action * e_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Wheel *ev) { E_Action *act; @@ -1297,7 +1297,7 @@ e_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_E return act; } -EAPI E_Action * +E_API E_Action * e_bindings_wheel_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Wheel *ev) { E_Binding_Event_Wheel event; @@ -1307,7 +1307,7 @@ e_bindings_wheel_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_E return e_bindings_wheel_event_handle(ctxt, obj, &event); } -EAPI E_Action * +E_API E_Action * e_bindings_wheel_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Wheel *ev) { E_Binding_Event_Wheel event; @@ -1317,7 +1317,7 @@ e_bindings_wheel_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore return e_bindings_wheel_event_handle(ctxt, obj, &event); } -EAPI void +E_API void e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *action, const char *params) { E_Binding_Acpi *binding; @@ -1331,7 +1331,7 @@ e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *ac acpi_bindings = eina_list_append(acpi_bindings, binding); } -EAPI void +E_API void e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *action, const char *params) { E_Binding_Acpi *binding; @@ -1353,7 +1353,7 @@ e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *ac } } -EAPI E_Action * +E_API E_Action * e_bindings_acpi_find(E_Binding_Context ctxt, E_Event_Acpi *ev, E_Binding_Acpi **bind_ret) { E_Binding_Acpi *binding; @@ -1382,7 +1382,7 @@ e_bindings_acpi_find(E_Binding_Context ctxt, E_Event_Acpi *ev, E_Binding_Acpi ** return NULL; } -EAPI E_Action * +E_API E_Action * e_bindings_acpi_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Acpi *ev) { E_Action *act; diff --git a/src/bin/e_bindings.h b/src/bin/e_bindings.h index 6014ddd..effec66 100644 --- a/src/bin/e_bindings.h +++ b/src/bin/e_bindings.h @@ -133,73 +133,73 @@ struct _E_Binding_Acpi EINTERN int e_bindings_init(void); EINTERN int e_bindings_shutdown(void); -EAPI void e_bindings_mouse_reset(void); -EAPI void e_bindings_key_reset(void); -EAPI void e_bindings_wheel_reset(void); -EAPI void e_bindings_edge_reset(void); -EAPI void e_bindings_signal_reset(void); -EAPI void e_bindings_reset(void); - -EAPI void e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); -EAPI void e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); -EAPI void e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win); -EAPI void e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win); -EAPI E_Action *e_bindings_mouse_button_find(E_Binding_Context ctxt, E_Binding_Event_Mouse_Button *ev, E_Binding_Mouse **bind_ret); -EAPI E_Action *e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev); -EAPI E_Action *e_bindings_mouse_down_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Down *ev); -EAPI E_Action *e_bindings_mouse_down_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev); -EAPI E_Action *e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev); -EAPI E_Action *e_bindings_mouse_up_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Up *ev); -EAPI E_Action *e_bindings_mouse_up_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev); - -EAPI void e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); -EAPI void e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); -EAPI E_Binding_Key *e_bindings_key_get(const char *action); -EAPI E_Binding_Key *e_bindings_key_find(const char *key, E_Binding_Modifier mod, int any_mod); -EAPI void e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win); -EAPI void e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win); -EAPI E_Action *e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev); -EAPI E_Action *e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev); -EAPI E_Action *e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev); -EAPI E_Action *e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev); - -EAPI Eina_Bool e_bindings_key_allowed(const char *key); - -EAPI void e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_only, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay); -EAPI Eina_Bool e_bindings_edge_flippable_get(E_Zone_Edge edge); -EAPI Eina_Bool e_bindings_edge_non_flippable_get(E_Zone_Edge edge); -EAPI E_Binding_Edge *e_bindings_edge_get(const char *action, E_Zone_Edge edge, int click); -EAPI void e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_only, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay); -EAPI E_Action *e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev); -EAPI E_Action *e_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev); -EAPI E_Action *e_bindings_edge_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev); -EAPI E_Action *e_bindings_edge_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev); - -EAPI void e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); -EAPI void e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); -EAPI E_Action *e_bindings_signal_find(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Signal **bind_ret); -EAPI E_Action *e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, const char *sig, const char *src); - -EAPI void e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); -EAPI void e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); -EAPI void e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win); -EAPI void e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win); -EAPI E_Action *e_bindings_wheel_find(E_Binding_Context ctxt, E_Binding_Event_Wheel *ev, E_Binding_Wheel **bind_ret); -EAPI E_Action *e_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Wheel *ev); -EAPI E_Action *e_bindings_wheel_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Wheel *ev); -EAPI E_Action *e_bindings_wheel_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Wheel *ev); - -EAPI void e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *action, const char *params); -EAPI void e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *action, const char *params); -EAPI E_Action *e_bindings_acpi_find(E_Binding_Context ctxt, E_Event_Acpi *ev, E_Binding_Acpi **bind_ret); -EAPI E_Action *e_bindings_acpi_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Acpi *ev); - -EAPI int e_bindings_evas_modifiers_convert(Evas_Modifier *modifiers); -EAPI int e_bindings_modifiers_to_ecore_convert(E_Binding_Modifier modifiers); -EAPI void e_bindings_evas_event_mouse_button_convert(const Evas_Event_Mouse_Down *ev, E_Binding_Event_Mouse_Button *event); -EAPI void e_bindings_evas_event_mouse_wheel_convert(const Evas_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event); -EAPI void e_bindings_ecore_event_mouse_button_convert(const Ecore_Event_Mouse_Button *ev, E_Binding_Event_Mouse_Button *event); -EAPI void e_bindings_ecore_event_mouse_wheel_convert(const Ecore_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event); +E_API void e_bindings_mouse_reset(void); +E_API void e_bindings_key_reset(void); +E_API void e_bindings_wheel_reset(void); +E_API void e_bindings_edge_reset(void); +E_API void e_bindings_signal_reset(void); +E_API void e_bindings_reset(void); + +E_API void e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); +E_API void e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); +E_API void e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win); +E_API void e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win); +E_API E_Action *e_bindings_mouse_button_find(E_Binding_Context ctxt, E_Binding_Event_Mouse_Button *ev, E_Binding_Mouse **bind_ret); +E_API E_Action *e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev); +E_API E_Action *e_bindings_mouse_down_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Down *ev); +E_API E_Action *e_bindings_mouse_down_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev); +E_API E_Action *e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev); +E_API E_Action *e_bindings_mouse_up_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Up *ev); +E_API E_Action *e_bindings_mouse_up_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev); + +E_API void e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); +E_API void e_bindings_key_del(E_Binding_Context ctxt, const char *key, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); +E_API E_Binding_Key *e_bindings_key_get(const char *action); +E_API E_Binding_Key *e_bindings_key_find(const char *key, E_Binding_Modifier mod, int any_mod); +E_API void e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win); +E_API void e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win); +E_API E_Action *e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev); +E_API E_Action *e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev); +E_API E_Action *e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev); +E_API E_Action *e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev); + +E_API Eina_Bool e_bindings_key_allowed(const char *key); + +E_API void e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_only, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay); +E_API Eina_Bool e_bindings_edge_flippable_get(E_Zone_Edge edge); +E_API Eina_Bool e_bindings_edge_non_flippable_get(E_Zone_Edge edge); +E_API E_Binding_Edge *e_bindings_edge_get(const char *action, E_Zone_Edge edge, int click); +E_API void e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_only, E_Binding_Modifier mod, int any_mod, const char *action, const char *params, float delay); +E_API E_Action *e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev); +E_API E_Action *e_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev); +E_API E_Action *e_bindings_edge_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev); +E_API E_Action *e_bindings_edge_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev); + +E_API void e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); +E_API void e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); +E_API E_Action *e_bindings_signal_find(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Signal **bind_ret); +E_API E_Action *e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, const char *sig, const char *src); + +E_API void e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); +E_API void e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params); +E_API void e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win); +E_API void e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win); +E_API E_Action *e_bindings_wheel_find(E_Binding_Context ctxt, E_Binding_Event_Wheel *ev, E_Binding_Wheel **bind_ret); +E_API E_Action *e_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Wheel *ev); +E_API E_Action *e_bindings_wheel_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Wheel *ev); +E_API E_Action *e_bindings_wheel_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Wheel *ev); + +E_API void e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *action, const char *params); +E_API void e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *action, const char *params); +E_API E_Action *e_bindings_acpi_find(E_Binding_Context ctxt, E_Event_Acpi *ev, E_Binding_Acpi **bind_ret); +E_API E_Action *e_bindings_acpi_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Acpi *ev); + +E_API int e_bindings_evas_modifiers_convert(Evas_Modifier *modifiers); +E_API int e_bindings_modifiers_to_ecore_convert(E_Binding_Modifier modifiers); +E_API void e_bindings_evas_event_mouse_button_convert(const Evas_Event_Mouse_Down *ev, E_Binding_Event_Mouse_Button *event); +E_API void e_bindings_evas_event_mouse_wheel_convert(const Evas_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event); +E_API void e_bindings_ecore_event_mouse_button_convert(const Ecore_Event_Mouse_Button *ev, E_Binding_Event_Mouse_Button *event); +E_API void e_bindings_ecore_event_mouse_wheel_convert(const Ecore_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event); #endif #endif diff --git a/src/bin/e_client.c b/src/bin/e_client.c index cc35441..ec8ded4 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -3,22 +3,22 @@ static int _e_client_hooks_delete = 0; static int _e_client_hooks_walking = 0; -EAPI int E_EVENT_CLIENT_ADD = -1; -EAPI int E_EVENT_CLIENT_REMOVE = -1; -EAPI int E_EVENT_CLIENT_ZONE_SET = -1; -EAPI int E_EVENT_CLIENT_DESK_SET = -1; -EAPI int E_EVENT_CLIENT_RESIZE = -1; -EAPI int E_EVENT_CLIENT_MOVE = -1; -EAPI int E_EVENT_CLIENT_SHOW = -1; -EAPI int E_EVENT_CLIENT_HIDE = -1; -EAPI int E_EVENT_CLIENT_ICONIFY = -1; -EAPI int E_EVENT_CLIENT_UNICONIFY = -1; -EAPI int E_EVENT_CLIENT_STACK = -1; -EAPI int E_EVENT_CLIENT_FOCUS_IN = -1; -EAPI int E_EVENT_CLIENT_FOCUS_OUT = -1; -EAPI int E_EVENT_CLIENT_PROPERTY = -1; -EAPI int E_EVENT_CLIENT_FULLSCREEN = -1; -EAPI int E_EVENT_CLIENT_UNFULLSCREEN = -1; +E_API int E_EVENT_CLIENT_ADD = -1; +E_API int E_EVENT_CLIENT_REMOVE = -1; +E_API int E_EVENT_CLIENT_ZONE_SET = -1; +E_API int E_EVENT_CLIENT_DESK_SET = -1; +E_API int E_EVENT_CLIENT_RESIZE = -1; +E_API int E_EVENT_CLIENT_MOVE = -1; +E_API int E_EVENT_CLIENT_SHOW = -1; +E_API int E_EVENT_CLIENT_HIDE = -1; +E_API int E_EVENT_CLIENT_ICONIFY = -1; +E_API int E_EVENT_CLIENT_UNICONIFY = -1; +E_API int E_EVENT_CLIENT_STACK = -1; +E_API int E_EVENT_CLIENT_FOCUS_IN = -1; +E_API int E_EVENT_CLIENT_FOCUS_OUT = -1; +E_API int E_EVENT_CLIENT_PROPERTY = -1; +E_API int E_EVENT_CLIENT_FULLSCREEN = -1; +E_API int E_EVENT_CLIENT_UNFULLSCREEN = -1; static Eina_Hash *clients_hash = NULL; // pixmap->client @@ -2425,7 +2425,7 @@ e_client_shutdown(void) warp_client = NULL; } -EAPI E_Client * +E_API E_Client * e_client_new(E_Pixmap *cp, int first_map, int internal) { E_Client *ec; @@ -2554,7 +2554,7 @@ e_client_new(E_Pixmap *cp, int first_map, int internal) return ec; } -EAPI Eina_Bool +E_API Eina_Bool e_client_desk_window_profile_available_check(E_Client *ec, const char *profile) { int i; @@ -2575,7 +2575,7 @@ e_client_desk_window_profile_available_check(E_Client *ec, const char *profile) return EINA_FALSE; } -EAPI void +E_API void e_client_desk_window_profile_wait_desk_set(E_Client *ec, E_Desk *desk) { E_OBJECT_CHECK(ec); @@ -2609,7 +2609,7 @@ e_client_desk_window_profile_wait_desk_set(E_Client *ec, E_Desk *desk) e_object_ref(E_OBJECT(ec->e.state.profile.wait_desk)); } -EAPI void +E_API void e_client_desk_set(E_Client *ec, E_Desk *desk) { E_Event_Client_Desk_Set *ev; @@ -2691,26 +2691,26 @@ e_client_desk_set(E_Client *ec, E_Desk *desk) evas_object_smart_callback_call(ec->frame, "desk_change", ec); } -EAPI Eina_Bool +E_API Eina_Bool e_client_comp_grabbed_get(void) { return comp_grabbed; } -EAPI E_Client * +E_API E_Client * e_client_action_get(void) { return action_client; } -EAPI E_Client * +E_API E_Client * e_client_warping_get(void) { return warp_client; } -EAPI Eina_List * +E_API Eina_List * e_clients_immortal_list(void) { const Eina_List *l; @@ -2727,7 +2727,7 @@ e_clients_immortal_list(void) ////////////////////////////////////////////////////////// -EAPI void +E_API void e_client_mouse_in(E_Client *ec, int x, int y) { if (comp_grabbed) return; @@ -2741,7 +2741,7 @@ e_client_mouse_in(E_Client *ec, int x, int y) e_focus_event_mouse_in(ec); } -EAPI void +E_API void e_client_mouse_out(E_Client *ec, int x, int y) { if (comp_grabbed) return; @@ -2757,7 +2757,7 @@ e_client_mouse_out(E_Client *ec, int x, int y) e_focus_event_mouse_out(ec); } -EAPI void +E_API void e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev) { EINA_SAFETY_ON_NULL_RETURN(ec); @@ -2768,7 +2768,7 @@ e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev e_bindings_wheel_event_handle(E_BINDING_CONTEXT_WINDOW, E_OBJECT(ec), ev); } -EAPI void +E_API void e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev) { Eina_Bool did_act = EINA_FALSE; @@ -2830,7 +2830,7 @@ e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Even ec->mouse.current.my = output->y; } -EAPI void +E_API void e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button* ev) { EINA_SAFETY_ON_NULL_RETURN(ec); @@ -2871,7 +2871,7 @@ e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_ ec->drag.start = 0; } -EAPI void +E_API void e_client_mouse_move(E_Client *ec, Evas_Point *output) { EINA_SAFETY_ON_NULL_RETURN(ec); @@ -2974,7 +2974,7 @@ e_client_mouse_move(E_Client *ec, Evas_Point *output) } /////////////////////////////////////////////////////// -EAPI void +E_API void e_client_res_change_geometry_save(E_Client *ec) { E_OBJECT_CHECK(ec); @@ -2992,7 +2992,7 @@ e_client_res_change_geometry_save(E_Client *ec) ec->pre_res_change.saved.h = ec->saved.h; } -EAPI void +E_API void e_client_res_change_geometry_restore(E_Client *ec) { struct @@ -3064,7 +3064,7 @@ e_client_res_change_geometry_restore(E_Client *ec) memcpy(&ec->pre_res_change, &pre_res_change, sizeof(pre_res_change)); } -EAPI void +E_API void e_client_zone_set(E_Client *ec, E_Zone *zone) { E_Event_Client_Zone_Set *ev; @@ -3127,7 +3127,7 @@ e_client_zone_set(E_Client *ec, E_Zone *zone) ec->pre_res_change.valid = 0; } -EAPI void +E_API void e_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h) { E_OBJECT_CHECK(ec); @@ -3144,7 +3144,7 @@ e_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h) } } -EAPI E_Client * +E_API E_Client * e_client_above_get(const E_Client *ec) { unsigned int x; @@ -3171,7 +3171,7 @@ e_client_above_get(const E_Client *ec) return NULL; } -EAPI E_Client * +E_API E_Client * e_client_below_get(const E_Client *ec) { unsigned int x; @@ -3205,7 +3205,7 @@ e_client_below_get(const E_Client *ec) return NULL; } -EAPI E_Client * +E_API E_Client * e_client_bottom_get(void) { unsigned int x; @@ -3222,7 +3222,7 @@ e_client_bottom_get(void) return NULL; } -EAPI E_Client * +E_API E_Client * e_client_top_get(void) { unsigned int x; @@ -3239,7 +3239,7 @@ e_client_top_get(void) return NULL; } -EAPI unsigned int +E_API unsigned int e_clients_count(void) { return eina_list_count(e_comp->clients); @@ -3250,7 +3250,7 @@ e_clients_count(void) * Set a callback which will be called just prior to updating the * move coordinates for a border */ -EAPI void +E_API void e_client_move_intercept_cb_set(E_Client *ec, E_Client_Move_Intercept_Cb cb) { ec->move_intercept_cb = cb; @@ -3258,7 +3258,7 @@ e_client_move_intercept_cb_set(E_Client *ec, E_Client_Move_Intercept_Cb cb) /////////////////////////////////////// -EAPI E_Client_Hook * +E_API E_Client_Hook * e_client_hook_add(E_Client_Hook_Point hookpoint, E_Client_Hook_Cb func, const void *data) { E_Client_Hook *ch; @@ -3273,7 +3273,7 @@ e_client_hook_add(E_Client_Hook_Point hookpoint, E_Client_Hook_Cb func, const vo return ch; } -EAPI void +E_API void e_client_hook_del(E_Client_Hook *ch) { ch->delete_me = 1; @@ -3288,39 +3288,39 @@ e_client_hook_del(E_Client_Hook *ch) /////////////////////////////////////// -EAPI void +E_API void e_client_focus_latest_set(E_Client *ec) { focus_stack = eina_list_remove(focus_stack, ec); focus_stack = eina_list_prepend(focus_stack, ec); } -EAPI void +E_API void e_client_raise_latest_set(E_Client *ec) { raise_stack = eina_list_remove(raise_stack, ec); raise_stack = eina_list_prepend(raise_stack, ec); } -EAPI Eina_Bool +E_API Eina_Bool e_client_focus_track_enabled(void) { return !focus_track_frozen; } -EAPI void +E_API void e_client_focus_track_freeze(void) { focus_track_frozen++; } -EAPI void +E_API void e_client_focus_track_thaw(void) { focus_track_frozen--; } -EAPI void +E_API void e_client_refocus(void) { E_Client *ec; @@ -3361,7 +3361,7 @@ e_client_refocus(void) * the last focused window should get focus). * */ -EAPI void +E_API void e_client_focus_set_with_pointer(E_Client *ec) { E_OBJECT_CHECK(ec); @@ -3487,7 +3487,7 @@ e_client_focused_set(E_Client *ec) _e_client_event_simple(ec, E_EVENT_CLIENT_FOCUS_IN); } -EAPI void +E_API void e_client_activate(E_Client *ec, Eina_Bool just_do_it) { E_OBJECT_CHECK(ec); @@ -3526,31 +3526,31 @@ e_client_activate(E_Client *ec, Eina_Bool just_do_it) } } -EAPI E_Client * +E_API E_Client * e_client_focused_get(void) { return focused; } -EAPI Eina_List * +E_API Eina_List * e_client_focus_stack_get(void) { return focus_stack; } -YOLO EAPI void +YOLO E_API void e_client_focus_stack_set(Eina_List *l) { focus_stack = l; } -EAPI Eina_List * +E_API Eina_List * e_client_raise_stack_get(void) { return raise_stack; } -EAPI Eina_List * +E_API Eina_List * e_client_lost_windows_get(E_Zone *zone) { Eina_List *list = NULL; @@ -3579,7 +3579,7 @@ e_client_lost_windows_get(E_Zone *zone) /////////////////////////////////////// -EAPI void +E_API void e_client_shade(E_Client *ec, E_Direction dir) { E_OBJECT_CHECK(ec); @@ -3607,7 +3607,7 @@ e_client_shade(E_Client *ec, E_Direction dir) e_remember_update(ec); } -EAPI void +E_API void e_client_unshade(E_Client *ec, E_Direction dir) { E_OBJECT_CHECK(ec); @@ -3635,7 +3635,7 @@ e_client_unshade(E_Client *ec, E_Direction dir) /////////////////////////////////////// -EAPI void +E_API void e_client_maximize(E_Client *ec, E_Maximize max) { E_OBJECT_CHECK(ec); @@ -3697,7 +3697,7 @@ e_client_maximize(E_Client *ec, E_Maximize max) evas_object_smart_callback_call(ec->frame, "maximize_done", NULL); } -EAPI void +E_API void e_client_unmaximize(E_Client *ec, E_Maximize max) { E_OBJECT_CHECK(ec); @@ -3807,7 +3807,7 @@ e_client_unmaximize(E_Client *ec, E_Maximize max) evas_object_smart_callback_call(ec->frame, "unmaximize_done", NULL); } -EAPI void +E_API void e_client_fullscreen(E_Client *ec, E_Fullscreen policy) { int x, y, w, h; @@ -3887,7 +3887,7 @@ e_client_fullscreen(E_Client *ec, E_Fullscreen policy) e_remember_update(ec); } -EAPI void +E_API void e_client_unfullscreen(E_Client *ec) { E_OBJECT_CHECK(ec); @@ -3928,7 +3928,7 @@ e_client_unfullscreen(E_Client *ec) /////////////////////////////////////// -EAPI void +E_API void e_client_iconify(E_Client *ec) { E_OBJECT_CHECK(ec); @@ -3962,7 +3962,7 @@ e_client_iconify(E_Client *ec) e_remember_update(ec); } -EAPI void +E_API void e_client_uniconify(E_Client *ec) { E_Desk *desk; @@ -3994,7 +3994,7 @@ e_client_uniconify(E_Client *ec) /////////////////////////////////////// -EAPI void +E_API void e_client_urgent_set(E_Client *ec, Eina_Bool urgent) { E_OBJECT_CHECK(ec); @@ -4024,7 +4024,7 @@ e_client_urgent_set(E_Client *ec, Eina_Bool urgent) /////////////////////////////////////// -EAPI void +E_API void e_client_stick(E_Client *ec) { E_Desk *desk; @@ -4058,7 +4058,7 @@ e_client_stick(E_Client *ec) e_remember_update(ec); } -EAPI void +E_API void e_client_unstick(E_Client *ec) { E_Desk *desk; @@ -4093,7 +4093,7 @@ e_client_unstick(E_Client *ec) e_remember_update(ec); } -EAPI void +E_API void e_client_pinned_set(E_Client *ec, Eina_Bool set) { E_Layer layer; @@ -4114,7 +4114,7 @@ e_client_pinned_set(E_Client *ec, Eina_Bool set) /////////////////////////////////////// -EAPI Eina_Bool +E_API Eina_Bool e_client_border_set(E_Client *ec, const char *name) { Eina_Stringshare *pborder; @@ -4144,7 +4144,7 @@ e_client_border_set(E_Client *ec, const char *name) /////////////////////////////////////// -EAPI void +E_API void e_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden) { E_OBJECT_CHECK(ec); @@ -4159,7 +4159,7 @@ e_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden) /////////////////////////////////////// -EAPI void +E_API void e_client_act_move_keyboard(E_Client *ec) { EINA_SAFETY_ON_NULL_RETURN(ec); @@ -4180,7 +4180,7 @@ e_client_act_move_keyboard(E_Client *ec) action_handler_mouse = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _e_client_move_mouse_down, NULL); } -EAPI void +E_API void e_client_act_resize_keyboard(E_Client *ec) { EINA_SAFETY_ON_NULL_RETURN(ec); @@ -4201,7 +4201,7 @@ e_client_act_resize_keyboard(E_Client *ec) action_handler_mouse = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _e_client_resize_mouse_down, NULL); } -EAPI void +E_API void e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev) { E_OBJECT_CHECK(ec); @@ -4223,7 +4223,7 @@ e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev) } } -EAPI void +E_API void e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED) { E_OBJECT_CHECK(ec); @@ -4236,7 +4236,7 @@ e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED _e_client_action_finish(); } -EAPI void +E_API void e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev) { E_OBJECT_CHECK(ec); @@ -4301,7 +4301,7 @@ e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev) e_pointer_mode_push(ec, ec->resize_mode); } -EAPI void +E_API void e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED) { E_OBJECT_CHECK(ec); @@ -4317,7 +4317,7 @@ e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUS _e_client_action_finish(); } -EAPI void +E_API void e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key) { E_OBJECT_CHECK(ec); @@ -4335,7 +4335,7 @@ e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key) } } -EAPI void +E_API void e_client_act_close_begin(E_Client *ec) { E_OBJECT_CHECK(ec); @@ -4353,7 +4353,7 @@ e_client_act_close_begin(E_Client *ec) } } -EAPI void +E_API void e_client_act_kill_begin(E_Client *ec) { E_OBJECT_CHECK(ec); @@ -4374,7 +4374,7 @@ e_client_act_kill_begin(E_Client *ec) //////////////////////////////////////////////// -EAPI Evas_Object * +E_API Evas_Object * e_client_icon_add(E_Client *ec, Evas *evas) { Evas_Object *o; @@ -4465,7 +4465,7 @@ e_client_icon_add(E_Client *ec, Evas *evas) //////////////////////////////////////////// -EAPI void +E_API void e_client_ping(E_Client *ec) { E_OBJECT_CHECK(ec); @@ -4482,7 +4482,7 @@ e_client_ping(E_Client *ec) //////////////////////////////////////////// -EAPI void +E_API void e_client_move_cancel(void) { if (!ecmove) return; @@ -4504,7 +4504,7 @@ e_client_move_cancel(void) _e_client_move_end(ecmove); } -EAPI void +E_API void e_client_resize_cancel(void) { if (!ecresize) return; @@ -4526,7 +4526,7 @@ e_client_resize_cancel(void) _e_client_resize_end(ecresize); } -EAPI Eina_Bool +E_API Eina_Bool e_client_resize_begin(E_Client *ec) { if ((ec->shaded) || (ec->shading) || @@ -4555,7 +4555,7 @@ error: //////////////////////////////////////////// -EAPI void +E_API void e_client_frame_recalc(E_Client *ec) { EINA_SAFETY_ON_NULL_RETURN(ec); @@ -4565,7 +4565,7 @@ e_client_frame_recalc(E_Client *ec) //////////////////////////////////////////// -EAPI void +E_API void e_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_UNUSED) { E_OBJECT_CHECK(ec); @@ -4579,7 +4579,7 @@ e_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_U _e_client_moveinfo_gather(ec, sig); } -EAPI void +E_API void e_client_signal_move_end(E_Client *ec, const char *sig EINA_UNUSED, const char *src EINA_UNUSED) { E_OBJECT_CHECK(ec); @@ -4591,7 +4591,7 @@ e_client_signal_move_end(E_Client *ec, const char *sig EINA_UNUSED, const char * e_zone_flip_coords_handle(ec->zone, -1, -1); } -EAPI void +E_API void e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, const char *src EINA_UNUSED) { int resize_mode = E_POINTER_RESIZE_BR; @@ -4639,7 +4639,7 @@ e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, con e_pointer_mode_push(ec, ec->resize_mode); } -EAPI void +E_API void e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED) { E_OBJECT_CHECK(ec); @@ -4653,7 +4653,7 @@ e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char //////////////////////////////////////////// -EAPI void +E_API void e_client_resize_limit(E_Client *ec, int *w, int *h) { double a; @@ -4750,7 +4750,7 @@ e_client_resize_limit(E_Client *ec, int *w, int *h) -EAPI E_Client * +E_API E_Client * e_client_under_pointer_get(E_Desk *desk, E_Client *exclude) { int x, y; @@ -4782,7 +4782,7 @@ e_client_under_pointer_get(E_Desk *desk, E_Client *exclude) //////////////////////////////////////////// -EAPI int +E_API int e_client_pointer_warp_to_center_now(E_Client *ec) { if (e_config->disable_all_pointer_warps) return 0; @@ -4800,7 +4800,7 @@ e_client_pointer_warp_to_center_now(E_Client *ec) return 1; } -EAPI int +E_API int e_client_pointer_warp_to_center(E_Client *ec) { int x, y; @@ -4849,7 +4849,7 @@ e_client_pointer_warp_to_center(E_Client *ec) //////////////////////////////////////////// -EAPI void +E_API void e_client_redirected_set(E_Client *ec, Eina_Bool set) { EINA_SAFETY_ON_NULL_RETURN(ec); @@ -4871,7 +4871,7 @@ e_client_redirected_set(E_Client *ec, Eina_Bool set) //////////////////////////////////////////// -EAPI Eina_Bool +E_API Eina_Bool e_client_is_stacking(const E_Client *ec) { return e_comp->layers[e_comp_canvas_layer_map(ec->layer)].obj == ec->frame; @@ -4879,7 +4879,7 @@ e_client_is_stacking(const E_Client *ec) //////////////////////////////////////////// -EAPI void +E_API void e_client_layout_cb_set(E_Client_Layout_Cb cb) { if (_e_client_layout_cb && cb) diff --git a/src/bin/e_client.h b/src/bin/e_client.h index d0b4c39..2144e0c 100644 --- a/src/bin/e_client.h +++ b/src/bin/e_client.h @@ -720,107 +720,107 @@ struct E_Client for (EC = e_client_top_get(); EC; EC = e_client_below_get(EC)) -EAPI extern int E_EVENT_CLIENT_ADD; -EAPI extern int E_EVENT_CLIENT_REMOVE; -EAPI extern int E_EVENT_CLIENT_ZONE_SET; -EAPI extern int E_EVENT_CLIENT_DESK_SET; -EAPI extern int E_EVENT_CLIENT_RESIZE; -EAPI extern int E_EVENT_CLIENT_MOVE; -EAPI extern int E_EVENT_CLIENT_SHOW; -EAPI extern int E_EVENT_CLIENT_HIDE; -EAPI extern int E_EVENT_CLIENT_ICONIFY; -EAPI extern int E_EVENT_CLIENT_UNICONIFY; -EAPI extern int E_EVENT_CLIENT_STACK; -EAPI extern int E_EVENT_CLIENT_FOCUS_IN; -EAPI extern int E_EVENT_CLIENT_FOCUS_OUT; -EAPI extern int E_EVENT_CLIENT_PROPERTY; -EAPI extern int E_EVENT_CLIENT_FULLSCREEN; -EAPI extern int E_EVENT_CLIENT_UNFULLSCREEN; +E_API extern int E_EVENT_CLIENT_ADD; +E_API extern int E_EVENT_CLIENT_REMOVE; +E_API extern int E_EVENT_CLIENT_ZONE_SET; +E_API extern int E_EVENT_CLIENT_DESK_SET; +E_API extern int E_EVENT_CLIENT_RESIZE; +E_API extern int E_EVENT_CLIENT_MOVE; +E_API extern int E_EVENT_CLIENT_SHOW; +E_API extern int E_EVENT_CLIENT_HIDE; +E_API extern int E_EVENT_CLIENT_ICONIFY; +E_API extern int E_EVENT_CLIENT_UNICONIFY; +E_API extern int E_EVENT_CLIENT_STACK; +E_API extern int E_EVENT_CLIENT_FOCUS_IN; +E_API extern int E_EVENT_CLIENT_FOCUS_OUT; +E_API extern int E_EVENT_CLIENT_PROPERTY; +E_API extern int E_EVENT_CLIENT_FULLSCREEN; +E_API extern int E_EVENT_CLIENT_UNFULLSCREEN; EINTERN void e_client_idler_before(void); EINTERN Eina_Bool e_client_init(void); EINTERN void e_client_shutdown(void); -EAPI E_Client *e_client_new(E_Pixmap *cp, int first_map, int internal); -EAPI void e_client_desk_set(E_Client *ec, E_Desk *desk); -EAPI Eina_Bool e_client_comp_grabbed_get(void); -EAPI E_Client *e_client_action_get(void); -EAPI E_Client *e_client_warping_get(void); -EAPI Eina_List *e_clients_immortal_list(void); -EAPI void e_client_mouse_in(E_Client *ec, int x, int y); -EAPI void e_client_mouse_out(E_Client *ec, int x, int y); -EAPI void e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev); -EAPI void e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev); -EAPI void e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button* ev); -EAPI void e_client_mouse_move(E_Client *ec, Evas_Point *output); -EAPI void e_client_res_change_geometry_save(E_Client *bd); -EAPI void e_client_res_change_geometry_restore(E_Client *ec); -EAPI void e_client_zone_set(E_Client *ec, E_Zone *zone); -EAPI void e_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h); -EAPI E_Client *e_client_above_get(const E_Client *ec); -EAPI E_Client *e_client_below_get(const E_Client *ec); -EAPI E_Client *e_client_bottom_get(void); -EAPI E_Client *e_client_top_get(void); -EAPI unsigned int e_clients_count(void); -EAPI void e_client_move_intercept_cb_set(E_Client *ec, E_Client_Move_Intercept_Cb cb); -EAPI E_Client_Hook *e_client_hook_add(E_Client_Hook_Point hookpoint, E_Client_Hook_Cb func, const void *data); -EAPI void e_client_hook_del(E_Client_Hook *ch); -EAPI void e_client_focus_latest_set(E_Client *ec); -EAPI void e_client_raise_latest_set(E_Client *ec); -EAPI Eina_Bool e_client_focus_track_enabled(void); -EAPI void e_client_focus_track_freeze(void); -EAPI void e_client_focus_track_thaw(void); -EAPI void e_client_refocus(void); -EAPI void e_client_focus_set_with_pointer(E_Client *ec); -EAPI void e_client_activate(E_Client *ec, Eina_Bool just_do_it); -EAPI E_Client *e_client_focused_get(void); -EAPI Eina_List *e_client_focus_stack_get(void); -EAPI Eina_List *e_client_raise_stack_get(void); -EAPI Eina_List *e_client_lost_windows_get(E_Zone *zone); -EAPI void e_client_shade(E_Client *ec, E_Direction dir); -EAPI void e_client_unshade(E_Client *ec, E_Direction dir); -EAPI void e_client_maximize(E_Client *ec, E_Maximize max); -EAPI void e_client_unmaximize(E_Client *ec, E_Maximize max); -EAPI void e_client_fullscreen(E_Client *ec, E_Fullscreen policy); -EAPI void e_client_unfullscreen(E_Client *ec); -EAPI void e_client_iconify(E_Client *ec); -EAPI void e_client_uniconify(E_Client *ec); -EAPI void e_client_urgent_set(E_Client *ec, Eina_Bool urgent); -EAPI void e_client_stick(E_Client *ec); -EAPI void e_client_unstick(E_Client *ec); -EAPI void e_client_pinned_set(E_Client *ec, Eina_Bool set); -EAPI void e_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden); -EAPI Eina_Bool e_client_border_set(E_Client *ec, const char *name); -EAPI void e_client_act_move_keyboard(E_Client *ec); -EAPI void e_client_act_resize_keyboard(E_Client *ec); -EAPI void e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev); -EAPI void e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED); -EAPI void e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev); -EAPI void e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED); -EAPI void e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key); -EAPI void e_client_act_close_begin(E_Client *ec); -EAPI void e_client_act_kill_begin(E_Client *ec); -EAPI Evas_Object *e_client_icon_add(E_Client *ec, Evas *evas); -EAPI void e_client_ping(E_Client *cw); -EAPI void e_client_move_cancel(void); -EAPI void e_client_resize_cancel(void); -EAPI Eina_Bool e_client_resize_begin(E_Client *ec); -EAPI void e_client_frame_recalc(E_Client *ec); -EAPI void e_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_UNUSED); -EAPI void e_client_signal_move_end(E_Client *ec, const char *sig EINA_UNUSED, const char *src EINA_UNUSED); -EAPI void e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, const char *src EINA_UNUSED); -EAPI void e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED); -EAPI void e_client_resize_limit(E_Client *ec, int *w, int *h); -EAPI E_Client *e_client_under_pointer_get(E_Desk *desk, E_Client *exclude); -EAPI int e_client_pointer_warp_to_center_now(E_Client *ec); -EAPI int e_client_pointer_warp_to_center(E_Client *ec); -EAPI void e_client_redirected_set(E_Client *ec, Eina_Bool set); -EAPI Eina_Bool e_client_is_stacking(const E_Client *ec); -EAPI Eina_Bool e_client_desk_window_profile_available_check(E_Client *ec, const char *profile); -EAPI void e_client_desk_window_profile_wait_desk_set(E_Client *ec, E_Desk *desk); -EAPI void e_client_layout_cb_set(E_Client_Layout_Cb cb); - -YOLO EAPI void e_client_focus_stack_set(Eina_List *l); +E_API E_Client *e_client_new(E_Pixmap *cp, int first_map, int internal); +E_API void e_client_desk_set(E_Client *ec, E_Desk *desk); +E_API Eina_Bool e_client_comp_grabbed_get(void); +E_API E_Client *e_client_action_get(void); +E_API E_Client *e_client_warping_get(void); +E_API Eina_List *e_clients_immortal_list(void); +E_API void e_client_mouse_in(E_Client *ec, int x, int y); +E_API void e_client_mouse_out(E_Client *ec, int x, int y); +E_API void e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev); +E_API void e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev); +E_API void e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button* ev); +E_API void e_client_mouse_move(E_Client *ec, Evas_Point *output); +E_API void e_client_res_change_geometry_save(E_Client *bd); +E_API void e_client_res_change_geometry_restore(E_Client *ec); +E_API void e_client_zone_set(E_Client *ec, E_Zone *zone); +E_API void e_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h); +E_API E_Client *e_client_above_get(const E_Client *ec); +E_API E_Client *e_client_below_get(const E_Client *ec); +E_API E_Client *e_client_bottom_get(void); +E_API E_Client *e_client_top_get(void); +E_API unsigned int e_clients_count(void); +E_API void e_client_move_intercept_cb_set(E_Client *ec, E_Client_Move_Intercept_Cb cb); +E_API E_Client_Hook *e_client_hook_add(E_Client_Hook_Point hookpoint, E_Client_Hook_Cb func, const void *data); +E_API void e_client_hook_del(E_Client_Hook *ch); +E_API void e_client_focus_latest_set(E_Client *ec); +E_API void e_client_raise_latest_set(E_Client *ec); +E_API Eina_Bool e_client_focus_track_enabled(void); +E_API void e_client_focus_track_freeze(void); +E_API void e_client_focus_track_thaw(void); +E_API void e_client_refocus(void); +E_API void e_client_focus_set_with_pointer(E_Client *ec); +E_API void e_client_activate(E_Client *ec, Eina_Bool just_do_it); +E_API E_Client *e_client_focused_get(void); +E_API Eina_List *e_client_focus_stack_get(void); +E_API Eina_List *e_client_raise_stack_get(void); +E_API Eina_List *e_client_lost_windows_get(E_Zone *zone); +E_API void e_client_shade(E_Client *ec, E_Direction dir); +E_API void e_client_unshade(E_Client *ec, E_Direction dir); +E_API void e_client_maximize(E_Client *ec, E_Maximize max); +E_API void e_client_unmaximize(E_Client *ec, E_Maximize max); +E_API void e_client_fullscreen(E_Client *ec, E_Fullscreen policy); +E_API void e_client_unfullscreen(E_Client *ec); +E_API void e_client_iconify(E_Client *ec); +E_API void e_client_uniconify(E_Client *ec); +E_API void e_client_urgent_set(E_Client *ec, Eina_Bool urgent); +E_API void e_client_stick(E_Client *ec); +E_API void e_client_unstick(E_Client *ec); +E_API void e_client_pinned_set(E_Client *ec, Eina_Bool set); +E_API void e_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden); +E_API Eina_Bool e_client_border_set(E_Client *ec, const char *name); +E_API void e_client_act_move_keyboard(E_Client *ec); +E_API void e_client_act_resize_keyboard(E_Client *ec); +E_API void e_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev); +E_API void e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED); +E_API void e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev); +E_API void e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED); +E_API void e_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key); +E_API void e_client_act_close_begin(E_Client *ec); +E_API void e_client_act_kill_begin(E_Client *ec); +E_API Evas_Object *e_client_icon_add(E_Client *ec, Evas *evas); +E_API void e_client_ping(E_Client *cw); +E_API void e_client_move_cancel(void); +E_API void e_client_resize_cancel(void); +E_API Eina_Bool e_client_resize_begin(E_Client *ec); +E_API void e_client_frame_recalc(E_Client *ec); +E_API void e_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_UNUSED); +E_API void e_client_signal_move_end(E_Client *ec, const char *sig EINA_UNUSED, const char *src EINA_UNUSED); +E_API void e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, const char *src EINA_UNUSED); +E_API void e_client_signal_resize_end(E_Client *ec, const char *dir EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED); +E_API void e_client_resize_limit(E_Client *ec, int *w, int *h); +E_API E_Client *e_client_under_pointer_get(E_Desk *desk, E_Client *exclude); +E_API int e_client_pointer_warp_to_center_now(E_Client *ec); +E_API int e_client_pointer_warp_to_center(E_Client *ec); +E_API void e_client_redirected_set(E_Client *ec, Eina_Bool set); +E_API Eina_Bool e_client_is_stacking(const E_Client *ec); +E_API Eina_Bool e_client_desk_window_profile_available_check(E_Client *ec, const char *profile); +E_API void e_client_desk_window_profile_wait_desk_set(E_Client *ec, E_Desk *desk); +E_API void e_client_layout_cb_set(E_Client_Layout_Cb cb); + +YOLO E_API void e_client_focus_stack_set(Eina_List *l); #include "e_client.x" #endif diff --git a/src/bin/e_color.h b/src/bin/e_color.h index ed4b1f0..4f6ee97 100644 --- a/src/bin/e_color.h +++ b/src/bin/e_color.h @@ -25,8 +25,8 @@ struct _E_Color int a; }; -EAPI void e_color_update_rgb (E_Color *ec); -EAPI void e_color_update_hsv (E_Color *ec); -EAPI void e_color_copy (const E_Color *from, E_Color *to); +E_API void e_color_update_rgb (E_Color *ec); +E_API void e_color_update_hsv (E_Color *ec); +E_API void e_color_copy (const E_Color *from, E_Color *to); #endif #endif diff --git a/src/bin/e_color_dialog.c b/src/bin/e_color_dialog.c index 25fe253..86ab5ed 100644 --- a/src/bin/e_color_dialog.c +++ b/src/bin/e_color_dialog.c @@ -102,7 +102,7 @@ e_color_dialog_cancel_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dia dia->cancel_data = data; } -EAPI void +E_API void e_color_dialog_change_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data) { dia->change_func = func; diff --git a/src/bin/e_color_dialog.h b/src/bin/e_color_dialog.h index f959942..b83fa80 100644 --- a/src/bin/e_color_dialog.h +++ b/src/bin/e_color_dialog.h @@ -24,14 +24,14 @@ struct _E_Color_Dialog void *change_data; }; -EAPI E_Color_Dialog *e_color_dialog_new (const E_Color *initial_color, Eina_Bool alpha_enabled); -EAPI void e_color_dialog_show (E_Color_Dialog *dia); -EAPI void e_color_dialog_title_set (E_Color_Dialog *dia, const char *title); +E_API E_Color_Dialog *e_color_dialog_new (const E_Color *initial_color, Eina_Bool alpha_enabled); +E_API void e_color_dialog_show (E_Color_Dialog *dia); +E_API void e_color_dialog_title_set (E_Color_Dialog *dia, const char *title); /* select and change pass the current color back, cancel passes the initial color */ -EAPI void e_color_dialog_select_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data); -EAPI void e_color_dialog_cancel_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data); -EAPI void e_color_dialog_change_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data); +E_API void e_color_dialog_select_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data); +E_API void e_color_dialog_cancel_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data); +E_API void e_color_dialog_change_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data); #endif #endif diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 59b3ee5..df79d23 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -21,7 +21,7 @@ static Eina_List *handlers = NULL; static Eina_List *hooks = NULL; -EAPI E_Comp *e_comp = NULL; +E_API E_Comp *e_comp = NULL; static Eina_Hash *ignores = NULL; static Eina_List *actions = NULL; @@ -36,9 +36,9 @@ static double ecore_frametime = 0; static int _e_comp_log_dom = -1; -EAPI int E_EVENT_COMPOSITOR_RESIZE = -1; -EAPI int E_EVENT_COMPOSITOR_DISABLE = -1; -EAPI int E_EVENT_COMPOSITOR_ENABLE = -1; +E_API int E_EVENT_COMPOSITOR_RESIZE = -1; +E_API int E_EVENT_COMPOSITOR_DISABLE = -1; +E_API int E_EVENT_COMPOSITOR_ENABLE = -1; ////////////////////////////////////////////////////////////////////////// #undef DBG @@ -1266,7 +1266,7 @@ e_comp_style_selector_create(Evas *evas, const char **source) return oi; } -EAPI E_Comp * +E_API E_Comp * e_comp_new(void) { if (e_comp) @@ -1280,7 +1280,7 @@ e_comp_new(void) return e_comp; } -EAPI int +E_API int e_comp_internal_save(void) { return e_config_domain_save("e_comp", conf_edd, conf); @@ -1318,7 +1318,7 @@ e_comp_shutdown(void) return 1; } -EAPI void +E_API void e_comp_render_queue(void) { if (conf->lock_fps) @@ -1337,7 +1337,7 @@ e_comp_render_queue(void) } } -EAPI void +E_API void e_comp_shape_queue(void) { if (e_comp->comp_type != E_PIXMAP_TYPE_X) return; @@ -1345,7 +1345,7 @@ e_comp_shape_queue(void) e_comp->shape_job = ecore_job_add(_e_comp_shapes_update_job, NULL); } -EAPI void +E_API void e_comp_shape_queue_block(Eina_Bool block) { e_comp->shape_queue_blocked = !!block; @@ -1355,13 +1355,13 @@ e_comp_shape_queue_block(Eina_Bool block) e_comp_shape_queue(); } -EAPI E_Comp_Config * +E_API E_Comp_Config * e_comp_config_get(void) { return conf; } -EAPI void +E_API void e_comp_shadows_reset(void) { E_Client *ec; @@ -1372,7 +1372,7 @@ e_comp_shadows_reset(void) e_comp_object_frame_theme_set(ec->frame, E_COMP_OBJECT_FRAME_RESHADOW); } -EAPI Ecore_Window +E_API Ecore_Window e_comp_top_window_at_xy_get(Evas_Coord x, Evas_Coord y) { E_Client *ec; @@ -1386,7 +1386,7 @@ e_comp_top_window_at_xy_get(Evas_Coord x, Evas_Coord y) return e_comp->ee_win; } -EAPI void +E_API void e_comp_util_wins_print(void) { Evas_Object *o; @@ -1411,7 +1411,7 @@ e_comp_util_wins_print(void) fputc('\n', stderr); } -EAPI void +E_API void e_comp_ignore_win_add(E_Pixmap_Type type, Ecore_Window win) { E_Client *ec; @@ -1423,7 +1423,7 @@ e_comp_ignore_win_add(E_Pixmap_Type type, Ecore_Window win) if (ec->visible) evas_object_hide(ec->frame); } -EAPI void +E_API void e_comp_ignore_win_del(E_Pixmap_Type type, Ecore_Window win) { E_Client *ec; @@ -1435,13 +1435,13 @@ e_comp_ignore_win_del(E_Pixmap_Type type, Ecore_Window win) if (ec->visible) evas_object_show(ec->frame); } -EAPI Eina_Bool +E_API Eina_Bool e_comp_ignore_win_find(Ecore_Window win) { return !!eina_hash_find(ignores, &win); } -EAPI void +E_API void e_comp_override_del() { e_comp->nocomp_override--; @@ -1452,7 +1452,7 @@ e_comp_override_del() } } -EAPI void +E_API void e_comp_override_add() { e_comp->nocomp_override++; @@ -1461,7 +1461,7 @@ e_comp_override_add() #if 0 FIXME -EAPI void +E_API void e_comp_block_window_add(void) { e_comp->block_count++; @@ -1476,7 +1476,7 @@ e_comp_block_window_add(void) ecore_x_window_show(e_comp->block_win); } -EAPI void +E_API void e_comp_block_window_del(void) { if (!e_comp->block_count) return; @@ -1487,14 +1487,14 @@ e_comp_block_window_del(void) } #endif -EAPI E_Comp * +E_API E_Comp * e_comp_find_by_window(Ecore_Window win) { if ((e_comp->win == win) || (e_comp->ee_win == win) || (e_comp->root == win)) return e_comp; return NULL; } -EAPI void +E_API void e_comp_override_timed_pop(void) { if (e_comp->nocomp_override <= 0) return; @@ -1504,7 +1504,7 @@ e_comp_override_timed_pop(void) e_comp->nocomp_override_timer = ecore_timer_add(1.0, _e_comp_override_expire, NULL); } -EAPI unsigned int +E_API unsigned int e_comp_e_object_layer_get(const E_Object *obj) { E_Gadcon *gc = NULL; @@ -1538,7 +1538,7 @@ e_comp_e_object_layer_get(const E_Object *obj) return 0; } -EAPI Eina_Bool +E_API Eina_Bool e_comp_grab_input(Eina_Bool mouse, Eina_Bool kbd) { Eina_Bool ret = EINA_FALSE; @@ -1561,7 +1561,7 @@ e_comp_grab_input(Eina_Bool mouse, Eina_Bool kbd) return ret; } -EAPI void +E_API void e_comp_ungrab_input(Eina_Bool mouse, Eina_Bool kbd) { Ecore_Window mwin = 0, kwin = 0; @@ -1586,45 +1586,45 @@ e_comp_ungrab_input(Eina_Bool mouse, Eina_Bool kbd) e_client_refocus(); } -EAPI Eina_Bool +E_API Eina_Bool e_comp_util_kbd_grabbed(void) { return e_menu_grab_window_get() || e_client_action_get() || e_grabinput_key_win_get(); } -EAPI Eina_Bool +E_API Eina_Bool e_comp_util_mouse_grabbed(void) { return e_menu_grab_window_get() || e_client_action_get() || e_grabinput_mouse_win_get(); } -EAPI void +E_API void e_comp_gl_set(Eina_Bool set) { gl_avail = !!set; } -EAPI Eina_Bool +E_API Eina_Bool e_comp_gl_get(void) { return gl_avail; } -EAPI void +E_API void e_comp_button_bindings_ungrab_all(void) { if (e_comp->bindings_ungrab_cb) e_comp->bindings_ungrab_cb(); } -EAPI void +E_API void e_comp_button_bindings_grab_all(void) { if (e_comp->bindings_grab_cb) e_comp->bindings_grab_cb(); } -EAPI void +E_API void e_comp_client_redirect_toggle(E_Client *ec) { EINA_SAFETY_ON_NULL_RETURN(ec); @@ -1636,7 +1636,7 @@ e_comp_client_redirect_toggle(E_Client *ec) e_comp_shape_queue(); } -EAPI Eina_Bool +E_API Eina_Bool e_comp_util_object_is_above_nocomp(Evas_Object *obj) { Evas_Object *o; diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h index c48cc48..6e4d6b7 100644 --- a/src/bin/e_comp.h +++ b/src/bin/e_comp.h @@ -52,8 +52,8 @@ typedef enum _E_Layer # include "e_comp_cfdata.h" -extern EAPI int E_EVENT_COMPOSITOR_DISABLE; -extern EAPI int E_EVENT_COMPOSITOR_ENABLE; +extern E_API int E_EVENT_COMPOSITOR_DISABLE; +extern E_API int E_EVENT_COMPOSITOR_ENABLE; typedef void (*E_Comp_Grab_Cb)(void); @@ -172,47 +172,47 @@ typedef enum E_COMP_ENGINE_GL = 2 } E_Comp_Engine; -extern EAPI E_Comp *e_comp; +extern E_API E_Comp *e_comp; EINTERN Eina_Bool e_comp_init(void); -EAPI E_Comp *e_comp_new(void); -EAPI int e_comp_internal_save(void); +E_API E_Comp *e_comp_new(void); +E_API int e_comp_internal_save(void); EINTERN int e_comp_shutdown(void); -EAPI void e_comp_render_queue(void); -EAPI void e_comp_shape_queue(void); -EAPI void e_comp_shape_queue_block(Eina_Bool block); -EAPI E_Comp_Config *e_comp_config_get(void); -EAPI const Eina_List *e_comp_list(void); -EAPI void e_comp_shadows_reset(void); -EAPI Ecore_Window e_comp_top_window_at_xy_get(Evas_Coord x, Evas_Coord y); -EAPI void e_comp_util_wins_print(void); -EAPI void e_comp_ignore_win_add(E_Pixmap_Type type, Ecore_Window win); -EAPI void e_comp_ignore_win_del(E_Pixmap_Type type, Ecore_Window win); -EAPI Eina_Bool e_comp_ignore_win_find(Ecore_Window win); -EAPI void e_comp_override_del(void); -EAPI void e_comp_override_add(void); -EAPI void e_comp_block_window_add(void); -EAPI void e_comp_block_window_del(void); -EAPI E_Comp *e_comp_find_by_window(Ecore_Window win); -EAPI void e_comp_override_timed_pop(void); -EAPI unsigned int e_comp_e_object_layer_get(const E_Object *obj); -EAPI Eina_Bool e_comp_grab_input(Eina_Bool mouse, Eina_Bool kbd); -EAPI void e_comp_ungrab_input(Eina_Bool mouse, Eina_Bool kbd); -EAPI void e_comp_gl_set(Eina_Bool set); -EAPI Eina_Bool e_comp_gl_get(void); - -EAPI void e_comp_button_bindings_grab_all(void); -EAPI void e_comp_button_bindings_ungrab_all(void); -EAPI void e_comp_client_redirect_toggle(E_Client *ec); -EAPI Eina_Bool e_comp_util_object_is_above_nocomp(Evas_Object *obj); +E_API void e_comp_render_queue(void); +E_API void e_comp_shape_queue(void); +E_API void e_comp_shape_queue_block(Eina_Bool block); +E_API E_Comp_Config *e_comp_config_get(void); +E_API const Eina_List *e_comp_list(void); +E_API void e_comp_shadows_reset(void); +E_API Ecore_Window e_comp_top_window_at_xy_get(Evas_Coord x, Evas_Coord y); +E_API void e_comp_util_wins_print(void); +E_API void e_comp_ignore_win_add(E_Pixmap_Type type, Ecore_Window win); +E_API void e_comp_ignore_win_del(E_Pixmap_Type type, Ecore_Window win); +E_API Eina_Bool e_comp_ignore_win_find(Ecore_Window win); +E_API void e_comp_override_del(void); +E_API void e_comp_override_add(void); +E_API void e_comp_block_window_add(void); +E_API void e_comp_block_window_del(void); +E_API E_Comp *e_comp_find_by_window(Ecore_Window win); +E_API void e_comp_override_timed_pop(void); +E_API unsigned int e_comp_e_object_layer_get(const E_Object *obj); +E_API Eina_Bool e_comp_grab_input(Eina_Bool mouse, Eina_Bool kbd); +E_API void e_comp_ungrab_input(Eina_Bool mouse, Eina_Bool kbd); +E_API void e_comp_gl_set(Eina_Bool set); +E_API Eina_Bool e_comp_gl_get(void); + +E_API void e_comp_button_bindings_grab_all(void); +E_API void e_comp_button_bindings_ungrab_all(void); +E_API void e_comp_client_redirect_toggle(E_Client *ec); +E_API Eina_Bool e_comp_util_object_is_above_nocomp(Evas_Object *obj); EINTERN Evas_Object *e_comp_style_selector_create(Evas *evas, const char **source); -EAPI E_Config_Dialog *e_int_config_comp(Evas_Object *parent, const char *params); -EAPI E_Config_Dialog *e_int_config_comp_match(Evas_Object *parent, const char *params); +E_API E_Config_Dialog *e_int_config_comp(Evas_Object *parent, const char *params); +E_API E_Config_Dialog *e_int_config_comp_match(Evas_Object *parent, const char *params); -EAPI Eina_Bool e_comp_util_kbd_grabbed(void); -EAPI Eina_Bool e_comp_util_mouse_grabbed(void); +E_API Eina_Bool e_comp_util_kbd_grabbed(void); +E_API Eina_Bool e_comp_util_mouse_grabbed(void); static inline Eina_Bool e_comp_util_client_is_fullscreen(const E_Client *ec) diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c index d33faec..92da584 100644 --- a/src/bin/e_comp_canvas.c +++ b/src/bin/e_comp_canvas.c @@ -178,7 +178,7 @@ _e_comp_canvas_cb_zone_sort(const void *data1, const void *data2) } -EAPI Eina_Bool +E_API Eina_Bool e_comp_canvas_init(int w, int h) { Evas_Object *o; @@ -252,7 +252,7 @@ e_comp_canvas_clear(void) ////////////////////////////////////////////// -EAPI void +E_API void e_comp_canvas_resize(int w, int h) { e_comp->w = w; @@ -260,19 +260,19 @@ e_comp_canvas_resize(int w, int h) ecore_evas_resize(e_comp->ee, w, h); } -EAPI void +E_API void e_comp_all_freeze(void) { evas_event_freeze(e_comp->evas); } -EAPI void +E_API void e_comp_all_thaw(void) { evas_event_thaw(e_comp->evas); } -EAPI E_Zone * +E_API E_Zone * e_comp_zone_xy_get(Evas_Coord x, Evas_Coord y) { const Eina_List *l; @@ -283,7 +283,7 @@ e_comp_zone_xy_get(Evas_Coord x, Evas_Coord y) return NULL; } -EAPI E_Zone * +E_API E_Zone * e_comp_zone_number_get(int num) { Eina_List *l = NULL; @@ -296,7 +296,7 @@ e_comp_zone_number_get(int num) return NULL; } -EAPI E_Zone * +E_API E_Zone * e_comp_zone_id_get(int id) { Eina_List *l = NULL; @@ -309,7 +309,7 @@ e_comp_zone_id_get(int id) return NULL; } -EAPI E_Desk * +E_API E_Desk * e_comp_desk_window_profile_get(const char *profile) { Eina_List *l = NULL; @@ -338,7 +338,7 @@ e_comp_desk_window_profile_get(const char *profile) return NULL; } -EAPI void +E_API void e_comp_canvas_zone_update(E_Zone *zone) { Evas_Object *o; @@ -389,7 +389,7 @@ e_comp_canvas_zone_update(E_Zone *zone) evas_object_show(o); } -EAPI void +E_API void e_comp_canvas_update(void) { Eina_List *l, *screens, *zones = NULL, *ll; @@ -528,7 +528,7 @@ e_comp_canvas_update(void) } } -EAPI void +E_API void e_comp_canvas_fake_layers_init(void) { unsigned int layer; @@ -544,7 +544,7 @@ e_comp_canvas_fake_layers_init(void) } } -EAPI void +E_API void e_comp_canvas_fps_toggle(void) { E_Comp_Config *conf = e_comp_config_get(); @@ -554,7 +554,7 @@ e_comp_canvas_fps_toggle(void) e_comp_render_queue(); } -EAPI E_Layer +E_API E_Layer e_comp_canvas_layer_map_to(unsigned int layer) { switch (layer) @@ -583,7 +583,7 @@ e_comp_canvas_layer_map_to(unsigned int layer) return -INT_MAX; } -EAPI unsigned int +E_API unsigned int e_comp_canvas_layer_map(E_Layer layer) { switch (layer) @@ -612,7 +612,7 @@ e_comp_canvas_layer_map(E_Layer layer) return 9999; } -EAPI unsigned int +E_API unsigned int e_comp_canvas_client_layer_map(E_Layer layer) { switch (layer) @@ -633,7 +633,7 @@ e_comp_canvas_client_layer_map(E_Layer layer) return 9999; } -EAPI E_Layer +E_API E_Layer e_comp_canvas_client_layer_map_nearest(int layer) { #define LAYER_MAP(X) \ @@ -652,14 +652,14 @@ e_comp_canvas_client_layer_map_nearest(int layer) return E_LAYER_CLIENT_PRIO; } -EAPI void +E_API void e_comp_canvas_keys_grab(void) { if (e_comp->root) e_bindings_key_grab(E_BINDING_CONTEXT_ANY, e_comp->root); } -EAPI void +E_API void e_comp_canvas_keys_ungrab(void) { if (e_comp->root) diff --git a/src/bin/e_comp_canvas.h b/src/bin/e_comp_canvas.h index df22610..926a8fa 100644 --- a/src/bin/e_comp_canvas.h +++ b/src/bin/e_comp_canvas.h @@ -6,27 +6,27 @@ #ifndef E_COMP_CANVAS_H #define E_COMP_CANVAS_H -extern EAPI int E_EVENT_COMPOSITOR_RESIZE; +extern E_API int E_EVENT_COMPOSITOR_RESIZE; -EAPI Eina_Bool e_comp_canvas_init(int w, int h); +E_API Eina_Bool e_comp_canvas_init(int w, int h); EINTERN void e_comp_canvas_clear(void); -EAPI void e_comp_canvas_resize(int w, int h); -EAPI void e_comp_all_freeze(void); -EAPI void e_comp_all_thaw(void); -EAPI E_Zone * e_comp_zone_xy_get(Evas_Coord x, Evas_Coord y); -EAPI E_Zone * e_comp_zone_number_get(int num); -EAPI E_Zone * e_comp_zone_id_get(int id); -EAPI E_Desk * e_comp_desk_window_profile_get(const char *profile); -EAPI void e_comp_canvas_zone_update(E_Zone *zone); -EAPI void e_comp_canvas_update(void); -EAPI void e_comp_canvas_fake_layers_init(void); -EAPI void e_comp_canvas_fps_toggle(void); -EAPI E_Layer e_comp_canvas_layer_map_to(unsigned int layer); -EAPI unsigned int e_comp_canvas_layer_map(E_Layer layer); -EAPI unsigned int e_comp_canvas_client_layer_map(E_Layer layer); -EAPI E_Layer e_comp_canvas_client_layer_map_nearest(int layer); -EAPI void e_comp_canvas_keys_grab(void); -EAPI void e_comp_canvas_keys_ungrab(void); +E_API void e_comp_canvas_resize(int w, int h); +E_API void e_comp_all_freeze(void); +E_API void e_comp_all_thaw(void); +E_API E_Zone * e_comp_zone_xy_get(Evas_Coord x, Evas_Coord y); +E_API E_Zone * e_comp_zone_number_get(int num); +E_API E_Zone * e_comp_zone_id_get(int id); +E_API E_Desk * e_comp_desk_window_profile_get(const char *profile); +E_API void e_comp_canvas_zone_update(E_Zone *zone); +E_API void e_comp_canvas_update(void); +E_API void e_comp_canvas_fake_layers_init(void); +E_API void e_comp_canvas_fps_toggle(void); +E_API E_Layer e_comp_canvas_layer_map_to(unsigned int layer); +E_API unsigned int e_comp_canvas_layer_map(E_Layer layer); +E_API unsigned int e_comp_canvas_client_layer_map(E_Layer layer); +E_API E_Layer e_comp_canvas_client_layer_map_nearest(int layer); +E_API void e_comp_canvas_keys_grab(void); +E_API void e_comp_canvas_keys_ungrab(void); /* the following functions are used for adjusting root window coordinates * to/from canvas coordinates. diff --git a/src/bin/e_comp_cfdata.c b/src/bin/e_comp_cfdata.c index 3f29ebb..1b022c3 100644 --- a/src/bin/e_comp_cfdata.c +++ b/src/bin/e_comp_cfdata.c @@ -1,7 +1,7 @@ #include "e.h" #include "e_comp_cfdata.h" -EAPI void +E_API void e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd) { *match_edd = E_CONFIG_DD_NEW("Comp_Match", E_Comp_Match); @@ -70,7 +70,7 @@ e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd) E_CONFIG_LIST(D, T, match.objects, *match_edd); } -EAPI E_Comp_Config * +E_API E_Comp_Config * e_comp_cfdata_config_new(void) { E_Comp_Config *cfg; @@ -195,7 +195,7 @@ e_comp_cfdata_config_new(void) return cfg; } -EAPI void +E_API void e_comp_cfdata_match_free(E_Comp_Match *m) { if (!m) return; @@ -207,7 +207,7 @@ e_comp_cfdata_match_free(E_Comp_Match *m) free(m); } -EAPI void +E_API void e_comp_cfdata_config_free(E_Comp_Config *cfg) { if (!cfg) return; diff --git a/src/bin/e_comp_cfdata.h b/src/bin/e_comp_cfdata.h index b1620eb..f9558e4 100644 --- a/src/bin/e_comp_cfdata.h +++ b/src/bin/e_comp_cfdata.h @@ -76,10 +76,10 @@ struct _E_Comp_Match char no_shadow; // set whether shadow is disabled }; -EAPI void e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd); -EAPI E_Comp_Config *e_comp_cfdata_config_new(void); -EAPI void e_comp_cfdata_config_free(E_Comp_Config *cfg); -EAPI void e_comp_cfdata_match_free(E_Comp_Match *m); +E_API void e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd); +E_API E_Comp_Config *e_comp_cfdata_config_new(void); +E_API void e_comp_cfdata_config_free(E_Comp_Config *cfg); +E_API void e_comp_cfdata_match_free(E_Comp_Match *m); #endif #endif diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 45c1079..f211957 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -137,7 +137,7 @@ static Evas_Smart *_e_comp_smart = NULL; EINTERN void e_client_focused_set(E_Client *ec); /* emitted every time a new noteworthy comp object is added */ -EAPI int E_EVENT_COMP_OBJECT_ADD = -1; +E_API int E_EVENT_COMP_OBJECT_ADD = -1; static void _e_comp_object_event_free(void *d EINA_UNUSED, void *event) @@ -2163,7 +2163,7 @@ _e_comp_smart_init(void) } } -EAPI void +E_API void e_comp_object_zoomap_set(Evas_Object *obj, Eina_Bool enabled) { API_ENTRY; @@ -2308,7 +2308,7 @@ _e_comp_object_util_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj e_comp_shape_queue(); } -EAPI Evas_Object * +E_API Evas_Object * e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type) { Evas_Object *o, *z = NULL; @@ -2442,7 +2442,7 @@ e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type) } /* utility functions for deleting objects when their "owner" is deleted */ -EAPI void +E_API void e_comp_object_util_del_list_append(Evas_Object *obj, Evas_Object *to_del) { Eina_List *l; @@ -2455,7 +2455,7 @@ e_comp_object_util_del_list_append(Evas_Object *obj, Evas_Object *to_del) evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _e_comp_object_util_del, NULL); } -EAPI void +E_API void e_comp_object_util_del_list_remove(Evas_Object *obj, Evas_Object *to_del) { Eina_List *l; @@ -2469,7 +2469,7 @@ e_comp_object_util_del_list_remove(Evas_Object *obj, Evas_Object *to_del) ///////////////////////////////////////////////////////// -EAPI Evas_Object * +E_API Evas_Object * e_comp_object_client_add(E_Client *ec) { Evas_Object *o; @@ -2492,7 +2492,7 @@ e_comp_object_client_add(E_Client *ec) } /* utility functions for getting client inset */ -EAPI void +E_API void e_comp_object_frame_xy_adjust(Evas_Object *obj, int x, int y, int *ax, int *ay) { API_ENTRY; @@ -2506,7 +2506,7 @@ e_comp_object_frame_xy_adjust(Evas_Object *obj, int x, int y, int *ax, int *ay) if (ay) *ay = y - cw->client_inset.t; } -EAPI void +E_API void e_comp_object_frame_xy_unadjust(Evas_Object *obj, int x, int y, int *ax, int *ay) { API_ENTRY; @@ -2520,7 +2520,7 @@ e_comp_object_frame_xy_unadjust(Evas_Object *obj, int x, int y, int *ax, int *ay if (ay) *ay = y + cw->client_inset.t; } -EAPI void +E_API void e_comp_object_frame_wh_adjust(Evas_Object *obj, int w, int h, int *aw, int *ah) { API_ENTRY; @@ -2534,7 +2534,7 @@ e_comp_object_frame_wh_adjust(Evas_Object *obj, int w, int h, int *aw, int *ah) if (ah) *ah = h + cw->client_inset.t + cw->client_inset.b; } -EAPI void +E_API void e_comp_object_frame_wh_unadjust(Evas_Object *obj, int w, int h, int *aw, int *ah) { API_ENTRY; @@ -2548,7 +2548,7 @@ e_comp_object_frame_wh_unadjust(Evas_Object *obj, int w, int h, int *aw, int *ah if (ah) *ah = h - cw->client_inset.t - cw->client_inset.b; } -EAPI E_Client * +E_API E_Client * e_comp_object_client_get(Evas_Object *obj) { Evas_Object *o; @@ -2561,7 +2561,7 @@ e_comp_object_client_get(Evas_Object *obj) return cw ? cw->ec : NULL; } -EAPI void +E_API void e_comp_object_frame_extends_get(Evas_Object *obj, int *x, int *y, int *w, int *h) { API_ENTRY; @@ -2576,7 +2576,7 @@ e_comp_object_frame_extends_get(Evas_Object *obj, int *x, int *y, int *w, int *h } } -EAPI E_Zone * +E_API E_Zone * e_comp_object_util_zone_get(Evas_Object *obj) { E_Zone *zone; @@ -2596,7 +2596,7 @@ e_comp_object_util_zone_get(Evas_Object *obj) return zone; } -EAPI void +E_API void e_comp_object_util_center(Evas_Object *obj) { int x, y, w, h, ow, oh; @@ -2616,7 +2616,7 @@ e_comp_object_util_center(Evas_Object *obj) evas_object_move(obj, x, y); } -EAPI void +E_API void e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on) { int x, y, w, h, ow, oh; @@ -2631,7 +2631,7 @@ e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on) evas_object_move(obj, x + (w / 2) - (ow / 2), y + (h / 2) - (oh / 2)); } -EAPI void +E_API void e_comp_object_util_fullscreen(Evas_Object *obj) { SOFT_ENTRY(); @@ -2645,7 +2645,7 @@ e_comp_object_util_fullscreen(Evas_Object *obj) } } -EAPI void +E_API void e_comp_object_util_center_pos_get(Evas_Object *obj, int *x, int *y) { E_Zone *zone; @@ -2663,7 +2663,7 @@ e_comp_object_util_center_pos_get(Evas_Object *obj, int *x, int *y) if (y) *y = zy + (zh - oh) / 2; } -EAPI void +E_API void e_comp_object_input_area_set(Evas_Object *obj, int x, int y, int w, int h) { API_ENTRY; @@ -2697,7 +2697,7 @@ e_comp_object_input_area_set(Evas_Object *obj, int x, int y, int w, int h) } } -EAPI void +E_API void e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int *b) { API_ENTRY; @@ -2707,7 +2707,7 @@ e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int * if (b) *b = cw->client_inset.b; } -EAPI void +E_API void e_comp_object_frame_icon_geometry_get(Evas_Object *obj, int *x, int *y, int *w, int *h) { API_ENTRY; @@ -2720,7 +2720,7 @@ e_comp_object_frame_icon_geometry_get(Evas_Object *obj, int *x, int *y, int *w, evas_object_geometry_get(cw->frame_icon, x, y, w, h); } -EAPI Eina_Bool +E_API Eina_Bool e_comp_object_frame_title_set(Evas_Object *obj, const char *name) { API_ENTRY EINA_FALSE; @@ -2731,14 +2731,14 @@ e_comp_object_frame_title_set(Evas_Object *obj, const char *name) return EINA_TRUE; } -EAPI Eina_Bool +E_API Eina_Bool e_comp_object_frame_exists(Evas_Object *obj) { API_ENTRY EINA_FALSE; return !!cw->frame_object; } -EAPI void +E_API void e_comp_object_frame_icon_update(Evas_Object *obj) { API_ENTRY; @@ -2752,7 +2752,7 @@ e_comp_object_frame_icon_update(Evas_Object *obj) E_FREE_FUNC(cw->frame_icon, evas_object_del); } -EAPI Eina_Bool +E_API Eina_Bool e_comp_object_frame_theme_set(Evas_Object *obj, const char *name) { Evas_Object *o, *pbg; @@ -2896,7 +2896,7 @@ reshadow: return EINA_TRUE; } -EAPI void +E_API void e_comp_object_signal_emit(Evas_Object *obj, const char *sig, const char *src) { E_Comp_Object_Mover *prov; @@ -2918,7 +2918,7 @@ e_comp_object_signal_emit(Evas_Object *obj, const char *sig, const char *src) } } -EAPI void +E_API void e_comp_object_signal_callback_add(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data) { /* FIXME: at some point I guess this should use eo to inherit @@ -2929,21 +2929,21 @@ e_comp_object_signal_callback_add(Evas_Object *obj, const char *sig, const char edje_object_signal_callback_add(cw->shobj, sig, src, cb, (void*)data); } -EAPI void +E_API void e_comp_object_signal_callback_del(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb) { API_ENTRY; edje_object_signal_callback_del(cw->shobj, sig, src, cb); } -EAPI void +E_API void e_comp_object_signal_callback_del_full(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data) { API_ENTRY; edje_object_signal_callback_del_full(cw->shobj, sig, src, cb, (void*)data); } -EAPI void +E_API void e_comp_object_damage(Evas_Object *obj, int x, int y, int w, int h) { int tw, th; @@ -3003,14 +3003,14 @@ e_comp_object_damage(Evas_Object *obj, int x, int y, int w, int h) e_comp_object_render_update_add(obj); } -EAPI Eina_Bool +E_API Eina_Bool e_comp_object_damage_exists(Evas_Object *obj) { API_ENTRY EINA_FALSE; return cw->updates_exist; } -EAPI void +E_API void e_comp_object_render_update_add(Evas_Object *obj) { API_ENTRY; @@ -3029,7 +3029,7 @@ e_comp_object_render_update_add(Evas_Object *obj) e_comp_render_queue(); } -EAPI void +E_API void e_comp_object_render_update_del(Evas_Object *obj) { API_ENTRY; @@ -3048,7 +3048,7 @@ e_comp_object_render_update_del(Evas_Object *obj) } } -EAPI void +E_API void e_comp_object_shape_apply(Evas_Object *obj) { Eina_List *l; @@ -3152,7 +3152,7 @@ e_comp_object_shape_apply(Evas_Object *obj) } /* helper function to simplify toggling of redirection for display servers which support it */ -EAPI void +E_API void e_comp_object_redirected_set(Evas_Object *obj, Eina_Bool set) { API_ENTRY; @@ -3190,7 +3190,7 @@ e_comp_object_redirected_set(Evas_Object *obj, Eina_Bool set) } } -EAPI void +E_API void e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set) { Evas_Native_Surface ns; @@ -3217,7 +3217,7 @@ e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set) } /* mark an object as dirty and setup damages */ -EAPI void +E_API void e_comp_object_dirty(Evas_Object *obj) { Eina_Iterator *it; @@ -3303,7 +3303,7 @@ e_comp_object_dirty(Evas_Object *obj) e_comp_object_render(obj); } -EAPI Eina_Bool +E_API Eina_Bool e_comp_object_render(Evas_Object *obj) { Eina_Iterator *it; @@ -3405,7 +3405,7 @@ e_comp_object_render(Evas_Object *obj) } /* create a duplicate of an evas object */ -EAPI Evas_Object * +E_API Evas_Object * e_comp_object_util_mirror_add(Evas_Object *obj) { Evas_Object *o; @@ -3476,7 +3476,7 @@ e_comp_object_util_mirror_add(Evas_Object *obj) ////////////////////////////////////////////////////// /* setup an api effect for a client */ -EAPI void +E_API void e_comp_object_effect_set(Evas_Object *obj, const char *effect) { char buf[4096]; @@ -3505,7 +3505,7 @@ e_comp_object_effect_set(Evas_Object *obj, const char *effect) } /* set params for embryo scripts in effect */ -EAPI void +E_API void e_comp_object_effect_params_set(Evas_Object *obj, int id, int *params, unsigned int count) { Edje_Message_Int_Set *msg; @@ -3547,7 +3547,7 @@ _e_comp_object_effect_end_cb(void *data, Evas_Object *obj, const char *emission, } /* clip effect to client's zone */ -EAPI void +E_API void e_comp_object_effect_clip(Evas_Object *obj) { API_ENTRY; @@ -3559,7 +3559,7 @@ e_comp_object_effect_clip(Evas_Object *obj) } /* unclip effect from client's zone */ -EAPI void +E_API void e_comp_object_effect_unclip(Evas_Object *obj) { API_ENTRY; @@ -3569,7 +3569,7 @@ e_comp_object_effect_unclip(Evas_Object *obj) } /* start effect, running end_cb after */ -EAPI void +E_API void e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *end_data) { API_ENTRY; @@ -3589,7 +3589,7 @@ e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void * } /* stop a currently-running effect immediately */ -EAPI void +E_API void e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb) { API_ENTRY; @@ -3617,7 +3617,7 @@ _e_comp_object_effect_mover_sort_cb(E_Comp_Object_Mover *a, E_Comp_Object_Mover } /* add a function to trigger based on signal emissions for the purpose of modifying effects */ -EAPI E_Comp_Object_Mover * +E_API E_Comp_Object_Mover * e_comp_object_effect_mover_add(int pri, const char *sig, E_Comp_Object_Mover_Cb provider, const void *data) { E_Comp_Object_Mover *prov; @@ -3633,7 +3633,7 @@ e_comp_object_effect_mover_add(int pri, const char *sig, E_Comp_Object_Mover_Cb return prov; } -EAPI void +E_API void e_comp_object_effect_mover_del(E_Comp_Object_Mover *prov) { EINA_SAFETY_ON_NULL_RETURN(prov); @@ -3723,7 +3723,7 @@ _e_comp_object_autoclose_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_O e_client_refocus(); } -EAPI void +E_API void e_comp_object_util_autoclose(Evas_Object *obj, E_Comp_Object_Autoclose_Cb del_cb, E_Comp_Object_Key_Cb cb, const void *data) { SOFT_ENTRY(); diff --git a/src/bin/e_comp_object.h b/src/bin/e_comp_object.h index 4aeaca7..adc8d27 100644 --- a/src/bin/e_comp_object.h +++ b/src/bin/e_comp_object.h @@ -33,54 +33,54 @@ struct E_Comp_Object_Frame }; -extern EAPI int E_EVENT_COMP_OBJECT_ADD; +extern E_API int E_EVENT_COMP_OBJECT_ADD; -EAPI void e_comp_object_zoomap_set(Evas_Object *obj, Eina_Bool enabled); -EAPI Evas_Object *e_comp_object_client_add(E_Client *ec); -EAPI Evas_Object *e_comp_object_util_mirror_add(Evas_Object *obj); -EAPI Evas_Object *e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type); -EAPI void e_comp_object_frame_xy_adjust(Evas_Object *obj, int x, int y, int *ax, int *ay); -EAPI void e_comp_object_frame_xy_unadjust(Evas_Object *obj, int x, int y, int *ax, int *ay); -EAPI void e_comp_object_frame_wh_adjust(Evas_Object *obj, int w, int h, int *aw, int *ah); -EAPI void e_comp_object_frame_wh_unadjust(Evas_Object *obj, int w, int h, int *aw, int *ah); -EAPI void e_comp_object_frame_extends_get(Evas_Object *obj, int *x, int *y, int *w, int *h); -EAPI E_Client *e_comp_object_client_get(Evas_Object *obj); -EAPI E_Zone *e_comp_object_util_zone_get(Evas_Object *obj); -EAPI void e_comp_object_util_del_list_append(Evas_Object *obj, Evas_Object *to_del); -EAPI void e_comp_object_util_del_list_remove(Evas_Object *obj, Evas_Object *to_del); -EAPI void e_comp_object_util_autoclose(Evas_Object *obj, E_Comp_Object_Autoclose_Cb del_cb, E_Comp_Object_Key_Cb cb, const void *data); -EAPI void e_comp_object_util_center(Evas_Object *obj); -EAPI void e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on); -EAPI void e_comp_object_util_center_pos_get(Evas_Object *obj, int *x, int *y); -EAPI void e_comp_object_util_fullscreen(Evas_Object *obj); -EAPI void e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int *b); -EAPI void e_comp_object_frame_icon_geometry_get(Evas_Object *obj, int *x, int *y, int *w, int *h); -EAPI Eina_Bool e_comp_object_frame_title_set(Evas_Object *obj, const char *name); -EAPI Eina_Bool e_comp_object_frame_exists(Evas_Object *obj); -EAPI void e_comp_object_frame_icon_update(Evas_Object *obj); -EAPI Eina_Bool e_comp_object_frame_theme_set(Evas_Object *obj, const char *name); -EAPI void e_comp_object_signal_emit(Evas_Object *obj, const char *sig, const char *src); -EAPI void e_comp_object_signal_callback_add(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data); -EAPI void e_comp_object_signal_callback_del(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb); -EAPI void e_comp_object_signal_callback_del_full(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data); -EAPI void e_comp_object_input_area_set(Evas_Object *obj, int x, int y, int w, int h); -EAPI void e_comp_object_damage(Evas_Object *obj, int x, int y, int w, int h); -EAPI Eina_Bool e_comp_object_damage_exists(Evas_Object *obj); -EAPI void e_comp_object_render_update_add(Evas_Object *obj); -EAPI void e_comp_object_render_update_del(Evas_Object *obj); -EAPI void e_comp_object_shape_apply(Evas_Object *obj); -EAPI void e_comp_object_redirected_set(Evas_Object *obj, Eina_Bool set); -EAPI void e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set); -EAPI void e_comp_object_dirty(Evas_Object *obj); -EAPI Eina_Bool e_comp_object_render(Evas_Object *obj); -EAPI void e_comp_object_effect_set(Evas_Object *obj, const char *effect); -EAPI void e_comp_object_effect_params_set(Evas_Object *obj, int id, int *params, unsigned int count); -EAPI void e_comp_object_effect_clip(Evas_Object *obj); -EAPI void e_comp_object_effect_unclip(Evas_Object *obj); -EAPI void e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *end_data); -EAPI void e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb); -EAPI E_Comp_Object_Mover *e_comp_object_effect_mover_add(int pri, const char *sig, E_Comp_Object_Mover_Cb provider, const void *data); -EAPI void e_comp_object_effect_mover_del(E_Comp_Object_Mover *prov); +E_API void e_comp_object_zoomap_set(Evas_Object *obj, Eina_Bool enabled); +E_API Evas_Object *e_comp_object_client_add(E_Client *ec); +E_API Evas_Object *e_comp_object_util_mirror_add(Evas_Object *obj); +E_API Evas_Object *e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type); +E_API void e_comp_object_frame_xy_adjust(Evas_Object *obj, int x, int y, int *ax, int *ay); +E_API void e_comp_object_frame_xy_unadjust(Evas_Object *obj, int x, int y, int *ax, int *ay); +E_API void e_comp_object_frame_wh_adjust(Evas_Object *obj, int w, int h, int *aw, int *ah); +E_API void e_comp_object_frame_wh_unadjust(Evas_Object *obj, int w, int h, int *aw, int *ah); +E_API void e_comp_object_frame_extends_get(Evas_Object *obj, int *x, int *y, int *w, int *h); +E_API E_Client *e_comp_object_client_get(Evas_Object *obj); +E_API E_Zone *e_comp_object_util_zone_get(Evas_Object *obj); +E_API void e_comp_object_util_del_list_append(Evas_Object *obj, Evas_Object *to_del); +E_API void e_comp_object_util_del_list_remove(Evas_Object *obj, Evas_Object *to_del); +E_API void e_comp_object_util_autoclose(Evas_Object *obj, E_Comp_Object_Autoclose_Cb del_cb, E_Comp_Object_Key_Cb cb, const void *data); +E_API void e_comp_object_util_center(Evas_Object *obj); +E_API void e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on); +E_API void e_comp_object_util_center_pos_get(Evas_Object *obj, int *x, int *y); +E_API void e_comp_object_util_fullscreen(Evas_Object *obj); +E_API void e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int *b); +E_API void e_comp_object_frame_icon_geometry_get(Evas_Object *obj, int *x, int *y, int *w, int *h); +E_API Eina_Bool e_comp_object_frame_title_set(Evas_Object *obj, const char *name); +E_API Eina_Bool e_comp_object_frame_exists(Evas_Object *obj); +E_API void e_comp_object_frame_icon_update(Evas_Object *obj); +E_API Eina_Bool e_comp_object_frame_theme_set(Evas_Object *obj, const char *name); +E_API void e_comp_object_signal_emit(Evas_Object *obj, const char *sig, const char *src); +E_API void e_comp_object_signal_callback_add(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data); +E_API void e_comp_object_signal_callback_del(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb); +E_API void e_comp_object_signal_callback_del_full(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data); +E_API void e_comp_object_input_area_set(Evas_Object *obj, int x, int y, int w, int h); +E_API void e_comp_object_damage(Evas_Object *obj, int x, int y, int w, int h); +E_API Eina_Bool e_comp_object_damage_exists(Evas_Object *obj); +E_API void e_comp_object_render_update_add(Evas_Object *obj); +E_API void e_comp_object_render_update_del(Evas_Object *obj); +E_API void e_comp_object_shape_apply(Evas_Object *obj); +E_API void e_comp_object_redirected_set(Evas_Object *obj, Eina_Bool set); +E_API void e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set); +E_API void e_comp_object_dirty(Evas_Object *obj); +E_API Eina_Bool e_comp_object_render(Evas_Object *obj); +E_API void e_comp_object_effect_set(Evas_Object *obj, const char *effect); +E_API void e_comp_object_effect_params_set(Evas_Object *obj, int id, int *params, unsigned int count); +E_API void e_comp_object_effect_clip(Evas_Object *obj); +E_API void e_comp_object_effect_unclip(Evas_Object *obj); +E_API void e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *end_data); +E_API void e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb); +E_API E_Comp_Object_Mover *e_comp_object_effect_mover_add(int pri, const char *sig, E_Comp_Object_Mover_Cb provider, const void *data); +E_API void e_comp_object_effect_mover_del(E_Comp_Object_Mover *prov); #endif #endif diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index a8d6038..84236f3 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2468,7 +2468,7 @@ disp_err: * * @returns true on success, false if initialization failed. */ -EAPI Eina_Bool +E_API Eina_Bool e_comp_wl_init(void) { /* set gl available if we have ecore_evas support */ @@ -2544,7 +2544,7 @@ e_comp_wl_init(void) * * @returns the corresponding Wayland signal */ -EAPI struct wl_signal +E_API struct wl_signal e_comp_wl_surface_create_signal_get(void) { return e_comp->wl_comp_data->signals.surface.create; @@ -2697,7 +2697,7 @@ e_comp_wl_buffer_reference(E_Comp_Wl_Buffer_Ref *ref, E_Comp_Wl_Buffer *buffer) * @param resource that owns the desired buffer * @returns a new E_Comp_Wl_Buffer object */ -EAPI E_Comp_Wl_Buffer * +E_API E_Comp_Wl_Buffer * e_comp_wl_buffer_get(struct wl_resource *resource) { E_Comp_Wl_Buffer *buffer; @@ -2728,7 +2728,7 @@ e_comp_wl_buffer_get(struct wl_resource *resource) * * @returns time in seconds. */ -EAPI double +E_API double e_comp_wl_idle_time_get(void) { return (ecore_loop_time_get() - _last_event_time); @@ -2770,7 +2770,7 @@ _e_comp_wl_output_get(Eina_List *outputs, const char *id) * * @returns True if a display output object could be added or updated */ -EAPI Eina_Bool +E_API Eina_Bool e_comp_wl_output_init(const char *id, const char *make, const char *model, int x, int y, int w, int h, int pw, int ph, unsigned int refresh, unsigned int subpixel, diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h index 2fc4714..8b3454c 100644 --- a/src/bin/e_comp_wl.h +++ b/src/bin/e_comp_wl.h @@ -277,7 +277,7 @@ struct _E_Comp_Wl_Output double scale; }; -EAPI Eina_Bool e_comp_wl_init(void); +E_API Eina_Bool e_comp_wl_init(void); EINTERN void e_comp_wl_shutdown(void); EINTERN struct wl_resource *e_comp_wl_surface_create(struct wl_client *client, int version, uint32_t id); @@ -286,11 +286,11 @@ EINTERN void e_comp_wl_surface_attach(E_Client *ec, E_Comp_Wl_Buffer *buffer); EINTERN Eina_Bool e_comp_wl_surface_commit(E_Client *ec); EINTERN Eina_Bool e_comp_wl_subsurface_commit(E_Client *ec); EINTERN void e_comp_wl_buffer_reference(E_Comp_Wl_Buffer_Ref *ref, E_Comp_Wl_Buffer *buffer); -EAPI E_Comp_Wl_Buffer *e_comp_wl_buffer_get(struct wl_resource *resource); +E_API E_Comp_Wl_Buffer *e_comp_wl_buffer_get(struct wl_resource *resource); -EAPI struct wl_signal e_comp_wl_surface_create_signal_get(void); -EAPI double e_comp_wl_idle_time_get(void); -EAPI Eina_Bool e_comp_wl_output_init(const char *id, const char *make, const char *model, int x, int y, int w, int h, int pw, int ph, unsigned int refresh, unsigned int subpixel, unsigned int transform); +E_API struct wl_signal e_comp_wl_surface_create_signal_get(void); +E_API double e_comp_wl_idle_time_get(void); +E_API Eina_Bool e_comp_wl_output_init(const char *id, const char *make, const char *model, int x, int y, int w, int h, int pw, int ph, unsigned int refresh, unsigned int subpixel, unsigned int transform); # endif #endif diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c index d0729b7..e529b46 100644 --- a/src/bin/e_comp_wl_input.c +++ b/src/bin/e_comp_wl_input.c @@ -524,7 +524,7 @@ e_comp_wl_input_keyboard_state_update(E_Comp_Data *cdata, uint32_t keycode, Eina xkb_state_update_key(cdata->xkb.state, keycode + 8, dir); } -EAPI void +E_API void e_comp_wl_input_pointer_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled) { /* check for valid compositor data */ @@ -538,7 +538,7 @@ e_comp_wl_input_pointer_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled) _e_comp_wl_input_update_seat_caps(cdata); } -EAPI void +E_API void e_comp_wl_input_keyboard_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled) { /* check for valid compositor data */ @@ -552,7 +552,7 @@ e_comp_wl_input_keyboard_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled) _e_comp_wl_input_update_seat_caps(cdata); } -EAPI void +E_API void e_comp_wl_input_keymap_set(E_Comp_Data *cdata, const char *rules, const char *model, const char *layout) { struct xkb_keymap *keymap; diff --git a/src/bin/e_comp_wl_input.h b/src/bin/e_comp_wl_input.h index a0b3604..19cad87 100644 --- a/src/bin/e_comp_wl_input.h +++ b/src/bin/e_comp_wl_input.h @@ -13,10 +13,10 @@ EINTERN void e_comp_wl_input_keyboard_modifiers_update(E_Comp_Data *cdata); EINTERN void e_comp_wl_input_keyboard_state_update(E_Comp_Data *cdata, uint32_t keycode, Eina_Bool pressed); EINTERN void e_comp_wl_input_keyboard_enter_send(E_Client *client); -EAPI void e_comp_wl_input_pointer_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled); -EAPI void e_comp_wl_input_keyboard_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled); +E_API void e_comp_wl_input_pointer_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled); +E_API void e_comp_wl_input_keyboard_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled); -EAPI void e_comp_wl_input_keymap_set(E_Comp_Data *cdata, const char *rules, const char *model, const char *layout); +E_API void e_comp_wl_input_keymap_set(E_Comp_Data *cdata, const char *rules, const char *model, const char *layout); # endif #endif diff --git a/src/bin/e_comp_x.h b/src/bin/e_comp_x.h index f254770..4f96a2c 100644 --- a/src/bin/e_comp_x.h +++ b/src/bin/e_comp_x.h @@ -108,7 +108,7 @@ struct _E_Comp_X_Client_Data EINTERN Eina_Bool e_comp_x_init(void); EINTERN void e_comp_x_shutdown(void); -EAPI void e_alert_composite_win(Ecore_X_Window root, Ecore_X_Window win); +E_API void e_alert_composite_win(Ecore_X_Window root, Ecore_X_Window win); EINTERN void e_comp_x_nocomp_end(void); # endif #endif diff --git a/src/bin/e_comp_x_randr.c b/src/bin/e_comp_x_randr.c index a0ca058..5a42be1 100644 --- a/src/bin/e_comp_x_randr.c +++ b/src/bin/e_comp_x_randr.c @@ -412,7 +412,7 @@ _mode_screen_find(Ecore_X_Window root, E_Randr2_Screen *s, Ecore_X_Randr_Output return mode; } -EAPI void +E_API void e_comp_x_randr_init(void) { // add handler for randr screen change events @@ -430,7 +430,7 @@ e_comp_x_randr_init(void) } } -EAPI void +E_API void e_comp_x_randr_shutdown(void) { // clear up event listening @@ -442,7 +442,7 @@ e_comp_x_randr_shutdown(void) E_FREE_LIST(handlers, ecore_event_handler_del); } -EAPI void +E_API void e_comp_x_randr_config_apply(void) { Eina_List *l; @@ -622,14 +622,14 @@ e_comp_x_randr_config_apply(void) // event_ignore = EINA_TRUE; } -EAPI Eina_Bool +E_API Eina_Bool e_comp_x_randr_available(void) { // is randr extn there? return ecore_x_randr_query(); } -EAPI E_Randr2 * +E_API E_Randr2 * e_comp_x_randr_create(void) { Ecore_X_Randr_Crtc *crtcs = NULL; @@ -826,7 +826,7 @@ e_comp_x_randr_create(void) return r; } -EAPI void +E_API void e_comp_x_randr_screen_iface_set(void) { if (e_comp->screen) @@ -834,7 +834,7 @@ e_comp_x_randr_screen_iface_set(void) e_comp->screen = &xiface; } -EAPI Eina_Bool +E_API Eina_Bool e_comp_x_randr_canvas_new(Ecore_Window parent, int w, int h) { Eina_Bool ret = EINA_TRUE; diff --git a/src/bin/e_comp_x_randr.h b/src/bin/e_comp_x_randr.h index 84932d6..41ca659 100644 --- a/src/bin/e_comp_x_randr.h +++ b/src/bin/e_comp_x_randr.h @@ -1,12 +1,12 @@ #ifndef E_COMP_X_RANDR_H # define E_COMP_X_RANDR_H -EAPI void e_comp_x_randr_init(void); -EAPI void e_comp_x_randr_shutdown(void); -EAPI void e_comp_x_randr_config_apply(void); -EAPI Eina_Bool e_comp_x_randr_available(void); -EAPI E_Randr2 *e_comp_x_randr_create(void); +E_API void e_comp_x_randr_init(void); +E_API void e_comp_x_randr_shutdown(void); +E_API void e_comp_x_randr_config_apply(void); +E_API Eina_Bool e_comp_x_randr_available(void); +E_API E_Randr2 *e_comp_x_randr_create(void); -EAPI void e_comp_x_randr_screen_iface_set(void); -EAPI Eina_Bool e_comp_x_randr_canvas_new(Ecore_Window parent, int w, int h); +E_API void e_comp_x_randr_screen_iface_set(void); +E_API Eina_Bool e_comp_x_randr_canvas_new(Ecore_Window parent, int w, int h); #endif diff --git a/src/bin/e_config.c b/src/bin/e_config.c index fa7d259..7f413f2 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -6,8 +6,8 @@ #define DEF_MENUCLICK 0.25 #endif -EAPI E_Config *e_config = NULL; -EAPI E_Config_Bindings *e_bindings = NULL; +E_API E_Config *e_config = NULL; +E_API E_Config_Bindings *e_bindings = NULL; static int _e_config_revisions = 9; @@ -51,9 +51,9 @@ static E_Config_DD *_e_config_env_var_edd = NULL; static E_Config_DD *_e_config_xkb_layout_edd = NULL; static E_Config_DD *_e_config_xkb_option_edd = NULL; -EAPI int E_EVENT_CONFIG_ICON_THEME = 0; -EAPI int E_EVENT_CONFIG_MODE_CHANGED = 0; -EAPI int E_EVENT_CONFIG_LOADED = 0; +E_API int E_EVENT_CONFIG_ICON_THEME = 0; +E_API int E_EVENT_CONFIG_MODE_CHANGED = 0; +E_API int E_EVENT_CONFIG_LOADED = 0; static E_Dialog *_e_config_error_dialog = NULL; @@ -952,7 +952,7 @@ e_config_shutdown(void) return 1; } -EAPI void +E_API void e_config_load(void) { int reload = 0; @@ -1523,7 +1523,7 @@ e_config_load(void) ecore_event_add(E_EVENT_CONFIG_LOADED, NULL, NULL, NULL); } -EAPI int +E_API int e_config_save(void) { E_FREE_FUNC(_e_config_save_defer, e_powersave_deferred_action_del); @@ -1531,7 +1531,7 @@ e_config_save(void) return e_config_domain_save("e", _e_config_edd, e_config); } -EAPI void +E_API void e_config_save_flush(void) { if (_e_config_save_defer) @@ -1542,7 +1542,7 @@ e_config_save_flush(void) } } -EAPI void +E_API void e_config_save_queue(void) { if (_e_config_save_defer) @@ -1551,20 +1551,20 @@ e_config_save_queue(void) NULL); } -EAPI const char * +E_API const char * e_config_profile_get(void) { return _e_config_profile; } -EAPI void +E_API void e_config_profile_set(const char *prof) { eina_stringshare_replace(&_e_config_profile, prof); e_util_env_set("E_CONF_PROFILE", _e_config_profile); } -EAPI char * +E_API char * e_config_profile_dir_get(const char *prof) { char buf[PATH_MAX]; @@ -1582,7 +1582,7 @@ _cb_sort_files(char *f1, char *f2) return strcmp(f1, f2); } -EAPI Eina_List * +E_API Eina_List * e_config_profile_list(void) { Eina_List *files; @@ -1658,7 +1658,7 @@ e_config_profile_list(void) return flist; } -EAPI void +E_API void e_config_profile_add(const char *prof) { char buf[4096]; @@ -1667,7 +1667,7 @@ e_config_profile_add(const char *prof) ecore_file_mkdir(buf); } -EAPI void +E_API void e_config_profile_del(const char *prof) { char buf[4096]; @@ -1676,13 +1676,13 @@ e_config_profile_del(const char *prof) ecore_file_recursive_rm(buf); } -EAPI void +E_API void e_config_save_block_set(int block) { _e_config_save_block = block; } -EAPI int +E_API int e_config_save_block_get(void) { return _e_config_save_block; @@ -1697,7 +1697,7 @@ e_config_save_block_get(void) * @param edd to struct definition * @return returns allocated struct on success, if unable to find config returns null */ -EAPI void * +E_API void * e_config_domain_load(const char *domain, E_Config_DD *edd) { Eet_File *ef; @@ -1730,7 +1730,7 @@ e_config_domain_load(const char *domain, E_Config_DD *edd) return e_config_domain_system_load(domain, edd); } -EAPI void * +E_API void * e_config_domain_system_load(const char *domain, E_Config_DD *edd) { Eet_File *ef; @@ -1783,7 +1783,7 @@ _e_config_mv_error(const char *from, const char *to) _e_config_error_dialog = dia; } -EAPI int +E_API int e_config_profile_save(void) { Eet_File *ef; @@ -1850,7 +1850,7 @@ e_config_profile_save(void) * @param data struct to save as configuration file * @return 1 if save success, 0 on failure */ -EAPI int +E_API int e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data) { Eet_File *ef; @@ -1914,7 +1914,7 @@ e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data) return ok; } -EAPI E_Config_Binding_Mouse * +E_API E_Config_Binding_Mouse * e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in) { Eina_List *l; @@ -1935,7 +1935,7 @@ e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in) return NULL; } -EAPI E_Config_Binding_Key * +E_API E_Config_Binding_Key * e_config_binding_key_match(E_Config_Binding_Key *eb_in) { Eina_List *l; @@ -1957,7 +1957,7 @@ e_config_binding_key_match(E_Config_Binding_Key *eb_in) return NULL; } -EAPI E_Config_Binding_Edge * +E_API E_Config_Binding_Edge * e_config_binding_edge_match(E_Config_Binding_Edge *eb_in) { Eina_List *l; @@ -1980,7 +1980,7 @@ e_config_binding_edge_match(E_Config_Binding_Edge *eb_in) return NULL; } -EAPI E_Config_Binding_Signal * +E_API E_Config_Binding_Signal * e_config_binding_signal_match(E_Config_Binding_Signal *eb_in) { Eina_List *l; @@ -2004,7 +2004,7 @@ e_config_binding_signal_match(E_Config_Binding_Signal *eb_in) return NULL; } -EAPI E_Config_Binding_Wheel * +E_API E_Config_Binding_Wheel * e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in) { Eina_List *l; @@ -2026,7 +2026,7 @@ e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in) return NULL; } -EAPI E_Config_Binding_Acpi * +E_API E_Config_Binding_Acpi * e_config_binding_acpi_match(E_Config_Binding_Acpi *eb_in) { Eina_List *l; @@ -2048,13 +2048,13 @@ e_config_binding_acpi_match(E_Config_Binding_Acpi *eb_in) return NULL; } -EAPI void +E_API void e_config_mode_changed(void) { ecore_event_add(E_EVENT_CONFIG_MODE_CHANGED, NULL, NULL, NULL); } -EAPI void +E_API void e_config_binding_acpi_free(E_Config_Binding_Acpi *eba) { if (!eba) return; @@ -2063,7 +2063,7 @@ e_config_binding_acpi_free(E_Config_Binding_Acpi *eba) free(eba); } -EAPI void +E_API void e_config_binding_key_free(E_Config_Binding_Key *ebk) { if (!ebk) return; @@ -2073,7 +2073,7 @@ e_config_binding_key_free(E_Config_Binding_Key *ebk) free(ebk); } -EAPI void +E_API void e_config_binding_edge_free(E_Config_Binding_Edge *ebe) { if (!ebe) return; @@ -2082,7 +2082,7 @@ e_config_binding_edge_free(E_Config_Binding_Edge *ebe) free(ebe); } -EAPI void +E_API void e_config_binding_mouse_free(E_Config_Binding_Mouse *ebm) { if (!ebm) return; @@ -2091,7 +2091,7 @@ e_config_binding_mouse_free(E_Config_Binding_Mouse *ebm) free(ebm); } -EAPI void +E_API void e_config_binding_wheel_free(E_Config_Binding_Wheel *ebw) { if (!ebw) return; @@ -2100,7 +2100,7 @@ e_config_binding_wheel_free(E_Config_Binding_Wheel *ebw) free(ebw); } -EAPI void +E_API void e_config_binding_signal_free(E_Config_Binding_Signal *ebs) { if (!ebs) return; @@ -2111,7 +2111,7 @@ e_config_binding_signal_free(E_Config_Binding_Signal *ebs) free(ebs); } -EAPI void +E_API void e_config_bindings_free(E_Config_Bindings *ecb) { if (!ecb) return; diff --git a/src/bin/e_config.h b/src/bin/e_config.h index b54f354..c3362f2 100644 --- a/src/bin/e_config.h +++ b/src/bin/e_config.h @@ -644,50 +644,50 @@ struct _E_Config_XKB_Option EINTERN int e_config_init(void); EINTERN int e_config_shutdown(void); -EAPI void e_config_load(void); - -EAPI int e_config_save(void); -EAPI void e_config_save_flush(void); -EAPI void e_config_save_queue(void); - -EAPI const char *e_config_profile_get(void); -EAPI char *e_config_profile_dir_get(const char *prof); -EAPI void e_config_profile_set(const char *prof); -EAPI Eina_List *e_config_profile_list(void); -EAPI void e_config_profile_add(const char *prof); -EAPI void e_config_profile_del(const char *prof); - -EAPI void e_config_save_block_set(int block); -EAPI int e_config_save_block_get(void); - -EAPI void *e_config_domain_load(const char *domain, E_Config_DD *edd); -EAPI void *e_config_domain_system_load(const char *domain, E_Config_DD *edd); -EAPI int e_config_profile_save(void); -EAPI int e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data); - -EAPI E_Config_Binding_Mouse *e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in); -EAPI E_Config_Binding_Key *e_config_binding_key_match(E_Config_Binding_Key *eb_in); -EAPI E_Config_Binding_Edge *e_config_binding_edge_match(E_Config_Binding_Edge *eb_in); -EAPI E_Config_Binding_Signal *e_config_binding_signal_match(E_Config_Binding_Signal *eb_in); -EAPI E_Config_Binding_Wheel *e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in); -EAPI E_Config_Binding_Acpi *e_config_binding_acpi_match(E_Config_Binding_Acpi *eb_in); -EAPI void e_config_mode_changed(void); - - -EAPI void e_config_bindings_free(E_Config_Bindings *ecb); -EAPI void e_config_binding_signal_free(E_Config_Binding_Signal *ebs); -EAPI void e_config_binding_wheel_free(E_Config_Binding_Wheel *ebw); -EAPI void e_config_binding_mouse_free(E_Config_Binding_Mouse *ebm); -EAPI void e_config_binding_edge_free(E_Config_Binding_Edge *ebe); -EAPI void e_config_binding_key_free(E_Config_Binding_Key *ebk); -EAPI void e_config_binding_acpi_free(E_Config_Binding_Acpi *eba); - -extern EAPI E_Config *e_config; -extern EAPI E_Config_Bindings *e_bindings; - -extern EAPI int E_EVENT_CONFIG_ICON_THEME; -extern EAPI int E_EVENT_CONFIG_MODE_CHANGED; -extern EAPI int E_EVENT_CONFIG_LOADED; +E_API void e_config_load(void); + +E_API int e_config_save(void); +E_API void e_config_save_flush(void); +E_API void e_config_save_queue(void); + +E_API const char *e_config_profile_get(void); +E_API char *e_config_profile_dir_get(const char *prof); +E_API void e_config_profile_set(const char *prof); +E_API Eina_List *e_config_profile_list(void); +E_API void e_config_profile_add(const char *prof); +E_API void e_config_profile_del(const char *prof); + +E_API void e_config_save_block_set(int block); +E_API int e_config_save_block_get(void); + +E_API void *e_config_domain_load(const char *domain, E_Config_DD *edd); +E_API void *e_config_domain_system_load(const char *domain, E_Config_DD *edd); +E_API int e_config_profile_save(void); +E_API int e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data); + +E_API E_Config_Binding_Mouse *e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in); +E_API E_Config_Binding_Key *e_config_binding_key_match(E_Config_Binding_Key *eb_in); +E_API E_Config_Binding_Edge *e_config_binding_edge_match(E_Config_Binding_Edge *eb_in); +E_API E_Config_Binding_Signal *e_config_binding_signal_match(E_Config_Binding_Signal *eb_in); +E_API E_Config_Binding_Wheel *e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in); +E_API E_Config_Binding_Acpi *e_config_binding_acpi_match(E_Config_Binding_Acpi *eb_in); +E_API void e_config_mode_changed(void); + + +E_API void e_config_bindings_free(E_Config_Bindings *ecb); +E_API void e_config_binding_signal_free(E_Config_Binding_Signal *ebs); +E_API void e_config_binding_wheel_free(E_Config_Binding_Wheel *ebw); +E_API void e_config_binding_mouse_free(E_Config_Binding_Mouse *ebm); +E_API void e_config_binding_edge_free(E_Config_Binding_Edge *ebe); +E_API void e_config_binding_key_free(E_Config_Binding_Key *ebk); +E_API void e_config_binding_acpi_free(E_Config_Binding_Acpi *eba); + +extern E_API E_Config *e_config; +extern E_API E_Config_Bindings *e_bindings; + +extern E_API int E_EVENT_CONFIG_ICON_THEME; +extern E_API int E_EVENT_CONFIG_MODE_CHANGED; +extern E_API int E_EVENT_CONFIG_LOADED; #endif #endif diff --git a/src/bin/e_config_data.c b/src/bin/e_config_data.c index 66783fc..8dd9033 100644 --- a/src/bin/e_config_data.c +++ b/src/bin/e_config_data.c @@ -2,14 +2,14 @@ static Eina_Hash *config_hash = NULL; -EAPI void +E_API void e_config_descriptor_free(E_Config_DD *edd) { eina_hash_del_by_key(config_hash, eet_data_descriptor_name_get((Eet_Data_Descriptor*)edd)); eet_data_descriptor_free((Eet_Data_Descriptor*)edd); } -EAPI E_Config_DD * +E_API E_Config_DD * e_config_descriptor_new(const char *name, int size) { Eet_Data_Descriptor_Class eddc; @@ -29,7 +29,7 @@ e_config_descriptor_new(const char *name, int size) return edd; } -EAPI E_Config_DD * +E_API E_Config_DD * e_config_descriptor_find(const char *name) { EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL); diff --git a/src/bin/e_config_data.h b/src/bin/e_config_data.h index 35bf7a1..b52ea32 100644 --- a/src/bin/e_config_data.h +++ b/src/bin/e_config_data.h @@ -55,9 +55,9 @@ typedef Eet_Data_Descriptor E_Config_DD; #ifndef E_CONFIG_DATA_H #define E_CONFIG_DATA_H -EAPI E_Config_DD *e_config_descriptor_new(const char *name, int size); -EAPI void e_config_descriptor_free(E_Config_DD *edd); -EAPI E_Config_DD *e_config_descriptor_find(const char *name); +E_API E_Config_DD *e_config_descriptor_new(const char *name, int size); +E_API void e_config_descriptor_free(E_Config_DD *edd); +E_API E_Config_DD *e_config_descriptor_find(const char *name); #endif #endif diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c index 04aa2c7..67f9951 100644 --- a/src/bin/e_config_dialog.c +++ b/src/bin/e_config_dialog.c @@ -31,7 +31,7 @@ static Eina_List *_e_config_dialog_list = NULL; * @param data additional data to attach to the dialog, will be passed to the callbacks * @return returns the created dialog. Null on failure */ -EAPI E_Config_Dialog * +E_API E_Config_Dialog * e_config_dialog_new(Evas_Object *parent, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data) { E_Config_Dialog *cfd; @@ -92,7 +92,7 @@ e_config_dialog_new(Evas_Object *parent, const char *title, const char *name, co return cfd; } -EAPI int +E_API int e_config_dialog_find(const char *name, const char *class) { Eina_List *l; @@ -122,7 +122,7 @@ e_config_dialog_find(const char *name, const char *class) return 0; } -EAPI E_Config_Dialog * +E_API E_Config_Dialog * e_config_dialog_get(const char *name, const char *class) { Eina_List *l; @@ -483,14 +483,14 @@ _e_config_dialog_cb_close(void *data EINA_UNUSED, E_Dialog *dia) if (ok) e_util_defer_object_del(E_OBJECT(cfd)); } -EAPI void +E_API void e_config_dialog_changed_auto_set(E_Config_Dialog *cfd, unsigned char value) { if (!cfd) return; cfd->cfg_changed_auto = !!value; } -EAPI void +E_API void e_config_dialog_changed_set(E_Config_Dialog *cfd, unsigned char value) { if (!cfd) return; diff --git a/src/bin/e_config_dialog.h b/src/bin/e_config_dialog.h index 78404ae..ac97779 100644 --- a/src/bin/e_config_dialog.h +++ b/src/bin/e_config_dialog.h @@ -55,12 +55,12 @@ struct _E_Config_Dialog unsigned char cfg_changed_auto : 1; }; -EAPI E_Config_Dialog *e_config_dialog_new(Evas_Object *parent, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data); -EAPI int e_config_dialog_find(const char *name, const char *class); -EAPI E_Config_Dialog *e_config_dialog_get(const char *name, const char *class); +E_API E_Config_Dialog *e_config_dialog_new(Evas_Object *parent, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data); +E_API int e_config_dialog_find(const char *name, const char *class); +E_API E_Config_Dialog *e_config_dialog_get(const char *name, const char *class); -EAPI void e_config_dialog_changed_auto_set(E_Config_Dialog *cfd, unsigned char value); -EAPI void e_config_dialog_changed_set(E_Config_Dialog *cfd, unsigned char value); +E_API void e_config_dialog_changed_auto_set(E_Config_Dialog *cfd, unsigned char value); +E_API void e_config_dialog_changed_set(E_Config_Dialog *cfd, unsigned char value); #endif #endif diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index ec7a85b..ac51ca4 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -11,7 +11,7 @@ static void _e_configure_registry_item_free(E_Configure_It *eci); static void _configure_job(void *data); static Eina_Bool _configure_init_timer(void *data); -EAPI Eina_List *e_configure_registry = NULL; +E_API Eina_List *e_configure_registry = NULL; static Eina_List *handlers = NULL; static E_Int_Menu_Augmentation *maug = NULL; @@ -46,7 +46,7 @@ e_configure_init(void) ecore_timer_add(0.0, _configure_init_timer, NULL); } -EAPI void +E_API void e_configure_registry_call(const char *path, Evas_Object *parent, const char *params) { E_Configure_Cat *ecat; @@ -88,19 +88,19 @@ e_configure_registry_call(const char *path, Evas_Object *parent, const char *par free(cat); } -EAPI void +E_API void e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func)(Evas_Object *parent, const char *params)) { _e_configure_registry_item_full_add(path, pri, label, icon_file, icon, func, NULL, NULL, NULL); } -EAPI void +E_API void e_configure_registry_generic_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, void (*generic_func)(Evas_Object *parent, const char *params)) { _e_configure_registry_item_full_add(path, pri, label, icon_file, icon, NULL, generic_func, NULL, NULL); } -EAPI void +E_API void e_configure_registry_item_params_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func)(Evas_Object *parent, const char *params), const char *params) { _e_configure_registry_item_full_add(path, pri, label, icon_file, icon, func, NULL, NULL, params); @@ -111,7 +111,7 @@ e_configure_registry_item_params_add(const char *path, int pri, const char *labe * *@param path location the item to delete */ -EAPI void +E_API void e_configure_registry_item_del(const char *path) { E_Configure_Cat *ecat; @@ -161,7 +161,7 @@ _E_configure_category_pri_cb(E_Configure_Cat *ecat, E_Configure_Cat *ecat2) return ecat->pri - ecat2->pri; } -EAPI void +E_API void e_configure_registry_category_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon) { E_Configure_Cat *ecat2; @@ -190,7 +190,7 @@ e_configure_registry_category_add(const char *path, int pri, const char *label, * *@param path location the category to delete */ -EAPI void +E_API void e_configure_registry_category_del(const char *path) { E_Configure_Cat *ecat; @@ -226,14 +226,14 @@ e_configure_registry_category_del(const char *path) *@param func the callback to use when the configuration item is clicked */ -EAPI void +E_API void e_configure_registry_custom_desktop_exec_callback_set(void (*func)(const void *data, const char *params, Efreet_Desktop *desktop), const void *data) { custom_desktop_exec.func = func; custom_desktop_exec.data = data; } -EAPI int +E_API int e_configure_registry_exists(const char *path) { E_Configure_Cat *ecat; diff --git a/src/bin/e_configure.h b/src/bin/e_configure.h index 16900eb..e4ec9cf 100644 --- a/src/bin/e_configure.h +++ b/src/bin/e_configure.h @@ -30,18 +30,18 @@ struct _E_Configure_It Efreet_Desktop *desktop; }; -EAPI void e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (Evas_Object *parent, const char *params)); -EAPI void e_configure_registry_item_params_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (Evas_Object *parent, const char *params), const char *params); -EAPI void e_configure_registry_generic_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, void (*generic_func) (Evas_Object *parent, const char *params)); -EAPI void e_configure_registry_item_del(const char *path); -EAPI void e_configure_registry_category_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon); -EAPI void e_configure_registry_category_del(const char *path); -EAPI void e_configure_registry_call(const char *path, Evas_Object *parent, const char *params); -EAPI int e_configure_registry_exists(const char *path); -EAPI void e_configure_registry_custom_desktop_exec_callback_set(void (*func) (const void *data, const char *params, Efreet_Desktop *desktop), const void *data); +E_API void e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (Evas_Object *parent, const char *params)); +E_API void e_configure_registry_item_params_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (Evas_Object *parent, const char *params), const char *params); +E_API void e_configure_registry_generic_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, void (*generic_func) (Evas_Object *parent, const char *params)); +E_API void e_configure_registry_item_del(const char *path); +E_API void e_configure_registry_category_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon); +E_API void e_configure_registry_category_del(const char *path); +E_API void e_configure_registry_call(const char *path, Evas_Object *parent, const char *params); +E_API int e_configure_registry_exists(const char *path); +E_API void e_configure_registry_custom_desktop_exec_callback_set(void (*func) (const void *data, const char *params, Efreet_Desktop *desktop), const void *data); EINTERN void e_configure_init(void); -extern EAPI Eina_List *e_configure_registry; +extern E_API Eina_List *e_configure_registry; #endif #endif diff --git a/src/bin/e_confirm_dialog.c b/src/bin/e_confirm_dialog.c index 6d1ac39..21f5f67 100644 --- a/src/bin/e_confirm_dialog.c +++ b/src/bin/e_confirm_dialog.c @@ -15,7 +15,7 @@ _dia_del(void *data) } /********** externally accesible functions ****************/ -EAPI E_Confirm_Dialog * +E_API E_Confirm_Dialog * e_confirm_dialog_show(const char *title, const char *icon, const char *text, const char *button_text, const char *button2_text, void (*func)(void *data), void (*func2)(void *data), diff --git a/src/bin/e_confirm_dialog.h b/src/bin/e_confirm_dialog.h index 0c2db07..6740af3 100644 --- a/src/bin/e_confirm_dialog.h +++ b/src/bin/e_confirm_dialog.h @@ -45,7 +45,7 @@ struct _E_Confirm_Dialog * del_func - the function to call before dialog is deleted * del_data - the pointer passer to del_func */ -EAPI E_Confirm_Dialog *e_confirm_dialog_show(const char *title, const char *icon, const char *text, const char *button_text, const char *button2_text, void (*func)(void *data), void (*func2)(void *data), void *data, void *data2, void (*del_func)(void *data), void *del_data); +E_API E_Confirm_Dialog *e_confirm_dialog_show(const char *title, const char *icon, const char *text, const char *button_text, const char *button2_text, void (*func)(void *data), void (*func2)(void *data), void *data, void *data2, void (*del_func)(void *data), void *del_data); #endif #endif diff --git a/src/bin/e_datastore.c b/src/bin/e_datastore.c index c0bb87c..eb28ee1 100644 --- a/src/bin/e_datastore.c +++ b/src/bin/e_datastore.c @@ -6,7 +6,7 @@ static Eina_Hash *store = NULL; /* externally accessible functions */ -EAPI void +E_API void e_datastore_set(char *key, void *data) { if (!store) store = eina_hash_string_superfast_new(NULL); @@ -14,13 +14,13 @@ e_datastore_set(char *key, void *data) eina_hash_add(store, key, data); } -EAPI void * +E_API void * e_datastore_get(char *key) { return eina_hash_find(store, key); } -EAPI void +E_API void e_datastore_del(char *key) { eina_hash_del(store, key, NULL); diff --git a/src/bin/e_datastore.h b/src/bin/e_datastore.h index f22e2b9..dfbb1b1 100644 --- a/src/bin/e_datastore.h +++ b/src/bin/e_datastore.h @@ -4,9 +4,9 @@ #ifndef E_DATASTORE_H #define E_DATASTORE_H -EAPI void e_datastore_set(char *key, void *data); -EAPI void *e_datastore_get(char *key); -EAPI void e_datastore_del(char *key); +E_API void e_datastore_set(char *key, void *data); +E_API void *e_datastore_get(char *key); +E_API void e_datastore_del(char *key); #endif #endif diff --git a/src/bin/e_dbusmenu.c b/src/bin/e_dbusmenu.c index 0307242..76cce57 100644 --- a/src/bin/e_dbusmenu.c +++ b/src/bin/e_dbusmenu.c @@ -337,7 +337,7 @@ layout_updated_cb(void *data, const Eldbus_Message *msg EINA_UNUSED) layout_update(ctx); } -EAPI E_DBusMenu_Ctx * +E_API E_DBusMenu_Ctx * e_dbusmenu_load(Eldbus_Connection *conn, const char *bus, const char *path, const void *data) { Eldbus_Object *obj; @@ -371,7 +371,7 @@ e_dbusmenu_load(Eldbus_Connection *conn, const char *bus, const char *path, cons return ctx; } -EAPI void +E_API void e_dbusmenu_event_send(E_DBusMenu_Item *m, E_DBusMenu_Item_Event event) { Eldbus_Message *msg; @@ -397,7 +397,7 @@ e_dbusmenu_event_send(E_DBusMenu_Item *m, E_DBusMenu_Item_Event event) eldbus_proxy_send(m->ctx->proxy, msg, NULL, NULL, -1); } -EAPI void +E_API void e_dbusmenu_unload(E_DBusMenu_Ctx *ctx) { Eldbus_Connection *conn; @@ -414,13 +414,13 @@ e_dbusmenu_unload(E_DBusMenu_Ctx *ctx) free(ctx); } -EAPI void +E_API void e_dbusmenu_pop_request_cb_set(E_DBusMenu_Ctx *ctx, E_DBusMenu_Pop_Request_Cb cb) { ctx->pop_request_cb = cb; } -EAPI void +E_API void e_dbusmenu_update_cb_set(E_DBusMenu_Ctx *ctx, E_DBusMenu_Update_Cb cb) { ctx->update_cb = cb; diff --git a/src/bin/e_dbusmenu.h b/src/bin/e_dbusmenu.h index 84005ff..cbc9df4 100644 --- a/src/bin/e_dbusmenu.h +++ b/src/bin/e_dbusmenu.h @@ -61,11 +61,11 @@ struct _E_DBusMenu_Item typedef void (*E_DBusMenu_Pop_Request_Cb)(void *data, const E_DBusMenu_Item *item); typedef void (*E_DBusMenu_Update_Cb)(void *data, E_DBusMenu_Item *new_root_item); -EAPI E_DBusMenu_Ctx * e_dbusmenu_load(Eldbus_Connection *conn, const char *bus, const char *path, const void *data); -EAPI void e_dbusmenu_unload(E_DBusMenu_Ctx *ctx); -EAPI void e_dbusmenu_update_cb_set(E_DBusMenu_Ctx *menu_data, E_DBusMenu_Update_Cb cb); -EAPI void e_dbusmenu_pop_request_cb_set(E_DBusMenu_Ctx *menu_data, E_DBusMenu_Pop_Request_Cb cb); +E_API E_DBusMenu_Ctx * e_dbusmenu_load(Eldbus_Connection *conn, const char *bus, const char *path, const void *data); +E_API void e_dbusmenu_unload(E_DBusMenu_Ctx *ctx); +E_API void e_dbusmenu_update_cb_set(E_DBusMenu_Ctx *menu_data, E_DBusMenu_Update_Cb cb); +E_API void e_dbusmenu_pop_request_cb_set(E_DBusMenu_Ctx *menu_data, E_DBusMenu_Pop_Request_Cb cb); -EAPI void e_dbusmenu_event_send(E_DBusMenu_Item *m, E_DBusMenu_Item_Event event); +E_API void e_dbusmenu_event_send(E_DBusMenu_Item *m, E_DBusMenu_Item_Event event); #endif diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c index 257f10c..e2a1d54 100644 --- a/src/bin/e_desk.c +++ b/src/bin/e_desk.c @@ -19,12 +19,12 @@ static void _e_desk_window_profile_change_protocol_set(void); static E_Desk_Flip_Cb _e_desk_flip_cb = NULL; static void *_e_desk_flip_data = NULL; -EAPI int E_EVENT_DESK_SHOW = 0; -EAPI int E_EVENT_DESK_BEFORE_SHOW = 0; -EAPI int E_EVENT_DESK_AFTER_SHOW = 0; -EAPI int E_EVENT_DESK_DESKSHOW = 0; -EAPI int E_EVENT_DESK_NAME_CHANGE = 0; -EAPI int E_EVENT_DESK_WINDOW_PROFILE_CHANGE = 0; +E_API int E_EVENT_DESK_SHOW = 0; +E_API int E_EVENT_DESK_BEFORE_SHOW = 0; +E_API int E_EVENT_DESK_AFTER_SHOW = 0; +E_API int E_EVENT_DESK_DESKSHOW = 0; +E_API int E_EVENT_DESK_NAME_CHANGE = 0; +E_API int E_EVENT_DESK_WINDOW_PROFILE_CHANGE = 0; EINTERN int e_desk_init(void) @@ -44,7 +44,7 @@ e_desk_shutdown(void) return 1; } -EAPI E_Desk * +E_API E_Desk * e_desk_new(E_Zone *zone, int x, int y) { E_Desk *desk; @@ -99,7 +99,7 @@ e_desk_new(E_Zone *zone, int x, int y) return desk; } -EAPI E_Client * +E_API E_Client * e_desk_client_top_visible_get(const E_Desk *desk) { E_Client *ec; @@ -112,7 +112,7 @@ e_desk_client_top_visible_get(const E_Desk *desk) return NULL; } -EAPI void +E_API void e_desk_name_set(E_Desk *desk, const char *name) { E_Event_Desk_Name_Change *ev; @@ -129,7 +129,7 @@ e_desk_name_set(E_Desk *desk, const char *name) _e_desk_event_desk_name_change_free, NULL); } -EAPI void +E_API void e_desk_name_add(int zone, int desk_x, int desk_y, const char *name) { E_Config_Desktop_Name *cfname; @@ -145,7 +145,7 @@ e_desk_name_add(int zone, int desk_x, int desk_y, const char *name) e_config->desktop_names = eina_list_append(e_config->desktop_names, cfname); } -EAPI void +E_API void e_desk_name_del(int zone, int desk_x, int desk_y) { Eina_List *l = NULL; @@ -165,7 +165,7 @@ e_desk_name_del(int zone, int desk_x, int desk_y) } } -EAPI void +E_API void e_desk_name_update(void) { const Eina_List *z, *l; @@ -207,7 +207,7 @@ e_desk_name_update(void) } } -EAPI void +E_API void e_desk_show(E_Desk *desk) { E_Event_Desk_Show *ev; @@ -319,7 +319,7 @@ e_desk_show(E_Desk *desk) e_zone_edge_flip_eval(desk->zone); } -EAPI void +E_API void e_desk_deskshow(E_Zone *zone) { E_Client *ec; @@ -370,7 +370,7 @@ e_desk_deskshow(E_Zone *zone) _e_desk_event_desk_deskshow_free, NULL); } -EAPI E_Client * +E_API E_Client * e_desk_last_focused_focus(E_Desk *desk) { Eina_List *l = NULL; @@ -414,31 +414,31 @@ e_desk_last_focused_focus(E_Desk *desk) return NULL; } -EAPI void +E_API void e_desk_row_add(E_Zone *zone) { e_zone_desk_count_set(zone, zone->desk_x_count, zone->desk_y_count + 1); } -EAPI void +E_API void e_desk_row_remove(E_Zone *zone) { e_zone_desk_count_set(zone, zone->desk_x_count, zone->desk_y_count - 1); } -EAPI void +E_API void e_desk_col_add(E_Zone *zone) { e_zone_desk_count_set(zone, zone->desk_x_count + 1, zone->desk_y_count); } -EAPI void +E_API void e_desk_col_remove(E_Zone *zone) { e_zone_desk_count_set(zone, zone->desk_x_count - 1, zone->desk_y_count); } -EAPI E_Desk * +E_API E_Desk * e_desk_current_get(E_Zone *zone) { E_OBJECT_CHECK_RETURN(zone, NULL); @@ -447,7 +447,7 @@ e_desk_current_get(E_Zone *zone) return e_desk_at_xy_get(zone, zone->desk_x_current, zone->desk_y_current); } -EAPI E_Desk * +E_API E_Desk * e_desk_at_xy_get(E_Zone *zone, int x, int y) { E_OBJECT_CHECK_RETURN(zone, NULL); @@ -462,7 +462,7 @@ e_desk_at_xy_get(E_Zone *zone, int x, int y) return zone->desks[x + (y * zone->desk_x_count)]; } -EAPI E_Desk * +E_API E_Desk * e_desk_at_pos_get(E_Zone *zone, int pos) { int x, y; @@ -479,7 +479,7 @@ e_desk_at_pos_get(E_Zone *zone, int pos) return zone->desks[x + (y * zone->desk_x_count)]; } -EAPI void +E_API void e_desk_xy_get(E_Desk *desk, int *x, int *y) { E_OBJECT_CHECK(desk); @@ -489,7 +489,7 @@ e_desk_xy_get(E_Desk *desk, int *x, int *y) if (y) *y = desk->y; } -EAPI void +E_API void e_desk_next(E_Zone *zone) { int x, y; @@ -514,7 +514,7 @@ e_desk_next(E_Zone *zone) e_desk_show(e_desk_at_xy_get(zone, x, y)); } -EAPI void +E_API void e_desk_prev(E_Zone *zone) { int x, y; @@ -538,7 +538,7 @@ e_desk_prev(E_Zone *zone) e_desk_show(e_desk_at_xy_get(zone, x, y)); } -EAPI void +E_API void e_desk_window_profile_set(E_Desk *desk, const char *profile) { @@ -556,7 +556,7 @@ e_desk_window_profile_set(E_Desk *desk, _e_desk_event_desk_window_profile_change_free, NULL); } -EAPI void +E_API void e_desk_window_profile_add(int zone, int desk_x, int desk_y, @@ -574,7 +574,7 @@ e_desk_window_profile_add(int zone, e_config->desktop_window_profiles = eina_list_append(e_config->desktop_window_profiles, cfprof); } -EAPI void +E_API void e_desk_window_profile_del(int zone, int desk_x, int desk_y) @@ -597,7 +597,7 @@ e_desk_window_profile_del(int zone, } } -EAPI void +E_API void e_desk_window_profile_update(void) { const Eina_List *z, *l; @@ -641,14 +641,14 @@ e_desk_window_profile_update(void) } } -EAPI void +E_API void e_desk_flip_cb_set(E_Desk_Flip_Cb cb, const void *data) { _e_desk_flip_cb = cb; _e_desk_flip_data = (void*)data; } -EAPI void +E_API void e_desk_flip_end(E_Desk *desk) { E_Event_Desk_After_Show *ev; @@ -694,7 +694,7 @@ e_desk_flip_end(E_Desk *desk) } } -EAPI unsigned int +E_API unsigned int e_desks_count(void) { Eina_List *l; diff --git a/src/bin/e_desk.h b/src/bin/e_desk.h index 3879f94..b683097 100644 --- a/src/bin/e_desk.h +++ b/src/bin/e_desk.h @@ -66,41 +66,41 @@ struct _E_Event_Desk_Window_Profile_Change EINTERN int e_desk_init(void); EINTERN int e_desk_shutdown(void); -EAPI E_Desk *e_desk_new(E_Zone *zone, int x, int y); -EAPI void e_desk_name_set(E_Desk *desk, const char *name); -EAPI void e_desk_name_add(int zone, int desk_x, int desk_y, const char *name); -EAPI void e_desk_name_del(int zone, int desk_x, int desk_y); -EAPI void e_desk_name_update(void); -EAPI void e_desk_show(E_Desk *desk); -EAPI void e_desk_deskshow(E_Zone *zone); -EAPI E_Client *e_desk_last_focused_focus(E_Desk *desk); -EAPI E_Client *e_desk_client_top_visible_get(const E_Desk *desk); -EAPI E_Desk *e_desk_current_get(E_Zone *zone); -EAPI E_Desk *e_desk_at_xy_get(E_Zone *zone, int x, int y); -EAPI E_Desk *e_desk_at_pos_get(E_Zone *zone, int pos); -EAPI void e_desk_xy_get(E_Desk *desk, int *x, int *y); -EAPI void e_desk_next(E_Zone *zone); -EAPI void e_desk_prev(E_Zone *zone); -EAPI void e_desk_row_add(E_Zone *zone); -EAPI void e_desk_row_remove(E_Zone *zone); -EAPI void e_desk_col_add(E_Zone *zone); -EAPI void e_desk_col_remove(E_Zone *zone); -EAPI void e_desk_window_profile_set(E_Desk *desk, const char *profile); -EAPI void e_desk_window_profile_add(int zone, int desk_x, int desk_y, const char *profile); -EAPI void e_desk_window_profile_del(int zone, int desk_x, int desk_y); -EAPI void e_desk_window_profile_update(void); - -EAPI void e_desk_flip_cb_set(E_Desk_Flip_Cb cb, const void *data); -EAPI void e_desk_flip_end(E_Desk *desk); - -EAPI unsigned int e_desks_count(void); - -extern EAPI int E_EVENT_DESK_SHOW; -extern EAPI int E_EVENT_DESK_BEFORE_SHOW; -extern EAPI int E_EVENT_DESK_AFTER_SHOW; -extern EAPI int E_EVENT_DESK_DESKSHOW; -extern EAPI int E_EVENT_DESK_NAME_CHANGE; -extern EAPI int E_EVENT_DESK_WINDOW_PROFILE_CHANGE; +E_API E_Desk *e_desk_new(E_Zone *zone, int x, int y); +E_API void e_desk_name_set(E_Desk *desk, const char *name); +E_API void e_desk_name_add(int zone, int desk_x, int desk_y, const char *name); +E_API void e_desk_name_del(int zone, int desk_x, int desk_y); +E_API void e_desk_name_update(void); +E_API void e_desk_show(E_Desk *desk); +E_API void e_desk_deskshow(E_Zone *zone); +E_API E_Client *e_desk_last_focused_focus(E_Desk *desk); +E_API E_Client *e_desk_client_top_visible_get(const E_Desk *desk); +E_API E_Desk *e_desk_current_get(E_Zone *zone); +E_API E_Desk *e_desk_at_xy_get(E_Zone *zone, int x, int y); +E_API E_Desk *e_desk_at_pos_get(E_Zone *zone, int pos); +E_API void e_desk_xy_get(E_Desk *desk, int *x, int *y); +E_API void e_desk_next(E_Zone *zone); +E_API void e_desk_prev(E_Zone *zone); +E_API void e_desk_row_add(E_Zone *zone); +E_API void e_desk_row_remove(E_Zone *zone); +E_API void e_desk_col_add(E_Zone *zone); +E_API void e_desk_col_remove(E_Zone *zone); +E_API void e_desk_window_profile_set(E_Desk *desk, const char *profile); +E_API void e_desk_window_profile_add(int zone, int desk_x, int desk_y, const char *profile); +E_API void e_desk_window_profile_del(int zone, int desk_x, int desk_y); +E_API void e_desk_window_profile_update(void); + +E_API void e_desk_flip_cb_set(E_Desk_Flip_Cb cb, const void *data); +E_API void e_desk_flip_end(E_Desk *desk); + +E_API unsigned int e_desks_count(void); + +extern E_API int E_EVENT_DESK_SHOW; +extern E_API int E_EVENT_DESK_BEFORE_SHOW; +extern E_API int E_EVENT_DESK_AFTER_SHOW; +extern E_API int E_EVENT_DESK_DESKSHOW; +extern E_API int E_EVENT_DESK_NAME_CHANGE; +extern E_API int E_EVENT_DESK_WINDOW_PROFILE_CHANGE; #endif #endif diff --git a/src/bin/e_deskenv.c b/src/bin/e_deskenv.c index bcf8767..c884471 100644 --- a/src/bin/e_deskenv.c +++ b/src/bin/e_deskenv.c @@ -48,7 +48,7 @@ e_deskenv_shutdown(void) return 1; } -EAPI void +E_API void e_deskenv_xmodmap_run(void) { #ifndef HAVE_WAYLAND_ONLY diff --git a/src/bin/e_deskenv.h b/src/bin/e_deskenv.h index bbab0f4..0bfc81e 100644 --- a/src/bin/e_deskenv.h +++ b/src/bin/e_deskenv.h @@ -5,6 +5,6 @@ EINTERN int e_deskenv_init(void); EINTERN int e_deskenv_shutdown(void); -EAPI void e_deskenv_xmodmap_run(void); +E_API void e_deskenv_xmodmap_run(void); #endif #endif diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c index 73b7220..6132b0b 100644 --- a/src/bin/e_desklock.c +++ b/src/bin/e_desklock.c @@ -41,7 +41,7 @@ static Eina_Bool _e_desklock_state = EINA_FALSE; static void _e_desklock_ask_presentation_mode(void); -EAPI int E_EVENT_DESKLOCK = 0; +E_API int E_EVENT_DESKLOCK = 0; EINTERN int e_desklock_init(void) @@ -95,7 +95,7 @@ e_desklock_shutdown(void) return 1; } -EAPI Eina_Stringshare * +E_API Eina_Stringshare * e_desklock_user_wallpaper_get(E_Zone *zone) { const E_Config_Desktop_Background *cdbg; @@ -117,7 +117,7 @@ e_desklock_user_wallpaper_get(E_Zone *zone) return e_theme_edje_file_get("base/theme/desklock", "e/desklock/background"); } -EAPI void +E_API void e_desklock_interface_append(E_Desklock_Interface *iface) { EINA_SAFETY_ON_NULL_RETURN(iface); @@ -139,7 +139,7 @@ e_desklock_interface_append(E_Desklock_Interface *iface) } } -EAPI void +E_API void e_desklock_interface_remove(E_Desklock_Interface *iface) { E_Desklock_Interface *diface; @@ -168,35 +168,35 @@ e_desklock_interface_remove(E_Desklock_Interface *iface) */ } -EAPI void +E_API void e_desklock_show_hook_add(E_Desklock_Show_Cb cb) { EINA_SAFETY_ON_NULL_RETURN(cb); show_hooks = eina_list_append(show_hooks, cb); } -EAPI void +E_API void e_desklock_show_hook_del(E_Desklock_Show_Cb cb) { EINA_SAFETY_ON_NULL_RETURN(cb); show_hooks = eina_list_remove(show_hooks, cb); } -EAPI void +E_API void e_desklock_hide_hook_add(E_Desklock_Hide_Cb cb) { EINA_SAFETY_ON_NULL_RETURN(cb); hide_hooks = eina_list_append(hide_hooks, cb); } -EAPI void +E_API void e_desklock_hide_hook_del(E_Desklock_Hide_Cb cb) { EINA_SAFETY_ON_NULL_RETURN(cb); hide_hooks = eina_list_remove(hide_hooks, cb); } -EAPI int +E_API int e_desklock_show_autolocked(void) { if (_e_desklock_autolock_time < 1.0) @@ -204,7 +204,7 @@ e_desklock_show_autolocked(void) return e_desklock_show(EINA_FALSE); } -EAPI int +E_API int e_desklock_show(Eina_Bool suspend) { const Eina_List *l; @@ -323,7 +323,7 @@ fail: return 0; } -EAPI void +E_API void e_desklock_hide(void) { Eina_List *l; @@ -389,7 +389,7 @@ e_desklock_hide(void) e_util_env_set("E_DESKLOCK_UNLOCKED", "happened"); } -EAPI Eina_Bool +E_API Eina_Bool e_desklock_state_get(void) { return _e_desklock_state; diff --git a/src/bin/e_desklock.h b/src/bin/e_desklock.h index 55257aa..5dfeaef 100644 --- a/src/bin/e_desklock.h +++ b/src/bin/e_desklock.h @@ -42,20 +42,20 @@ struct _E_Event_Desklock EINTERN int e_desklock_init(void); EINTERN int e_desklock_shutdown(void); -EAPI int e_desklock_show(Eina_Bool suspend); -EAPI int e_desklock_show_autolocked(void); -EAPI void e_desklock_hide(void); -EAPI Eina_Bool e_desklock_state_get(void); +E_API int e_desklock_show(Eina_Bool suspend); +E_API int e_desklock_show_autolocked(void); +E_API void e_desklock_hide(void); +E_API Eina_Bool e_desklock_state_get(void); -EAPI void e_desklock_interface_append(E_Desklock_Interface *iface); -EAPI void e_desklock_interface_remove(E_Desklock_Interface *iface); -EAPI Eina_Stringshare *e_desklock_user_wallpaper_get(E_Zone *zone); -EAPI void e_desklock_show_hook_add(E_Desklock_Show_Cb cb); -EAPI void e_desklock_show_hook_del(E_Desklock_Show_Cb cb); -EAPI void e_desklock_hide_hook_add(E_Desklock_Hide_Cb cb); -EAPI void e_desklock_hide_hook_del(E_Desklock_Hide_Cb cb); +E_API void e_desklock_interface_append(E_Desklock_Interface *iface); +E_API void e_desklock_interface_remove(E_Desklock_Interface *iface); +E_API Eina_Stringshare *e_desklock_user_wallpaper_get(E_Zone *zone); +E_API void e_desklock_show_hook_add(E_Desklock_Show_Cb cb); +E_API void e_desklock_show_hook_del(E_Desklock_Show_Cb cb); +E_API void e_desklock_hide_hook_add(E_Desklock_Hide_Cb cb); +E_API void e_desklock_hide_hook_del(E_Desklock_Hide_Cb cb); -extern EAPI int E_EVENT_DESKLOCK; +extern E_API int E_EVENT_DESKLOCK; static inline Eina_Bool e_desklock_is_external(void) diff --git a/src/bin/e_deskmirror.c b/src/bin/e_deskmirror.c index 72a2e20..617f719 100644 --- a/src/bin/e_deskmirror.c +++ b/src/bin/e_deskmirror.c @@ -678,7 +678,7 @@ _client_property(E_Smart_Data *sd, int type EINA_UNUSED, E_Event_Client_Property } /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_deskmirror_add(E_Desk *desk, Eina_Bool pager, Eina_Bool taskbar) { E_Smart_Data *sd; @@ -726,7 +726,7 @@ e_deskmirror_add(E_Desk *desk, Eina_Bool pager, Eina_Bool taskbar) return o; } -EAPI Evas_Object * +E_API Evas_Object * e_deskmirror_mirror_find(Evas_Object *deskmirror, Evas_Object *comp_object) { Mirror *m; @@ -738,7 +738,7 @@ e_deskmirror_mirror_find(Evas_Object *deskmirror, Evas_Object *comp_object) return m ? m->mirror : NULL; } -EAPI Eina_List * +E_API Eina_List * e_deskmirror_mirror_list(Evas_Object *deskmirror) { Eina_List *l = NULL; @@ -762,7 +762,7 @@ _mirror_copy_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_ evas_object_smart_callback_del_full(data, "shadow_change", _mirror_client_shadow_change, obj); } -EAPI Evas_Object * +E_API Evas_Object * e_deskmirror_mirror_copy(Evas_Object *obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); @@ -798,7 +798,7 @@ e_deskmirror_mirror_copy(Evas_Object *obj) return NULL; } -EAPI void +E_API void e_deskmirror_coord_canvas_to_virtual(Evas_Object *obj, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy) { API_ENTRY(obj); @@ -806,7 +806,7 @@ e_deskmirror_coord_canvas_to_virtual(Evas_Object *obj, Evas_Coord cx, Evas_Coord e_layout_coord_canvas_to_virtual(sd->layout, cx, cy, vx, vy); } -EAPI void +E_API void e_deskmirror_coord_virtual_to_canvas(Evas_Object *obj, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy) { API_ENTRY(obj); @@ -814,14 +814,14 @@ e_deskmirror_coord_virtual_to_canvas(Evas_Object *obj, Evas_Coord vx, Evas_Coord e_layout_coord_virtual_to_canvas(sd->layout, vx, vy, cx, cy); } -EAPI E_Desk * +E_API E_Desk * e_deskmirror_desk_get(Evas_Object *obj) { API_ENTRY(obj) NULL; return sd->desk; } -EAPI void +E_API void e_deskmirror_util_wins_print(Evas_Object *obj) { E_Smart_Data *sd; diff --git a/src/bin/e_deskmirror.h b/src/bin/e_deskmirror.h index a3db64d..a9a137b 100644 --- a/src/bin/e_deskmirror.h +++ b/src/bin/e_deskmirror.h @@ -1,14 +1,14 @@ #ifndef E_WIDGET_DESKMIRROR_H #define E_WIDGET_DESKMIRROR_H -EAPI Evas_Object *e_deskmirror_add(E_Desk *desk, Eina_Bool pager, Eina_Bool taskbar); -EAPI Evas_Object *e_deskmirror_mirror_find(Evas_Object *deskmirror, Evas_Object *comp_object); -EAPI Eina_List *e_deskmirror_mirror_list(Evas_Object *deskmirror); -EAPI Evas_Object *e_deskmirror_mirror_copy(Evas_Object *obj); -EAPI void e_deskmirror_coord_canvas_to_virtual(Evas_Object *obj, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy); -EAPI void e_deskmirror_coord_virtual_to_canvas(Evas_Object *obj, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy); -EAPI E_Desk *e_deskmirror_desk_get(Evas_Object *obj); -EAPI void e_deskmirror_util_wins_print(Evas_Object *obj); +E_API Evas_Object *e_deskmirror_add(E_Desk *desk, Eina_Bool pager, Eina_Bool taskbar); +E_API Evas_Object *e_deskmirror_mirror_find(Evas_Object *deskmirror, Evas_Object *comp_object); +E_API Eina_List *e_deskmirror_mirror_list(Evas_Object *deskmirror); +E_API Evas_Object *e_deskmirror_mirror_copy(Evas_Object *obj); +E_API void e_deskmirror_coord_canvas_to_virtual(Evas_Object *obj, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy); +E_API void e_deskmirror_coord_virtual_to_canvas(Evas_Object *obj, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy); +E_API E_Desk *e_deskmirror_desk_get(Evas_Object *obj); +E_API void e_deskmirror_util_wins_print(Evas_Object *obj); //#define DESKMIRROR_TEST #endif diff --git a/src/bin/e_desktop_editor.c b/src/bin/e_desktop_editor.c index 8a01647..a759f18 100644 --- a/src/bin/e_desktop_editor.c +++ b/src/bin/e_desktop_editor.c @@ -95,7 +95,7 @@ _e_util_icon_save(Ecore_X_Icon *icon, const char *filename) } /* externally accessible functions */ -EAPI Efreet_Desktop * +E_API Efreet_Desktop * e_desktop_client_create(E_Client *ec) { Efreet_Desktop *desktop = NULL; @@ -183,7 +183,7 @@ e_desktop_client_create(E_Client *ec) return desktop; } -EAPI E_Desktop_Edit * +E_API E_Desktop_Edit * e_desktop_client_edit(E_Client *ec) { E_Desktop_Edit *editor; @@ -228,7 +228,7 @@ e_desktop_client_edit(E_Client *ec) return editor; } -EAPI E_Desktop_Edit * +E_API E_Desktop_Edit * e_desktop_edit(Efreet_Desktop *desktop) { E_Desktop_Edit *editor; diff --git a/src/bin/e_desktop_editor.h b/src/bin/e_desktop_editor.h index b887a11..87edfcc 100644 --- a/src/bin/e_desktop_editor.h +++ b/src/bin/e_desktop_editor.h @@ -32,9 +32,9 @@ struct _E_Desktop_Edit E_Config_Dialog *cfd; }; -EAPI Efreet_Desktop *e_desktop_client_create(E_Client *ec); -EAPI E_Desktop_Edit *e_desktop_client_edit(E_Client *ec); -EAPI E_Desktop_Edit *e_desktop_edit(Efreet_Desktop *desktop); +E_API Efreet_Desktop *e_desktop_client_create(E_Client *ec); +E_API E_Desktop_Edit *e_desktop_client_edit(E_Client *ec); +E_API E_Desktop_Edit *e_desktop_edit(Efreet_Desktop *desktop); #endif #endif diff --git a/src/bin/e_dialog.c b/src/bin/e_dialog.c index c9295c7..2b0435b 100644 --- a/src/bin/e_dialog.c +++ b/src/bin/e_dialog.c @@ -77,19 +77,19 @@ _e_dialog_internal_new(Evas_Object *parent, const char *name, const char *class, return dia; } -EAPI E_Dialog * +E_API E_Dialog * e_dialog_new(Evas_Object *parent, const char *name, const char *class) { return _e_dialog_internal_new(parent, name, class, 1); } -EAPI E_Dialog * +E_API E_Dialog * e_dialog_normal_win_new(Evas_Object *parent, const char *name, const char *class) { return _e_dialog_internal_new(parent, name, class, 0); } -EAPI void +E_API void e_dialog_button_add(E_Dialog *dia, const char *label, const char *icon, E_Dialog_Cb func, void *data) { Evas_Object *o; @@ -100,7 +100,7 @@ e_dialog_button_add(E_Dialog *dia, const char *label, const char *icon, E_Dialog dia->buttons = eina_list_append(dia->buttons, o); } -EAPI int +E_API int e_dialog_button_focus_num(E_Dialog *dia, int button) { Evas_Object *o; @@ -110,7 +110,7 @@ e_dialog_button_focus_num(E_Dialog *dia, int button) return 1; } -EAPI int +E_API int e_dialog_button_disable_num_set(E_Dialog *dia, int button, int disabled) { Evas_Object *o; @@ -120,7 +120,7 @@ e_dialog_button_disable_num_set(E_Dialog *dia, int button, int disabled) return 1; } -EAPI int +E_API int e_dialog_button_disable_num_get(E_Dialog *dia, int button) { Evas_Object *o; @@ -131,13 +131,13 @@ e_dialog_button_disable_num_get(E_Dialog *dia, int button) return ret; } -EAPI void +E_API void e_dialog_title_set(E_Dialog *dia, const char *title) { elm_win_title_set(dia->win, title); } -EAPI void +E_API void e_dialog_text_set(E_Dialog *dia, const char *text) { if (!dia->text_object) @@ -154,7 +154,7 @@ e_dialog_text_set(E_Dialog *dia, const char *text) elm_object_part_text_set(dia->text_object, "e.textblock.message", text); } -EAPI void +E_API void e_dialog_icon_set(E_Dialog *dia, const char *icon, Evas_Coord size) { if (!icon) @@ -188,7 +188,7 @@ e_dialog_icon_set(E_Dialog *dia, const char *icon, Evas_Coord size) edje_object_message_signal_process(elm_layout_edje_get(dia->bg_object)); } -EAPI void +E_API void e_dialog_border_icon_set(E_Dialog *dia, const char *icon) { E_Client *ec; @@ -198,7 +198,7 @@ e_dialog_border_icon_set(E_Dialog *dia, const char *icon) eina_stringshare_replace(&ec->internal_icon, icon); } -EAPI void +E_API void e_dialog_content_set(E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coord minh) { int mw, mh; @@ -215,7 +215,7 @@ e_dialog_content_set(E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coor evas_object_show(obj); } -EAPI void +E_API void e_dialog_resizable_set(E_Dialog *dia, int resizable) { dia->resizable = resizable; @@ -238,7 +238,7 @@ e_dialog_resizable_set(E_Dialog *dia, int resizable) } } -EAPI void +E_API void e_dialog_show(E_Dialog *dia) { Evas_Coord mw, mh; diff --git a/src/bin/e_dialog.h b/src/bin/e_dialog.h index acfddd0..426abb0 100644 --- a/src/bin/e_dialog.h +++ b/src/bin/e_dialog.h @@ -28,19 +28,19 @@ struct _E_Dialog typedef void (*E_Dialog_Cb)(void *data, E_Dialog *dia); -EAPI E_Dialog *e_dialog_new (Evas_Object *parent, const char *name, const char *class); -EAPI E_Dialog *e_dialog_normal_win_new (Evas_Object *parent, const char *name, const char *class); -EAPI void e_dialog_button_add (E_Dialog *dia, const char *label, const char *icon, E_Dialog_Cb func, void *data); -EAPI int e_dialog_button_focus_num (E_Dialog *dia, int button); -EAPI int e_dialog_button_disable_num_set (E_Dialog *dia, int button, int disabled); -EAPI int e_dialog_button_disable_num_get (E_Dialog *dia, int button); -EAPI void e_dialog_title_set (E_Dialog *dia, const char *title); -EAPI void e_dialog_text_set (E_Dialog *dia, const char *text); -EAPI void e_dialog_icon_set (E_Dialog *dia, const char *icon, Evas_Coord size); -EAPI void e_dialog_border_icon_set (E_Dialog *dia, const char *icon); -EAPI void e_dialog_content_set (E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coord minh); -EAPI void e_dialog_resizable_set (E_Dialog *dia, int resizable); -EAPI void e_dialog_show (E_Dialog *dia); +E_API E_Dialog *e_dialog_new (Evas_Object *parent, const char *name, const char *class); +E_API E_Dialog *e_dialog_normal_win_new (Evas_Object *parent, const char *name, const char *class); +E_API void e_dialog_button_add (E_Dialog *dia, const char *label, const char *icon, E_Dialog_Cb func, void *data); +E_API int e_dialog_button_focus_num (E_Dialog *dia, int button); +E_API int e_dialog_button_disable_num_set (E_Dialog *dia, int button, int disabled); +E_API int e_dialog_button_disable_num_get (E_Dialog *dia, int button); +E_API void e_dialog_title_set (E_Dialog *dia, const char *title); +E_API void e_dialog_text_set (E_Dialog *dia, const char *text); +E_API void e_dialog_icon_set (E_Dialog *dia, const char *icon, Evas_Coord size); +E_API void e_dialog_border_icon_set (E_Dialog *dia, const char *icon); +E_API void e_dialog_content_set (E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coord minh); +E_API void e_dialog_resizable_set (E_Dialog *dia, int resizable); +E_API void e_dialog_show (E_Dialog *dia); #endif #endif diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c index 1e94552..eb1dcac 100644 --- a/src/bin/e_dnd.c +++ b/src/bin/e_dnd.c @@ -164,13 +164,13 @@ e_dnd_shutdown(void) return 1; } -EAPI E_Drag * +E_API E_Drag * e_drag_current_get(void) { return _drag_current; } -EAPI E_Drag * +E_API E_Drag * e_drag_new(int x, int y, const char **types, unsigned int num_types, void *data, int size, @@ -218,13 +218,13 @@ e_drag_new(int x, int y, return drag; } -EAPI Evas * +E_API Evas * e_drag_evas_get(const E_Drag *drag) { return drag->evas; } -EAPI void +E_API void e_drag_object_set(E_Drag *drag, Evas_Object *object) { EINA_SAFETY_ON_NULL_RETURN(object); @@ -240,7 +240,7 @@ e_drag_object_set(E_Drag *drag, Evas_Object *object) evas_object_pass_events_set(drag->comp_object, 1); } -EAPI void +E_API void e_drag_move(E_Drag *drag, int x, int y) { if ((drag->x == x) && (drag->y == y)) return; @@ -250,7 +250,7 @@ e_drag_move(E_Drag *drag, int x, int y) evas_object_move(drag->comp_object, x, y); } -EAPI void +E_API void e_drag_resize(E_Drag *drag, int w, int h) { if ((drag->w == w) && (drag->h == h)) return; @@ -260,13 +260,13 @@ e_drag_resize(E_Drag *drag, int w, int h) evas_object_resize(drag->comp_object, w, h); } -EAPI int +E_API int e_dnd_active(void) { return _drag_win != 0; } -EAPI int +E_API int e_drag_start(E_Drag *drag, int x, int y) { const Eina_List *l; @@ -324,7 +324,7 @@ e_drag_start(E_Drag *drag, int x, int y) return 1; } -EAPI int +E_API int e_drag_xdnd_start(E_Drag *drag, int x, int y) { #ifndef HAVE_WAYLAND_ONLY @@ -394,14 +394,14 @@ e_drag_xdnd_start(E_Drag *drag, int x, int y) return 1; } -EAPI void +E_API void e_drop_handler_xds_set(E_Drop_Handler *handler, Eina_Bool (*cb)(void *data, const char *type)) { handler->cb.xds = cb; } /* should only be used for windows */ -EAPI void +E_API void e_drop_xds_update(Eina_Bool enable, const char *value) { #ifndef HAVE_WAYLAND_ONLY @@ -438,7 +438,7 @@ e_drop_xds_update(Eina_Bool enable, const char *value) #endif } -EAPI E_Drop_Handler * +E_API E_Drop_Handler * e_drop_handler_add(E_Object *obj, Evas_Object *win, void *data, void (*enter_cb)(void *data, const char *type, void *event), @@ -475,7 +475,7 @@ e_drop_handler_add(E_Object *obj, Evas_Object *win, return handler; } -EAPI void +E_API void e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h) { handler->x = x; @@ -484,7 +484,7 @@ e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h) handler->h = h; } -EAPI int +E_API int e_drop_inside(const E_Drop_Handler *handler, int x, int y) { int dx, dy; @@ -495,7 +495,7 @@ e_drop_inside(const E_Drop_Handler *handler, int x, int y) return E_INSIDE(x, y, handler->x, handler->y, handler->w, handler->h); } -EAPI void +E_API void e_drop_handler_del(E_Drop_Handler *handler) { unsigned int i; @@ -521,7 +521,7 @@ e_drop_handler_del(E_Drop_Handler *handler) free(handler); } -EAPI int +E_API int e_drop_xdnd_register_set(Ecore_Window win, int reg) { if (e_comp->comp_type != E_PIXMAP_TYPE_X) return 0; @@ -545,7 +545,7 @@ e_drop_xdnd_register_set(Ecore_Window win, int reg) return 1; } -EAPI void +E_API void e_drop_handler_responsive_set(E_Drop_Handler *handler) { Ecore_X_Window hwin = _e_drag_win_get(handler, 1); @@ -555,7 +555,7 @@ e_drop_handler_responsive_set(E_Drop_Handler *handler) eina_hash_set(_drop_handlers_responsives, &hwin, eina_list_append(l, handler)); } -EAPI int +E_API int e_drop_handler_responsive_get(const E_Drop_Handler *handler) { Ecore_X_Window hwin = _e_drag_win_get(handler, 1); @@ -565,32 +565,32 @@ e_drop_handler_responsive_get(const E_Drop_Handler *handler) return l && eina_list_data_find(l, handler); } -EAPI void +E_API void e_drop_handler_action_set(unsigned int action) { _action = action; } -EAPI unsigned int +E_API unsigned int e_drop_handler_action_get(void) { return _action; } -EAPI void +E_API void e_drag_key_down_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e)) { drag->cb.key_down = func; } -EAPI void +E_API void e_drag_key_up_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e)) { drag->cb.key_up = func; } /* from ecore_x_selection.c */ -EAPI Eina_List * +E_API Eina_List * e_dnd_util_text_uri_list_convert(char *data, int size) { char *tmp; diff --git a/src/bin/e_dnd.h b/src/bin/e_dnd.h index d03791d..3baa9b0 100644 --- a/src/bin/e_dnd.h +++ b/src/bin/e_dnd.h @@ -111,29 +111,29 @@ struct E_Dnd_X_Moz_Url EINTERN int e_dnd_init(void); EINTERN int e_dnd_shutdown(void); -EAPI int e_dnd_active(void); +E_API int e_dnd_active(void); -EAPI E_Drag *e_drag_current_get(void); +E_API E_Drag *e_drag_current_get(void); /* x and y are the top left coords of the object that is to be dragged */ -EAPI E_Drag *e_drag_new(int x, int y, +E_API E_Drag *e_drag_new(int x, int y, const char **types, unsigned int num_types, void *data, int size, void *(*convert_cb)(E_Drag * drag, const char *type), void (*finished_cb)(E_Drag *drag, int dropped)); -EAPI Evas *e_drag_evas_get(const E_Drag *drag); -EAPI void e_drag_object_set(E_Drag *drag, Evas_Object *object); -EAPI void e_drag_move(E_Drag *drag, int x, int y); -EAPI void e_drag_resize(E_Drag *drag, int w, int h); -EAPI void e_drag_key_down_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e)); -EAPI void e_drag_key_up_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e)); +E_API Evas *e_drag_evas_get(const E_Drag *drag); +E_API void e_drag_object_set(E_Drag *drag, Evas_Object *object); +E_API void e_drag_move(E_Drag *drag, int x, int y); +E_API void e_drag_resize(E_Drag *drag, int w, int h); +E_API void e_drag_key_down_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e)); +E_API void e_drag_key_up_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e)); /* x and y are the coords where the mouse is when dragging starts */ -EAPI int e_drag_start(E_Drag *drag, int x, int y); -EAPI int e_drag_xdnd_start(E_Drag *drag, int x, int y); +E_API int e_drag_start(E_Drag *drag, int x, int y); +E_API int e_drag_xdnd_start(E_Drag *drag, int x, int y); -EAPI void e_drop_xds_update(Eina_Bool enable, const char *value); -EAPI void e_drop_handler_xds_set(E_Drop_Handler *handler, Eina_Bool (*cb)(void *data, const char *type)); -EAPI E_Drop_Handler *e_drop_handler_add(E_Object *obj, Evas_Object *win, +E_API void e_drop_xds_update(Eina_Bool enable, const char *value); +E_API void e_drop_handler_xds_set(E_Drop_Handler *handler, Eina_Bool (*cb)(void *data, const char *type)); +E_API E_Drop_Handler *e_drop_handler_add(E_Object *obj, Evas_Object *win, void *data, void (*enter_cb)(void *data, const char *type, void *event), void (*move_cb)(void *data, const char *type, void *event), @@ -141,15 +141,15 @@ EAPI E_Drop_Handler *e_drop_handler_add(E_Object *obj, Evas_Object *win, void (*drop_cb)(void *data, const char *type, void *event), const char **types, unsigned int num_types, int x, int y, int w, int h); -EAPI void e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h); -EAPI int e_drop_inside(const E_Drop_Handler *handler, int x, int y); -EAPI void e_drop_handler_del(E_Drop_Handler *handler); -EAPI int e_drop_xdnd_register_set(Ecore_Window win, int reg); -EAPI void e_drop_handler_responsive_set(E_Drop_Handler *handler); -EAPI int e_drop_handler_responsive_get(const E_Drop_Handler *handler); -EAPI void e_drop_handler_action_set(unsigned int action); -EAPI unsigned int e_drop_handler_action_get(void); -EAPI Eina_List *e_dnd_util_text_uri_list_convert(char *data, int size); +E_API void e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h); +E_API int e_drop_inside(const E_Drop_Handler *handler, int x, int y); +E_API void e_drop_handler_del(E_Drop_Handler *handler); +E_API int e_drop_xdnd_register_set(Ecore_Window win, int reg); +E_API void e_drop_handler_responsive_set(E_Drop_Handler *handler); +E_API int e_drop_handler_responsive_get(const E_Drop_Handler *handler); +E_API void e_drop_handler_action_set(unsigned int action); +E_API unsigned int e_drop_handler_action_get(void); +E_API Eina_List *e_dnd_util_text_uri_list_convert(char *data, int size); static inline void diff --git a/src/bin/e_dpms.c b/src/bin/e_dpms.c index fde8e4f..5678e74 100644 --- a/src/bin/e_dpms.c +++ b/src/bin/e_dpms.c @@ -14,7 +14,7 @@ static unsigned int _e_dpms_timeout_suspend = 0; static unsigned int _e_dpms_timeout_off = 0; static int _e_dpms_enabled = EINA_FALSE; -EAPI void +E_API void e_dpms_update(void) { unsigned int standby = 0, suspend = 0, off = 0; @@ -65,7 +65,7 @@ e_dpms_update(void) #endif } -EAPI void +E_API void e_dpms_force_update(void) { unsigned int standby = 0, suspend = 0, off = 0; diff --git a/src/bin/e_dpms.h b/src/bin/e_dpms.h index 80414db..37ec666 100644 --- a/src/bin/e_dpms.h +++ b/src/bin/e_dpms.h @@ -6,8 +6,8 @@ EINTERN int e_dpms_init(void); EINTERN int e_dpms_shutdown(void); -EAPI void e_dpms_update(void); -EAPI void e_dpms_force_update(void); +E_API void e_dpms_update(void); +E_API void e_dpms_force_update(void); #endif #endif diff --git a/src/bin/e_entry_dialog.c b/src/bin/e_entry_dialog.c index 4f8051f..259d9c0 100644 --- a/src/bin/e_entry_dialog.c +++ b/src/bin/e_entry_dialog.c @@ -9,7 +9,7 @@ static void _e_entry_dialog_delete(E_Dialog *dia, Evas *e EINA_UNUSED, Evas_Obje static void _e_entry_cb_key_down(void *data, Evas_Object *obj, void *event_info); /* Externally accesible functions */ -EAPI E_Entry_Dialog * +E_API E_Entry_Dialog * e_entry_dialog_show(const char *title, const char *icon, const char *text, const char *initial_text, const char *button_text, const char *button2_text, diff --git a/src/bin/e_entry_dialog.h b/src/bin/e_entry_dialog.h index 382f3f3..9ea39fa 100644 --- a/src/bin/e_entry_dialog.h +++ b/src/bin/e_entry_dialog.h @@ -25,7 +25,7 @@ struct _E_Entry_Dialog } cancel; }; -EAPI E_Entry_Dialog *e_entry_dialog_show(const char *title, +E_API E_Entry_Dialog *e_entry_dialog_show(const char *title, const char *icon, const char *text, const char *initial_text, diff --git a/src/bin/e_env.c b/src/bin/e_env.c index 719a276..96e5e45 100644 --- a/src/bin/e_env.c +++ b/src/bin/e_env.c @@ -32,13 +32,13 @@ e_env_shutdown(void) return 1; } -EAPI void +E_API void e_env_set(const char *var, const char *val) { e_util_env_set(var, val); } -EAPI void +E_API void e_env_unset(const char *var) { e_util_env_set(var, NULL); diff --git a/src/bin/e_env.h b/src/bin/e_env.h index 0e520f5..83bc773 100644 --- a/src/bin/e_env.h +++ b/src/bin/e_env.h @@ -8,8 +8,8 @@ EINTERN int e_env_init(void); EINTERN int e_env_shutdown(void); -EAPI void e_env_set(const char *var, const char *val); -EAPI void e_env_unset(const char *var); +E_API void e_env_set(const char *var, const char *val); +E_API void e_env_unset(const char *var); #endif #endif diff --git a/src/bin/e_error.c b/src/bin/e_error.c index cd7e5cc..397109b 100644 --- a/src/bin/e_error.c +++ b/src/bin/e_error.c @@ -5,7 +5,7 @@ /* local subsystem globals */ /* externally accessible functions */ -EAPI void +E_API void e_error_message_show_internal(char *txt) { /* FIXME: maybe log these to a file and display them at some point */ diff --git a/src/bin/e_error.h b/src/bin/e_error.h index 205b7d4..cf6d683 100644 --- a/src/bin/e_error.h +++ b/src/bin/e_error.h @@ -12,7 +12,7 @@ #ifndef E_ERROR_H #define E_ERROR_H -EAPI void e_error_message_show_internal(char *txt); +E_API void e_error_message_show_internal(char *txt); #endif #endif diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c index daababe..d538a0f 100644 --- a/src/bin/e_exec.c +++ b/src/bin/e_exec.c @@ -77,9 +77,9 @@ static Ecore_Event_Handler *_e_exec_border_add_handler = NULL; static E_Exec_Instance *(*_e_exec_executor_func)(void *data, E_Zone * zone, Efreet_Desktop * desktop, const char *exec, Eina_List *files, const char *launch_method) = NULL; static void *_e_exec_executor_data = NULL; -EAPI int E_EVENT_EXEC_NEW = -1; -EAPI int E_EVENT_EXEC_NEW_CLIENT = -1; -EAPI int E_EVENT_EXEC_DEL = -1; +E_API int E_EVENT_EXEC_NEW = -1; +E_API int E_EVENT_EXEC_NEW_CLIENT = -1; +E_API int E_EVENT_EXEC_DEL = -1; /* externally accessible functions */ EINTERN int @@ -112,14 +112,14 @@ e_exec_shutdown(void) return 1; } -EAPI void +E_API void e_exec_executor_set(E_Exec_Instance *(*func)(void *data, E_Zone * zone, Efreet_Desktop * desktop, const char *exec, Eina_List *files, const char *launch_method), const void *data) { _e_exec_executor_func = func; _e_exec_executor_data = (void *)data; } -EAPI E_Exec_Instance * +E_API E_Exec_Instance * e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char *launch_method) { @@ -212,7 +212,7 @@ e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec, return inst; } -EAPI void +E_API void e_exec_phony_del(E_Exec_Instance *inst) { if (!inst) return; @@ -222,7 +222,7 @@ e_exec_phony_del(E_Exec_Instance *inst) _e_exec_instance_free(inst); } -EAPI E_Exec_Instance * +E_API E_Exec_Instance * e_exec_phony(E_Client *ec) { E_Exec_Instance *inst; @@ -288,7 +288,7 @@ e_exec_phony(E_Client *ec) return inst; } -EAPI E_Exec_Instance * +E_API E_Exec_Instance * e_exec_startup_id_pid_instance_find(int id, pid_t pid) { E_Exec_Search search; @@ -301,7 +301,7 @@ e_exec_startup_id_pid_instance_find(int id, pid_t pid) return search.inst; } -EAPI Efreet_Desktop * +E_API Efreet_Desktop * e_exec_startup_id_pid_find(int id, pid_t pid) { E_Exec_Instance *inst; @@ -311,7 +311,7 @@ e_exec_startup_id_pid_find(int id, pid_t pid) return inst->desktop; } -EAPI E_Exec_Instance * +E_API E_Exec_Instance * e_exec_startup_desktop_instance_find(Efreet_Desktop *desktop) { E_Exec_Search search; @@ -349,14 +349,14 @@ _e_exe_instance_watchers_call(E_Exec_Instance *inst, E_Exec_Watch_Type type) } } -EAPI void +E_API void e_exec_instance_found(E_Exec_Instance *inst) { E_FREE_FUNC(inst->expire_timer, ecore_timer_del); _e_exe_instance_watchers_call(inst, E_EXEC_WATCH_STARTED); } -EAPI void +E_API void e_exec_instance_client_add(E_Exec_Instance *inst, E_Client *ec) { e_object_ref(E_OBJECT(ec)); @@ -366,7 +366,7 @@ e_exec_instance_client_add(E_Exec_Instance *inst, E_Client *ec) ecore_event_add(E_EVENT_EXEC_NEW_CLIENT, inst, _e_exec_cb_exec_new_client_free, ec); } -EAPI void +E_API void e_exec_instance_watcher_add(E_Exec_Instance *inst, void (*func)(void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type), const void *data) { E_Exec_Watch *iw; @@ -378,7 +378,7 @@ e_exec_instance_watcher_add(E_Exec_Instance *inst, void (*func)(void *data, E_Ex inst->watchers = eina_list_append(inst->watchers, iw); } -EAPI void +E_API void e_exec_instance_watcher_del(E_Exec_Instance *inst, void (*func)(void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type), const void *data) { E_Exec_Watch *iw; @@ -1233,14 +1233,14 @@ _dialog_save_cb(void *data EINA_UNUSED, void *data2) fclose(f); } -EAPI const Eina_List * +E_API const Eina_List * e_exec_desktop_instances_find(const Efreet_Desktop *desktop) { EINA_SAFETY_ON_NULL_RETURN_VAL(desktop, NULL); return eina_hash_find(e_exec_instances, desktop->orig_path ?: desktop->name); } -EAPI const Eina_Hash * +E_API const Eina_Hash * e_exec_instances_get(void) { return e_exec_instances; diff --git a/src/bin/e_exec.h b/src/bin/e_exec.h index c76c8ff..df59b1d 100644 --- a/src/bin/e_exec.h +++ b/src/bin/e_exec.h @@ -33,25 +33,25 @@ typedef enum EINTERN int e_exec_init(void); EINTERN int e_exec_shutdown(void); -EAPI void e_exec_executor_set(E_Exec_Instance *(*func) (void *data, E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char *launch_method), const void *data); -EAPI E_Exec_Instance *e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char *launch_method); -EAPI E_Exec_Instance *e_exec_phony(E_Client *ec); -EAPI void e_exec_phony_del(E_Exec_Instance *inst); -EAPI E_Exec_Instance *e_exec_startup_id_pid_instance_find(int id, pid_t pid); -EAPI Efreet_Desktop *e_exec_startup_id_pid_find(int startup_id, pid_t pid); -EAPI E_Exec_Instance *e_exec_startup_desktop_instance_find(Efreet_Desktop *desktop); -EAPI void e_exec_instance_found(E_Exec_Instance *inst); -EAPI void e_exec_instance_watcher_add(E_Exec_Instance *inst, void (*func) (void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type), const void *data); -EAPI void e_exec_instance_watcher_del(E_Exec_Instance *inst, void (*func) (void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type), const void *data); -EAPI const Eina_List *e_exec_desktop_instances_find(const Efreet_Desktop *desktop); - -EAPI const Eina_Hash *e_exec_instances_get(void); -EAPI void e_exec_instance_client_add(E_Exec_Instance *inst, E_Client *ec); +E_API void e_exec_executor_set(E_Exec_Instance *(*func) (void *data, E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char *launch_method), const void *data); +E_API E_Exec_Instance *e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char *launch_method); +E_API E_Exec_Instance *e_exec_phony(E_Client *ec); +E_API void e_exec_phony_del(E_Exec_Instance *inst); +E_API E_Exec_Instance *e_exec_startup_id_pid_instance_find(int id, pid_t pid); +E_API Efreet_Desktop *e_exec_startup_id_pid_find(int startup_id, pid_t pid); +E_API E_Exec_Instance *e_exec_startup_desktop_instance_find(Efreet_Desktop *desktop); +E_API void e_exec_instance_found(E_Exec_Instance *inst); +E_API void e_exec_instance_watcher_add(E_Exec_Instance *inst, void (*func) (void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type), const void *data); +E_API void e_exec_instance_watcher_del(E_Exec_Instance *inst, void (*func) (void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type), const void *data); +E_API const Eina_List *e_exec_desktop_instances_find(const Efreet_Desktop *desktop); + +E_API const Eina_Hash *e_exec_instances_get(void); +E_API void e_exec_instance_client_add(E_Exec_Instance *inst, E_Client *ec); /* sends E_Exec_Instance */ -EAPI extern int E_EVENT_EXEC_NEW; -EAPI extern int E_EVENT_EXEC_NEW_CLIENT; -EAPI extern int E_EVENT_EXEC_DEL; +E_API extern int E_EVENT_EXEC_NEW; +E_API extern int E_EVENT_EXEC_NEW_CLIENT; +E_API extern int E_EVENT_EXEC_DEL; #endif #endif diff --git a/src/bin/e_exehist.c b/src/bin/e_exehist.c index 488fd62..ec7ef71 100644 --- a/src/bin/e_exehist.c +++ b/src/bin/e_exehist.c @@ -1,7 +1,7 @@ #include "e.h" #include -EAPI int E_EVENT_EXEHIST_UPDATE = 0; +E_API int E_EVENT_EXEHIST_UPDATE = 0; /* local subsystem functions */ typedef struct _E_Exehist E_Exehist; @@ -82,7 +82,7 @@ e_exehist_shutdown(void) return 1; } -EAPI void +E_API void e_exehist_startup_id_set(int id) { _e_exehist_load(); @@ -92,7 +92,7 @@ e_exehist_startup_id_set(int id) _e_exehist_unload_queue(); } -EAPI int +E_API int e_exehist_startup_id_get(void) { int id; @@ -103,7 +103,7 @@ e_exehist_startup_id_get(void) return id; } -EAPI void +E_API void e_exehist_add(const char *launch_method, const char *exe) { E_Exehist_Item *ei; @@ -127,7 +127,7 @@ e_exehist_add(const char *launch_method, const char *exe) _e_exehist_unload_queue(); } -EAPI void +E_API void e_exehist_del(const char *exe) { E_Exehist_Item *ei; @@ -155,7 +155,7 @@ e_exehist_del(const char *exe) ecore_event_add(E_EVENT_EXEHIST_UPDATE, NULL, NULL, NULL); } -EAPI void +E_API void e_exehist_clear(void) { _e_exehist_load(); @@ -166,7 +166,7 @@ e_exehist_clear(void) _e_exehist_unload_queue(); } -EAPI int +E_API int e_exehist_popularity_get(const char *exe) { Eina_List *l; @@ -188,7 +188,7 @@ e_exehist_popularity_get(const char *exe) return count; } -EAPI double +E_API double e_exehist_newest_run_get(const char *exe) { Eina_List *l; @@ -213,13 +213,13 @@ e_exehist_newest_run_get(const char *exe) return 0.0; } -EAPI Eina_List * +E_API Eina_List * e_exehist_list_get(void) { return e_exehist_sorted_list_get(E_EXEHIST_SORT_BY_DATE, 0); } -EAPI Eina_List * +E_API Eina_List * e_exehist_sorted_list_get(E_Exehist_Sort sort_type, int max) { Eina_List *list = NULL, *pop = NULL, *l = NULL, *m; @@ -296,7 +296,7 @@ e_exehist_sorted_list_get(E_Exehist_Sort sort_type, int max) return list; } -EAPI void +E_API void e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop) { const char *f; @@ -363,7 +363,7 @@ e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop) _e_exehist_unload_queue(); } -EAPI Efreet_Desktop * +E_API Efreet_Desktop * e_exehist_mime_desktop_get(const char *mime) { Efreet_Desktop *desktop; diff --git a/src/bin/e_exehist.h b/src/bin/e_exehist.h index 2ca9f97..f745f59 100644 --- a/src/bin/e_exehist.h +++ b/src/bin/e_exehist.h @@ -14,19 +14,19 @@ typedef enum _E_Exehist_Sort EINTERN int e_exehist_init(void); EINTERN int e_exehist_shutdown(void); -EAPI void e_exehist_startup_id_set(int id); -EAPI int e_exehist_startup_id_get(void); -EAPI void e_exehist_add(const char *launch_method, const char *exe); -EAPI void e_exehist_del(const char *exe); -EAPI void e_exehist_clear(void); -EAPI int e_exehist_popularity_get(const char *exe); -EAPI double e_exehist_newest_run_get(const char *exe); -EAPI Eina_List *e_exehist_list_get(void); -EAPI Eina_List *e_exehist_sorted_list_get(E_Exehist_Sort sort_type, int max); -EAPI void e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop); -EAPI Efreet_Desktop *e_exehist_mime_desktop_get(const char *mime); +E_API void e_exehist_startup_id_set(int id); +E_API int e_exehist_startup_id_get(void); +E_API void e_exehist_add(const char *launch_method, const char *exe); +E_API void e_exehist_del(const char *exe); +E_API void e_exehist_clear(void); +E_API int e_exehist_popularity_get(const char *exe); +E_API double e_exehist_newest_run_get(const char *exe); +E_API Eina_List *e_exehist_list_get(void); +E_API Eina_List *e_exehist_sorted_list_get(E_Exehist_Sort sort_type, int max); +E_API void e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop); +E_API Efreet_Desktop *e_exehist_mime_desktop_get(const char *mime); -extern EAPI int E_EVENT_EXEHIST_UPDATE; +extern E_API int E_EVENT_EXEHIST_UPDATE; #endif #endif diff --git a/src/bin/e_filereg.c b/src/bin/e_filereg.c index 9443407..9fa43f6 100644 --- a/src/bin/e_filereg.c +++ b/src/bin/e_filereg.c @@ -36,7 +36,7 @@ e_filereg_shutdown(void) return 1; } -EAPI int +E_API int e_filereg_register(const char *path) { Filereg_Item *fi = NULL; @@ -55,7 +55,7 @@ e_filereg_register(const char *path) return 1; } -EAPI void +E_API void e_filereg_deregister(const char *path) { Filereg_Item *fi = NULL; @@ -73,7 +73,7 @@ e_filereg_deregister(const char *path) } } -EAPI Eina_Bool +E_API Eina_Bool e_filereg_file_protected(const char *path) { if (eina_hash_find(_e_filereg, path)) return EINA_TRUE; diff --git a/src/bin/e_filereg.h b/src/bin/e_filereg.h index 32ba41c..057e454 100644 --- a/src/bin/e_filereg.h +++ b/src/bin/e_filereg.h @@ -7,9 +7,9 @@ EINTERN int e_filereg_init(void); EINTERN int e_filereg_shutdown(void); -EAPI int e_filereg_register(const char * path); -EAPI void e_filereg_deregister(const char * path); -EAPI Eina_Bool e_filereg_file_protected(const char * path); +E_API int e_filereg_register(const char * path); +E_API void e_filereg_deregister(const char * path); +E_API Eina_Bool e_filereg_file_protected(const char * path); #endif #endif diff --git a/src/bin/e_flowlayout.c b/src/bin/e_flowlayout.c index 0b576dd..1463164 100644 --- a/src/bin/e_flowlayout.c +++ b/src/bin/e_flowlayout.c @@ -68,14 +68,14 @@ static void _e_flowlayout_smart_clip_unset(Evas_Object *obj); static Evas_Smart *_e_smart = NULL; /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_flowlayout_add(Evas *evas) { _e_flowlayout_smart_init(); return evas_object_smart_add(evas, _e_smart); } -EAPI int +E_API int e_flowlayout_freeze(Evas_Object *obj) { E_Smart_Data *sd; @@ -87,7 +87,7 @@ e_flowlayout_freeze(Evas_Object *obj) return sd->frozen; } -EAPI int +E_API int e_flowlayout_thaw(Evas_Object *obj) { E_Smart_Data *sd; @@ -100,7 +100,7 @@ e_flowlayout_thaw(Evas_Object *obj) return sd->frozen; } -EAPI void +E_API void e_flowlayout_orientation_set(Evas_Object *obj, int horizontal) { E_Smart_Data *sd; @@ -115,7 +115,7 @@ e_flowlayout_orientation_set(Evas_Object *obj, int horizontal) if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd); } -EAPI int +E_API int e_flowlayout_orientation_get(Evas_Object *obj) { E_Smart_Data *sd; @@ -126,7 +126,7 @@ e_flowlayout_orientation_get(Evas_Object *obj) return sd->horizontal; } -EAPI void +E_API void e_flowlayout_flowdirection_set(Evas_Object *obj, int right, int bottom) { E_Smart_Data *sd; @@ -144,7 +144,7 @@ e_flowlayout_flowdirection_set(Evas_Object *obj, int right, int bottom) if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd); } -EAPI void +E_API void e_flowlayout_flowdirection_get(Evas_Object *obj, int *right, int *bottom) { E_Smart_Data *sd; @@ -156,7 +156,7 @@ e_flowlayout_flowdirection_get(Evas_Object *obj, int *right, int *bottom) if (bottom) *bottom = sd->flowright; } -EAPI void +E_API void e_flowlayout_homogenous_set(Evas_Object *obj, int homogenous) { E_Smart_Data *sd; @@ -170,7 +170,7 @@ e_flowlayout_homogenous_set(Evas_Object *obj, int homogenous) if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd); } -EAPI int +E_API int e_flowlayout_homogenous_get(Evas_Object *obj) { E_Smart_Data *sd; @@ -181,7 +181,7 @@ e_flowlayout_homogenous_get(Evas_Object *obj) return sd->homogenous; } -EAPI void +E_API void e_flowlayout_fill_set(Evas_Object *obj, int fill) { E_Smart_Data *sd; @@ -195,7 +195,7 @@ e_flowlayout_fill_set(Evas_Object *obj, int fill) if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd); } -EAPI int +E_API int e_flowlayout_fill_get(Evas_Object *obj) { E_Smart_Data *sd; @@ -206,7 +206,7 @@ e_flowlayout_fill_get(Evas_Object *obj) return sd->fill; } -EAPI int +E_API int e_flowlayout_pack_start(Evas_Object *obj, Evas_Object *child) { E_Smart_Data *sd; @@ -221,7 +221,7 @@ e_flowlayout_pack_start(Evas_Object *obj, Evas_Object *child) return 0; } -EAPI int +E_API int e_flowlayout_pack_end(Evas_Object *obj, Evas_Object *child) { E_Smart_Data *sd; @@ -236,7 +236,7 @@ e_flowlayout_pack_end(Evas_Object *obj, Evas_Object *child) return eina_list_count(sd->items) - 1; } -EAPI int +E_API int e_flowlayout_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *before) { E_Smart_Data *sd; @@ -259,7 +259,7 @@ e_flowlayout_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *befo return i; } -EAPI int +E_API int e_flowlayout_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after) { E_Smart_Data *sd; @@ -282,7 +282,7 @@ e_flowlayout_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after return i; } -EAPI int +E_API int e_flowlayout_pack_count_get(Evas_Object *obj) { E_Smart_Data *sd; @@ -293,7 +293,7 @@ e_flowlayout_pack_count_get(Evas_Object *obj) return eina_list_count(sd->items); } -EAPI Evas_Object * +E_API Evas_Object * e_flowlayout_pack_object_nth(Evas_Object *obj, int n) { E_Smart_Data *sd; @@ -304,7 +304,7 @@ e_flowlayout_pack_object_nth(Evas_Object *obj, int n) return eina_list_nth(sd->items, n); } -EAPI Evas_Object * +E_API Evas_Object * e_flowlayout_pack_object_first(Evas_Object *obj) { E_Smart_Data *sd; @@ -315,7 +315,7 @@ e_flowlayout_pack_object_first(Evas_Object *obj) return eina_list_data_get(sd->items); } -EAPI Evas_Object * +E_API Evas_Object * e_flowlayout_pack_object_last(Evas_Object *obj) { E_Smart_Data *sd; @@ -326,7 +326,7 @@ e_flowlayout_pack_object_last(Evas_Object *obj) return eina_list_last_data_get(sd->items); } -EAPI Evas_Object * +E_API Evas_Object * e_flowlayout_pack_object_prev(Evas_Object *obj, Evas_Object *child) { E_Smart_Data *sd; @@ -341,7 +341,7 @@ e_flowlayout_pack_object_prev(Evas_Object *obj, Evas_Object *child) return NULL; } -EAPI Evas_Object * +E_API Evas_Object * e_flowlayout_pack_object_next(Evas_Object *obj, Evas_Object *child) { E_Smart_Data *sd; @@ -356,7 +356,7 @@ e_flowlayout_pack_object_next(Evas_Object *obj, Evas_Object *child) return NULL; } -EAPI void +E_API void e_flowlayout_pack_options_set(Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h) { E_Flowlayout_Item *bi; @@ -377,7 +377,7 @@ e_flowlayout_pack_options_set(Evas_Object *obj, int fill_w, int fill_h, int expa if (bi->sd->frozen <= 0) _e_flowlayout_smart_reconfigure(bi->sd); } -EAPI void +E_API void e_flowlayout_unpack(Evas_Object *obj) { E_Flowlayout_Item *bi; @@ -393,7 +393,7 @@ e_flowlayout_unpack(Evas_Object *obj) if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd); } -EAPI void +E_API void e_flowlayout_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) { E_Smart_Data *sd; @@ -406,7 +406,7 @@ e_flowlayout_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) if (minh) *minh = sd->min.h; } -EAPI void +E_API void e_flowlayout_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh) { E_Smart_Data *sd; @@ -419,7 +419,7 @@ e_flowlayout_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh) if (maxh) *maxh = sd->max.h; } -EAPI int +E_API int e_flowlayout_max_children(Evas_Object *obj) { E_Smart_Data *sd; @@ -431,7 +431,7 @@ e_flowlayout_max_children(Evas_Object *obj) return sd->rows * sd->cols; } -EAPI void +E_API void e_flowlayout_align_get(Evas_Object *obj, double *ax, double *ay) { E_Smart_Data *sd; @@ -443,7 +443,7 @@ e_flowlayout_align_get(Evas_Object *obj, double *ax, double *ay) if (ay) *ay = sd->align.y; } -EAPI void +E_API void e_flowlayout_align_set(Evas_Object *obj, double ax, double ay) { E_Smart_Data *sd; diff --git a/src/bin/e_flowlayout.h b/src/bin/e_flowlayout.h index a49e35b..da898b3 100644 --- a/src/bin/e_flowlayout.h +++ b/src/bin/e_flowlayout.h @@ -3,34 +3,34 @@ #ifndef E_FLOWLAYOUT_H #define E_FLOWLAYOUT_H -EAPI Evas_Object *e_flowlayout_add (Evas *evas); -EAPI int e_flowlayout_freeze (Evas_Object *obj); -EAPI int e_flowlayout_thaw (Evas_Object *obj); -EAPI void e_flowlayout_orientation_set (Evas_Object *obj, int horizontal); -EAPI int e_flowlayout_orientation_get (Evas_Object *obj); -EAPI void e_flowlayout_flowdirection_set (Evas_Object *obj, int right, int bottom); -EAPI void e_flowlayout_flowdirection_get (Evas_Object *obj, int *right, int *bottom); -EAPI void e_flowlayout_homogenous_set (Evas_Object *obj, int homogenous); -EAPI int e_flowlayout_fill_get (Evas_Object *obj); -EAPI void e_flowlayout_fill_set (Evas_Object *obj, int fill); -EAPI int e_flowlayout_pack_start (Evas_Object *obj, Evas_Object *child); -EAPI int e_flowlayout_pack_end (Evas_Object *obj, Evas_Object *child); -EAPI int e_flowlayout_pack_before (Evas_Object *obj, Evas_Object *child, Evas_Object *before); -EAPI int e_flowlayout_pack_after (Evas_Object *obj, Evas_Object *child, Evas_Object *after); -EAPI int e_flowlayout_pack_count_get (Evas_Object *obj); -EAPI Evas_Object *e_flowlayout_pack_object_nth (Evas_Object *obj, int n); -EAPI Evas_Object *e_flowlayout_pack_object_first (Evas_Object *obj); -EAPI Evas_Object *e_flowlayout_pack_object_last (Evas_Object *obj); -EAPI Evas_Object *e_flowlayout_pack_object_prev(Evas_Object *obj, Evas_Object *child); -EAPI Evas_Object *e_flowlayout_pack_object_next(Evas_Object *obj, Evas_Object *child); -EAPI void e_flowlayout_pack_options_set (Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h); -EAPI void e_flowlayout_unpack (Evas_Object *obj); -EAPI void e_flowlayout_size_min_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh); -EAPI void e_flowlayout_size_max_get (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh); -EAPI void e_flowlayout_align_get (Evas_Object *obj, double *ax, double *ay); -EAPI void e_flowlayout_align_set (Evas_Object *obj, double ax, double ay); +E_API Evas_Object *e_flowlayout_add (Evas *evas); +E_API int e_flowlayout_freeze (Evas_Object *obj); +E_API int e_flowlayout_thaw (Evas_Object *obj); +E_API void e_flowlayout_orientation_set (Evas_Object *obj, int horizontal); +E_API int e_flowlayout_orientation_get (Evas_Object *obj); +E_API void e_flowlayout_flowdirection_set (Evas_Object *obj, int right, int bottom); +E_API void e_flowlayout_flowdirection_get (Evas_Object *obj, int *right, int *bottom); +E_API void e_flowlayout_homogenous_set (Evas_Object *obj, int homogenous); +E_API int e_flowlayout_fill_get (Evas_Object *obj); +E_API void e_flowlayout_fill_set (Evas_Object *obj, int fill); +E_API int e_flowlayout_pack_start (Evas_Object *obj, Evas_Object *child); +E_API int e_flowlayout_pack_end (Evas_Object *obj, Evas_Object *child); +E_API int e_flowlayout_pack_before (Evas_Object *obj, Evas_Object *child, Evas_Object *before); +E_API int e_flowlayout_pack_after (Evas_Object *obj, Evas_Object *child, Evas_Object *after); +E_API int e_flowlayout_pack_count_get (Evas_Object *obj); +E_API Evas_Object *e_flowlayout_pack_object_nth (Evas_Object *obj, int n); +E_API Evas_Object *e_flowlayout_pack_object_first (Evas_Object *obj); +E_API Evas_Object *e_flowlayout_pack_object_last (Evas_Object *obj); +E_API Evas_Object *e_flowlayout_pack_object_prev(Evas_Object *obj, Evas_Object *child); +E_API Evas_Object *e_flowlayout_pack_object_next(Evas_Object *obj, Evas_Object *child); +E_API void e_flowlayout_pack_options_set (Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h); +E_API void e_flowlayout_unpack (Evas_Object *obj); +E_API void e_flowlayout_size_min_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh); +E_API void e_flowlayout_size_max_get (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh); +E_API void e_flowlayout_align_get (Evas_Object *obj, double *ax, double *ay); +E_API void e_flowlayout_align_set (Evas_Object *obj, double ax, double ay); /* This function only works if homogenous is set */ -EAPI int e_flowlayout_max_children (Evas_Object *obj); +E_API int e_flowlayout_max_children (Evas_Object *obj); #endif #endif diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 72dacc3..2049f13 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -887,7 +887,7 @@ e_fm2_shutdown(void) return 1; } -EAPI Evas_Object * +E_API Evas_Object * e_fm2_add(Evas *evas) { return evas_object_smart_add(evas, _e_fm2_smart); @@ -1021,7 +1021,7 @@ _e_fm2_thread_cleanup_cb(void *d EINA_UNUSED, Ecore_Thread *et EINA_UNUSED) _e_fm2_favorites_thread = NULL; } -EAPI void +E_API void e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path) { const char *real_path; @@ -1163,49 +1163,49 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path) sd->tmp.iter = EINA_FALSE; } -EAPI void +E_API void e_fm2_underlay_show(Evas_Object *obj) { EFM_SMART_CHECK(); evas_object_show(sd->underlay); } -EAPI void +E_API void e_fm2_underlay_hide(Evas_Object *obj) { EFM_SMART_CHECK(); evas_object_hide(sd->underlay); } -EAPI void +E_API void e_fm2_all_unsel(Evas_Object *obj) { EFM_SMART_CHECK(); _e_fm2_icon_desel_any(obj); } -EAPI void +E_API void e_fm2_all_sel(Evas_Object *obj) { EFM_SMART_CHECK(); _e_fm2_icon_sel_any(obj); } -EAPI void +E_API void e_fm2_first_sel(Evas_Object *obj) { EFM_SMART_CHECK(); _e_fm2_icon_sel_first(obj, EINA_FALSE); } -EAPI void +E_API void e_fm2_last_sel(Evas_Object *obj) { EFM_SMART_CHECK(); _e_fm2_icon_sel_last(obj, EINA_FALSE); } -EAPI void +E_API void e_fm2_custom_theme_set(Evas_Object *obj, const char *path) { EFM_SMART_CHECK(); @@ -1220,7 +1220,7 @@ e_fm2_custom_theme_set(Evas_Object *obj, const char *path) "rubberband"); } -EAPI void +E_API void e_fm2_custom_theme_content_set(Evas_Object *obj, const char *content) { EFM_SMART_CHECK(); @@ -1233,7 +1233,7 @@ e_fm2_custom_theme_content_set(Evas_Object *obj, const char *content) "overlay"); } -EAPI void +E_API void e_fm2_path_get(Evas_Object *obj, const char **dev, const char **path) { if (dev) *dev = NULL; @@ -1400,7 +1400,7 @@ _e_fm2_dir_save_props(E_Fm2_Smart_Data *sd) e_fm2_custom_file_flush(); } -EAPI void +E_API void e_fm2_refresh(Evas_Object *obj) { EFM_SMART_CHECK(); @@ -1426,7 +1426,7 @@ e_fm2_refresh(Evas_Object *obj) sd->tmp.iter = EINA_FALSE; } -EAPI int +E_API int e_fm2_has_parent_get(Evas_Object *obj) { EFM_SMART_CHECK(0); @@ -1437,14 +1437,14 @@ e_fm2_has_parent_get(Evas_Object *obj) return 1; } -EAPI const char * +E_API const char * e_fm2_real_path_get(Evas_Object *obj) { EFM_SMART_CHECK(NULL); return sd->realpath; } -EAPI void +E_API void e_fm2_parent_go(Evas_Object *obj) { char *p, *path; @@ -1462,7 +1462,7 @@ e_fm2_parent_go(Evas_Object *obj) } } -EAPI void +E_API void e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg) { EFM_SMART_CHECK(); @@ -1479,14 +1479,14 @@ e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg) sd->config->theme.icons = eina_stringshare_add(cfg->theme.icons); } -EAPI E_Fm2_Config * +E_API E_Fm2_Config * e_fm2_config_get(Evas_Object *obj) { EFM_SMART_CHECK(NULL); return sd->config; } -EAPI Eina_List * +E_API Eina_List * e_fm2_selected_list_get(Evas_Object *obj) { Eina_List *list = NULL, *l; @@ -1498,7 +1498,7 @@ e_fm2_selected_list_get(Evas_Object *obj) return list; } -EAPI Eina_List * +E_API Eina_List * e_fm2_all_list_get(Evas_Object *obj) { Eina_List *list = NULL, *l; @@ -1512,14 +1512,14 @@ e_fm2_all_list_get(Evas_Object *obj) return list; } -EAPI void +E_API void e_fm2_deselect_all(Evas_Object *obj) { EFM_SMART_CHECK(); _e_fm2_icon_desel_any(obj); } -EAPI void +E_API void e_fm2_select_set(Evas_Object *obj, const char *file, int select_) { Eina_List *l; @@ -1542,7 +1542,7 @@ e_fm2_select_set(Evas_Object *obj, const char *file, int select_) } } -EAPI void +E_API void e_fm2_file_show(Evas_Object *obj, const char *file) { Eina_List *l; @@ -1559,7 +1559,7 @@ e_fm2_file_show(Evas_Object *obj, const char *file) } } -EAPI void +E_API void e_fm2_icon_menu_replace_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data) { EFM_SMART_CHECK(); @@ -1567,7 +1567,7 @@ e_fm2_icon_menu_replace_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data) sd->icon_menu.replace.data = data; } -EAPI void +E_API void e_fm2_icon_menu_start_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data) { EFM_SMART_CHECK(); @@ -1575,7 +1575,7 @@ e_fm2_icon_menu_start_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void * sd->icon_menu.start.data = data; } -EAPI void +E_API void e_fm2_icon_menu_end_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data) { EFM_SMART_CHECK(); @@ -1583,42 +1583,42 @@ e_fm2_icon_menu_end_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *da sd->icon_menu.end.data = data; } -EAPI void +E_API void e_fm2_icon_menu_flags_set(Evas_Object *obj, E_Fm2_Menu_Flags flags) { EFM_SMART_CHECK(); sd->icon_menu.flags = flags; } -EAPI E_Fm2_Menu_Flags +E_API E_Fm2_Menu_Flags e_fm2_icon_menu_flags_get(Evas_Object *obj) { EFM_SMART_CHECK(0); return sd->icon_menu.flags; } -EAPI void +E_API void e_fm2_view_flags_set(Evas_Object *obj, E_Fm2_View_Flags flags) { EFM_SMART_CHECK(); sd->view_flags = flags; } -EAPI E_Fm2_View_Flags +E_API E_Fm2_View_Flags e_fm2_view_flags_get(Evas_Object *obj) { EFM_SMART_CHECK(0); return sd->view_flags; } -EAPI E_Object * +E_API E_Object * e_fm2_window_object_get(Evas_Object *obj) { EFM_SMART_CHECK(NULL); return sd->eobj; } -EAPI void +E_API void e_fm2_window_object_set(Evas_Object *obj, E_Object *eobj) { const char *drop[] = {"text/uri-list", "text/x-moz-url", "XdndDirectSave0"}; @@ -1639,7 +1639,7 @@ e_fm2_window_object_set(Evas_Object *obj, E_Object *eobj) e_drop_handler_xds_set(sd->drop_handler, _e_fm2_cb_dnd_drop); } -EAPI void +E_API void e_fm2_window_set(Evas_Object *obj, Evas_Object *win) { const char *drop[] = {"text/uri-list", "text/x-moz-url", "XdndDirectSave0"}; @@ -1721,14 +1721,14 @@ _e_fm2_icons_update_helper(E_Fm2_Smart_Data *sd, Eina_Bool icon_only) e_fm2_custom_file_flush(); } -EAPI void +E_API void e_fm2_icons_update(Evas_Object *obj) { EFM_SMART_CHECK(); _e_fm2_icons_update_helper(sd, EINA_FALSE); } -EAPI void +E_API void e_fm2_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { EFM_SMART_CHECK(); @@ -1743,7 +1743,7 @@ e_fm2_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) sd->scroll_job = ecore_job_add(_e_fm2_cb_scroll_job, obj); } -EAPI void +E_API void e_fm2_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) { EFM_SMART_CHECK(); @@ -1751,7 +1751,7 @@ e_fm2_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) if (y) *y = sd->pos.y; } -EAPI void +E_API void e_fm2_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) { Evas_Coord mx, my; @@ -1764,7 +1764,7 @@ e_fm2_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) if (y) *y = my; } -EAPI void +E_API void e_fm2_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { EFM_SMART_CHECK(); @@ -1772,7 +1772,7 @@ e_fm2_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) if (h) *h = sd->max.h; } -EAPI void +E_API void e_fm2_all_icons_update(void) { Evas_Object *o; @@ -2252,7 +2252,7 @@ _e_fm2_icon_discover_get(Evas *evas, const E_Fm2_Icon *ic, Evas_Smart_Cb gen_fun * @param force_gen force thumbnail generation. * @param type_ret string that identifies type of icon. */ -EAPI Evas_Object * +E_API Evas_Object * e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic, Evas_Smart_Cb gen_func, void *data, int force_gen, const char **type_ret) @@ -2338,14 +2338,14 @@ e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic, return _e_fm2_icon_explicit_theme_get(evas, ic, "text/plain", type_ret); } -EAPI E_Fm2_Icon_Info * +E_API E_Fm2_Icon_Info * e_fm2_icon_file_info_get(E_Fm2_Icon *ic) { if (!ic) return NULL; return &(ic->info); } -EAPI void +E_API void e_fm2_icon_geometry_get(E_Fm2_Icon *ic, int *x, int *y, int *w, int *h) { int xx, yy, ww, hh; @@ -2566,7 +2566,7 @@ _e_fm2_client_file_mkdir(const char *path, const char *rel, int rel_to, int x, i #endif -EAPI int +E_API int e_fm2_client_file_move(Evas_Object *e_fm, const char *args) { int id; @@ -2577,7 +2577,7 @@ e_fm2_client_file_move(Evas_Object *e_fm, const char *args) return id; } -EAPI int +E_API int e_fm2_client_file_copy(Evas_Object *e_fm, const char *args) { int id = _e_fm_client_send_new(E_FM_OP_COPY, (void *)args, strlen(args) + 1); @@ -2585,7 +2585,7 @@ e_fm2_client_file_copy(Evas_Object *e_fm, const char *args) return id; } -EAPI int +E_API int e_fm2_client_file_symlink(Evas_Object *e_fm, const char *args) { int id = _e_fm_client_send_new(E_FM_OP_SYMLINK, (void *)args, strlen(args) + 1); @@ -2593,7 +2593,7 @@ e_fm2_client_file_symlink(Evas_Object *e_fm, const char *args) return id; } -EAPI int +E_API int _e_fm2_client_mount(const char *udi, const char *mountpoint) { char *d; @@ -2618,7 +2618,7 @@ _e_fm2_client_mount(const char *udi, const char *mountpoint) return _e_fm_client_send_new(E_FM_OP_MOUNT, (void *)d, l); } -EAPI int +E_API int _e_fm2_client_unmount(const char *udi) { char *d; @@ -2637,7 +2637,7 @@ _e_fm2_client_unmount(const char *udi) return _e_fm_client_send_new(E_FM_OP_UNMOUNT, (void *)d, l); } -EAPI int +E_API int _e_fm2_client_eject(const char *udi) { char *data; @@ -2691,7 +2691,7 @@ _e_fm2_client_monitor_list_end(Evas_Object *obj) _e_fm2_live_process_begin(obj); } -EAPI void +E_API void _e_fm2_file_force_update(const char *path) { Evas_Object *o; @@ -2731,7 +2731,7 @@ _e_fm2_file_force_update(const char *path) free(dir); } -EAPI void +E_API void e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) { Evas_Object *obj; @@ -3237,7 +3237,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) } } -EAPI void +E_API void e_fm2_client_del(Ecore_Ipc_Event_Client_Del *e) { Eina_List *l; @@ -5154,7 +5154,7 @@ _e_fm2_icon_desktop_url_eval(const char *val) return s; } -EAPI const char * +E_API const char * e_fm2_desktop_url_eval(const char *val) { return _e_fm2_icon_desktop_url_eval(val); @@ -7789,6 +7789,7 @@ _e_fm2_cb_icon_thumb_gen(void *data, Evas_Object *obj, void *event_info EINA_UNU _e_fm2_icon_icon_set(ic); } +#if 0 static void _e_fm2_cb_focus_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { @@ -7797,6 +7798,7 @@ _e_fm2_cb_focus_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED if (sd->iop_icon && sd->iop_icon->entry_widget) e_widget_focus_set(sd->iop_icon->entry_widget, 1); } +#endif static void _e_fm2_cb_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info) @@ -11536,7 +11538,7 @@ _e_fm2_operation_abort_internal(E_Fm2_Op_Registry_Entry *ere) _e_fm_client_send(E_FM_OP_ABORT, ere->id, NULL, 0); } -EAPI void +E_API void e_fm2_operation_abort(int id) { E_Fm2_Op_Registry_Entry *ere; @@ -11549,7 +11551,7 @@ e_fm2_operation_abort(int id) e_fm2_op_registry_entry_unref(ere); } -EAPI Eina_Bool +E_API Eina_Bool e_fm2_optimal_size_calc(Evas_Object *obj, int minw, int maxw, int maxh, int *w, int *h) { int x, y, step_w, step_h; @@ -11587,28 +11589,28 @@ e_fm2_optimal_size_calc(Evas_Object *obj, int minw, int maxw, int maxh, int *w, return EINA_TRUE; } -EAPI E_Fm2_View_Mode +E_API E_Fm2_View_Mode e_fm2_view_mode_get(Evas_Object *obj) { EFM_SMART_CHECK(0); return _e_fm2_view_mode_get(sd); } -EAPI Eina_Bool +E_API Eina_Bool e_fm2_typebuf_visible_get(Evas_Object *obj) { EFM_SMART_CHECK(EINA_FALSE); return sd->typebuf_visible; } -EAPI void +E_API void e_fm2_typebuf_clear(Evas_Object *obj) { EFM_SMART_CHECK(); _e_fm2_typebuf_hide(obj); } -EAPI void +E_API void e_fm2_overlay_clip_to(Evas_Object *obj, Evas_Object *clip) { int x, y, w, h; @@ -11636,13 +11638,13 @@ e_fm2_overlay_clip_to(Evas_Object *obj, Evas_Object *clip) } } -EAPI const char * +E_API const char * e_fm2_real_path_map(const char *dev, const char *path) { return _e_fm2_dev_path_map(NULL, dev, path); } -EAPI void +E_API void e_fm2_favorites_init(void) { Eina_List *files; @@ -11665,21 +11667,21 @@ e_fm2_favorites_init(void) } } -EAPI unsigned int +E_API unsigned int e_fm2_selected_count(Evas_Object *obj) { EFM_SMART_CHECK(0); return eina_list_count(sd->selected_icons); } -EAPI E_Fm2_Icon_Info * +E_API E_Fm2_Icon_Info * e_fm2_drop_icon_get(Evas_Object *obj) { EFM_SMART_CHECK(NULL); return sd->drop_icon ? &sd->drop_icon->info : NULL; } -EAPI Eina_List * +E_API Eina_List * e_fm2_uri_path_list_get(const Eina_List *uri_list) { E_Fm2_Uri *uri; @@ -11711,7 +11713,7 @@ e_fm2_uri_path_list_get(const Eina_List *uri_list) return path_list; } -EAPI Efreet_Desktop * +E_API Efreet_Desktop * e_fm2_desktop_get(Evas_Object *obj) { EFM_SMART_CHECK(NULL); @@ -11719,7 +11721,7 @@ e_fm2_desktop_get(Evas_Object *obj) return sd->desktop; } -EAPI void +E_API void e_fm2_drop_menu(Evas_Object *obj, char *args) { E_Menu *menu; @@ -11778,7 +11780,7 @@ error: sd->menu = NULL; } -EAPI E_Fm2_Icon * +E_API E_Fm2_Icon * e_fm2_icon_editing_get(Evas_Object *obj) { EFM_SMART_CHECK(NULL); diff --git a/src/bin/e_fm.h b/src/bin/e_fm.h index 4677eb1..30411d2 100644 --- a/src/bin/e_fm.h +++ b/src/bin/e_fm.h @@ -150,78 +150,78 @@ typedef void (*E_Fm_Cb)(void *data, Evas_Object *obj, E_Menu *m, E_Fm2_Icon_Info EINTERN int e_fm2_init(void); EINTERN int e_fm2_shutdown(void); -EAPI Evas_Object *e_fm2_add(Evas *evas); -EAPI void e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path); -EAPI void e_fm2_custom_theme_set(Evas_Object *obj, const char *path); -EAPI void e_fm2_custom_theme_content_set(Evas_Object *obj, const char *content); -EAPI void e_fm2_underlay_show(Evas_Object *obj); -EAPI void e_fm2_underlay_hide(Evas_Object *obj); -EAPI void e_fm2_all_unsel(Evas_Object *obj); -EAPI void e_fm2_all_sel(Evas_Object *obj); -EAPI void e_fm2_first_sel(Evas_Object *obj); -EAPI void e_fm2_last_sel(Evas_Object *obj); -EAPI void e_fm2_path_get(Evas_Object *obj, const char **dev, const char **path); -EAPI void e_fm2_refresh(Evas_Object *obj); -EAPI const char *e_fm2_real_path_get(Evas_Object *obj); -EAPI int e_fm2_has_parent_get(Evas_Object *obj); -EAPI void e_fm2_parent_go(Evas_Object *obj); -EAPI void e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg); -EAPI E_Fm2_Config *e_fm2_config_get(Evas_Object *obj); -EAPI Eina_List *e_fm2_selected_list_get(Evas_Object *obj); -EAPI Eina_List *e_fm2_all_list_get(Evas_Object *obj); -EAPI void e_fm2_select_set(Evas_Object *obj, const char *file, int select); -EAPI void e_fm2_deselect_all(Evas_Object *obj); -EAPI void e_fm2_file_show(Evas_Object *obj, const char *file); -EAPI void e_fm2_icon_menu_replace_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data); -EAPI void e_fm2_icon_menu_start_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data); -EAPI void e_fm2_icon_menu_end_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data); -EAPI void e_fm2_icon_menu_flags_set(Evas_Object *obj, E_Fm2_Menu_Flags flags); -EAPI E_Fm2_Menu_Flags e_fm2_icon_menu_flags_get(Evas_Object *obj); -EAPI void e_fm2_view_flags_set(Evas_Object *obj, E_Fm2_View_Flags flags); -EAPI E_Fm2_View_Flags e_fm2_view_flags_get(Evas_Object *obj); -EAPI E_Object *e_fm2_window_object_get(Evas_Object *obj); -EAPI void e_fm2_window_object_set(Evas_Object *obj, E_Object *eobj); -EAPI void e_fm2_window_set(Evas_Object *obj, Evas_Object *win); -EAPI void e_fm2_icons_update(Evas_Object *obj); - -EAPI void e_fm2_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y); -EAPI void e_fm2_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); -EAPI void e_fm2_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); -EAPI void e_fm2_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); - -EAPI void e_fm2_all_icons_update(void); - -EAPI void e_fm2_operation_abort(int id); - -EAPI Evas_Object *e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic, Evas_Smart_Cb gen_func, +E_API Evas_Object *e_fm2_add(Evas *evas); +E_API void e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path); +E_API void e_fm2_custom_theme_set(Evas_Object *obj, const char *path); +E_API void e_fm2_custom_theme_content_set(Evas_Object *obj, const char *content); +E_API void e_fm2_underlay_show(Evas_Object *obj); +E_API void e_fm2_underlay_hide(Evas_Object *obj); +E_API void e_fm2_all_unsel(Evas_Object *obj); +E_API void e_fm2_all_sel(Evas_Object *obj); +E_API void e_fm2_first_sel(Evas_Object *obj); +E_API void e_fm2_last_sel(Evas_Object *obj); +E_API void e_fm2_path_get(Evas_Object *obj, const char **dev, const char **path); +E_API void e_fm2_refresh(Evas_Object *obj); +E_API const char *e_fm2_real_path_get(Evas_Object *obj); +E_API int e_fm2_has_parent_get(Evas_Object *obj); +E_API void e_fm2_parent_go(Evas_Object *obj); +E_API void e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg); +E_API E_Fm2_Config *e_fm2_config_get(Evas_Object *obj); +E_API Eina_List *e_fm2_selected_list_get(Evas_Object *obj); +E_API Eina_List *e_fm2_all_list_get(Evas_Object *obj); +E_API void e_fm2_select_set(Evas_Object *obj, const char *file, int select); +E_API void e_fm2_deselect_all(Evas_Object *obj); +E_API void e_fm2_file_show(Evas_Object *obj, const char *file); +E_API void e_fm2_icon_menu_replace_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data); +E_API void e_fm2_icon_menu_start_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data); +E_API void e_fm2_icon_menu_end_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data); +E_API void e_fm2_icon_menu_flags_set(Evas_Object *obj, E_Fm2_Menu_Flags flags); +E_API E_Fm2_Menu_Flags e_fm2_icon_menu_flags_get(Evas_Object *obj); +E_API void e_fm2_view_flags_set(Evas_Object *obj, E_Fm2_View_Flags flags); +E_API E_Fm2_View_Flags e_fm2_view_flags_get(Evas_Object *obj); +E_API E_Object *e_fm2_window_object_get(Evas_Object *obj); +E_API void e_fm2_window_object_set(Evas_Object *obj, E_Object *eobj); +E_API void e_fm2_window_set(Evas_Object *obj, Evas_Object *win); +E_API void e_fm2_icons_update(Evas_Object *obj); + +E_API void e_fm2_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y); +E_API void e_fm2_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); +E_API void e_fm2_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); +E_API void e_fm2_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); + +E_API void e_fm2_all_icons_update(void); + +E_API void e_fm2_operation_abort(int id); + +E_API Evas_Object *e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic, Evas_Smart_Cb gen_func, void *data, int force_gen, const char **type_ret); -EAPI E_Fm2_Icon_Info *e_fm2_icon_file_info_get(E_Fm2_Icon *ic); -EAPI void e_fm2_icon_geometry_get(E_Fm2_Icon *ic, int *x, int *y, int *w, int *h); -EAPI Eina_Bool e_fm2_typebuf_visible_get(Evas_Object *obj); -EAPI void e_fm2_typebuf_clear(Evas_Object *obj); -EAPI void e_fm2_overlay_clip_to(Evas_Object *fm, Evas_Object *clip); - -EAPI void e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e); -EAPI void e_fm2_client_del(Ecore_Ipc_Event_Client_Del *e); -EAPI E_Fm2_View_Mode e_fm2_view_mode_get(Evas_Object *obj); -EAPI Eina_Bool e_fm2_optimal_size_calc(Evas_Object *obj, int minw, int maxw, int maxh, int *w, int *h); -EAPI const char *e_fm2_real_path_map(const char *dev, const char *path); -EAPI void e_fm2_favorites_init(void); -EAPI unsigned int e_fm2_selected_count(Evas_Object *obj); -EAPI const char *e_fm2_desktop_url_eval(const char *val); -EAPI E_Fm2_Icon_Info *e_fm2_drop_icon_get(Evas_Object *obj); -EAPI void e_fm2_drop_menu(Evas_Object *e_fm, char *args); -EAPI Eina_List *e_fm2_uri_path_list_get(const Eina_List *uri_list); -EAPI Efreet_Desktop *e_fm2_desktop_get(Evas_Object *obj); - -EAPI int e_fm2_client_file_move(Evas_Object *e_fm, const char *args); -EAPI int e_fm2_client_file_copy(Evas_Object *e_fm, const char *args); -EAPI int e_fm2_client_file_symlink(Evas_Object *e_fm, const char *args); - -EAPI int _e_fm2_client_mount(const char *udi, const char *mountpoint); -EAPI int _e_fm2_client_unmount(const char *udi); -EAPI void _e_fm2_file_force_update(const char *path); - -EAPI E_Fm2_Icon *e_fm2_icon_editing_get(Evas_Object *obj); +E_API E_Fm2_Icon_Info *e_fm2_icon_file_info_get(E_Fm2_Icon *ic); +E_API void e_fm2_icon_geometry_get(E_Fm2_Icon *ic, int *x, int *y, int *w, int *h); +E_API Eina_Bool e_fm2_typebuf_visible_get(Evas_Object *obj); +E_API void e_fm2_typebuf_clear(Evas_Object *obj); +E_API void e_fm2_overlay_clip_to(Evas_Object *fm, Evas_Object *clip); + +E_API void e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e); +E_API void e_fm2_client_del(Ecore_Ipc_Event_Client_Del *e); +E_API E_Fm2_View_Mode e_fm2_view_mode_get(Evas_Object *obj); +E_API Eina_Bool e_fm2_optimal_size_calc(Evas_Object *obj, int minw, int maxw, int maxh, int *w, int *h); +E_API const char *e_fm2_real_path_map(const char *dev, const char *path); +E_API void e_fm2_favorites_init(void); +E_API unsigned int e_fm2_selected_count(Evas_Object *obj); +E_API const char *e_fm2_desktop_url_eval(const char *val); +E_API E_Fm2_Icon_Info *e_fm2_drop_icon_get(Evas_Object *obj); +E_API void e_fm2_drop_menu(Evas_Object *e_fm, char *args); +E_API Eina_List *e_fm2_uri_path_list_get(const Eina_List *uri_list); +E_API Efreet_Desktop *e_fm2_desktop_get(Evas_Object *obj); + +E_API int e_fm2_client_file_move(Evas_Object *e_fm, const char *args); +E_API int e_fm2_client_file_copy(Evas_Object *e_fm, const char *args); +E_API int e_fm2_client_file_symlink(Evas_Object *e_fm, const char *args); + +E_API int _e_fm2_client_mount(const char *udi, const char *mountpoint); +E_API int _e_fm2_client_unmount(const char *udi); +E_API void _e_fm2_file_force_update(const char *path); + +E_API E_Fm2_Icon *e_fm2_icon_editing_get(Evas_Object *obj); #endif #endif diff --git a/src/bin/e_fm/e_fm_ipc.h b/src/bin/e_fm/e_fm_ipc.h index 5389d26..0476c0f 100644 --- a/src/bin/e_fm/e_fm_ipc.h +++ b/src/bin/e_fm/e_fm_ipc.h @@ -1,6 +1,7 @@ #ifndef E_FM_IPC_H #define E_FM_IPC_H +#include "e_fm_main.h" #include "e_fm_shared_types.h" int _e_fm_ipc_init(void); @@ -9,16 +10,16 @@ Eina_Bool _e_fm_ipc_slave_error_cb(void *data, int type, void *event); Eina_Bool _e_fm_ipc_slave_del_cb(void *data, int type, void *event); void e_fm_ipc_volume_add(E_Volume *v); -EAPI E_Storage *e_storage_add(const char *udi); -EAPI void e_storage_del(const char *udi); -EAPI E_Storage *e_storage_find(const char *udi); +E_API E_Storage *e_storage_add(const char *udi); +E_API void e_storage_del(const char *udi); +E_API E_Storage *e_storage_find(const char *udi); -EAPI E_Volume *e_volume_add(const char *udi, char first_time); -EAPI void e_volume_del(const char *udi); -EAPI E_Volume *e_volume_find(const char *udi); +E_API E_Volume *e_volume_add(const char *udi, char first_time); +E_API void e_volume_del(const char *udi); +E_API E_Volume *e_volume_find(const char *udi); -EAPI void e_volume_mount(E_Volume *v); -EAPI void e_volume_unmount(E_Volume *v); -EAPI void e_volume_eject(E_Volume *v); +E_API void e_volume_mount(E_Volume *v); +E_API void e_volume_unmount(E_Volume *v); +E_API void e_volume_eject(E_Volume *v); #endif diff --git a/src/bin/e_fm/e_fm_main.c b/src/bin/e_fm/e_fm_main.c index e24cc46..a1317d6 100644 --- a/src/bin/e_fm/e_fm_main.c +++ b/src/bin/e_fm/e_fm_main.c @@ -46,6 +46,8 @@ void *alloca (size_t); #include #include +#include "e_fm_main.h" + #define E_TYPEDEFS #include "e_config_data.h" #include "e_fm_op.h" @@ -77,8 +79,8 @@ static Efm_Mode mode = EFM_MODE_USING_RASTER_MOUNT; * */ -#ifndef EAPI -#define EAPI +#ifndef E_API +#define E_API #endif #include "e_fm_main.h" @@ -217,7 +219,7 @@ _e_volume_free(E_Volume *v) /* API functions */ -EAPI void +E_API void e_volume_mount(E_Volume *v) { switch (mode) @@ -242,7 +244,7 @@ e_volume_mount(E_Volume *v) } -EAPI void +E_API void e_volume_unmount(E_Volume *v) { switch (mode) @@ -266,7 +268,7 @@ e_volume_unmount(E_Volume *v) } } -EAPI void +E_API void e_volume_eject(E_Volume *v) { switch (mode) @@ -290,7 +292,7 @@ e_volume_eject(E_Volume *v) } } -EAPI E_Volume * +E_API E_Volume * e_volume_find(const char *udi) { switch (mode) @@ -312,7 +314,7 @@ e_volume_find(const char *udi) return NULL; } -EAPI void +E_API void e_storage_del(const char *udi) { switch (mode) @@ -336,7 +338,7 @@ e_storage_del(const char *udi) } } -EAPI E_Storage * +E_API E_Storage * e_storage_find(const char *udi) { switch (mode) diff --git a/src/bin/e_fm/e_fm_main.h b/src/bin/e_fm/e_fm_main.h index 849adf9..1ff95ef 100644 --- a/src/bin/e_fm/e_fm_main.h +++ b/src/bin/e_fm/e_fm_main.h @@ -13,6 +13,31 @@ #define ERR(...) EINA_LOG_DOM_ERR(efm_log_dom, __VA_ARGS__) #define CRI(...) EINA_LOG_DOM_CRIT(efm_log_dom, __VA_ARGS__) +# ifdef E_API +# undef E_API +# endif +# ifdef WIN32 +# ifdef BUILDING_DLL +# define E_API __declspec(dllexport) +# else +# define E_API __declspec(dllimport) +# endif +# else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +/* BROKEN in gcc 4 on amd64 */ +# if 0 +# pragma GCC visibility push(hidden) +# endif +# define E_API __attribute__ ((visibility("default"))) +# else +# define E_API +# endif +# else +# define E_API +# endif +# endif + extern Ecore_Ipc_Server *_e_fm_ipc_server; extern int efm_log_dom; diff --git a/src/bin/e_fm/e_fm_main_udisks2.c b/src/bin/e_fm/e_fm_main_udisks2.c index 5431bc3..5441fe9 100644 --- a/src/bin/e_fm/e_fm_main_udisks2.c +++ b/src/bin/e_fm/e_fm_main_udisks2.c @@ -919,7 +919,9 @@ _volume_eject_umount_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *p E_Volume *v = data; if (eldbus_message_error_get(msg, &name, &txt)) - ERR("%s: %s", name, txt); + { + ERR("%s: %s", name, txt); + } else if (v->optype == E_VOLUME_OP_TYPE_EJECT) { vols_ejecting = eina_list_remove(vols_ejecting, v); diff --git a/src/bin/e_fm_cmdline.c b/src/bin/e_fm_cmdline.c index 0d51faa..944443c 100644 --- a/src/bin/e_fm_cmdline.c +++ b/src/bin/e_fm_cmdline.c @@ -12,6 +12,31 @@ #include #include +# ifdef E_API +# undef E_API +# endif +# ifdef WIN32 +# ifdef BUILDING_DLL +# define E_API __declspec(dllexport) +# else +# define E_API __declspec(dllimport) +# endif +# else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +/* BROKEN in gcc 4 on amd64 */ +# if 0 +# pragma GCC visibility push(hidden) +# endif +# define E_API __attribute__ ((visibility("default"))) +# else +# define E_API +# endif +# else +# define E_API +# endif +# endif + static Eldbus_Connection *conn = NULL; static int retval = EXIT_SUCCESS; static int pending = 0; @@ -136,7 +161,7 @@ static const Ecore_Getopt options = { } }; -EAPI int +E_API int main(int argc, char *argv[]) { Eina_Bool quit_option = EINA_FALSE; diff --git a/src/bin/e_fm_custom.c b/src/bin/e_fm_custom.c index f4b0270..7f13e28 100644 --- a/src/bin/e_fm_custom.c +++ b/src/bin/e_fm_custom.c @@ -103,7 +103,7 @@ e_fm2_custom_file_shutdown(void) _e_fm2_custom_dir_edd = NULL; } -EAPI E_Fm2_Custom_File * +E_API E_Fm2_Custom_File * e_fm2_custom_file_get(const char *path) { E_Fm2_Custom_File *cf; @@ -146,7 +146,7 @@ _e_fm2_custom_dir_dup(const E_Fm2_Custom_Dir *dir) return copy; } -EAPI E_Fm2_Custom_File * +E_API E_Fm2_Custom_File * e_fm2_custom_file_dup(const E_Fm2_Custom_File *cf) { E_Fm2_Custom_File *copy; @@ -163,7 +163,7 @@ e_fm2_custom_file_dup(const E_Fm2_Custom_File *cf) return copy; } -EAPI void +E_API void e_fm2_custom_file_set(const char *path, const E_Fm2_Custom_File *cf) { E_Fm2_Custom_File *cf1; @@ -189,7 +189,7 @@ e_fm2_custom_file_set(const char *path, const E_Fm2_Custom_File *cf) _e_fm2_custom_writes = 1; } -EAPI void +E_API void e_fm2_custom_file_del(const char *path) { Eina_List *list, *l; @@ -217,7 +217,7 @@ e_fm2_custom_file_del(const char *path) _e_fm2_custom_writes = 1; } -EAPI void +E_API void e_fm2_custom_file_rename(const char *path, const char *new_path) { E_Fm2_Custom_File *cf, *cf2; @@ -260,7 +260,7 @@ e_fm2_custom_file_rename(const char *path, const char *new_path) _e_fm2_custom_writes = 1; } -EAPI void +E_API void e_fm2_custom_file_flush(void) { if (!_e_fm2_custom_file) return; diff --git a/src/bin/e_fm_custom.h b/src/bin/e_fm_custom.h index 091affd..1392cb0 100644 --- a/src/bin/e_fm_custom.h +++ b/src/bin/e_fm_custom.h @@ -53,13 +53,13 @@ struct _E_Fm2_Custom_File EINTERN int e_fm2_custom_file_init(void); EINTERN void e_fm2_custom_file_shutdown(void); -EAPI E_Fm2_Custom_File *e_fm2_custom_file_get(const char *path); -EAPI void e_fm2_custom_file_set(const char *path, const E_Fm2_Custom_File *cf); -EAPI void e_fm2_custom_file_del(const char *path); -EAPI void e_fm2_custom_file_rename(const char *path, const char *new_path); -EAPI void e_fm2_custom_file_flush(void); +E_API E_Fm2_Custom_File *e_fm2_custom_file_get(const char *path); +E_API void e_fm2_custom_file_set(const char *path, const E_Fm2_Custom_File *cf); +E_API void e_fm2_custom_file_del(const char *path); +E_API void e_fm2_custom_file_rename(const char *path, const char *new_path); +E_API void e_fm2_custom_file_flush(void); -EAPI E_Fm2_Custom_File *e_fm2_custom_file_dup(const E_Fm2_Custom_File *cf); +E_API E_Fm2_Custom_File *e_fm2_custom_file_dup(const E_Fm2_Custom_File *cf); #endif #endif diff --git a/src/bin/e_fm_device.c b/src/bin/e_fm_device.c index 92b1f53..a7a252e 100644 --- a/src/bin/e_fm_device.c +++ b/src/bin/e_fm_device.c @@ -119,7 +119,7 @@ _e_fm2_device_volume_setup(E_Volume *v) E_FREE(size); } -EAPI void +E_API void e_fm2_device_storage_add(E_Storage *s) { Eina_List *l; @@ -185,7 +185,7 @@ e_fm2_device_storage_add(E_Storage *s) } } -EAPI void +E_API void e_fm2_device_storage_del(E_Storage *s) { // printf("STO- %s\n", s->udi); @@ -193,7 +193,7 @@ e_fm2_device_storage_del(E_Storage *s) _e_fm_shared_device_storage_free(s); } -EAPI E_Storage * +E_API E_Storage * e_fm2_device_storage_find(const char *udi) { Eina_List *l; @@ -207,7 +207,7 @@ e_fm2_device_storage_find(const char *udi) return NULL; } -EAPI void +E_API void e_fm2_device_volume_add(E_Volume *v) { E_Storage *s; @@ -280,7 +280,7 @@ e_fm2_device_volume_add(E_Volume *v) if (v->storage) _e_fm2_device_volume_setup(v); } -EAPI void +E_API void e_fm2_device_volume_del(E_Volume *v) { E_Fm2_Mount *m; @@ -376,7 +376,7 @@ _e_fm2_volume_erase(E_Volume *v) _e_fm2_file_force_update(buf); } -EAPI E_Volume * +E_API E_Volume * e_fm2_device_volume_find(const char *udi) { Eina_List *l; @@ -393,7 +393,7 @@ e_fm2_device_volume_find(const char *udi) return NULL; } -EAPI E_Volume * +E_API E_Volume * e_fm2_device_volume_find_fast(const char *udi) { Eina_List *l; @@ -407,7 +407,7 @@ e_fm2_device_volume_find_fast(const char *udi) return NULL; } -EAPI const char * +E_API const char * e_fm2_device_volume_mountpoint_get(E_Volume *v) { char buf[PATH_MAX] = {0}; @@ -436,7 +436,7 @@ e_fm2_device_volume_mountpoint_get(E_Volume *v) return eina_stringshare_add(buf); } -EAPI E_Fm2_Device_Mount_Op * +E_API E_Fm2_Device_Mount_Op * e_fm2_device_mount_op_add(E_Fm2_Mount *m, char *args, size_t size, size_t length) { E_Fm2_Device_Mount_Op *mop; @@ -446,7 +446,7 @@ e_fm2_device_mount_op_add(E_Fm2_Mount *m, char *args, size_t size, size_t length return mop; } -EAPI void +E_API void e_fm2_device_mount_add(E_Volume *v, const char *mountpoint) { @@ -458,7 +458,7 @@ e_fm2_device_mount_add(E_Volume *v, // printf("MOUNT %s %s\n", v->udi, v->mount_point); } -EAPI void +E_API void e_fm2_device_mount_del(E_Volume *v) { E_Fm2_Mount *m; @@ -477,7 +477,7 @@ e_fm2_device_mount_del(E_Volume *v) } } -EAPI void +E_API void e_fm2_device_mount_free(E_Fm2_Mount *m) { if (!m) return; @@ -488,7 +488,7 @@ e_fm2_device_mount_free(E_Fm2_Mount *m) free(m); } -EAPI E_Fm2_Mount * +E_API E_Fm2_Mount * e_fm2_device_mount_find(const char *path) { Eina_List *l; @@ -507,7 +507,7 @@ e_fm2_device_mount_find(const char *path) return NULL; } -EAPI E_Fm2_Mount * +E_API E_Fm2_Mount * e_fm2_device_mount(E_Volume *v, Ecore_Cb mount_ok, Ecore_Cb mount_fail, @@ -547,7 +547,7 @@ e_fm2_device_mount(E_Volume *v, return m; } -EAPI void +E_API void e_fm2_device_mount_fail(E_Volume *v) { E_Fm2_Mount *m; @@ -566,7 +566,7 @@ e_fm2_device_mount_fail(E_Volume *v) } } -EAPI void +E_API void e_fm2_device_unmount(E_Fm2_Mount *m) { E_Volume *v; @@ -587,7 +587,7 @@ e_fm2_device_unmount(E_Fm2_Mount *m) } } -EAPI void +E_API void e_fm2_device_unmount_fail(E_Volume *v) { Eina_List *l; @@ -688,7 +688,7 @@ _e_fm2_device_check_desktop_icons_cb(void *data, Ecore_Thread *eth EINA_UNUSED) E_FREE_LIST(data, free); } -EAPI void +E_API void e_fm2_device_show_desktop_icons(void) { Eina_List *l; @@ -726,7 +726,7 @@ e_fm2_device_show_desktop_icons(void) } } -EAPI void +E_API void e_fm2_device_hide_desktop_icons(void) { Eina_List *l; @@ -759,7 +759,7 @@ e_fm2_device_hide_desktop_icons(void) } } -EAPI void +E_API void e_fm2_device_check_desktop_icons(void) { Eina_List *l, *thd = NULL; @@ -782,7 +782,7 @@ e_fm2_device_check_desktop_icons(void) _check_vols = ecore_thread_run(_e_fm2_device_check_desktop_icons_cb, _e_fm2_device_check_desktop_icons_cb_end, _e_fm2_device_check_desktop_icons_cb_end, thd); } -EAPI Eina_List * +E_API Eina_List * e_fm2_device_volume_list_get(void) { return _e_vols; diff --git a/src/bin/e_fm_device.h b/src/bin/e_fm_device.h index 56aa29b..73538bc 100644 --- a/src/bin/e_fm_device.h +++ b/src/bin/e_fm_device.h @@ -4,32 +4,32 @@ #include "e.h" #include "e_fm.h" -EAPI void e_fm2_device_storage_add(E_Storage *s); -EAPI void e_fm2_device_storage_del(E_Storage *s); -EAPI E_Storage *e_fm2_device_storage_find(const char *udi); +E_API void e_fm2_device_storage_add(E_Storage *s); +E_API void e_fm2_device_storage_del(E_Storage *s); +E_API E_Storage *e_fm2_device_storage_find(const char *udi); -EAPI void e_fm2_device_volume_add(E_Volume *s); -EAPI void e_fm2_device_volume_del(E_Volume *s); -EAPI E_Volume *e_fm2_device_volume_find(const char *udi); -EAPI E_Volume *e_fm2_device_volume_find_fast(const char *udi); -EAPI const char *e_fm2_device_volume_mountpoint_get(E_Volume *v); +E_API void e_fm2_device_volume_add(E_Volume *s); +E_API void e_fm2_device_volume_del(E_Volume *s); +E_API E_Volume *e_fm2_device_volume_find(const char *udi); +E_API E_Volume *e_fm2_device_volume_find_fast(const char *udi); +E_API const char *e_fm2_device_volume_mountpoint_get(E_Volume *v); -EAPI void e_fm2_device_mount_add(E_Volume *v, const char *mountpoint); -EAPI E_Fm2_Device_Mount_Op *e_fm2_device_mount_op_add(E_Fm2_Mount *m, char *args, size_t size, size_t length); -EAPI void e_fm2_device_mount_free(E_Fm2_Mount *m) EINA_ARG_NONNULL(1); -EAPI void e_fm2_device_mount_del(E_Volume *v); -EAPI E_Fm2_Mount *e_fm2_device_mount_find(const char *path); -EAPI E_Fm2_Mount *e_fm2_device_mount(E_Volume *v, +E_API void e_fm2_device_mount_add(E_Volume *v, const char *mountpoint); +E_API E_Fm2_Device_Mount_Op *e_fm2_device_mount_op_add(E_Fm2_Mount *m, char *args, size_t size, size_t length); +E_API void e_fm2_device_mount_free(E_Fm2_Mount *m) EINA_ARG_NONNULL(1); +E_API void e_fm2_device_mount_del(E_Volume *v); +E_API E_Fm2_Mount *e_fm2_device_mount_find(const char *path); +E_API E_Fm2_Mount *e_fm2_device_mount(E_Volume *v, Ecore_Cb mount_ok, Ecore_Cb mount_fail, Ecore_Cb unmount_ok, Ecore_Cb unmount_fail, void *data); -EAPI void e_fm2_device_mount_fail(E_Volume *v); -EAPI void e_fm2_device_unmount(E_Fm2_Mount *m); -EAPI void e_fm2_device_unmount_fail(E_Volume *v); +E_API void e_fm2_device_mount_fail(E_Volume *v); +E_API void e_fm2_device_unmount(E_Fm2_Mount *m); +E_API void e_fm2_device_unmount_fail(E_Volume *v); -EAPI void e_fm2_device_show_desktop_icons(void); -EAPI void e_fm2_device_hide_desktop_icons(void); -EAPI void e_fm2_device_check_desktop_icons(void); -EAPI Eina_List *e_fm2_device_volume_list_get(void); +E_API void e_fm2_device_show_desktop_icons(void); +E_API void e_fm2_device_hide_desktop_icons(void); +E_API void e_fm2_device_check_desktop_icons(void); +E_API Eina_List *e_fm2_device_volume_list_get(void); #endif diff --git a/src/bin/e_fm_mime.c b/src/bin/e_fm_mime.c index 501819e..20c6e06 100644 --- a/src/bin/e_fm_mime.c +++ b/src/bin/e_fm_mime.c @@ -17,7 +17,7 @@ static Eina_Hash *_mime_handlers = NULL; static Eina_Hash *_glob_handlers = NULL; /* externally accessible functions */ -EAPI const char * +E_API const char * e_fm_mime_filename_get(const char *fname) { return efreet_mime_globs_type_get(fname); @@ -30,7 +30,7 @@ e_fm_mime_filename_get(const char *fname) * "/path/to/file....edj" = explicit icon edje file * "/path/to/file..." = explicit image file to use */ -EAPI const char * +E_API const char * e_fm_mime_icon_get(const char *mime) { char buf[4096], buf2[4096], *val; @@ -125,7 +125,7 @@ ok: return val; } -EAPI void +E_API void e_fm_mime_icon_cache_flush(void) { Eina_List *freelist = NULL; @@ -137,7 +137,7 @@ e_fm_mime_icon_cache_flush(void) } /* create (allocate), set properties, and return a new mime handler */ -EAPI E_Fm2_Mime_Handler * +E_API E_Fm2_Mime_Handler * e_fm2_mime_handler_new(const char *label, const char *icon_group, void (*action_func)(void *data, Evas_Object *obj, const char *path), void *action_data, int(test_func) (void *data, Evas_Object * obj, const char *path), void *test_data) { E_Fm2_Mime_Handler *handler; @@ -157,7 +157,7 @@ e_fm2_mime_handler_new(const char *label, const char *icon_group, void (*action_ return handler; } -EAPI void +E_API void e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler) { if (!handler) return; @@ -168,7 +168,7 @@ e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler) } /* associate a certain mime type with a handler */ -EAPI Eina_Bool +E_API Eina_Bool e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime) { Eina_List *handlers = NULL; @@ -193,7 +193,7 @@ e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime) } /* associate a certain glob with a handler */ -EAPI Eina_Bool +E_API Eina_Bool e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob_) { Eina_List *handlers = NULL; @@ -218,7 +218,7 @@ e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob_) } /* delete a certain handler for a certain mime */ -EAPI void +E_API void e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime) { Eina_List *handlers = NULL; @@ -244,7 +244,7 @@ e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime) } /* delete a certain handler for a certain glob */ -EAPI void +E_API void e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob_) { Eina_List *handlers = NULL; @@ -269,7 +269,7 @@ e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob_) } } -EAPI const Eina_List * +E_API const Eina_List * e_fm2_mime_handler_mime_handlers_get(const char *mime) { if ((!mime) || (!_mime_handlers)) return NULL; @@ -278,7 +278,7 @@ e_fm2_mime_handler_mime_handlers_get(const char *mime) /* get the list of glob handlers for a glob. NOTE: the list should be free()'ed */ -EAPI Eina_List * +E_API Eina_List * e_fm2_mime_handler_glob_handlers_get(const char *glob_) { E_Fm2_Mime_Handler_Tuple *tuple = NULL; @@ -296,7 +296,7 @@ e_fm2_mime_handler_glob_handlers_get(const char *glob_) } /* call a certain handler */ -EAPI Eina_Bool +E_API Eina_Bool e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path) { if ((!handler) || (!obj) || (!path) || (!handler->action_func)) @@ -318,7 +318,7 @@ e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const cha } /* call all handlers related to a certain mime */ -EAPI void +E_API void e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, const char *mime) { const Eina_List *l, *handlers; @@ -338,7 +338,7 @@ e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, co } /* call all handlers related to a certain glob */ -EAPI void +E_API void e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, const char *glob_) { Eina_List *handlers = NULL; @@ -359,7 +359,7 @@ e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, co } /* run a handlers test function */ -EAPI Eina_Bool +E_API Eina_Bool e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path) { if ((!handler) || (!obj) || (!path)) return 0; diff --git a/src/bin/e_fm_mime.h b/src/bin/e_fm_mime.h index 69d25f2..7c4d6f9 100644 --- a/src/bin/e_fm_mime.h +++ b/src/bin/e_fm_mime.h @@ -15,22 +15,22 @@ struct _E_Fm2_Mime_Handler void *test_data; }; -EAPI const char *e_fm_mime_filename_get(const char *fname); -EAPI const char *e_fm_mime_icon_get(const char *mime); -EAPI void e_fm_mime_icon_cache_flush(void); +E_API const char *e_fm_mime_filename_get(const char *fname); +E_API const char *e_fm_mime_icon_get(const char *mime); +E_API void e_fm_mime_icon_cache_flush(void); -EAPI E_Fm2_Mime_Handler *e_fm2_mime_handler_new(const char *label, const char *icon_group, void (*action_func) (void *data, Evas_Object *obj, const char *path), void *action_data, int (test_func) (void *data, Evas_Object *obj, const char *path), void *test_data); -EAPI void e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler); -EAPI Eina_Bool e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime); -EAPI Eina_Bool e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob); -EAPI Eina_Bool e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path); -EAPI Eina_Bool e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path); -EAPI void e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, const char *mime); -EAPI void e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, const char *glob); -EAPI void e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime); -EAPI void e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob); -EAPI const Eina_List *e_fm2_mime_handler_mime_handlers_get(const char *mime); -EAPI Eina_List *e_fm2_mime_handler_glob_handlers_get(const char *glob); +E_API E_Fm2_Mime_Handler *e_fm2_mime_handler_new(const char *label, const char *icon_group, void (*action_func) (void *data, Evas_Object *obj, const char *path), void *action_data, int (test_func) (void *data, Evas_Object *obj, const char *path), void *test_data); +E_API void e_fm2_mime_handler_free(E_Fm2_Mime_Handler *handler); +E_API Eina_Bool e_fm2_mime_handler_mime_add(E_Fm2_Mime_Handler *handler, const char *mime); +E_API Eina_Bool e_fm2_mime_handler_glob_add(E_Fm2_Mime_Handler *handler, const char *glob); +E_API Eina_Bool e_fm2_mime_handler_call(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path); +E_API Eina_Bool e_fm2_mime_handler_test(E_Fm2_Mime_Handler *handler, Evas_Object *obj, const char *path); +E_API void e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, const char *mime); +E_API void e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, const char *glob); +E_API void e_fm2_mime_handler_mime_del(E_Fm2_Mime_Handler *handler, const char *mime); +E_API void e_fm2_mime_handler_glob_del(E_Fm2_Mime_Handler *handler, const char *glob); +E_API const Eina_List *e_fm2_mime_handler_mime_handlers_get(const char *mime); +E_API Eina_List *e_fm2_mime_handler_glob_handlers_get(const char *glob); #endif #endif diff --git a/src/bin/e_fm_op_registry.c b/src/bin/e_fm_op_registry.c index 8b5832a..1479185 100644 --- a/src/bin/e_fm_op_registry.c +++ b/src/bin/e_fm_op_registry.c @@ -1,8 +1,8 @@ #include "e.h" -EAPI int E_EVENT_FM_OP_REGISTRY_ADD = 0; -EAPI int E_EVENT_FM_OP_REGISTRY_DEL = 0; -EAPI int E_EVENT_FM_OP_REGISTRY_CHANGED = 0; +E_API int E_EVENT_FM_OP_REGISTRY_ADD = 0; +E_API int E_EVENT_FM_OP_REGISTRY_DEL = 0; +E_API int E_EVENT_FM_OP_REGISTRY_CHANGED = 0; static Eina_Hash *_e_fm2_op_registry = NULL; static unsigned int _e_fm2_init_count = 0; @@ -236,7 +236,7 @@ e_fm2_op_registry_entry_files_set(E_Fm2_Op_Registry_Entry *entry, const char *sr * * @return: new number of references after operation or -1 on error. */ -EAPI int +E_API int e_fm2_op_registry_entry_ref(E_Fm2_Op_Registry_Entry *entry) { E_Fm2_Op_Registry_Entry_Internal *e; @@ -253,7 +253,7 @@ e_fm2_op_registry_entry_ref(E_Fm2_Op_Registry_Entry *entry) * @return: new number of references after operation or -1 on error, * if 0 the entry was freed and pointer is then invalid. */ -EAPI int +E_API int e_fm2_op_registry_entry_unref(E_Fm2_Op_Registry_Entry *entry) { E_Fm2_Op_Registry_Entry_Internal *e; @@ -272,7 +272,7 @@ e_fm2_op_registry_entry_unref(E_Fm2_Op_Registry_Entry *entry) * * @return: 0 if no window, window identifier otherwise. */ -EAPI Ecore_X_Window +E_API Ecore_X_Window e_fm2_op_registry_entry_xwin_get(const E_Fm2_Op_Registry_Entry *entry) { Evas *e; @@ -295,7 +295,7 @@ e_fm2_op_registry_entry_xwin_get(const E_Fm2_Op_Registry_Entry *entry) * * @note: does not increment reference. */ -EAPI E_Fm2_Op_Registry_Entry * +E_API E_Fm2_Op_Registry_Entry * e_fm2_op_registry_entry_get(int id) { return eina_hash_find(_e_fm2_op_registry, &id); @@ -316,7 +316,7 @@ e_fm2_op_registry_entry_get(int id) * @note: does not increment reference. * @note: on errors, @p free_data will be called. */ -EAPI void +E_API void e_fm2_op_registry_entry_listener_add(E_Fm2_Op_Registry_Entry *entry, void (*cb)(void *data, const E_Fm2_Op_Registry_Entry *entry), const void *data, void (*free_data)(void *data)) { E_Fm2_Op_Registry_Entry_Internal *e; @@ -361,7 +361,7 @@ e_fm2_op_registry_entry_listener_add(E_Fm2_Op_Registry_Entry *entry, void (*cb)( * @note: does not decrement reference. * @see: e_fm2_op_registry_entry_listener_add() */ -EAPI void +E_API void e_fm2_op_registry_entry_listener_del(E_Fm2_Op_Registry_Entry *entry, void (*cb)(void *data, const E_Fm2_Op_Registry_Entry *entry), const void *data) { E_Fm2_Op_Registry_Entry_Internal *e; @@ -393,7 +393,7 @@ e_fm2_op_registry_entry_listener_del(E_Fm2_Op_Registry_Entry *entry, void (*cb)( * * @see e_fm2_op_registry_get_all() */ -EAPI Eina_Iterator * +E_API Eina_Iterator * e_fm2_op_registry_iterator_new(void) { return eina_hash_iterator_data_new(_e_fm2_op_registry); @@ -410,7 +410,7 @@ e_fm2_op_registry_iterator_new(void) * @note: if you need a simple, immediate walk, use * e_fm2_op_registry_iterator_new() */ -EAPI Eina_List * +E_API Eina_List * e_fm2_op_registry_get_all(void) { Eina_List *list; @@ -429,7 +429,7 @@ e_fm2_op_registry_get_all(void) return list; } -EAPI void +E_API void e_fm2_op_registry_get_all_free(Eina_List *list) { E_Fm2_Op_Registry_Entry *entry; @@ -437,13 +437,13 @@ e_fm2_op_registry_get_all_free(Eina_List *list) e_fm2_op_registry_entry_unref(entry); } -EAPI Eina_Bool +E_API Eina_Bool e_fm2_op_registry_is_empty(void) { return eina_hash_population(_e_fm2_op_registry) == 0; } -EAPI int +E_API int e_fm2_op_registry_count(void) { return eina_hash_population(_e_fm2_op_registry); @@ -485,7 +485,7 @@ e_fm2_op_registry_shutdown(void) return 0; } -EAPI void +E_API void e_fm2_op_registry_entry_abort(E_Fm2_Op_Registry_Entry *entry) { if (!entry) return; diff --git a/src/bin/e_fm_op_registry.h b/src/bin/e_fm_op_registry.h index e04a2fb..2a385ec 100644 --- a/src/bin/e_fm_op_registry.h +++ b/src/bin/e_fm_op_registry.h @@ -41,27 +41,27 @@ struct _E_Fm2_Op_Registry_Entry } func; }; -extern EAPI int E_EVENT_FM_OP_REGISTRY_ADD; -extern EAPI int E_EVENT_FM_OP_REGISTRY_DEL; -extern EAPI int E_EVENT_FM_OP_REGISTRY_CHANGED; +extern E_API int E_EVENT_FM_OP_REGISTRY_ADD; +extern E_API int E_EVENT_FM_OP_REGISTRY_DEL; +extern E_API int E_EVENT_FM_OP_REGISTRY_CHANGED; -EAPI int e_fm2_op_registry_entry_ref(E_Fm2_Op_Registry_Entry *entry); -EAPI int e_fm2_op_registry_entry_unref(E_Fm2_Op_Registry_Entry *entry); +E_API int e_fm2_op_registry_entry_ref(E_Fm2_Op_Registry_Entry *entry); +E_API int e_fm2_op_registry_entry_unref(E_Fm2_Op_Registry_Entry *entry); -EAPI Ecore_X_Window e_fm2_op_registry_entry_xwin_get(const E_Fm2_Op_Registry_Entry *entry); +E_API Ecore_X_Window e_fm2_op_registry_entry_xwin_get(const E_Fm2_Op_Registry_Entry *entry); -EAPI E_Fm2_Op_Registry_Entry *e_fm2_op_registry_entry_get(int id); +E_API E_Fm2_Op_Registry_Entry *e_fm2_op_registry_entry_get(int id); -EAPI void e_fm2_op_registry_entry_listener_add(E_Fm2_Op_Registry_Entry *entry, void (*cb)(void *data, const E_Fm2_Op_Registry_Entry *entry), const void *data, void (*free_data)(void *data)); -EAPI void e_fm2_op_registry_entry_listener_del(E_Fm2_Op_Registry_Entry *entry, void (*cb)(void *data, const E_Fm2_Op_Registry_Entry *entry), const void *data); +E_API void e_fm2_op_registry_entry_listener_add(E_Fm2_Op_Registry_Entry *entry, void (*cb)(void *data, const E_Fm2_Op_Registry_Entry *entry), const void *data, void (*free_data)(void *data)); +E_API void e_fm2_op_registry_entry_listener_del(E_Fm2_Op_Registry_Entry *entry, void (*cb)(void *data, const E_Fm2_Op_Registry_Entry *entry), const void *data); -EAPI Eina_Iterator *e_fm2_op_registry_iterator_new(void); -EAPI Eina_List *e_fm2_op_registry_get_all(void); -EAPI void e_fm2_op_registry_get_all_free(Eina_List *list); -EAPI Eina_Bool e_fm2_op_registry_is_empty(void); -EAPI int e_fm2_op_registry_count(void); +E_API Eina_Iterator *e_fm2_op_registry_iterator_new(void); +E_API Eina_List *e_fm2_op_registry_get_all(void); +E_API void e_fm2_op_registry_get_all_free(Eina_List *list); +E_API Eina_Bool e_fm2_op_registry_is_empty(void); +E_API int e_fm2_op_registry_count(void); -EAPI void e_fm2_op_registry_entry_abort(E_Fm2_Op_Registry_Entry *entry); +E_API void e_fm2_op_registry_entry_abort(E_Fm2_Op_Registry_Entry *entry); EINTERN unsigned int e_fm2_op_registry_init(void); EINTERN unsigned int e_fm2_op_registry_shutdown(void); diff --git a/src/bin/e_fm_prop.c b/src/bin/e_fm_prop.c index 0c74d6e..6d9a222 100644 --- a/src/bin/e_fm_prop.c +++ b/src/bin/e_fm_prop.c @@ -93,7 +93,7 @@ struct _E_Config_Dialog_Data }; /* a nice easy setup function that does the dirty work */ -EAPI E_Config_Dialog * +E_API E_Config_Dialog * e_fm_prop_file(E_Fm2_Icon *ic) { E_Config_Dialog *cfd; diff --git a/src/bin/e_fm_prop.h b/src/bin/e_fm_prop.h index 36a023d..a71dc8e 100644 --- a/src/bin/e_fm_prop.h +++ b/src/bin/e_fm_prop.h @@ -3,7 +3,7 @@ #ifndef E_FM_PROP_H #define E_FM_PROP_H -EAPI E_Config_Dialog *e_fm_prop_file(E_Fm2_Icon *ic); +E_API E_Config_Dialog *e_fm_prop_file(E_Fm2_Icon *ic); #endif #endif diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c index 984de51..c1e5e6d 100644 --- a/src/bin/e_focus.c +++ b/src/bin/e_focus.c @@ -6,7 +6,7 @@ static Eina_Bool _e_focus_raise_timer(void *data); /* local subsystem globals */ /* externally accessible functions */ -EAPI void +E_API void e_focus_event_mouse_in(E_Client *ec) { @@ -28,7 +28,7 @@ e_focus_event_mouse_in(E_Client *ec) } } -EAPI void +E_API void e_focus_event_mouse_out(E_Client *ec) { if (e_config->focus_policy == E_FOCUS_MOUSE) @@ -42,7 +42,7 @@ e_focus_event_mouse_out(E_Client *ec) E_FREE_FUNC(ec->raise_timer, ecore_timer_del); } -EAPI void +E_API void e_focus_event_mouse_down(E_Client *ec) { if (e_client_focus_policy_click(ec) || @@ -55,12 +55,12 @@ e_focus_event_mouse_down(E_Client *ec) } } -EAPI void +E_API void e_focus_event_mouse_up(E_Client *ec EINA_UNUSED) { } -EAPI void +E_API void e_focus_event_focus_in(E_Client *ec) { if ((e_client_focus_policy_click(ec)) && @@ -81,7 +81,7 @@ e_focus_event_focus_in(E_Client *ec) } } -EAPI void +E_API void e_focus_event_focus_out(E_Client *ec) { if ((e_client_focus_policy_click(ec)) && diff --git a/src/bin/e_focus.h b/src/bin/e_focus.h index 9b20560..14364ff 100644 --- a/src/bin/e_focus.h +++ b/src/bin/e_focus.h @@ -3,14 +3,14 @@ #ifndef E_FOCUS_H #define E_FOCUS_H -EAPI void e_focus_event_mouse_in(E_Client* ec); -EAPI void e_focus_event_mouse_out(E_Client* ec); -EAPI void e_focus_event_mouse_down(E_Client* ec); -EAPI void e_focus_event_mouse_up(E_Client* ec); -EAPI void e_focus_event_focus_in(E_Client *ec); -EAPI void e_focus_event_focus_out(E_Client *ec); -EAPI void e_focus_setup(E_Client *ec); -EAPI void e_focus_setdown(E_Client *ec); +E_API void e_focus_event_mouse_in(E_Client* ec); +E_API void e_focus_event_mouse_out(E_Client* ec); +E_API void e_focus_event_mouse_down(E_Client* ec); +E_API void e_focus_event_mouse_up(E_Client* ec); +E_API void e_focus_event_focus_in(E_Client *ec); +E_API void e_focus_event_focus_out(E_Client *ec); +E_API void e_focus_setup(E_Client *ec); +E_API void e_focus_setdown(E_Client *ec); #endif #endif diff --git a/src/bin/e_font.c b/src/bin/e_font.c index d1952d0..e1f4e74 100644 --- a/src/bin/e_font.c +++ b/src/bin/e_font.c @@ -21,7 +21,7 @@ e_font_shutdown(void) return 1; } -EAPI void +E_API void e_font_apply(void) { char buf[1024]; @@ -77,7 +77,7 @@ e_font_apply(void) e_client_frame_recalc(ec); } -EAPI Eina_List * +E_API Eina_List * e_font_available_list(void) { Eina_List *evas_fonts; @@ -102,7 +102,7 @@ e_font_available_list(void) return e_fonts; } -EAPI void +E_API void e_font_available_list_free(Eina_List *available) { E_Font_Available *efa; @@ -114,7 +114,7 @@ e_font_available_list_free(Eina_List *available) } } -EAPI void +E_API void e_font_properties_free(E_Font_Properties *efp) { const char *str; @@ -137,14 +137,14 @@ _font_hash_free_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSE return 1; } -EAPI void +E_API void e_font_available_hash_free(Eina_Hash *hash) { eina_hash_foreach(hash, _font_hash_free_cb, NULL); eina_hash_free(hash); } -EAPI E_Font_Properties * +E_API E_Font_Properties * e_font_fontconfig_name_parse(const char *font) { if (!font) return NULL; @@ -232,7 +232,7 @@ _e_font_available_hash_add(Eina_Hash *font_hash, const char *full_name) return font_hash; } -EAPI Eina_Hash * +E_API Eina_Hash * e_font_available_list_parse(Eina_List *list) { Eina_Hash *font_hash; @@ -263,7 +263,7 @@ e_font_available_list_parse(Eina_List *list) return font_hash; } -EAPI const char * +E_API const char * e_font_fontconfig_name_get(const char *name, const char *style) { char buf[256]; @@ -274,7 +274,7 @@ e_font_fontconfig_name_get(const char *name, const char *style) return eina_stringshare_add(buf); } -EAPI void +E_API void e_font_fallback_clear(void) { E_Font_Fallback *eff; @@ -286,7 +286,7 @@ e_font_fallback_clear(void) } } -EAPI void +E_API void e_font_fallback_append(const char *font) { E_Font_Fallback *eff; @@ -298,7 +298,7 @@ e_font_fallback_append(const char *font) e_config->font_fallbacks = eina_list_append(e_config->font_fallbacks, eff); } -EAPI void +E_API void e_font_fallback_prepend(const char *font) { E_Font_Fallback *eff; @@ -310,7 +310,7 @@ e_font_fallback_prepend(const char *font) e_config->font_fallbacks = eina_list_prepend(e_config->font_fallbacks, eff); } -EAPI void +E_API void e_font_fallback_remove(const char *font) { Eina_List *next; @@ -329,13 +329,13 @@ e_font_fallback_remove(const char *font) } } -EAPI Eina_List * +E_API Eina_List * e_font_fallback_list(void) { return e_config->font_fallbacks; } -EAPI void +E_API void e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size) { E_Font_Default *efd; @@ -370,7 +370,7 @@ e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size /* * returns a pointer to the data, return null if nothing if found. */ -EAPI E_Font_Default * +E_API E_Font_Default * e_font_default_get(const char *text_class) { E_Font_Default *efd = NULL, *defd = NULL; @@ -394,7 +394,7 @@ e_font_default_get(const char *text_class) return defd; } -EAPI void +E_API void e_font_default_remove(const char *text_class) { E_Font_Default *efd; @@ -416,7 +416,7 @@ e_font_default_remove(const char *text_class) } } -EAPI Eina_List * +E_API Eina_List * e_font_default_list(void) { return e_config->font_defaults; @@ -426,7 +426,7 @@ e_font_default_list(void) * in size_ret. This function is needed when all hell breaks loose and * we need a font name and size. */ -EAPI const char * +E_API const char * e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret) { E_Font_Default *efd; diff --git a/src/bin/e_font.h b/src/bin/e_font.h index 128cc0d..0b4e14d 100644 --- a/src/bin/e_font.h +++ b/src/bin/e_font.h @@ -34,28 +34,28 @@ struct _E_Font_Properties EINTERN int e_font_init(void); EINTERN int e_font_shutdown(void); -EAPI void e_font_apply(void); -EAPI Eina_List *e_font_available_list(void); -EAPI void e_font_available_list_free(Eina_List *available); -EAPI Eina_Hash *e_font_available_list_parse(Eina_List *list); -EAPI void e_font_available_hash_free(Eina_Hash *hash); -EAPI E_Font_Properties *e_font_fontconfig_name_parse(const char *font); -EAPI const char *e_font_fontconfig_name_get(const char *name, const char *style); -EAPI void e_font_properties_free(E_Font_Properties *efp); +E_API void e_font_apply(void); +E_API Eina_List *e_font_available_list(void); +E_API void e_font_available_list_free(Eina_List *available); +E_API Eina_Hash *e_font_available_list_parse(Eina_List *list); +E_API void e_font_available_hash_free(Eina_Hash *hash); +E_API E_Font_Properties *e_font_fontconfig_name_parse(const char *font); +E_API const char *e_font_fontconfig_name_get(const char *name, const char *style); +E_API void e_font_properties_free(E_Font_Properties *efp); /* global font fallbacks */ -EAPI void e_font_fallback_clear(void); -EAPI void e_font_fallback_append(const char *font); -EAPI void e_font_fallback_prepend(const char *font); -EAPI void e_font_fallback_remove(const char *font); -EAPI Eina_List *e_font_fallback_list(void); +E_API void e_font_fallback_clear(void); +E_API void e_font_fallback_append(const char *font); +E_API void e_font_fallback_prepend(const char *font); +E_API void e_font_fallback_remove(const char *font); +E_API Eina_List *e_font_fallback_list(void); /* setup edje text classes */ -EAPI void e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size); -EAPI E_Font_Default *e_font_default_get(const char *text_class); -EAPI void e_font_default_remove(const char *text_class); -EAPI Eina_List *e_font_default_list(void); -EAPI const char *e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret); +E_API void e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size); +E_API E_Font_Default *e_font_default_get(const char *text_class); +E_API void e_font_default_remove(const char *text_class); +E_API Eina_List *e_font_default_list(void); +E_API const char *e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret); #endif #endif diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index f57cab0..83ab356 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -180,11 +180,11 @@ struct _E_Layout_Item_Container } /********************/ -EAPI int E_EVENT_GADCON_CLIENT_CLASS_ADD = -1; -EAPI int E_EVENT_GADCON_CLIENT_CLASS_DEL = -1; -EAPI int E_EVENT_GADCON_CLIENT_ADD = -1; -EAPI int E_EVENT_GADCON_CLIENT_DEL = -1; -EAPI int E_EVENT_GADCON_POPULATE = -1; +E_API int E_EVENT_GADCON_CLIENT_CLASS_ADD = -1; +E_API int E_EVENT_GADCON_CLIENT_CLASS_DEL = -1; +E_API int E_EVENT_GADCON_CLIENT_ADD = -1; +E_API int E_EVENT_GADCON_CLIENT_DEL = -1; +E_API int E_EVENT_GADCON_POPULATE = -1; static Eina_Hash *providers = NULL; static Eina_List *providers_list = NULL; @@ -257,7 +257,7 @@ e_gadcon_shutdown(void) * @param cc version of gadcon, name and callbacks to use * for handling creation and destroying a gadget */ -EAPI void +E_API void e_gadcon_provider_register(const E_Gadcon_Client_Class *cc) { E_Gadcon *gc; @@ -292,7 +292,7 @@ e_gadcon_provider_register(const E_Gadcon_Client_Class *cc) * * @param cc the gadget class that was used to register the gadget */ -EAPI void +E_API void e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc) { Eina_List *l, *ll, *dlist = NULL; @@ -328,7 +328,7 @@ e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc) } } -EAPI void +E_API void e_gadcon_client_queue(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc) { Eina_List *l; @@ -340,13 +340,13 @@ e_gadcon_client_queue(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc) eina_hash_set(gc->awaiting_classes, cf_gcc->name, l); } -EAPI Eina_List * +E_API Eina_List * e_gadcon_provider_list(void) { return providers_list; } -EAPI void +E_API void e_gadcon_custom_new(E_Gadcon *gc) { E_OBJECT_CHECK(gc); @@ -364,7 +364,7 @@ e_gadcon_custom_new(E_Gadcon *gc) gc->custom = EINA_TRUE; } -EAPI void +E_API void e_gadcon_custom_del(E_Gadcon *gc) { E_OBJECT_CHECK(gc); @@ -376,7 +376,7 @@ e_gadcon_custom_del(E_Gadcon *gc) gadcons = eina_list_remove(gadcons, gc); } -EAPI void +E_API void e_gadcon_custom_populate_request(E_Gadcon *gc) { E_OBJECT_CHECK(gc); @@ -392,7 +392,7 @@ e_gadcon_custom_populate_request(E_Gadcon *gc) custom_populate_requests = eina_list_append(custom_populate_requests, gc); } -EAPI E_Gadcon * +E_API E_Gadcon * e_gadcon_dummy_new(int id) { E_Gadcon *gc; @@ -410,7 +410,7 @@ e_gadcon_dummy_new(int id) return gc; } -EAPI void +E_API void e_gadcon_config_del(E_Gadcon *gc) { E_OBJECT_CHECK(gc); @@ -418,7 +418,7 @@ e_gadcon_config_del(E_Gadcon *gc) gc->cfg_delete = 1; } -EAPI void +E_API void e_gadcon_drop_handler_add(E_Gadcon *gc, E_Gadcon_DND_Cb enter, E_Gadcon_DND_Cb leave, E_Gadcon_DND_Cb move, E_Gadcon_DND_Cb drop, int x, int y, int w, int h) { const char *drop_types[] = { "enlightenment/gadcon_client" }; @@ -437,7 +437,7 @@ e_gadcon_drop_handler_add(E_Gadcon *gc, E_Gadcon_DND_Cb enter, E_Gadcon_DND_Cb l gc->dnd_drop_cb = drop; } -EAPI E_Gadcon * +E_API E_Gadcon * e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, const char *swallow_name) { E_Gadcon *gc; @@ -495,7 +495,7 @@ e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, const char *s return gc; } -EAPI void +E_API void e_gadcon_swallowed_min_size_set(E_Gadcon *gc, Evas_Coord w, Evas_Coord h) { E_OBJECT_CHECK(gc); @@ -508,7 +508,7 @@ e_gadcon_swallowed_min_size_set(E_Gadcon *gc, Evas_Coord w, Evas_Coord h) } } -EAPI void +E_API void e_gadcon_min_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data) { E_OBJECT_CHECK(gc); @@ -517,7 +517,7 @@ e_gadcon_min_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_ gc->min_size_request.data = data; } -EAPI void +E_API void e_gadcon_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data) { E_OBJECT_CHECK(gc); @@ -526,7 +526,7 @@ e_gadcon_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadc gc->resize_request.data = data; } -EAPI void +E_API void e_gadcon_frame_request_callback_set(E_Gadcon *gc, Evas_Object *(*func)(void *data, E_Gadcon_Client * gcc, const char *style), void *data) { E_OBJECT_CHECK(gc); @@ -535,7 +535,7 @@ e_gadcon_frame_request_callback_set(E_Gadcon *gc, Evas_Object *(*func)(void *dat gc->frame_request.data = data; } -EAPI void +E_API void e_gadcon_populate_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, const E_Gadcon_Client_Class *cc), void *data) { E_OBJECT_CHECK(gc); @@ -544,7 +544,7 @@ e_gadcon_populate_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon * gc->populate_class.data = data; } -EAPI void +E_API void e_gadcon_layout_policy_set(E_Gadcon *gc, E_Gadcon_Layout_Policy layout_policy) { E_OBJECT_CHECK(gc); @@ -554,7 +554,7 @@ e_gadcon_layout_policy_set(E_Gadcon *gc, E_Gadcon_Layout_Policy layout_policy) /* FIXME: delete container obj, re-pack all clients */ } -EAPI Eina_Bool +E_API Eina_Bool e_gadcon_populate(E_Gadcon *gc) { Eina_List *l; @@ -588,7 +588,7 @@ e_gadcon_populate(E_Gadcon *gc) return EINA_TRUE; } -EAPI void +E_API void e_gadcon_unpopulate(E_Gadcon *gc) { E_Gadcon_Client *gcc; @@ -614,7 +614,7 @@ e_gadcon_unpopulate(E_Gadcon *gc) if (gc->o_container && (!stopping)) e_gadcon_layout_thaw(gc->o_container); } -EAPI void +E_API void e_gadcon_repopulate(E_Gadcon *gc) { E_OBJECT_CHECK(gc); @@ -625,7 +625,7 @@ e_gadcon_repopulate(E_Gadcon *gc) if (gc->o_container) e_gadcon_layout_thaw(gc->o_container); } -EAPI void +E_API void e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc) { Eina_List *l; @@ -643,7 +643,7 @@ e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc) e_gadcon_layout_thaw(gc->o_container); } -EAPI void +E_API void e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient) { Eina_List *l; @@ -695,7 +695,7 @@ e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient) e_gadcon_layout_thaw(gc->o_container); } -EAPI void +E_API void e_gadcon_edit_begin(E_Gadcon *gc) { Eina_List *l; @@ -711,7 +711,7 @@ e_gadcon_edit_begin(E_Gadcon *gc) e_gadcon_layout_thaw(gc->o_container); } -EAPI void +E_API void e_gadcon_edit_end(E_Gadcon *gc) { Eina_List *l; @@ -727,7 +727,7 @@ e_gadcon_edit_end(E_Gadcon *gc) e_gadcon_locked_set(gc, 0); } -EAPI void +E_API void e_gadcon_all_edit_begin(void) { Eina_List *l; @@ -737,7 +737,7 @@ e_gadcon_all_edit_begin(void) e_gadcon_edit_begin(gc); } -EAPI void +E_API void e_gadcon_all_edit_end(void) { Eina_List *l; @@ -747,7 +747,7 @@ e_gadcon_all_edit_end(void) e_gadcon_edit_end(gc); } -EAPI void +E_API void e_gadcon_zone_set(E_Gadcon *gc, E_Zone *zone) { E_OBJECT_CHECK(gc); @@ -756,7 +756,7 @@ e_gadcon_zone_set(E_Gadcon *gc, E_Zone *zone) if (gc->cf) gc->cf->zone = zone->num; } -EAPI E_Zone * +E_API E_Zone * e_gadcon_zone_get(E_Gadcon *gc) { E_OBJECT_CHECK_RETURN(gc, NULL); @@ -766,7 +766,7 @@ e_gadcon_zone_get(E_Gadcon *gc) return e_win_client_get(gc->toolbar->fwin)->zone; } -EAPI void +E_API void e_gadcon_ecore_evas_set(E_Gadcon *gc, Ecore_Evas *ee) { E_OBJECT_CHECK(gc); @@ -774,7 +774,7 @@ e_gadcon_ecore_evas_set(E_Gadcon *gc, Ecore_Evas *ee) gc->ecore_evas = ee; } -EAPI int +E_API int e_gadcon_canvas_zone_geometry_get(E_Gadcon *gc, int *x, int *y, int *w, int *h) { E_OBJECT_CHECK_RETURN(gc, 0); @@ -790,7 +790,7 @@ e_gadcon_canvas_zone_geometry_get(E_Gadcon *gc, int *x, int *y, int *w, int *h) return 1; } -EAPI void +E_API void e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon_Client *gcc, E_Menu *menu), void *data) { E_OBJECT_CHECK(gc); @@ -799,7 +799,7 @@ e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, void (*func)(void *data, E_Gadc gc->menu_attach.data = data; } -EAPI void +E_API void e_gadcon_util_lock_func_set(E_Gadcon *gc, void (*func)(void *data, int lock), void *data) { E_OBJECT_CHECK(gc); @@ -808,7 +808,7 @@ e_gadcon_util_lock_func_set(E_Gadcon *gc, void (*func)(void *data, int lock), vo gc->locked_set.data = data; } -EAPI void +E_API void e_gadcon_util_urgent_show_func_set(E_Gadcon *gc, void (*func)(void *data), void *data) { E_OBJECT_CHECK(gc); @@ -817,7 +817,7 @@ e_gadcon_util_urgent_show_func_set(E_Gadcon *gc, void (*func)(void *data), void gc->urgent_show.data = data; } -EAPI void +E_API void e_gadcon_dnd_window_set(E_Gadcon *gc, Ecore_X_Window win) { E_OBJECT_CHECK(gc); @@ -825,7 +825,7 @@ e_gadcon_dnd_window_set(E_Gadcon *gc, Ecore_X_Window win) gc->dnd_win = win; } -EAPI Ecore_X_Window +E_API Ecore_X_Window e_gadcon_dnd_window_get(E_Gadcon *gc) { E_OBJECT_CHECK_RETURN(gc, 0); @@ -833,7 +833,7 @@ e_gadcon_dnd_window_get(E_Gadcon *gc) return gc->dnd_win; } -EAPI void +E_API void e_gadcon_xdnd_window_set(E_Gadcon *gc, Ecore_X_Window win) { E_OBJECT_CHECK(gc); @@ -841,7 +841,7 @@ e_gadcon_xdnd_window_set(E_Gadcon *gc, Ecore_X_Window win) gc->xdnd_win = win; } -EAPI Ecore_X_Window +E_API Ecore_X_Window e_gadcon_xdnd_window_get(E_Gadcon *gc) { E_OBJECT_CHECK_RETURN(gc, 0); @@ -849,7 +849,7 @@ e_gadcon_xdnd_window_get(E_Gadcon *gc) return gc->xdnd_win; } -EAPI void +E_API void e_gadcon_name_set(E_Gadcon *gc, const char *name) { if (!gc) return; @@ -859,7 +859,7 @@ e_gadcon_name_set(E_Gadcon *gc, const char *name) eina_stringshare_replace(&gc->cf->name, name); } -EAPI void +E_API void e_gadcon_shelf_set(E_Gadcon *gc, E_Shelf *shelf) { E_OBJECT_CHECK(gc); @@ -867,7 +867,7 @@ e_gadcon_shelf_set(E_Gadcon *gc, E_Shelf *shelf) gc->shelf = shelf; } -EAPI E_Shelf * +E_API E_Shelf * e_gadcon_shelf_get(E_Gadcon *gc) { E_OBJECT_CHECK_RETURN(gc, NULL); @@ -875,7 +875,7 @@ e_gadcon_shelf_get(E_Gadcon *gc) return gc->shelf; } -EAPI void +E_API void e_gadcon_toolbar_set(E_Gadcon *gc, E_Toolbar *toolbar) { E_OBJECT_CHECK(gc); @@ -883,7 +883,7 @@ e_gadcon_toolbar_set(E_Gadcon *gc, E_Toolbar *toolbar) gc->toolbar = toolbar; } -EAPI E_Toolbar * +E_API E_Toolbar * e_gadcon_toolbar_get(E_Gadcon *gc) { E_OBJECT_CHECK_RETURN(gc, NULL); @@ -891,7 +891,7 @@ e_gadcon_toolbar_get(E_Gadcon *gc) return gc->toolbar; } -EAPI E_Config_Gadcon_Client * +E_API E_Config_Gadcon_Client * e_gadcon_client_config_new(E_Gadcon *gc, const char *name) { E_Gadcon_Client_Class *cc; @@ -948,7 +948,7 @@ e_gadcon_client_config_new(E_Gadcon *gc, const char *name) return cf_gcc; } -EAPI void +E_API void e_gadcon_client_config_del(E_Config_Gadcon *cf_gc, E_Config_Gadcon_Client *cf_gcc) { E_Gadcon *gc; @@ -969,7 +969,7 @@ e_gadcon_client_config_del(E_Config_Gadcon *cf_gc, E_Config_Gadcon_Client *cf_gc free(cf_gcc); } -EAPI E_Gadcon_Client * +E_API E_Gadcon_Client * e_gadcon_client_find(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc) { E_Gadcon_Client *gcc; @@ -1008,7 +1008,7 @@ _e_gadcon_client_frame_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EIN gcc->o_frame = NULL; } -EAPI void +E_API void e_gadcon_drag_finished_cb(E_Drag *drag, int dropped) { E_Gadcon_Client *gcc; @@ -1039,7 +1039,7 @@ e_gadcon_drag_finished_cb(E_Drag *drag, int dropped) * @param base_obj the evas object that will show up in the shelf or gadget module * @return returns pointer to created gadget, on failure returns null */ -EAPI E_Gadcon_Client * +E_API E_Gadcon_Client * e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id EINA_UNUSED, const char *style, Evas_Object *base_obj) { E_Gadcon_Client *gcc; @@ -1131,7 +1131,7 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id EINA_UNUSED, return gcc; } -EAPI void +E_API void e_gadcon_client_edit_begin(E_Gadcon_Client *gcc) { Evas_Coord x, y, w, h; @@ -1226,7 +1226,7 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc) evas_object_show(gcc->o_control); } -EAPI void +E_API void e_gadcon_client_edit_end(E_Gadcon_Client *gcc) { Eina_List *l = NULL; @@ -1269,7 +1269,7 @@ e_gadcon_client_edit_end(E_Gadcon_Client *gcc) gcc->gadcon->editing = 0; } -EAPI void +E_API void e_gadcon_client_show(E_Gadcon_Client *gcc) { E_OBJECT_CHECK(gcc); @@ -1294,7 +1294,7 @@ e_gadcon_client_show(E_Gadcon_Client *gcc) gcc->hidden = 0; } -EAPI void +E_API void e_gadcon_client_hide(E_Gadcon_Client *gcc) { E_OBJECT_CHECK(gcc); @@ -1313,7 +1313,7 @@ e_gadcon_client_hide(E_Gadcon_Client *gcc) gcc->hidden = 1; } -EAPI void +E_API void e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h) { E_OBJECT_CHECK(gcc); @@ -1352,7 +1352,7 @@ e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h) } } -EAPI void +E_API void e_gadcon_client_min_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h) { E_OBJECT_CHECK(gcc); @@ -1370,7 +1370,7 @@ e_gadcon_client_min_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h) _e_gadcon_moveresize_handle(gcc); } -EAPI void +E_API void e_gadcon_client_aspect_set(E_Gadcon_Client *gcc, int w, int h) { E_OBJECT_CHECK(gcc); @@ -1391,7 +1391,7 @@ e_gadcon_client_aspect_set(E_Gadcon_Client *gcc, int w, int h) _e_gadcon_moveresize_handle(gcc); } -EAPI void +E_API void e_gadcon_client_autoscroll_toggle_disabled_set(E_Gadcon_Client *gcc, Eina_Bool disable) { disable = !!disable; @@ -1400,7 +1400,7 @@ e_gadcon_client_autoscroll_toggle_disabled_set(E_Gadcon_Client *gcc, Eina_Bool d if (disable) e_gadcon_client_autoscroll_set(gcc, 1); } -EAPI void +E_API void e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll) { E_OBJECT_CHECK(gcc); @@ -1451,7 +1451,7 @@ e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll) } } -EAPI void +E_API void e_gadcon_client_resizable_set(E_Gadcon_Client *gcc EINA_UNUSED, int resizable EINA_UNUSED) { E_OBJECT_CHECK(gcc); @@ -1495,7 +1495,7 @@ e_gadcon_client_resizable_set(E_Gadcon_Client *gcc EINA_UNUSED, int resizable EI */ } -EAPI int +E_API int e_gadcon_client_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *h) { int gx = 0, gy = 0; @@ -1510,7 +1510,7 @@ e_gadcon_client_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int * return 1; } -EAPI int +E_API int e_gadcon_client_viewport_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *h) { E_OBJECT_CHECK_RETURN(gcc, 0); @@ -1529,7 +1529,7 @@ e_gadcon_client_viewport_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int return 1; } -EAPI E_Zone * +E_API E_Zone * e_gadcon_client_zone_get(E_Gadcon_Client *gcc) { E_OBJECT_CHECK_RETURN(gcc, NULL); @@ -1669,7 +1669,7 @@ _e_gadcon_gadget_move_to_pre_cb(void *data, E_Menu *m) _e_gadcon_add_locations_menu_for_site(m, gcc, E_GADCON_SITE_UNKNOWN, &n); } -EAPI void +E_API void e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu) { E_Menu *mn; @@ -1690,7 +1690,7 @@ e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu) } } -EAPI E_Menu * +E_API E_Menu * e_gadcon_client_menu_set(E_Gadcon_Client *gcc, E_Menu *m) { E_Menu *ret; @@ -1708,7 +1708,7 @@ e_gadcon_client_menu_set(E_Gadcon_Client *gcc, E_Menu *m) return ret; } -EAPI E_Menu * +E_API E_Menu * e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget, int flags EINA_UNUSED) { E_Menu *mo, *menu_main = NULL; @@ -1839,7 +1839,7 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget return menu_main; } -EAPI void +E_API void e_gadcon_client_util_menu_attach(E_Gadcon_Client *gcc) { E_OBJECT_CHECK(gcc); @@ -1876,7 +1876,7 @@ e_gadcon_client_util_menu_attach(E_Gadcon_Client *gcc) } } -EAPI void +E_API void e_gadcon_locked_set(E_Gadcon *gc, int lock) { E_OBJECT_CHECK(gc); @@ -1885,7 +1885,7 @@ e_gadcon_locked_set(E_Gadcon *gc, int lock) gc->locked_set.func(gc->locked_set.data, lock); } -EAPI void +E_API void e_gadcon_urgent_show(E_Gadcon *gc) { E_OBJECT_CHECK(gc); @@ -1897,7 +1897,7 @@ e_gadcon_urgent_show(E_Gadcon *gc) /* * NOTE: x & y are relative to the o_box of the gadcon. */ -EAPI void +E_API void e_gadcon_client_autoscroll_update(E_Gadcon_Client *gcc, Evas_Coord x, Evas_Coord y) { E_OBJECT_CHECK(gcc); @@ -1933,7 +1933,7 @@ e_gadcon_client_autoscroll_update(E_Gadcon_Client *gcc, Evas_Coord x, Evas_Coord } } -EAPI void +E_API void e_gadcon_client_autoscroll_cb_set(E_Gadcon_Client *gcc, void (*func)(void *data), void *data) { E_OBJECT_CHECK(gcc); @@ -1942,25 +1942,25 @@ e_gadcon_client_autoscroll_cb_set(E_Gadcon_Client *gcc, void (*func)(void *data) gcc->scroll_cb.data = data; } -EAPI Eina_Bool +E_API Eina_Bool e_gadcon_site_is_shelf(E_Gadcon_Site site) { return site == E_GADCON_SITE_SHELF; } -EAPI Eina_Bool +E_API Eina_Bool e_gadcon_site_is_desktop(E_Gadcon_Site site) { return site == E_GADCON_SITE_DESKTOP; } -EAPI Eina_Bool +E_API Eina_Bool e_gadcon_site_is_efm_toolbar(E_Gadcon_Site site) { return site == E_GADCON_SITE_EFM_TOOLBAR; } -EAPI Eina_Bool +E_API Eina_Bool e_gadcon_site_is_any_toolbar(E_Gadcon_Site site) { switch (site) @@ -1976,7 +1976,7 @@ e_gadcon_site_is_any_toolbar(E_Gadcon_Site site) return EINA_FALSE; } -EAPI Eina_Bool +E_API Eina_Bool e_gadcon_site_is_not_toolbar(E_Gadcon_Site site) { switch (site) @@ -1992,7 +1992,7 @@ e_gadcon_site_is_not_toolbar(E_Gadcon_Site site) return EINA_TRUE; } -EAPI void +E_API void e_gadcon_client_drag_set(E_Gadcon_Client *gcc) { Eina_List *l; @@ -5697,7 +5697,7 @@ _e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *cc) /* gadgets movement between different gadcons */ -EAPI E_Gadcon_Location * +E_API E_Gadcon_Location * e_gadcon_location_new(const char *name, E_Gadcon_Site site, int (*add_func)(void *data, E_Gadcon_Client *gcc, const E_Gadcon_Client_Class *cc), @@ -5718,7 +5718,7 @@ e_gadcon_location_new(const char *name, return loc; } -EAPI void +E_API void e_gadcon_location_set_icon_name(E_Gadcon_Location *loc, const char *name) { if (loc->icon_name) eina_stringshare_del(loc->icon_name); @@ -5728,7 +5728,7 @@ e_gadcon_location_set_icon_name(E_Gadcon_Location *loc, const char *name) loc->icon_name = NULL; } -EAPI void +E_API void e_gadcon_location_free(E_Gadcon_Location *loc) { eina_stringshare_del(loc->name); @@ -5736,13 +5736,13 @@ e_gadcon_location_free(E_Gadcon_Location *loc) free(loc); } -EAPI void +E_API void e_gadcon_location_register(E_Gadcon_Location *loc) { gadcon_locations = eina_list_append(gadcon_locations, loc); } -EAPI void +E_API void e_gadcon_location_unregister(E_Gadcon_Location *loc) { gadcon_locations = eina_list_remove(gadcon_locations, loc); @@ -5761,7 +5761,7 @@ _e_gadcon_location_change(E_Gadcon_Client *gcc, E_Gadcon_Location *src, E_Gadcon return 1; } -EAPI Eina_Bool +E_API Eina_Bool e_gadcon_client_visible_get(const E_Gadcon_Client *gcc, const E_Desk *desk) { const Eina_List *l; diff --git a/src/bin/e_gadcon.h b/src/bin/e_gadcon.h index 87a02e7..71485d9 100644 --- a/src/bin/e_gadcon.h +++ b/src/bin/e_gadcon.h @@ -61,11 +61,11 @@ typedef void (*E_Gadcon_DND_Cb)(E_Gadcon*, E_Gadcon_Client*); #define E_GADCON_DUMMY_TYPE 0xE0b01016 #define E_GADCON_CLIENT_TYPE 0xE0b01007 -EAPI extern int E_EVENT_GADCON_CLIENT_ADD; -EAPI extern int E_EVENT_GADCON_CLIENT_DEL; -EAPI extern int E_EVENT_GADCON_CLIENT_CLASS_ADD; -EAPI extern int E_EVENT_GADCON_CLIENT_CLASS_DEL; -EAPI extern int E_EVENT_GADCON_POPULATE; +E_API extern int E_EVENT_GADCON_CLIENT_ADD; +E_API extern int E_EVENT_GADCON_CLIENT_DEL; +E_API extern int E_EVENT_GADCON_CLIENT_CLASS_ADD; +E_API extern int E_EVENT_GADCON_CLIENT_CLASS_DEL; +E_API extern int E_EVENT_GADCON_POPULATE; struct _E_Gadcon { @@ -274,99 +274,99 @@ struct _E_Gadcon_Location EINTERN int e_gadcon_init(void); EINTERN int e_gadcon_shutdown(void); -EAPI void e_gadcon_provider_register(const E_Gadcon_Client_Class *cc); -EAPI void e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc); -EAPI Eina_List *e_gadcon_provider_list(void); -EAPI E_Gadcon *e_gadcon_dummy_new(int id); -EAPI void e_gadcon_drop_handler_add(E_Gadcon *gc, E_Gadcon_DND_Cb enter, E_Gadcon_DND_Cb leave, E_Gadcon_DND_Cb move, E_Gadcon_DND_Cb drop, int x, int y, int w, int h); -EAPI void e_gadcon_config_del(E_Gadcon *gc); -EAPI E_Gadcon *e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, const char *swallow_name); -EAPI void e_gadcon_custom_new(E_Gadcon *gc); -EAPI void e_gadcon_custom_del(E_Gadcon *gc); -EAPI void e_gadcon_custom_populate_request(E_Gadcon *gc); -EAPI void e_gadcon_swallowed_min_size_set(E_Gadcon *gc, Evas_Coord w, Evas_Coord h); -EAPI void e_gadcon_min_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data); -EAPI void e_gadcon_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data); -EAPI void e_gadcon_frame_request_callback_set(E_Gadcon * gc, Evas_Object * (*func)(void *data, E_Gadcon_Client * gcc, const char *style), void *data); -EAPI void e_gadcon_populate_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, const E_Gadcon_Client_Class *cc), void *data); -EAPI void e_gadcon_layout_policy_set(E_Gadcon *gc, E_Gadcon_Layout_Policy layout_policy); -EAPI Eina_Bool e_gadcon_populate(E_Gadcon *gc); -EAPI void e_gadcon_unpopulate(E_Gadcon *gc); -EAPI void e_gadcon_repopulate(E_Gadcon *gc); -EAPI void e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc); -EAPI void e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient); -EAPI void e_gadcon_edit_begin(E_Gadcon *gc); -EAPI void e_gadcon_edit_end(E_Gadcon *gc); -EAPI void e_gadcon_all_edit_begin(void); -EAPI void e_gadcon_all_edit_end(void); -EAPI void e_gadcon_zone_set(E_Gadcon *gc, E_Zone *zone); -EAPI E_Zone *e_gadcon_zone_get(E_Gadcon *gc); -EAPI void e_gadcon_ecore_evas_set(E_Gadcon *gc, Ecore_Evas *ee); -EAPI int e_gadcon_canvas_zone_geometry_get(E_Gadcon *gc, int *x, int *y, int *w, int *h); -EAPI void e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon_Client *gcc, E_Menu *menu), void *data); -EAPI void e_gadcon_util_lock_func_set(E_Gadcon *gc, void (*func)(void *data, int lock), void *data); -EAPI void e_gadcon_util_urgent_show_func_set(E_Gadcon *gc, void (*func)(void *data), void *data); -EAPI void e_gadcon_dnd_window_set(E_Gadcon *gc, Ecore_X_Window win); -EAPI Ecore_X_Window e_gadcon_dnd_window_get(E_Gadcon *gc); -EAPI void e_gadcon_xdnd_window_set(E_Gadcon *gc, Ecore_X_Window win); -EAPI Ecore_X_Window e_gadcon_xdnd_window_get(E_Gadcon *gc); -EAPI void e_gadcon_shelf_set(E_Gadcon *gc, E_Shelf *shelf); -EAPI E_Shelf *e_gadcon_shelf_get(E_Gadcon *gc); -EAPI void e_gadcon_toolbar_set(E_Gadcon *gc, E_Toolbar *toolbar); -EAPI E_Toolbar *e_gadcon_toolbar_get(E_Gadcon *gc); -EAPI E_Gadcon_Client *e_gadcon_client_find(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc); -EAPI E_Config_Gadcon_Client *e_gadcon_client_config_new(E_Gadcon *gc, const char *name); -EAPI void e_gadcon_client_config_del(E_Config_Gadcon *cf_gc, E_Config_Gadcon_Client *cf_gcc); -EAPI E_Gadcon_Client *e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *style, Evas_Object *base_obj); -EAPI void e_gadcon_client_edit_begin(E_Gadcon_Client *gcc); -EAPI void e_gadcon_client_edit_end(E_Gadcon_Client *gcc); -EAPI void e_gadcon_client_queue(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc); -EAPI void e_gadcon_client_show(E_Gadcon_Client *gcc); -EAPI void e_gadcon_client_hide(E_Gadcon_Client *gcc); -EAPI void e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h); -EAPI void e_gadcon_client_min_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h); -EAPI void e_gadcon_client_aspect_set(E_Gadcon_Client *gcc, int w, int h); -EAPI void e_gadcon_client_autoscroll_toggle_disabled_set(E_Gadcon_Client *gcc, Eina_Bool disable); -EAPI void e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll); -EAPI void e_gadcon_client_autoscroll_update(E_Gadcon_Client *gcc, int mx, int my); -EAPI void e_gadcon_client_autoscroll_cb_set(E_Gadcon_Client *gcc, void (*func)(void *data), void *data); -EAPI void e_gadcon_client_resizable_set(E_Gadcon_Client *gcc, int resizable); -EAPI int e_gadcon_client_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *h); -EAPI int e_gadcon_client_viewport_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *h); -EAPI E_Zone *e_gadcon_client_zone_get(E_Gadcon_Client *gcc); -EAPI E_Menu *e_gadcon_client_menu_set(E_Gadcon_Client *gcc, E_Menu *m); -EAPI E_Menu *e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget, int flags); -EAPI void e_gadcon_client_util_menu_attach(E_Gadcon_Client *gcc); -EAPI void e_gadcon_locked_set(E_Gadcon *gc, int lock); -EAPI void e_gadcon_urgent_show(E_Gadcon *gc); -EAPI void e_gadcon_name_set(E_Gadcon *gc, const char *name); +E_API void e_gadcon_provider_register(const E_Gadcon_Client_Class *cc); +E_API void e_gadcon_provider_unregister(const E_Gadcon_Client_Class *cc); +E_API Eina_List *e_gadcon_provider_list(void); +E_API E_Gadcon *e_gadcon_dummy_new(int id); +E_API void e_gadcon_drop_handler_add(E_Gadcon *gc, E_Gadcon_DND_Cb enter, E_Gadcon_DND_Cb leave, E_Gadcon_DND_Cb move, E_Gadcon_DND_Cb drop, int x, int y, int w, int h); +E_API void e_gadcon_config_del(E_Gadcon *gc); +E_API E_Gadcon *e_gadcon_swallowed_new(const char *name, int id, Evas_Object *obj, const char *swallow_name); +E_API void e_gadcon_custom_new(E_Gadcon *gc); +E_API void e_gadcon_custom_del(E_Gadcon *gc); +E_API void e_gadcon_custom_populate_request(E_Gadcon *gc); +E_API void e_gadcon_swallowed_min_size_set(E_Gadcon *gc, Evas_Coord w, Evas_Coord h); +E_API void e_gadcon_min_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data); +E_API void e_gadcon_size_request_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h), void *data); +E_API void e_gadcon_frame_request_callback_set(E_Gadcon * gc, Evas_Object * (*func)(void *data, E_Gadcon_Client * gcc, const char *style), void *data); +E_API void e_gadcon_populate_callback_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon *gc, const E_Gadcon_Client_Class *cc), void *data); +E_API void e_gadcon_layout_policy_set(E_Gadcon *gc, E_Gadcon_Layout_Policy layout_policy); +E_API Eina_Bool e_gadcon_populate(E_Gadcon *gc); +E_API void e_gadcon_unpopulate(E_Gadcon *gc); +E_API void e_gadcon_repopulate(E_Gadcon *gc); +E_API void e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc); +E_API void e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient); +E_API void e_gadcon_edit_begin(E_Gadcon *gc); +E_API void e_gadcon_edit_end(E_Gadcon *gc); +E_API void e_gadcon_all_edit_begin(void); +E_API void e_gadcon_all_edit_end(void); +E_API void e_gadcon_zone_set(E_Gadcon *gc, E_Zone *zone); +E_API E_Zone *e_gadcon_zone_get(E_Gadcon *gc); +E_API void e_gadcon_ecore_evas_set(E_Gadcon *gc, Ecore_Evas *ee); +E_API int e_gadcon_canvas_zone_geometry_get(E_Gadcon *gc, int *x, int *y, int *w, int *h); +E_API void e_gadcon_util_menu_attach_func_set(E_Gadcon *gc, void (*func)(void *data, E_Gadcon_Client *gcc, E_Menu *menu), void *data); +E_API void e_gadcon_util_lock_func_set(E_Gadcon *gc, void (*func)(void *data, int lock), void *data); +E_API void e_gadcon_util_urgent_show_func_set(E_Gadcon *gc, void (*func)(void *data), void *data); +E_API void e_gadcon_dnd_window_set(E_Gadcon *gc, Ecore_X_Window win); +E_API Ecore_X_Window e_gadcon_dnd_window_get(E_Gadcon *gc); +E_API void e_gadcon_xdnd_window_set(E_Gadcon *gc, Ecore_X_Window win); +E_API Ecore_X_Window e_gadcon_xdnd_window_get(E_Gadcon *gc); +E_API void e_gadcon_shelf_set(E_Gadcon *gc, E_Shelf *shelf); +E_API E_Shelf *e_gadcon_shelf_get(E_Gadcon *gc); +E_API void e_gadcon_toolbar_set(E_Gadcon *gc, E_Toolbar *toolbar); +E_API E_Toolbar *e_gadcon_toolbar_get(E_Gadcon *gc); +E_API E_Gadcon_Client *e_gadcon_client_find(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc); +E_API E_Config_Gadcon_Client *e_gadcon_client_config_new(E_Gadcon *gc, const char *name); +E_API void e_gadcon_client_config_del(E_Config_Gadcon *cf_gc, E_Config_Gadcon_Client *cf_gcc); +E_API E_Gadcon_Client *e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *style, Evas_Object *base_obj); +E_API void e_gadcon_client_edit_begin(E_Gadcon_Client *gcc); +E_API void e_gadcon_client_edit_end(E_Gadcon_Client *gcc); +E_API void e_gadcon_client_queue(E_Gadcon *gc, E_Config_Gadcon_Client *cf_gcc); +E_API void e_gadcon_client_show(E_Gadcon_Client *gcc); +E_API void e_gadcon_client_hide(E_Gadcon_Client *gcc); +E_API void e_gadcon_client_size_request(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h); +E_API void e_gadcon_client_min_size_set(E_Gadcon_Client *gcc, Evas_Coord w, Evas_Coord h); +E_API void e_gadcon_client_aspect_set(E_Gadcon_Client *gcc, int w, int h); +E_API void e_gadcon_client_autoscroll_toggle_disabled_set(E_Gadcon_Client *gcc, Eina_Bool disable); +E_API void e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll); +E_API void e_gadcon_client_autoscroll_update(E_Gadcon_Client *gcc, int mx, int my); +E_API void e_gadcon_client_autoscroll_cb_set(E_Gadcon_Client *gcc, void (*func)(void *data), void *data); +E_API void e_gadcon_client_resizable_set(E_Gadcon_Client *gcc, int resizable); +E_API int e_gadcon_client_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *h); +E_API int e_gadcon_client_viewport_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *h); +E_API E_Zone *e_gadcon_client_zone_get(E_Gadcon_Client *gcc); +E_API E_Menu *e_gadcon_client_menu_set(E_Gadcon_Client *gcc, E_Menu *m); +E_API E_Menu *e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget, int flags); +E_API void e_gadcon_client_util_menu_attach(E_Gadcon_Client *gcc); +E_API void e_gadcon_locked_set(E_Gadcon *gc, int lock); +E_API void e_gadcon_urgent_show(E_Gadcon *gc); +E_API void e_gadcon_name_set(E_Gadcon *gc, const char *name); /* site helpers */ -EAPI Eina_Bool e_gadcon_site_is_shelf(E_Gadcon_Site site); -EAPI Eina_Bool e_gadcon_site_is_desktop(E_Gadcon_Site site); -EAPI Eina_Bool e_gadcon_site_is_efm_toolbar(E_Gadcon_Site site); +E_API Eina_Bool e_gadcon_site_is_shelf(E_Gadcon_Site site); +E_API Eina_Bool e_gadcon_site_is_desktop(E_Gadcon_Site site); +E_API Eina_Bool e_gadcon_site_is_efm_toolbar(E_Gadcon_Site site); -EAPI Eina_Bool e_gadcon_site_is_any_toolbar(E_Gadcon_Site site); // all toolbar sities -EAPI Eina_Bool e_gadcon_site_is_not_toolbar(E_Gadcon_Site site); // all non-toolbar sities +E_API Eina_Bool e_gadcon_site_is_any_toolbar(E_Gadcon_Site site); // all toolbar sities +E_API Eina_Bool e_gadcon_site_is_not_toolbar(E_Gadcon_Site site); // all non-toolbar sities /* location helpers */ -EAPI E_Gadcon_Location * +E_API E_Gadcon_Location * e_gadcon_location_new(const char *name, E_Gadcon_Site site, int (*add_func)(void *data, E_Gadcon_Client *, const E_Gadcon_Client_Class *cc), void *add_data, void (*remove_func)(void *data, E_Gadcon_Client *cc), void *remove_data); -EAPI void e_gadcon_location_free(E_Gadcon_Location *loc); -EAPI void e_gadcon_location_register(E_Gadcon_Location *loc); -EAPI void e_gadcon_location_unregister(E_Gadcon_Location *loc); -EAPI void e_gadcon_location_set_icon_name(E_Gadcon_Location *loc, const char *name); -EAPI void e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu); -EAPI void e_gadcon_drag_finished_cb(E_Drag *drag, int dropped); -EAPI void e_gadcon_client_drag_set(E_Gadcon_Client *gcc); - -EAPI Eina_Bool e_gadcon_client_visible_get(const E_Gadcon_Client *gcc, const E_Desk *desk); +E_API void e_gadcon_location_free(E_Gadcon_Location *loc); +E_API void e_gadcon_location_register(E_Gadcon_Location *loc); +E_API void e_gadcon_location_unregister(E_Gadcon_Location *loc); +E_API void e_gadcon_location_set_icon_name(E_Gadcon_Location *loc, const char *name); +E_API void e_gadcon_client_add_location_menu(E_Gadcon_Client *gcc, E_Menu *menu); +E_API void e_gadcon_drag_finished_cb(E_Drag *drag, int dropped); +E_API void e_gadcon_client_drag_set(E_Gadcon_Client *gcc); + +E_API Eina_Bool e_gadcon_client_visible_get(const E_Gadcon_Client *gcc, const E_Desk *desk); #define GADCON_CLIENT_CONFIG_GET(_type, _items, _gc_class, _id) \ if (!_id) \ diff --git a/src/bin/e_gadcon_popup.c b/src/bin/e_gadcon_popup.c index 836f061..268c093 100644 --- a/src/bin/e_gadcon_popup.c +++ b/src/bin/e_gadcon_popup.c @@ -204,7 +204,7 @@ _e_gadcon_popup_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void * /* externally accessible functions */ -EAPI E_Gadcon_Popup * +E_API E_Gadcon_Popup * e_gadcon_popup_new(E_Gadcon_Client *gcc, Eina_Bool noshadow) { E_Gadcon_Popup *pop; @@ -231,7 +231,7 @@ e_gadcon_popup_new(E_Gadcon_Client *gcc, Eina_Bool noshadow) return pop; } -EAPI void +E_API void e_gadcon_popup_content_set(E_Gadcon_Popup *pop, Evas_Object *o) { Evas_Object *old_o; @@ -258,7 +258,7 @@ e_gadcon_popup_content_set(E_Gadcon_Popup *pop, Evas_Object *o) _e_gadcon_popup_size_recalc(pop, o); } -EAPI void +E_API void e_gadcon_popup_show(E_Gadcon_Popup *pop) { E_OBJECT_CHECK(pop); @@ -275,7 +275,7 @@ e_gadcon_popup_show(E_Gadcon_Popup *pop) pop->visible = EINA_TRUE; } -EAPI void +E_API void e_gadcon_popup_hide(E_Gadcon_Popup *pop) { E_OBJECT_CHECK(pop); @@ -287,7 +287,7 @@ e_gadcon_popup_hide(E_Gadcon_Popup *pop) pop->visible = EINA_FALSE; } -EAPI void +E_API void e_gadcon_popup_toggle_pinned(E_Gadcon_Popup *pop) { if (!pop) return; @@ -306,7 +306,7 @@ e_gadcon_popup_toggle_pinned(E_Gadcon_Popup *pop) } } -EAPI void +E_API void e_gadcon_popup_lock_set(E_Gadcon_Popup *pop, Eina_Bool setting) { E_OBJECT_CHECK(pop); diff --git a/src/bin/e_gadcon_popup.h b/src/bin/e_gadcon_popup.h index bb5c0c5..4914ddc 100644 --- a/src/bin/e_gadcon_popup.h +++ b/src/bin/e_gadcon_popup.h @@ -25,12 +25,12 @@ struct _E_Gadcon_Popup Eina_Bool visible : 1; }; -EAPI E_Gadcon_Popup *e_gadcon_popup_new(E_Gadcon_Client *gcc, Eina_Bool noshadow); -EAPI void e_gadcon_popup_content_set(E_Gadcon_Popup *pop, Evas_Object *o); -EAPI void e_gadcon_popup_show(E_Gadcon_Popup *pop); -EAPI void e_gadcon_popup_hide(E_Gadcon_Popup *pop); -EAPI void e_gadcon_popup_toggle_pinned(E_Gadcon_Popup *pop); -EAPI void e_gadcon_popup_lock_set(E_Gadcon_Popup *pop, Eina_Bool setting); +E_API E_Gadcon_Popup *e_gadcon_popup_new(E_Gadcon_Client *gcc, Eina_Bool noshadow); +E_API void e_gadcon_popup_content_set(E_Gadcon_Popup *pop, Evas_Object *o); +E_API void e_gadcon_popup_show(E_Gadcon_Popup *pop); +E_API void e_gadcon_popup_hide(E_Gadcon_Popup *pop); +E_API void e_gadcon_popup_toggle_pinned(E_Gadcon_Popup *pop); +E_API void e_gadcon_popup_lock_set(E_Gadcon_Popup *pop, Eina_Bool setting); #endif #endif diff --git a/src/bin/e_grab_dialog.c b/src/bin/e_grab_dialog.c index ee1657f..db533fe 100644 --- a/src/bin/e_grab_dialog.c +++ b/src/bin/e_grab_dialog.c @@ -96,7 +96,7 @@ _e_grab_dialog_dia_del(void *data) e_object_del(dia->data); } -EAPI E_Grab_Dialog * +E_API E_Grab_Dialog * e_grab_dialog_show(Evas_Object *parent, Eina_Bool is_mouse, Ecore_Event_Handler_Cb key, Ecore_Event_Handler_Cb mouse, Ecore_Event_Handler_Cb wheel, const void *data) { E_Grab_Dialog *eg; diff --git a/src/bin/e_grab_dialog.h b/src/bin/e_grab_dialog.h index d3adcc2..e82e5b5 100644 --- a/src/bin/e_grab_dialog.h +++ b/src/bin/e_grab_dialog.h @@ -21,7 +21,7 @@ struct _E_Grab_Dialog void *data; }; -EAPI E_Grab_Dialog *e_grab_dialog_show(Evas_Object *parent, Eina_Bool is_mouse, Ecore_Event_Handler_Cb key, Ecore_Event_Handler_Cb mouse, Ecore_Event_Handler_Cb wheel, const void *data); +E_API E_Grab_Dialog *e_grab_dialog_show(Evas_Object *parent, Eina_Bool is_mouse, Ecore_Event_Handler_Cb key, Ecore_Event_Handler_Cb mouse, Ecore_Event_Handler_Cb wheel, const void *data); #endif #endif diff --git a/src/bin/e_grabinput.c b/src/bin/e_grabinput.c index 7c42db7..de78c09 100644 --- a/src/bin/e_grabinput.c +++ b/src/bin/e_grabinput.c @@ -33,7 +33,7 @@ e_grabinput_shutdown(void) return 1; } -EAPI int +E_API int e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win) { if (grab_mouse_win) @@ -118,7 +118,7 @@ e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win) return 1; } -EAPI void +E_API void e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win) { if (mouse_win == grab_mouse_win) @@ -154,7 +154,7 @@ e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win) } } -EAPI void +E_API void e_grabinput_focus(Ecore_Window win, E_Focus_Method method) { if (grab_key_win != 0) @@ -170,25 +170,25 @@ e_grabinput_focus(Ecore_Window win, E_Focus_Method method) } } -EAPI double +E_API double e_grabinput_last_focus_time_get(void) { return last_focus_time; } -EAPI Ecore_Window +E_API Ecore_Window e_grabinput_last_focus_win_get(void) { return focus_fix_win; } -EAPI Ecore_Window +E_API Ecore_Window e_grabinput_key_win_get(void) { return grab_key_win; } -EAPI Ecore_Window +E_API Ecore_Window e_grabinput_mouse_win_get(void) { return grab_mouse_win; diff --git a/src/bin/e_grabinput.h b/src/bin/e_grabinput.h index 8d3732e..5dabb81 100644 --- a/src/bin/e_grabinput.h +++ b/src/bin/e_grabinput.h @@ -14,13 +14,13 @@ typedef enum _E_Focus_Method EINTERN int e_grabinput_init(void); EINTERN int e_grabinput_shutdown(void); -EAPI int e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win); -EAPI void e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win); -EAPI void e_grabinput_focus(Ecore_Window win, E_Focus_Method method); -EAPI double e_grabinput_last_focus_time_get(void); -EAPI Ecore_Window e_grabinput_last_focus_win_get(void); -EAPI Ecore_Window e_grabinput_key_win_get(void); -EAPI Ecore_Window e_grabinput_mouse_win_get(void); +E_API int e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win); +E_API void e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win); +E_API void e_grabinput_focus(Ecore_Window win, E_Focus_Method method); +E_API double e_grabinput_last_focus_time_get(void); +E_API Ecore_Window e_grabinput_last_focus_win_get(void); +E_API Ecore_Window e_grabinput_key_win_get(void); +E_API Ecore_Window e_grabinput_mouse_win_get(void); #endif #endif diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c index 443d1c2..29f8cc1 100644 --- a/src/bin/e_hints.c +++ b/src/bin/e_hints.c @@ -6,15 +6,15 @@ static void e_hints_e16_comms_pretend(Ecore_X_Window root, Ecore_X_Window propwi static void e_hints_openoffice_gnome_fake(Ecore_Window root); //static void e_hints_openoffice_kde_fake(Ecore_Window root); -EAPI Ecore_X_Atom ATM__QTOPIA_SOFT_MENU = 0; -EAPI Ecore_X_Atom ATM__QTOPIA_SOFT_MENUS = 0; -EAPI Ecore_X_Atom ATM_GNOME_SM_PROXY = 0; -EAPI Ecore_X_Atom ATM_ENLIGHTENMENT_COMMS = 0; -EAPI Ecore_X_Atom ATM_ENLIGHTENMENT_VERSION = 0; -EAPI Ecore_X_Atom ATM_ENLIGHTENMENT_SCALE = 0; - -EAPI Ecore_X_Atom ATM_NETWM_SHOW_WINDOW_MENU = 0; -EAPI Ecore_X_Atom ATM_NETWM_PERFORM_BUTTON_ACTION = 0; +E_API Ecore_X_Atom ATM__QTOPIA_SOFT_MENU = 0; +E_API Ecore_X_Atom ATM__QTOPIA_SOFT_MENUS = 0; +E_API Ecore_X_Atom ATM_GNOME_SM_PROXY = 0; +E_API Ecore_X_Atom ATM_ENLIGHTENMENT_COMMS = 0; +E_API Ecore_X_Atom ATM_ENLIGHTENMENT_VERSION = 0; +E_API Ecore_X_Atom ATM_ENLIGHTENMENT_SCALE = 0; + +E_API Ecore_X_Atom ATM_NETWM_SHOW_WINDOW_MENU = 0; +E_API Ecore_X_Atom ATM_NETWM_PERFORM_BUTTON_ACTION = 0; #endif EINTERN void @@ -294,7 +294,7 @@ e_hints_manager_init(E_Manager *man) } #endif -EAPI void +E_API void e_hints_client_list_set(void) { #ifdef HAVE_WAYLAND_ONLY @@ -323,7 +323,7 @@ e_hints_client_list_set(void) /* Client list is already in stacking order, so this function is nearly * identical to the previous one */ -EAPI void +E_API void e_hints_client_stacking_set(void) { #ifdef HAVE_WAYLAND_ONLY @@ -382,7 +382,7 @@ e_hints_client_stacking_set(void) #endif } -EAPI void +E_API void e_hints_active_window_set(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -573,7 +573,7 @@ e_hints_window_init(E_Client *ec) #endif } -EAPI void +E_API void e_hints_window_state_set(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -633,7 +633,7 @@ e_hints_window_state_set(E_Client *ec) #endif } -EAPI void +E_API void e_hints_allowed_action_set(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -668,7 +668,7 @@ e_hints_allowed_action_set(E_Client *ec) #endif } -EAPI void +E_API void e_hints_window_type_set(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -679,7 +679,7 @@ e_hints_window_type_set(E_Client *ec) #endif } -EAPI void +E_API void e_hints_window_type_get(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -729,7 +729,7 @@ e_hints_window_type_get(E_Client *ec) } #ifdef E_COMP_X_H -EAPI void +E_API void e_hints_window_state_update(E_Client *ec, int state, int action) { if (!e_pixmap_is_x(ec->pixmap)) return; @@ -994,7 +994,7 @@ e_hints_window_state_update(E_Client *ec, int state, int action) } #endif -EAPI void +E_API void e_hints_window_state_get(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1084,7 +1084,7 @@ e_hints_window_state_get(E_Client *ec) #endif } -EAPI void +E_API void e_hints_allowed_action_update(E_Client *ec, int action) { #ifdef HAVE_WAYLAND_ONLY @@ -1133,7 +1133,7 @@ e_hints_allowed_action_update(E_Client *ec, int action) #endif } -EAPI void +E_API void e_hints_allowed_action_get(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1228,7 +1228,7 @@ _e_hints_process_wakeup(E_Client *ec) } #endif -EAPI void +E_API void e_hints_window_visible_set(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1248,7 +1248,7 @@ e_hints_window_visible_set(E_Client *ec) #endif } -EAPI void +E_API void e_hints_window_iconic_set(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1268,7 +1268,7 @@ e_hints_window_iconic_set(E_Client *ec) #endif } -EAPI void +E_API void e_hints_window_hidden_set(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1288,7 +1288,7 @@ e_hints_window_hidden_set(E_Client *ec) #endif } -EAPI void +E_API void e_hints_window_shaded_set(E_Client *ec, int on) { #ifdef HAVE_WAYLAND_ONLY @@ -1316,7 +1316,7 @@ e_hints_window_shaded_set(E_Client *ec, int on) #endif } -EAPI void +E_API void e_hints_window_shade_direction_set(E_Client *ec, E_Direction dir) { #ifdef HAVE_WAYLAND_ONLY @@ -1328,7 +1328,7 @@ e_hints_window_shade_direction_set(E_Client *ec, E_Direction dir) #endif } -EAPI E_Direction +E_API E_Direction e_hints_window_shade_direction_get(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1347,7 +1347,7 @@ e_hints_window_shade_direction_get(E_Client *ec) return E_DIRECTION_UP; } -EAPI void +E_API void e_hints_window_size_set(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1364,7 +1364,7 @@ e_hints_window_size_set(E_Client *ec) #endif } -EAPI void +E_API void e_hints_window_size_unset(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1375,7 +1375,7 @@ e_hints_window_size_unset(E_Client *ec) #endif } -EAPI int +E_API int e_hints_window_size_get(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1400,7 +1400,7 @@ e_hints_window_size_get(E_Client *ec) return 1; } -EAPI void +E_API void e_hints_window_maximized_set(E_Client *ec, int horizontal, int vertical) { #ifdef HAVE_WAYLAND_ONLY @@ -1436,7 +1436,7 @@ e_hints_window_maximized_set(E_Client *ec, int horizontal, int vertical) #endif } -EAPI void +E_API void e_hints_window_fullscreen_set(E_Client *ec, int on) { @@ -1460,7 +1460,7 @@ e_hints_window_fullscreen_set(E_Client *ec, #endif } -EAPI void +E_API void e_hints_window_sticky_set(E_Client *ec, int on) { #ifdef HAVE_WAYLAND_ONLY @@ -1483,7 +1483,7 @@ e_hints_window_sticky_set(E_Client *ec, int on) #endif } -EAPI void +E_API void e_hints_window_stacking_set(E_Client *ec, E_Stacking stacking) { #ifdef HAVE_WAYLAND_ONLY @@ -1498,7 +1498,7 @@ e_hints_window_stacking_set(E_Client *ec, E_Stacking stacking) #endif } -EAPI void +E_API void e_hints_window_desktop_set(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1526,7 +1526,7 @@ e_hints_window_desktop_set(E_Client *ec) #endif } -EAPI void +E_API void e_hints_window_e_state_get(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1556,13 +1556,13 @@ e_hints_window_e_state_get(E_Client *ec) #endif } -EAPI void +E_API void e_hints_window_e_state_set(E_Client *ec EINA_UNUSED) { /* TODO */ } -EAPI void +E_API void e_hints_window_qtopia_soft_menu_get(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1578,7 +1578,7 @@ e_hints_window_qtopia_soft_menu_get(E_Client *ec) #endif } -EAPI void +E_API void e_hints_window_qtopia_soft_menus_get(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1594,7 +1594,7 @@ e_hints_window_qtopia_soft_menus_get(E_Client *ec) #endif } -EAPI void +E_API void e_hints_window_virtual_keyboard_state_get(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1613,7 +1613,7 @@ e_hints_window_virtual_keyboard_state_get(E_Client *ec) #endif } -EAPI void +E_API void e_hints_window_virtual_keyboard_get(E_Client *ec) { #ifdef HAVE_WAYLAND_ONLY @@ -1652,7 +1652,7 @@ e_hints_openoffice_kde_fake(Ecore_Window root) } #endif -EAPI void +E_API void e_hints_scale_update(void) { #ifdef HAVE_WAYLAND_ONLY diff --git a/src/bin/e_hints.h b/src/bin/e_hints.h index 72f3385..7e81e40 100644 --- a/src/bin/e_hints.h +++ b/src/bin/e_hints.h @@ -5,58 +5,58 @@ EINTERN void e_hints_init(Ecore_Window win, Ecore_Window propwin); //EINTERN void e_hints_manager_init(E_Manager *man); -EAPI void e_hints_client_list_set(void); -EAPI void e_hints_client_stacking_set(void); +E_API void e_hints_client_list_set(void); +E_API void e_hints_client_stacking_set(void); -EAPI void e_hints_active_window_set(E_Client *ec); +E_API void e_hints_active_window_set(E_Client *ec); EINTERN void e_hints_window_init(E_Client *ec); -EAPI void e_hints_window_state_set(E_Client *ec); -EAPI void e_hints_window_state_get(E_Client *ec); -EAPI void e_hints_window_type_set(E_Client *ec); -EAPI void e_hints_window_type_get(E_Client *ec); +E_API void e_hints_window_state_set(E_Client *ec); +E_API void e_hints_window_state_get(E_Client *ec); +E_API void e_hints_window_type_set(E_Client *ec); +E_API void e_hints_window_type_get(E_Client *ec); -EAPI void e_hints_window_visible_set(E_Client *ec); -EAPI void e_hints_window_iconic_set(E_Client *ec); -EAPI void e_hints_window_hidden_set(E_Client *ec); +E_API void e_hints_window_visible_set(E_Client *ec); +E_API void e_hints_window_iconic_set(E_Client *ec); +E_API void e_hints_window_hidden_set(E_Client *ec); -EAPI void e_hints_window_shade_direction_set(E_Client *ec, E_Direction dir); -EAPI E_Direction e_hints_window_shade_direction_get(E_Client *ec); +E_API void e_hints_window_shade_direction_set(E_Client *ec, E_Direction dir); +E_API E_Direction e_hints_window_shade_direction_get(E_Client *ec); -EAPI void e_hints_window_size_set(E_Client *ec); -EAPI void e_hints_window_size_unset(E_Client *ec); -EAPI int e_hints_window_size_get(E_Client *ec); +E_API void e_hints_window_size_set(E_Client *ec); +E_API void e_hints_window_size_unset(E_Client *ec); +E_API int e_hints_window_size_get(E_Client *ec); -EAPI void e_hints_window_shaded_set(E_Client *ec, int on); -EAPI void e_hints_window_maximized_set(E_Client *ec, int horizontal, int vertical); -EAPI void e_hints_window_fullscreen_set(E_Client *ec, int on); -EAPI void e_hints_window_sticky_set(E_Client *ec, int on); -EAPI void e_hints_window_stacking_set(E_Client *ec, E_Stacking stacking); -EAPI void e_hints_window_desktop_set(E_Client *ec); +E_API void e_hints_window_shaded_set(E_Client *ec, int on); +E_API void e_hints_window_maximized_set(E_Client *ec, int horizontal, int vertical); +E_API void e_hints_window_fullscreen_set(E_Client *ec, int on); +E_API void e_hints_window_sticky_set(E_Client *ec, int on); +E_API void e_hints_window_stacking_set(E_Client *ec, E_Stacking stacking); +E_API void e_hints_window_desktop_set(E_Client *ec); -EAPI void e_hints_window_e_state_set(E_Client *ec); -EAPI void e_hints_window_e_state_get(E_Client *ec); +E_API void e_hints_window_e_state_set(E_Client *ec); +E_API void e_hints_window_e_state_get(E_Client *ec); -EAPI void e_hints_window_qtopia_soft_menu_get(E_Client *ec); -EAPI void e_hints_window_qtopia_soft_menus_get(E_Client *ec); +E_API void e_hints_window_qtopia_soft_menu_get(E_Client *ec); +E_API void e_hints_window_qtopia_soft_menus_get(E_Client *ec); -EAPI void e_hints_window_virtual_keyboard_state_get(E_Client *ec); -EAPI void e_hints_window_virtual_keyboard_get(E_Client *ec); +E_API void e_hints_window_virtual_keyboard_state_get(E_Client *ec); +E_API void e_hints_window_virtual_keyboard_get(E_Client *ec); -EAPI void e_hints_scale_update(void); +E_API void e_hints_scale_update(void); #ifdef E_COMP_X_H -EAPI void e_hints_window_state_update(E_Client *ec, int state, int action); -extern EAPI Ecore_X_Atom ATM__QTOPIA_SOFT_MENU; -extern EAPI Ecore_X_Atom ATM__QTOPIA_SOFT_MENUS; -extern EAPI Ecore_X_Atom ATM_GNOME_SM_PROXY; -extern EAPI Ecore_X_Atom ATM_ENLIGHTENMENT_COMMS; -extern EAPI Ecore_X_Atom ATM_ENLIGHTENMENT_VERSION; -extern EAPI Ecore_X_Atom ATM_ENLIGHTENMENT_SCALE; -extern EAPI Ecore_X_Atom ATM_NETWM_SHOW_WINDOW_MENU; -extern EAPI Ecore_X_Atom ATM_NETWM_PERFORM_BUTTON_ACTION; +E_API void e_hints_window_state_update(E_Client *ec, int state, int action); +extern E_API Ecore_X_Atom ATM__QTOPIA_SOFT_MENU; +extern E_API Ecore_X_Atom ATM__QTOPIA_SOFT_MENUS; +extern E_API Ecore_X_Atom ATM_GNOME_SM_PROXY; +extern E_API Ecore_X_Atom ATM_ENLIGHTENMENT_COMMS; +extern E_API Ecore_X_Atom ATM_ENLIGHTENMENT_VERSION; +extern E_API Ecore_X_Atom ATM_ENLIGHTENMENT_SCALE; +extern E_API Ecore_X_Atom ATM_NETWM_SHOW_WINDOW_MENU; +extern E_API Ecore_X_Atom ATM_NETWM_PERFORM_BUTTON_ACTION; #endif #endif #endif diff --git a/src/bin/e_icon.c b/src/bin/e_icon.c index bf7e7ba..ab60380 100644 --- a/src/bin/e_icon.c +++ b/src/bin/e_icon.c @@ -151,7 +151,7 @@ e_icon_shutdown(void) } /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_icon_add(Evas *evas) { _e_icon_smart_init(); @@ -217,7 +217,7 @@ _handle_anim(E_Smart_Data *sd) return 1; } -EAPI Eina_Bool +E_API Eina_Bool e_icon_file_set(Evas_Object *obj, const char *file) { E_Smart_Data *sd; @@ -297,7 +297,7 @@ e_icon_file_set(Evas_Object *obj, const char *file) return EINA_TRUE; } -EAPI Eina_Bool +E_API Eina_Bool e_icon_file_key_set(Evas_Object *obj, const char *file, const char *key) { E_Smart_Data *sd; @@ -343,7 +343,7 @@ e_icon_file_key_set(Evas_Object *obj, const char *file, const char *key) return EINA_TRUE; } -EAPI void +E_API void e_icon_edje_object_set(Evas_Object *obj, Evas_Object *edje) { E_Smart_Data *sd; @@ -374,7 +374,7 @@ e_icon_edje_object_set(Evas_Object *obj, Evas_Object *edje) _e_icon_smart_reconfigure(sd); } -EAPI Evas_Object * +E_API Evas_Object * e_icon_edje_get(Evas_Object *obj) { E_Smart_Data *sd; @@ -385,7 +385,7 @@ e_icon_edje_get(Evas_Object *obj) return sd->edje ? sd->obj : NULL; } -EAPI Eina_Bool +E_API Eina_Bool e_icon_file_edje_set(Evas_Object *obj, const char *file, const char *part) { E_Smart_Data *sd; @@ -421,7 +421,7 @@ e_icon_file_edje_set(Evas_Object *obj, const char *file, const char *part) return EINA_TRUE; } -EAPI Eina_Bool +E_API Eina_Bool e_icon_fdo_icon_set(Evas_Object *obj, const char *icon) { E_Smart_Data *sd; @@ -478,7 +478,7 @@ e_icon_fdo_icon_set(Evas_Object *obj, const char *icon) return EINA_TRUE; } -EAPI void +E_API void e_icon_image_object_set(Evas_Object *obj, Evas_Object *o) { E_Smart_Data *sd; @@ -508,7 +508,7 @@ e_icon_image_object_set(Evas_Object *obj, Evas_Object *o) _e_icon_smart_reconfigure(sd); } -EAPI Eina_Bool +E_API Eina_Bool e_icon_file_get(const Evas_Object *obj, const char **file, const char **group) { E_Smart_Data *sd; @@ -534,7 +534,7 @@ e_icon_file_get(const Evas_Object *obj, const char **file, const char **group) return file || group; } -EAPI void +E_API void e_icon_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth) { E_Smart_Data *sd; @@ -545,7 +545,7 @@ e_icon_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth) evas_object_image_smooth_scale_set(sd->obj, smooth); } -EAPI Eina_Bool +E_API Eina_Bool e_icon_smooth_scale_get(const Evas_Object *obj) { E_Smart_Data *sd; @@ -557,7 +557,7 @@ e_icon_smooth_scale_get(const Evas_Object *obj) return evas_object_image_smooth_scale_get(sd->obj); } -EAPI void +E_API void e_icon_alpha_set(Evas_Object *obj, Eina_Bool alpha) { E_Smart_Data *sd; @@ -568,7 +568,7 @@ e_icon_alpha_set(Evas_Object *obj, Eina_Bool alpha) evas_object_image_alpha_set(sd->obj, alpha); } -EAPI Eina_Bool +E_API Eina_Bool e_icon_alpha_get(const Evas_Object *obj) { E_Smart_Data *sd; @@ -579,7 +579,7 @@ e_icon_alpha_get(const Evas_Object *obj) return evas_object_image_alpha_get(sd->obj); } -EAPI void +E_API void e_icon_preload_set(Evas_Object *obj, Eina_Bool preload) { E_Smart_Data *sd; @@ -589,7 +589,7 @@ e_icon_preload_set(Evas_Object *obj, Eina_Bool preload) sd->preload = preload; } -EAPI Eina_Bool +E_API Eina_Bool e_icon_preload_get(const Evas_Object *obj) { E_Smart_Data *sd; @@ -599,7 +599,7 @@ e_icon_preload_get(const Evas_Object *obj) return sd->preload; } -EAPI void +E_API void e_icon_size_get(const Evas_Object *obj, int *w, int *h) { E_Smart_Data *sd; @@ -617,7 +617,7 @@ e_icon_size_get(const Evas_Object *obj, int *w, int *h) evas_object_image_size_get(sd->obj, w, h); } -EAPI Eina_Bool +E_API Eina_Bool e_icon_fill_inside_get(const Evas_Object *obj) { E_Smart_Data *sd; @@ -627,7 +627,7 @@ e_icon_fill_inside_get(const Evas_Object *obj) return sd->fill_inside; } -EAPI void +E_API void e_icon_fill_inside_set(Evas_Object *obj, Eina_Bool fill_inside) { E_Smart_Data *sd; @@ -640,7 +640,7 @@ e_icon_fill_inside_set(Evas_Object *obj, Eina_Bool fill_inside) _e_icon_smart_reconfigure(sd); } -EAPI Eina_Bool +E_API Eina_Bool e_icon_scale_up_get(const Evas_Object *obj) { E_Smart_Data *sd; @@ -650,7 +650,7 @@ e_icon_scale_up_get(const Evas_Object *obj) return sd->scale_up; } -EAPI void +E_API void e_icon_scale_up_set(Evas_Object *obj, Eina_Bool scale_up) { E_Smart_Data *sd; @@ -663,7 +663,7 @@ e_icon_scale_up_set(Evas_Object *obj, Eina_Bool scale_up) _e_icon_smart_reconfigure(sd); } -EAPI void +E_API void e_icon_data_set(Evas_Object *obj, void *data, int w, int h) { E_Smart_Data *sd; @@ -675,7 +675,7 @@ e_icon_data_set(Evas_Object *obj, void *data, int w, int h) evas_object_image_data_copy_set(sd->obj, data); } -EAPI void * +E_API void * e_icon_data_get(const Evas_Object *obj, int *w, int *h) { E_Smart_Data *sd; @@ -687,7 +687,7 @@ e_icon_data_get(const Evas_Object *obj, int *w, int *h) return evas_object_image_data_get(sd->obj, 0); } -EAPI void +E_API void e_icon_scale_size_set(Evas_Object *obj, int size) { E_Smart_Data *sd; @@ -699,7 +699,7 @@ e_icon_scale_size_set(Evas_Object *obj, int size) evas_object_image_load_size_set(sd->obj, sd->size, sd->size); } -EAPI int +E_API int e_icon_scale_size_get(const Evas_Object *obj) { E_Smart_Data *sd; @@ -709,7 +709,7 @@ e_icon_scale_size_get(const Evas_Object *obj) return sd->size; } -EAPI void +E_API void e_icon_selected_set(const Evas_Object *obj, Eina_Bool selected) { E_Smart_Data *sd; diff --git a/src/bin/e_icon.h b/src/bin/e_icon.h index bdb4835..cbe42bb 100644 --- a/src/bin/e_icon.h +++ b/src/bin/e_icon.h @@ -6,31 +6,31 @@ EINTERN int e_icon_init(void); EINTERN int e_icon_shutdown(void); -EAPI Evas_Object *e_icon_add (Evas *evas); -EAPI Eina_Bool e_icon_file_set (Evas_Object *obj, const char *file); -EAPI Eina_Bool e_icon_file_key_set (Evas_Object *obj, const char *file, const char *key); -EAPI Evas_Object *e_icon_edje_get(Evas_Object *obj); -EAPI Eina_Bool e_icon_file_edje_set (Evas_Object *obj, const char *file, const char *part); -EAPI Eina_Bool e_icon_fdo_icon_set (Evas_Object *obj, const char *icon); -EAPI void e_icon_edje_object_set(Evas_Object *obj, Evas_Object *edje); -EAPI void e_icon_image_object_set (Evas_Object *obj, Evas_Object *o); -EAPI Eina_Bool e_icon_file_get(const Evas_Object *obj, const char **file, const char **group); -EAPI void e_icon_smooth_scale_set (Evas_Object *obj, Eina_Bool smooth); -EAPI Eina_Bool e_icon_smooth_scale_get (const Evas_Object *obj); -EAPI void e_icon_alpha_set (Evas_Object *obj, Eina_Bool smooth); -EAPI Eina_Bool e_icon_alpha_get (const Evas_Object *obj); -EAPI void e_icon_preload_set (Evas_Object *obj, Eina_Bool preload); -EAPI Eina_Bool e_icon_preload_get (const Evas_Object *obj); -EAPI void e_icon_size_get (const Evas_Object *obj, int *w, int *h); -EAPI Eina_Bool e_icon_fill_inside_get (const Evas_Object *obj); -EAPI void e_icon_fill_inside_set (Evas_Object *obj, Eina_Bool fill_inside); -EAPI Eina_Bool e_icon_scale_up_get (const Evas_Object *obj); -EAPI void e_icon_scale_up_set (Evas_Object *obj, Eina_Bool scale_up); -EAPI void e_icon_data_set (Evas_Object *obj, void *data, int w, int h); -EAPI void *e_icon_data_get (const Evas_Object *obj, int *w, int *h); -EAPI void e_icon_scale_size_set (Evas_Object *obj, int size); -EAPI int e_icon_scale_size_get (const Evas_Object *obj); -EAPI void e_icon_selected_set (const Evas_Object *obj, Eina_Bool selected); +E_API Evas_Object *e_icon_add (Evas *evas); +E_API Eina_Bool e_icon_file_set (Evas_Object *obj, const char *file); +E_API Eina_Bool e_icon_file_key_set (Evas_Object *obj, const char *file, const char *key); +E_API Evas_Object *e_icon_edje_get(Evas_Object *obj); +E_API Eina_Bool e_icon_file_edje_set (Evas_Object *obj, const char *file, const char *part); +E_API Eina_Bool e_icon_fdo_icon_set (Evas_Object *obj, const char *icon); +E_API void e_icon_edje_object_set(Evas_Object *obj, Evas_Object *edje); +E_API void e_icon_image_object_set (Evas_Object *obj, Evas_Object *o); +E_API Eina_Bool e_icon_file_get(const Evas_Object *obj, const char **file, const char **group); +E_API void e_icon_smooth_scale_set (Evas_Object *obj, Eina_Bool smooth); +E_API Eina_Bool e_icon_smooth_scale_get (const Evas_Object *obj); +E_API void e_icon_alpha_set (Evas_Object *obj, Eina_Bool smooth); +E_API Eina_Bool e_icon_alpha_get (const Evas_Object *obj); +E_API void e_icon_preload_set (Evas_Object *obj, Eina_Bool preload); +E_API Eina_Bool e_icon_preload_get (const Evas_Object *obj); +E_API void e_icon_size_get (const Evas_Object *obj, int *w, int *h); +E_API Eina_Bool e_icon_fill_inside_get (const Evas_Object *obj); +E_API void e_icon_fill_inside_set (Evas_Object *obj, Eina_Bool fill_inside); +E_API Eina_Bool e_icon_scale_up_get (const Evas_Object *obj); +E_API void e_icon_scale_up_set (Evas_Object *obj, Eina_Bool scale_up); +E_API void e_icon_data_set (Evas_Object *obj, void *data, int w, int h); +E_API void *e_icon_data_get (const Evas_Object *obj, int *w, int *h); +E_API void e_icon_scale_size_set (Evas_Object *obj, int size); +E_API int e_icon_scale_size_get (const Evas_Object *obj); +E_API void e_icon_selected_set (const Evas_Object *obj, Eina_Bool selected); #endif #endif diff --git a/src/bin/e_ilist.c b/src/bin/e_ilist.c index c1c20ac..59f17fb 100644 --- a/src/bin/e_ilist.c +++ b/src/bin/e_ilist.c @@ -56,14 +56,14 @@ static void _item_unselect(E_Ilist_Item *si); static Evas_Smart *_e_smart = NULL; -EAPI Evas_Object * +E_API Evas_Object * e_ilist_add(Evas *evas) { _e_smart_init(); return evas_object_smart_add(evas, _e_smart); } -EAPI void +E_API void e_ilist_append(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func)(void *data, void *data2), void (*func_hilight)(void *data, void *data2), void *data, void *data2) { E_Ilist_Item *si; @@ -90,7 +90,7 @@ e_ilist_append(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char evas_object_show(si->o_base); } -EAPI void +E_API void e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func)(void *data, void *data2), void (*func_hilight)(void *data, void *data2), void *data, void *data2, int relative) { E_Ilist_Item *si, *ri; @@ -124,7 +124,7 @@ e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, c evas_object_show(si->o_base); } -EAPI void +E_API void e_ilist_prepend(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func)(void *data, void *data2), void (*func_hilight)(void *data, void *data2), void *data, void *data2) { E_Ilist_Item *si; @@ -142,7 +142,7 @@ e_ilist_prepend(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const cha evas_object_show(si->o_base); } -EAPI void +E_API void e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func)(void *data, void *data2), void (*func_hilight)(void *data, void *data2), void *data, void *data2, int relative) { E_Ilist_Item *si, *ri; @@ -168,7 +168,7 @@ e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, evas_object_show(si->o_base); } -EAPI void +E_API void e_ilist_clear(Evas_Object *obj) { E_Ilist_Item *si = NULL; @@ -190,54 +190,54 @@ e_ilist_clear(Evas_Object *obj) sd->selected = -1; } -EAPI void +E_API void e_ilist_freeze(Evas_Object *obj) { API_ENTRY return; } -EAPI void +E_API void e_ilist_thaw(Evas_Object *obj) { API_ENTRY return; } -EAPI int +E_API int e_ilist_count(Evas_Object *obj) { API_ENTRY return 0; return eina_list_count(sd->items); } -EAPI int +E_API int e_ilist_selector_get(Evas_Object *obj) { API_ENTRY return 0; return sd->selector; } -EAPI void +E_API void e_ilist_selector_set(Evas_Object *obj, int selector) { API_ENTRY return; sd->selector = selector; } -EAPI Eina_Bool +E_API Eina_Bool e_ilist_multi_select_get(Evas_Object *obj) { API_ENTRY return 0; return sd->multi_select; } -EAPI void +E_API void e_ilist_multi_select_set(Evas_Object *obj, Eina_Bool multi) { API_ENTRY return; sd->multi_select = multi; } -EAPI void +E_API void e_ilist_size_min_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { API_ENTRY return; @@ -245,7 +245,7 @@ e_ilist_size_min_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) evas_object_size_hint_min_get(sd->o_box, w, h); } -EAPI void +E_API void e_ilist_unselect(Evas_Object *obj) { API_ENTRY return; @@ -257,7 +257,7 @@ e_ilist_unselect(Evas_Object *obj) sd->selected = -1; } -EAPI void +E_API void e_ilist_selected_set(Evas_Object *obj, int n) { E_Ilist_Item *si = NULL; @@ -291,14 +291,14 @@ e_ilist_selected_set(Evas_Object *obj, int n) } } -EAPI const Eina_List * +E_API const Eina_List * e_ilist_selected_items_get(Evas_Object *obj) { API_ENTRY return NULL; return sd->selected_items; } -EAPI int +E_API int e_ilist_selected_get(Evas_Object *obj) { Eina_List *l = NULL; @@ -319,7 +319,7 @@ e_ilist_selected_get(Evas_Object *obj) return j; } -EAPI const char * +E_API const char * e_ilist_selected_label_get(Evas_Object *obj) { E_Ilist_Item *si = NULL; @@ -342,7 +342,7 @@ e_ilist_selected_label_get(Evas_Object *obj) return NULL; } -EAPI void * +E_API void * e_ilist_selected_data_get(Evas_Object *obj) { E_Ilist_Item *si = NULL; @@ -356,7 +356,7 @@ e_ilist_selected_data_get(Evas_Object *obj) return NULL; } -EAPI void * +E_API void * e_ilist_selected_data2_get(Evas_Object *obj) { E_Ilist_Item *si = NULL; @@ -370,7 +370,7 @@ e_ilist_selected_data2_get(Evas_Object *obj) return NULL; } -EAPI Evas_Object * +E_API Evas_Object * e_ilist_selected_icon_get(Evas_Object *obj) { E_Ilist_Item *si = NULL; @@ -384,7 +384,7 @@ e_ilist_selected_icon_get(Evas_Object *obj) return NULL; } -EAPI Evas_Object * +E_API Evas_Object * e_ilist_selected_end_get(Evas_Object *obj) { E_Ilist_Item *si = NULL; @@ -398,7 +398,7 @@ e_ilist_selected_end_get(Evas_Object *obj) return NULL; } -EAPI void +E_API void e_ilist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { E_Ilist_Item *si = NULL; @@ -412,7 +412,7 @@ e_ilist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Ev *y -= sd->y; } -EAPI int +E_API int e_ilist_selected_count_get(Evas_Object *obj) { API_ENTRY return 0; @@ -420,7 +420,7 @@ e_ilist_selected_count_get(Evas_Object *obj) return eina_list_count(sd->selected_items); } -EAPI void +E_API void e_ilist_remove_num(Evas_Object *obj, int n) { E_Ilist_Item *si = NULL; @@ -459,7 +459,7 @@ e_ilist_remove_num(Evas_Object *obj, int n) evas_object_resize(sd->o_smart, w, sd->h - h); } -EAPI const char * +E_API const char * e_ilist_nth_label_get(Evas_Object *obj, int n) { E_Ilist_Item *si = NULL; @@ -480,7 +480,7 @@ e_ilist_nth_label_get(Evas_Object *obj, int n) return NULL; } -EAPI void +E_API void e_ilist_item_label_set(E_Ilist_Item *si, const char *label) { EINA_SAFETY_ON_NULL_RETURN(si); @@ -488,7 +488,7 @@ e_ilist_item_label_set(E_Ilist_Item *si, const char *label) edje_object_part_text_set(si->o_base, "e.text.label", label); } -EAPI void +E_API void e_ilist_nth_label_set(Evas_Object *obj, int n, const char *label) { E_Ilist_Item *si = NULL; @@ -502,7 +502,7 @@ e_ilist_nth_label_set(Evas_Object *obj, int n, const char *label) if (si) e_ilist_item_label_set(si, label); } -EAPI Evas_Object * +E_API Evas_Object * e_ilist_nth_icon_get(Evas_Object *obj, int n) { E_Ilist_Item *si = NULL; @@ -514,7 +514,7 @@ e_ilist_nth_icon_get(Evas_Object *obj, int n) return NULL; } -EAPI void +E_API void e_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon) { E_Ilist_Item *si = NULL; @@ -538,7 +538,7 @@ e_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon) } } -EAPI Evas_Object * +E_API Evas_Object * e_ilist_nth_end_get(Evas_Object *obj, int n) { E_Ilist_Item *si = NULL; @@ -550,7 +550,7 @@ e_ilist_nth_end_get(Evas_Object *obj, int n) return NULL; } -EAPI void +E_API void e_ilist_nth_end_set(Evas_Object *obj, int n, Evas_Object *end) { E_Ilist_Item *si = NULL; @@ -572,7 +572,7 @@ e_ilist_nth_end_set(Evas_Object *obj, int n, Evas_Object *end) } } -EAPI Eina_Bool +E_API Eina_Bool e_ilist_nth_is_header(Evas_Object *obj, int n) { E_Ilist_Item *si = NULL; @@ -584,7 +584,7 @@ e_ilist_nth_is_header(Evas_Object *obj, int n) return 0; } -EAPI void +E_API void e_ilist_nth_geometry_get(Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { E_Ilist_Item *si = NULL; @@ -597,7 +597,7 @@ e_ilist_nth_geometry_get(Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord *y, *y -= sd->y; } -EAPI void +E_API void e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { Eina_List *l = NULL; @@ -634,14 +634,14 @@ e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) } } -EAPI const Eina_List * +E_API const Eina_List * e_ilist_items_get(Evas_Object *obj) { API_ENTRY return NULL; return sd->items; } -EAPI void +E_API void e_ilist_multi_select(Evas_Object *obj, int n) { E_Ilist_Item *si = NULL; @@ -678,7 +678,7 @@ e_ilist_multi_select(Evas_Object *obj, int n) } } -EAPI void +E_API void e_ilist_range_select(Evas_Object *obj, int n) { int i, j, dir; @@ -707,7 +707,7 @@ e_ilist_range_select(Evas_Object *obj, int n) } } -EAPI Eina_Bool +E_API Eina_Bool e_ilist_custom_edje_file_set(Evas_Object *obj, const char *file, const char *group) { Eina_List *l; diff --git a/src/bin/e_ilist.h b/src/bin/e_ilist.h index 42b1465..c5c6f05 100644 --- a/src/bin/e_ilist.h +++ b/src/bin/e_ilist.h @@ -22,45 +22,45 @@ struct _E_Ilist_Item void *data, *data2; }; -EAPI Evas_Object *e_ilist_add (Evas *evas); -EAPI void e_ilist_append (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2); -EAPI void e_ilist_append_relative (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2, int relative); -EAPI void e_ilist_prepend (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2); -EAPI void e_ilist_prepend_relative (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2, int relative); -EAPI void e_ilist_clear (Evas_Object *obj); -EAPI void e_ilist_freeze (Evas_Object *obj); -EAPI void e_ilist_thaw (Evas_Object *obj); -EAPI int e_ilist_count (Evas_Object *obj); -EAPI int e_ilist_selector_get (Evas_Object *obj); -EAPI void e_ilist_selector_set (Evas_Object *obj, int selector); -EAPI Eina_Bool e_ilist_multi_select_get (Evas_Object *obj); -EAPI void e_ilist_multi_select_set (Evas_Object *obj, Eina_Bool multi); -EAPI void e_ilist_size_min_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); -EAPI void e_ilist_unselect (Evas_Object *obj); -EAPI void e_ilist_selected_set (Evas_Object *obj, int n); -EAPI int e_ilist_selected_get (Evas_Object *obj); -EAPI const char *e_ilist_selected_label_get (Evas_Object *obj); -EAPI void *e_ilist_selected_data_get (Evas_Object *obj); -EAPI void *e_ilist_selected_data2_get (Evas_Object *obj); -EAPI Evas_Object *e_ilist_selected_icon_get (Evas_Object *obj); -EAPI Evas_Object *e_ilist_selected_end_get (Evas_Object *obj); -EAPI void e_ilist_selected_geometry_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); -EAPI const Eina_List *e_ilist_selected_items_get(Evas_Object *obj); -EAPI int e_ilist_selected_count_get (Evas_Object *obj); -EAPI void e_ilist_remove_num (Evas_Object *obj, int n); -EAPI const char *e_ilist_nth_label_get (Evas_Object *obj, int n); -EAPI void e_ilist_nth_label_set (Evas_Object *obj, int n, const char *label); -EAPI Evas_Object *e_ilist_nth_icon_get (Evas_Object *obj, int n); -EAPI void e_ilist_nth_icon_set (Evas_Object *obj, int n, Evas_Object *icon); -EAPI Evas_Object *e_ilist_nth_end_get (Evas_Object *obj, int n); -EAPI void e_ilist_nth_end_set (Evas_Object *obj, int n, Evas_Object *end); -EAPI Eina_Bool e_ilist_nth_is_header (Evas_Object *obj, int n); -EAPI void e_ilist_nth_geometry_get (Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); -EAPI void e_ilist_icon_size_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h); -EAPI const Eina_List *e_ilist_items_get (Evas_Object *obj); -EAPI void e_ilist_multi_select (Evas_Object *obj, int n); -EAPI void e_ilist_range_select (Evas_Object *obj, int n); -EAPI void e_ilist_item_label_set(E_Ilist_Item *si, const char *label); -EAPI Eina_Bool e_ilist_custom_edje_file_set(Evas_Object *obj, const char *file, const char *group); +E_API Evas_Object *e_ilist_add (Evas *evas); +E_API void e_ilist_append (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2); +E_API void e_ilist_append_relative (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2, int relative); +E_API void e_ilist_prepend (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2); +E_API void e_ilist_prepend_relative (Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2, int relative); +E_API void e_ilist_clear (Evas_Object *obj); +E_API void e_ilist_freeze (Evas_Object *obj); +E_API void e_ilist_thaw (Evas_Object *obj); +E_API int e_ilist_count (Evas_Object *obj); +E_API int e_ilist_selector_get (Evas_Object *obj); +E_API void e_ilist_selector_set (Evas_Object *obj, int selector); +E_API Eina_Bool e_ilist_multi_select_get (Evas_Object *obj); +E_API void e_ilist_multi_select_set (Evas_Object *obj, Eina_Bool multi); +E_API void e_ilist_size_min_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); +E_API void e_ilist_unselect (Evas_Object *obj); +E_API void e_ilist_selected_set (Evas_Object *obj, int n); +E_API int e_ilist_selected_get (Evas_Object *obj); +E_API const char *e_ilist_selected_label_get (Evas_Object *obj); +E_API void *e_ilist_selected_data_get (Evas_Object *obj); +E_API void *e_ilist_selected_data2_get (Evas_Object *obj); +E_API Evas_Object *e_ilist_selected_icon_get (Evas_Object *obj); +E_API Evas_Object *e_ilist_selected_end_get (Evas_Object *obj); +E_API void e_ilist_selected_geometry_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); +E_API const Eina_List *e_ilist_selected_items_get(Evas_Object *obj); +E_API int e_ilist_selected_count_get (Evas_Object *obj); +E_API void e_ilist_remove_num (Evas_Object *obj, int n); +E_API const char *e_ilist_nth_label_get (Evas_Object *obj, int n); +E_API void e_ilist_nth_label_set (Evas_Object *obj, int n, const char *label); +E_API Evas_Object *e_ilist_nth_icon_get (Evas_Object *obj, int n); +E_API void e_ilist_nth_icon_set (Evas_Object *obj, int n, Evas_Object *icon); +E_API Evas_Object *e_ilist_nth_end_get (Evas_Object *obj, int n); +E_API void e_ilist_nth_end_set (Evas_Object *obj, int n, Evas_Object *end); +E_API Eina_Bool e_ilist_nth_is_header (Evas_Object *obj, int n); +E_API void e_ilist_nth_geometry_get (Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); +E_API void e_ilist_icon_size_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h); +E_API const Eina_List *e_ilist_items_get (Evas_Object *obj); +E_API void e_ilist_multi_select (Evas_Object *obj, int n); +E_API void e_ilist_range_select (Evas_Object *obj, int n); +E_API void e_ilist_item_label_set(E_Ilist_Item *si, const char *label); +E_API Eina_Bool e_ilist_custom_edje_file_set(Evas_Object *obj, const char *file, const char *group); #endif #endif diff --git a/src/bin/e_import_config_dialog.c b/src/bin/e_import_config_dialog.c index 10646ad..fe1cfdc 100644 --- a/src/bin/e_import_config_dialog.c +++ b/src/bin/e_import_config_dialog.c @@ -433,7 +433,7 @@ _e_import_config_dialog_win_del(void *data, Evas *e EINA_UNUSED, Evas_Object *ob /////////////////////////////////////////////////////////////////////////////////// -EAPI E_Import_Config_Dialog * +E_API E_Import_Config_Dialog * e_import_config_dialog_show(Evas_Object *parent, const char *path, Ecore_End_Cb ok, Ecore_Cb cancel) { Evas *evas; diff --git a/src/bin/e_import_config_dialog.h b/src/bin/e_import_config_dialog.h index 620fa00..3cc80cf 100644 --- a/src/bin/e_import_config_dialog.h +++ b/src/bin/e_import_config_dialog.h @@ -26,7 +26,7 @@ struct _E_Import_Config_Dialog E_Dialog *dia; }; -EAPI E_Import_Config_Dialog *e_import_config_dialog_show(Evas_Object *parent, const char *path, Ecore_End_Cb ok, Ecore_Cb cancel); +E_API E_Import_Config_Dialog *e_import_config_dialog_show(Evas_Object *parent, const char *path, Ecore_End_Cb ok, Ecore_Cb cancel); #endif #endif diff --git a/src/bin/e_import_dialog.c b/src/bin/e_import_dialog.c index 5bbebed..cb07a11 100644 --- a/src/bin/e_import_dialog.c +++ b/src/bin/e_import_dialog.c @@ -132,7 +132,7 @@ _e_import_dialog_win_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_ ////////////////////////////////////////////////////////////////////////////////// -EAPI E_Import_Dialog * +E_API E_Import_Dialog * e_import_dialog_show(Evas_Object *parent EINA_UNUSED, const char *dev, const char *path, Ecore_End_Cb ok, Ecore_Cb cancel) { Evas *evas; diff --git a/src/bin/e_import_dialog.h b/src/bin/e_import_dialog.h index a18999b..836bc28 100644 --- a/src/bin/e_import_dialog.h +++ b/src/bin/e_import_dialog.h @@ -15,7 +15,7 @@ struct _E_Import_Dialog E_Dialog *dia; }; -EAPI E_Import_Dialog *e_import_dialog_show(Evas_Object *parent, const char *dev, const char *path, Ecore_End_Cb ok, Ecore_Cb cancel); +E_API E_Import_Dialog *e_import_dialog_show(Evas_Object *parent, const char *dev, const char *path, Ecore_End_Cb ok, Ecore_Cb cancel); #endif #endif diff --git a/src/bin/e_init.c b/src/bin/e_init.c index 2ab6f61..f009f13 100644 --- a/src/bin/e_init.c +++ b/src/bin/e_init.c @@ -1,6 +1,6 @@ #include "e.h" -EAPI int E_EVENT_INIT_DONE = 0; +E_API int E_EVENT_INIT_DONE = 0; /* local variables */ static int done = 0; @@ -41,7 +41,7 @@ e_init_shutdown(void) return 1; } -EAPI void +E_API void e_init_show(void) { Evas_Object *o; @@ -79,7 +79,7 @@ e_init_show(void) e_init_version_set(VERSION); } -EAPI void +E_API void e_init_hide(void) { E_FREE_LIST(splash_objs, evas_object_del); @@ -88,28 +88,28 @@ e_init_hide(void) E_FREE_FUNC(_e_init_timeout_timer, ecore_timer_del); } -EAPI void +E_API void e_init_title_set(const char *str) { if (!_e_init_object) return; edje_object_part_text_set(_e_init_object, "e.text.title", str); } -EAPI void +E_API void e_init_version_set(const char *str) { if (!_e_init_object) return; edje_object_part_text_set(_e_init_object, "e.text.version", str); } -EAPI void +E_API void e_init_status_set(const char *str) { if (!_e_init_object) return; edje_object_part_text_set(_e_init_object, "e.text.status", str); } -EAPI void +E_API void e_init_done(void) { undone--; @@ -120,13 +120,13 @@ e_init_done(void) edje_object_signal_emit(_e_init_object, "e,state,done", "e"); } -EAPI void +E_API void e_init_undone(void) { undone++; } -EAPI int +E_API int e_init_count_get(void) { return undone; diff --git a/src/bin/e_init.h b/src/bin/e_init.h index fba785d..df1cd52 100644 --- a/src/bin/e_init.h +++ b/src/bin/e_init.h @@ -5,18 +5,18 @@ EINTERN int e_init_init(void); EINTERN int e_init_shutdown(void); -EAPI void e_init_show(void); -EAPI void e_init_hide(void); -EAPI void e_init_title_set(const char *str); -EAPI void e_init_version_set(const char *str); -EAPI void e_init_status_set(const char *str); -EAPI void e_init_done(void); -EAPI void e_init_undone(void); -EAPI void e_init_client_data(Ecore_Ipc_Event_Client_Data *e); -EAPI void e_init_client_del(Ecore_Ipc_Event_Client_Del *e); -EAPI int e_init_count_get(void); +E_API void e_init_show(void); +E_API void e_init_hide(void); +E_API void e_init_title_set(const char *str); +E_API void e_init_version_set(const char *str); +E_API void e_init_status_set(const char *str); +E_API void e_init_done(void); +E_API void e_init_undone(void); +E_API void e_init_client_data(Ecore_Ipc_Event_Client_Data *e); +E_API void e_init_client_del(Ecore_Ipc_Event_Client_Del *e); +E_API int e_init_count_get(void); -extern EAPI int E_EVENT_INIT_DONE; +extern E_API int E_EVENT_INIT_DONE; #endif #endif diff --git a/src/bin/e_int_client_locks.c b/src/bin/e_int_client_locks.c index 8768655..7f4eb72 100644 --- a/src/bin/e_int_client_locks.c +++ b/src/bin/e_int_client_locks.c @@ -44,7 +44,7 @@ struct _E_Config_Dialog_Data }; /* a nice easy setup function that does the dirty work */ -EAPI void +E_API void e_int_client_locks(E_Client *ec) { E_Config_Dialog *cfd; diff --git a/src/bin/e_int_client_locks.h b/src/bin/e_int_client_locks.h index 9cf421c..e3881cd 100644 --- a/src/bin/e_int_client_locks.h +++ b/src/bin/e_int_client_locks.h @@ -3,7 +3,7 @@ #ifndef E_INT_BORDER_LOCKS_H #define E_INT_BORDER_LOCKS_H -EAPI void e_int_client_locks(E_Client *ec); +E_API void e_int_client_locks(E_Client *ec); #endif #endif diff --git a/src/bin/e_int_client_menu.c b/src/bin/e_int_client_menu.c index 08d5b15..00add27 100644 --- a/src/bin/e_int_client_menu.c +++ b/src/bin/e_int_client_menu.c @@ -54,7 +54,7 @@ static void _e_client_menu_cb_netwm_icon(void *data, E_Menu *m, E_Menu_Item *mi) static Eina_List *menu_hooks = NULL; -EAPI E_Client_Menu_Hook * +E_API E_Client_Menu_Hook * e_int_client_menu_hook_add(E_Client_Menu_Hook_Cb cb, const void *data) { E_Client_Menu_Hook *h; @@ -69,7 +69,7 @@ e_int_client_menu_hook_add(E_Client_Menu_Hook_Cb cb, const void *data) return h; } -EAPI void +E_API void e_int_client_menu_hook_del(E_Client_Menu_Hook *hook) { E_Client_Menu_Hook *h; @@ -86,7 +86,7 @@ e_int_client_menu_hook_del(E_Client_Menu_Hook *hook) } } -EAPI void +E_API void e_int_client_menu_hooks_clear(void) { E_Client_Menu_Hook *h; @@ -94,7 +94,7 @@ e_int_client_menu_hooks_clear(void) free(h); } -EAPI void +E_API void e_int_client_menu_create(E_Client *ec) { E_Menu *m; @@ -246,7 +246,7 @@ e_int_client_menu_create(E_Client *ec) h->cb(h->data, ec); } -EAPI void +E_API void e_int_client_menu_show(E_Client *ec, Evas_Coord x, Evas_Coord y, int key, unsigned int timestamp) { e_int_client_menu_create(ec); @@ -258,7 +258,7 @@ e_int_client_menu_show(E_Client *ec, Evas_Coord x, Evas_Coord y, int key, unsign E_MENU_POP_DIRECTION_DOWN, timestamp); } -EAPI void +E_API void e_int_client_menu_del(E_Client *ec) { if (!ec->border_menu) return; diff --git a/src/bin/e_int_client_menu.h b/src/bin/e_int_client_menu.h index 2915b0f..58f230b 100644 --- a/src/bin/e_int_client_menu.h +++ b/src/bin/e_int_client_menu.h @@ -11,12 +11,12 @@ typedef struct E_Client_Menu_Hook void *data; } E_Client_Menu_Hook; -EAPI E_Client_Menu_Hook *e_int_client_menu_hook_add(E_Client_Menu_Hook_Cb cb, const void *data); -EAPI void e_int_client_menu_hook_del(E_Client_Menu_Hook *hook); -EAPI void e_int_client_menu_hooks_clear(void); -EAPI void e_int_client_menu_create(E_Client *ec); -EAPI void e_int_client_menu_show(E_Client *ec, Evas_Coord x, Evas_Coord y, int key, unsigned int timestamp); -EAPI void e_int_client_menu_del(E_Client *ec); +E_API E_Client_Menu_Hook *e_int_client_menu_hook_add(E_Client_Menu_Hook_Cb cb, const void *data); +E_API void e_int_client_menu_hook_del(E_Client_Menu_Hook *hook); +E_API void e_int_client_menu_hooks_clear(void); +E_API void e_int_client_menu_create(E_Client *ec); +E_API void e_int_client_menu_show(E_Client *ec, Evas_Coord x, Evas_Coord y, int key, unsigned int timestamp); +E_API void e_int_client_menu_del(E_Client *ec); #endif #endif diff --git a/src/bin/e_int_client_prop.c b/src/bin/e_int_client_prop.c index 8e0f0d5..1388ef9 100644 --- a/src/bin/e_int_client_prop.c +++ b/src/bin/e_int_client_prop.c @@ -64,7 +64,7 @@ struct _E_Config_Dialog_Data } netwm; }; -EAPI void +E_API void e_int_client_prop(E_Client *ec) { E_Dialog *dia; diff --git a/src/bin/e_int_client_prop.h b/src/bin/e_int_client_prop.h index 8546457..a8a8bc3 100644 --- a/src/bin/e_int_client_prop.h +++ b/src/bin/e_int_client_prop.h @@ -3,7 +3,7 @@ #ifndef E_INT_BORDER_PROP_H #define E_INT_BORDER_PROP_H -EAPI void e_int_client_prop(E_Client *ec); +E_API void e_int_client_prop(E_Client *ec); #endif #endif diff --git a/src/bin/e_int_client_remember.c b/src/bin/e_int_client_remember.c index c34cc43..3de6000 100644 --- a/src/bin/e_int_client_remember.c +++ b/src/bin/e_int_client_remember.c @@ -68,7 +68,7 @@ struct _E_Config_Dialog_Data }; /* a nice easy setup function that does the dirty work */ -EAPI E_Config_Dialog * +E_API E_Config_Dialog * e_int_client_remember_edit(E_Remember *rem) { E_Config_Dialog_View *v; @@ -87,7 +87,7 @@ e_int_client_remember_edit(E_Remember *rem) NULL, 0, v, rem); } -EAPI void +E_API void e_int_client_remember(E_Client *ec) { E_Config_Dialog *cfd; diff --git a/src/bin/e_int_client_remember.h b/src/bin/e_int_client_remember.h index 379db82..8b7c4c8 100644 --- a/src/bin/e_int_client_remember.h +++ b/src/bin/e_int_client_remember.h @@ -3,8 +3,8 @@ #ifndef E_INT_BORDER_REMEMBER_H #define E_INT_BORDER_REMEMBER_H -EAPI void e_int_client_remember(E_Client *ec); -EAPI E_Config_Dialog *e_int_client_remember_edit(E_Remember *rem); +E_API void e_int_client_remember(E_Client *ec); +E_API E_Config_Dialog *e_int_client_remember_edit(E_Remember *rem); #endif #endif diff --git a/src/bin/e_int_config_comp.c b/src/bin/e_int_config_comp.c index f53f24a..198357b 100644 --- a/src/bin/e_int_config_comp.c +++ b/src/bin/e_int_config_comp.c @@ -67,7 +67,7 @@ static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -EAPI E_Config_Dialog * +E_API E_Config_Dialog * e_int_config_comp(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; diff --git a/src/bin/e_int_config_comp_match.c b/src/bin/e_int_config_comp_match.c index f5d80c2..d179fc4 100644 --- a/src/bin/e_int_config_comp_match.c +++ b/src/bin/e_int_config_comp_match.c @@ -868,7 +868,7 @@ _create_data(E_Config_Dialog *cfd) return cfdata; } -EAPI E_Config_Dialog * +E_API E_Config_Dialog * e_int_config_comp_match(Evas_Object *parent, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c index fa9687c..efcc6a8 100644 --- a/src/bin/e_int_config_modules.c +++ b/src/bin/e_int_config_modules.c @@ -82,7 +82,7 @@ static int _types_list_sort(const void *data1, const void *data2); static void _btn_cb_unload(void *data, void *data2); static void _btn_cb_load(void *data, void *data2); -EAPI E_Config_Dialog * +E_API E_Config_Dialog * e_int_config_modules(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd = NULL; diff --git a/src/bin/e_int_config_modules.h b/src/bin/e_int_config_modules.h index 6727371..f95582d 100644 --- a/src/bin/e_int_config_modules.h +++ b/src/bin/e_int_config_modules.h @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_MODULES_H #define E_INT_CONFIG_MODULES_H -EAPI E_Config_Dialog *e_int_config_modules(Evas_Object *parent, const char *params); +E_API E_Config_Dialog *e_int_config_modules(Evas_Object *parent, const char *params); #endif #endif diff --git a/src/bin/e_int_gadcon_config.c b/src/bin/e_int_gadcon_config.c index 79d6d29..e53b016 100644 --- a/src/bin/e_int_gadcon_config.c +++ b/src/bin/e_int_gadcon_config.c @@ -777,19 +777,19 @@ _cb_load_timer(void *data) return ECORE_CALLBACK_CANCEL; } -EAPI void +E_API void e_int_gadcon_config_shelf(E_Gadcon *gc) { _create_dialog(gc, _("Shelf Contents"), 0); } -EAPI void +E_API void e_int_gadcon_config_toolbar(E_Gadcon *gc) { _create_dialog(gc, _("Toolbar Contents"), 0); } -EAPI void +E_API void e_int_gadcon_config_hook(E_Gadcon *gc, const char *name, E_Gadcon_Site site) { _create_dialog(gc, name, site); diff --git a/src/bin/e_int_gadcon_config.h b/src/bin/e_int_gadcon_config.h index a88b3a8..9ed888b 100644 --- a/src/bin/e_int_gadcon_config.h +++ b/src/bin/e_int_gadcon_config.h @@ -3,9 +3,9 @@ #ifndef E_INT_GADCON_CONFIG_H #define E_INT_GADCON_CONFIG_H -EAPI void e_int_gadcon_config_shelf (E_Gadcon *gc); -EAPI void e_int_gadcon_config_toolbar (E_Gadcon *gc); -EAPI void e_int_gadcon_config_hook(E_Gadcon *gc, const char *name, E_Gadcon_Site site); +E_API void e_int_gadcon_config_shelf (E_Gadcon *gc); +E_API void e_int_gadcon_config_toolbar (E_Gadcon *gc); +E_API void e_int_gadcon_config_hook(E_Gadcon *gc, const char *name, E_Gadcon_Site site); #endif #endif diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index effa5cc..a536f50 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -121,7 +121,7 @@ _TEST(void *d EINA_UNUSED, E_Menu *m, E_Menu_Item *mi EINA_UNUSED) #endif /* externally accessible functions */ -EAPI E_Menu * +E_API E_Menu * e_int_menus_main_new(void) { E_Menu *m, *subm; @@ -298,7 +298,7 @@ e_int_menus_main_new(void) return m; } -EAPI E_Menu * +E_API E_Menu * e_int_menus_apps_new(const char *dir) { E_Menu *m; @@ -309,7 +309,7 @@ e_int_menus_apps_new(const char *dir) return m; } -EAPI E_Menu * +E_API E_Menu * e_int_menus_desktops_new(void) { E_Menu *m, *subm; @@ -344,7 +344,7 @@ e_int_menus_desktops_new(void) return m; } -EAPI E_Menu * +E_API E_Menu * e_int_menus_favorite_apps_new(void) { E_Menu *m = NULL; @@ -356,7 +356,7 @@ e_int_menus_favorite_apps_new(void) return m; } -EAPI E_Menu * +E_API E_Menu * e_int_menus_all_apps_new(void) { E_Menu *m; @@ -365,7 +365,7 @@ e_int_menus_all_apps_new(void) return m; } -EAPI E_Menu * +E_API E_Menu * e_int_menus_config_new(void) { E_Menu *m; @@ -376,7 +376,7 @@ e_int_menus_config_new(void) return m; } -EAPI E_Menu * +E_API E_Menu * e_int_menus_clients_new(void) { E_Menu *m; @@ -386,7 +386,7 @@ e_int_menus_clients_new(void) return m; } -EAPI E_Menu * +E_API E_Menu * e_int_menus_lost_clients_new(void) { E_Menu *m; @@ -396,7 +396,7 @@ e_int_menus_lost_clients_new(void) return m; } -EAPI E_Int_Menu_Augmentation * +E_API E_Int_Menu_Augmentation * e_int_menus_menu_augmentation_add_sorted(const char *menu, const char *sort_key, void (*func_add)(void *data, E_Menu *m), @@ -461,7 +461,7 @@ e_int_menus_menu_augmentation_add_sorted(const char *menu, return maug; } -EAPI E_Int_Menu_Augmentation * +E_API E_Int_Menu_Augmentation * e_int_menus_menu_augmentation_add(const char *menu, void (*func_add)(void *data, E_Menu *m), void *data_add, @@ -472,7 +472,7 @@ e_int_menus_menu_augmentation_add(const char *menu, (menu, NULL, func_add, data_add, func_del, data_del); } -EAPI void +E_API void e_int_menus_menu_augmentation_del(const char *menu, E_Int_Menu_Augmentation *maug) { Eina_List *l; @@ -498,14 +498,14 @@ e_int_menus_menu_augmentation_del(const char *menu, E_Int_Menu_Augmentation *mau free(maug); } -EAPI void +E_API void e_int_menus_cache_clear(void) { if (_e_int_menus_app_menus) eina_hash_free_buckets(_e_int_menus_app_menus); } -EAPI void +E_API void e_int_menus_menu_augmentation_point_disabled_set(const char *menu, Eina_Bool disabled) { if (!menu) return; diff --git a/src/bin/e_int_menus.h b/src/bin/e_int_menus.h index 8af6532..bc7d290 100644 --- a/src/bin/e_int_menus.h +++ b/src/bin/e_int_menus.h @@ -58,33 +58,33 @@ struct _E_Int_Menu_Augmentation } add, del; }; -EAPI E_Menu *e_int_menus_main_new(void); -EAPI E_Menu *e_int_menus_desktops_new(void); -EAPI E_Menu *e_int_menus_clients_new(void); -EAPI E_Menu *e_int_menus_apps_new(const char *dir); -EAPI E_Menu *e_int_menus_favorite_apps_new(void); -EAPI E_Menu *e_int_menus_all_apps_new(void); -EAPI E_Menu *e_int_menus_config_new(void); -EAPI E_Menu *e_int_menus_lost_clients_new(void); -EAPI E_Menu *e_int_menus_shelves_new(void); +E_API E_Menu *e_int_menus_main_new(void); +E_API E_Menu *e_int_menus_desktops_new(void); +E_API E_Menu *e_int_menus_clients_new(void); +E_API E_Menu *e_int_menus_apps_new(const char *dir); +E_API E_Menu *e_int_menus_favorite_apps_new(void); +E_API E_Menu *e_int_menus_all_apps_new(void); +E_API E_Menu *e_int_menus_config_new(void); +E_API E_Menu *e_int_menus_lost_clients_new(void); +E_API E_Menu *e_int_menus_shelves_new(void); -EAPI E_Int_Menu_Augmentation *e_int_menus_menu_augmentation_add(const char *menu, +E_API E_Int_Menu_Augmentation *e_int_menus_menu_augmentation_add(const char *menu, void (*func_add) (void *data, E_Menu *m), void *data_add, void (*func_del) (void *data, E_Menu *m), void *data_del); -EAPI E_Int_Menu_Augmentation *e_int_menus_menu_augmentation_add_sorted(const char *menu, +E_API E_Int_Menu_Augmentation *e_int_menus_menu_augmentation_add_sorted(const char *menu, const char *sort_key, void (*func_add) (void *data, E_Menu *m), void *data_add, void (*func_del) (void *data, E_Menu *m), void *data_del); -EAPI void e_int_menus_menu_augmentation_del(const char *menu, +E_API void e_int_menus_menu_augmentation_del(const char *menu, E_Int_Menu_Augmentation *maug); -EAPI void e_int_menus_menu_augmentation_point_disabled_set(const char *menu, +E_API void e_int_menus_menu_augmentation_point_disabled_set(const char *menu, Eina_Bool disabled); -EAPI void e_int_menus_cache_clear(void); +E_API void e_int_menus_cache_clear(void); EINTERN void e_int_menus_init(void); EINTERN void e_int_menus_shutdown(void); #endif diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c index 3043ed2..6c21944 100644 --- a/src/bin/e_int_shelf_config.c +++ b/src/bin/e_int_shelf_config.c @@ -29,7 +29,7 @@ static void _fill_styles(E_Config_Dialog_Data *cfdata, Evas_Object *obj) static void _cb_autohide_change(void *data, Evas_Object *obj EINA_UNUSED); static void _fill_desks(E_Config_Dialog_Data *cfdata); -EAPI void +E_API void e_int_shelf_config(E_Shelf *es) { E_Config_Dialog_View *v; diff --git a/src/bin/e_int_shelf_config.h b/src/bin/e_int_shelf_config.h index 5289aba..7982d4a 100644 --- a/src/bin/e_int_shelf_config.h +++ b/src/bin/e_int_shelf_config.h @@ -3,7 +3,7 @@ #ifndef E_INT_SHELF_CONFIG_H #define E_INT_SHELF_CONFIG_H -EAPI void e_int_shelf_config(E_Shelf *es); +E_API void e_int_shelf_config(E_Shelf *es); #endif #endif diff --git a/src/bin/e_int_toolbar_config.c b/src/bin/e_int_toolbar_config.c index e82874d..dc0e724 100644 --- a/src/bin/e_int_toolbar_config.c +++ b/src/bin/e_int_toolbar_config.c @@ -13,7 +13,7 @@ struct _E_Config_Dialog_Data int orient; }; -EAPI void +E_API void e_int_toolbar_config(E_Toolbar *tbar) { E_Config_Dialog *cfd; diff --git a/src/bin/e_int_toolbar_config.h b/src/bin/e_int_toolbar_config.h index 529e1a1..67fb83d 100644 --- a/src/bin/e_int_toolbar_config.h +++ b/src/bin/e_int_toolbar_config.h @@ -3,7 +3,7 @@ #ifndef E_INT_TOOLBAR_CONFIG_H #define E_INT_TOOLBAR_CONFIG_H -EAPI void e_int_toolbar_config(E_Toolbar *tbar); +E_API void e_int_toolbar_config(E_Toolbar *tbar); #endif #endif diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c index 1609228..75763ad 100644 --- a/src/bin/e_intl.c +++ b/src/bin/e_intl.c @@ -133,7 +133,7 @@ e_intl_post_shutdown(void) * - Add support of compound locales i.e. (en_US;zh_CN;C) ==Defer== * - Add Configuration for to-be-set environment variables */ -EAPI void +E_API void e_intl_language_set(const char *lang) { int set_envars; @@ -253,19 +253,19 @@ e_intl_language_set(const char *lang) } } -EAPI const char * +E_API const char * e_intl_language_get(void) { return _e_intl_language; } -EAPI const char * +E_API const char * e_intl_language_alias_get(void) { return _e_intl_language_alias; } -EAPI Eina_List * +E_API Eina_List * e_intl_language_list(void) { Eina_List *next; @@ -311,7 +311,7 @@ _e_intl_language_list_find(Eina_List *language_list, char *language) return 0; } -EAPI void +E_API void e_intl_input_method_set(const char *imc_path) { if (!imc_path) @@ -365,7 +365,7 @@ e_intl_input_method_set(const char *imc_path) } } -EAPI Eina_List * +E_API Eina_List * e_intl_input_method_list(void) { Eina_List *input_methods; @@ -613,7 +613,7 @@ _e_intl_locale_alias_hash_get(void) /* * Not canonic, just gets the parts */ -EAPI E_Locale_Parts * +E_API E_Locale_Parts * e_intl_locale_parts_get(const char *locale) { /* Parse Results */ @@ -756,7 +756,7 @@ e_intl_locale_parts_get(const char *locale) return locale_parts; } -EAPI void +E_API void e_intl_locale_parts_free(E_Locale_Parts *locale_parts) { if (locale_parts) @@ -769,7 +769,7 @@ e_intl_locale_parts_free(E_Locale_Parts *locale_parts) } } -EAPI char * +E_API char * e_intl_locale_parts_combine(E_Locale_Parts *locale_parts, int mask) { int locale_size; @@ -825,7 +825,7 @@ e_intl_locale_parts_combine(E_Locale_Parts *locale_parts, int mask) return locale; } -EAPI char * +E_API char * e_intl_locale_charset_canonic_get(const char *charset) { char charset_canonic[32]; diff --git a/src/bin/e_intl.h b/src/bin/e_intl.h index 584511e..90f8da0 100644 --- a/src/bin/e_intl.h +++ b/src/bin/e_intl.h @@ -45,22 +45,22 @@ EINTERN int e_intl_shutdown(void); EINTERN int e_intl_post_init(void); EINTERN int e_intl_post_shutdown(void); /* Setting & Getting Language */ -EAPI void e_intl_language_set(const char *lang); -EAPI const char *e_intl_language_get(void); -EAPI const char *e_intl_language_alias_get(void); -EAPI Eina_List *e_intl_language_list(void); +E_API void e_intl_language_set(const char *lang); +E_API const char *e_intl_language_get(void); +E_API const char *e_intl_language_alias_get(void); +E_API Eina_List *e_intl_language_list(void); /* Setting & Getting Input Method */ -EAPI void e_intl_input_method_set(const char *method); -EAPI const char *e_intl_input_method_get(void); -EAPI Eina_List *e_intl_input_method_list(void); -EAPI const char *e_intl_imc_personal_path_get(void); -EAPI const char *e_intl_imc_system_path_get(void); +E_API void e_intl_input_method_set(const char *method); +E_API const char *e_intl_input_method_get(void); +E_API Eina_List *e_intl_input_method_list(void); +E_API const char *e_intl_imc_personal_path_get(void); +E_API const char *e_intl_imc_system_path_get(void); /* Getting locale */ -EAPI E_Locale_Parts *e_intl_locale_parts_get(const char *locale); -EAPI void e_intl_locale_parts_free(E_Locale_Parts *locale_parts); -EAPI char *e_intl_locale_parts_combine(E_Locale_Parts *locale_parts, int mask); -EAPI char *e_intl_locale_charset_canonic_get(const char *charset); +E_API E_Locale_Parts *e_intl_locale_parts_get(const char *locale); +E_API void e_intl_locale_parts_free(E_Locale_Parts *locale_parts); +E_API char *e_intl_locale_parts_combine(E_Locale_Parts *locale_parts, int mask); +E_API char *e_intl_locale_charset_canonic_get(const char *charset); # endif #endif diff --git a/src/bin/e_intl_data.c b/src/bin/e_intl_data.c index a8156e4..bd02c81 100644 --- a/src/bin/e_intl_data.c +++ b/src/bin/e_intl_data.c @@ -31,7 +31,7 @@ e_intl_data_shutdown(void) } /* Get the input method configuration from the file */ -EAPI E_Input_Method_Config * +E_API E_Input_Method_Config * e_intl_input_method_config_read(Eet_File *imc_file) { E_Input_Method_Config *imc; @@ -45,7 +45,7 @@ e_intl_input_method_config_read(Eet_File *imc_file) } /* Write the input method configuration to the file */ -EAPI int +E_API int e_intl_input_method_config_write(Eet_File *imc_file, E_Input_Method_Config *imc) { int ok = 0; @@ -57,7 +57,7 @@ e_intl_input_method_config_write(Eet_File *imc_file, E_Input_Method_Config *imc) return ok; } -EAPI void +E_API void e_intl_input_method_config_free(E_Input_Method_Config *imc) { if (imc) diff --git a/src/bin/e_intl_data.h b/src/bin/e_intl_data.h index 07b8650..d2dfb22 100644 --- a/src/bin/e_intl_data.h +++ b/src/bin/e_intl_data.h @@ -22,8 +22,8 @@ struct _E_Input_Method_Config EINTERN int e_intl_data_init(void); EINTERN int e_intl_data_shutdown(void); -EAPI E_Input_Method_Config *e_intl_input_method_config_read(Eet_File *imc_file); -EAPI int e_intl_input_method_config_write(Eet_File *imc_file, E_Input_Method_Config *imc); -EAPI void e_intl_input_method_config_free(E_Input_Method_Config *imc); +E_API E_Input_Method_Config *e_intl_input_method_config_read(Eet_File *imc_file); +E_API int e_intl_input_method_config_write(Eet_File *imc_file, E_Input_Method_Config *imc); +E_API void e_intl_input_method_config_free(E_Input_Method_Config *imc); #endif #endif diff --git a/src/bin/e_ipc_codec.c b/src/bin/e_ipc_codec.c index d237a78..1a8c413 100644 --- a/src/bin/e_ipc_codec.c +++ b/src/bin/e_ipc_codec.c @@ -164,7 +164,7 @@ e_ipc_codec_shutdown(void) E_CONFIG_DD_FREE(_e_ipc_str_4int_list_edd); } -EAPI int +E_API int e_ipc_codec_int_dec(char *data, int bytes, int *dest) { E_Ipc_Int *dat; @@ -177,7 +177,7 @@ e_ipc_codec_int_dec(char *data, int bytes, int *dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_int_enc(int val, int *size_ret) { E_Ipc_Int dat; @@ -186,7 +186,7 @@ e_ipc_codec_int_enc(int val, int *size_ret) return eet_data_descriptor_encode(_e_ipc_int_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_double_dec(char *data, int bytes, double *dest) { E_Ipc_Double *dat; @@ -199,7 +199,7 @@ e_ipc_codec_double_dec(char *data, int bytes, double *dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_double_enc(double val, int *size_ret) { E_Ipc_Double dat; @@ -208,7 +208,7 @@ e_ipc_codec_double_enc(double val, int *size_ret) return eet_data_descriptor_encode(_e_ipc_double_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_2int_dec(char *data, int bytes, int *dest, int *dest2) { E_Ipc_2Int *dat; @@ -222,7 +222,7 @@ e_ipc_codec_2int_dec(char *data, int bytes, int *dest, int *dest2) return 1; } -EAPI void * +E_API void * e_ipc_codec_2int_enc(int val1, int val2, int *size_ret) { E_Ipc_2Int dat; @@ -232,7 +232,7 @@ e_ipc_codec_2int_enc(int val1, int val2, int *size_ret) return eet_data_descriptor_encode(_e_ipc_2int_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_str_dec(char *data, int bytes, char **dest) { E_Ipc_Str *dat; @@ -245,7 +245,7 @@ e_ipc_codec_str_dec(char *data, int bytes, char **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_str_enc(const char *str, int *size_ret) { E_Ipc_Str dat; @@ -254,7 +254,7 @@ e_ipc_codec_str_enc(const char *str, int *size_ret) return eet_data_descriptor_encode(_e_ipc_str_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_2str_dec(char *data, int bytes, E_Ipc_2Str **dest) { E_Ipc_2Str *dat; @@ -266,7 +266,7 @@ e_ipc_codec_2str_dec(char *data, int bytes, E_Ipc_2Str **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_2str_enc(const char *str1, const char *str2, int *size_ret) { E_Ipc_2Str dat; @@ -276,7 +276,7 @@ e_ipc_codec_2str_enc(const char *str1, const char *str2, int *size_ret) return eet_data_descriptor_encode(_e_ipc_2str_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_2str_list_dec(char *data, int bytes, Eina_List **dest) { E_Ipc_List *dat; @@ -289,7 +289,7 @@ e_ipc_codec_2str_list_dec(char *data, int bytes, Eina_List **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_2str_list_enc(Eina_List *list, int *size_ret) { E_Ipc_List dat; @@ -297,7 +297,7 @@ e_ipc_codec_2str_list_enc(Eina_List *list, int *size_ret) return eet_data_descriptor_encode(_e_ipc_2str_list_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_str_list_dec(char *data, int bytes, Eina_List **dest) { E_Ipc_List *dat; @@ -317,7 +317,7 @@ e_ipc_codec_str_list_dec(char *data, int bytes, Eina_List **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_str_list_enc(Eina_List *list, int *size_ret) { E_Ipc_List dat; @@ -338,7 +338,7 @@ e_ipc_codec_str_list_enc(Eina_List *list, int *size_ret) return data; } -EAPI int +E_API int e_ipc_codec_str_int_dec(char *data, int bytes, E_Ipc_Str_Int **dest) { E_Ipc_Str_Int *dat; @@ -350,7 +350,7 @@ e_ipc_codec_str_int_dec(char *data, int bytes, E_Ipc_Str_Int **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_str_int_enc(const char *str, int val, int *size_ret) { E_Ipc_Str_Int dat; @@ -360,7 +360,7 @@ e_ipc_codec_str_int_enc(const char *str, int val, int *size_ret) return eet_data_descriptor_encode(_e_ipc_str_int_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_str_int_list_dec(char *data, int bytes, Eina_List **dest) { E_Ipc_List *dat; @@ -373,7 +373,7 @@ e_ipc_codec_str_int_list_dec(char *data, int bytes, Eina_List **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_str_int_list_enc(Eina_List *list, int *size_ret) { E_Ipc_List dat; @@ -381,7 +381,7 @@ e_ipc_codec_str_int_list_enc(Eina_List *list, int *size_ret) return eet_data_descriptor_encode(_e_ipc_str_int_list_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_2str_int_dec(char *data, int bytes, E_Ipc_2Str_Int **dest) { E_Ipc_2Str_Int *dat; @@ -393,7 +393,7 @@ e_ipc_codec_2str_int_dec(char *data, int bytes, E_Ipc_2Str_Int **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_2str_int_enc(const char *str1, const char *str2, int val, int *size_ret) { E_Ipc_2Str_Int dat; @@ -404,7 +404,7 @@ e_ipc_codec_2str_int_enc(const char *str1, const char *str2, int val, int *size_ return eet_data_descriptor_encode(_e_ipc_2str_int_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_2str_int_list_dec(char *data, int bytes, Eina_List **dest) { E_Ipc_List *dat; @@ -417,7 +417,7 @@ e_ipc_codec_2str_int_list_dec(char *data, int bytes, Eina_List **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_2str_int_list_enc(Eina_List *list, int *size_ret) { E_Ipc_List dat; @@ -425,7 +425,7 @@ e_ipc_codec_2str_int_list_enc(Eina_List *list, int *size_ret) return eet_data_descriptor_encode(_e_ipc_2str_int_list_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_4int_2str_dec(char *data, int bytes, E_Ipc_4Int_2Str **dest) { E_Ipc_4Int_2Str *dat; @@ -437,7 +437,7 @@ e_ipc_codec_4int_2str_dec(char *data, int bytes, E_Ipc_4Int_2Str **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, const char *str1, const char *str2, int *size_ret) { E_Ipc_4Int_2Str dat; @@ -451,7 +451,7 @@ e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, const char *st return eet_data_descriptor_encode(_e_ipc_4int_2str_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Eina_List **dest) { E_Ipc_List *dat; @@ -464,7 +464,7 @@ e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Eina_List **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_4int_2str_list_enc(Eina_List *list, int *size_ret) { E_Ipc_List dat; @@ -472,7 +472,7 @@ e_ipc_codec_4int_2str_list_enc(Eina_List *list, int *size_ret) return eet_data_descriptor_encode(_e_ipc_4int_2str_list_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_5int_2str_dec(char *data, int bytes, E_Ipc_5Int_2Str **dest) { E_Ipc_5Int_2Str *dat; @@ -484,7 +484,7 @@ e_ipc_codec_5int_2str_dec(char *data, int bytes, E_Ipc_5Int_2Str **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, const char *str1, const char *str2, int *size_ret) { E_Ipc_5Int_2Str dat; @@ -499,7 +499,7 @@ e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, cons return eet_data_descriptor_encode(_e_ipc_5int_2str_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Eina_List **dest) { E_Ipc_List *dat; @@ -512,7 +512,7 @@ e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Eina_List **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_5int_2str_list_enc(Eina_List *list, int *size_ret) { E_Ipc_List dat; @@ -520,7 +520,7 @@ e_ipc_codec_5int_2str_list_enc(Eina_List *list, int *size_ret) return eet_data_descriptor_encode(_e_ipc_5int_2str_list_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_3int_4str_dec(char *data, int bytes, E_Ipc_3Int_4Str **dest) { E_Ipc_3Int_4Str *dat; @@ -532,7 +532,7 @@ e_ipc_codec_3int_4str_dec(char *data, int bytes, E_Ipc_3Int_4Str **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, const char *str4, int *size_ret) { E_Ipc_3Int_4Str dat; @@ -547,7 +547,7 @@ e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, const char *str1, const return eet_data_descriptor_encode(_e_ipc_3int_4str_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Eina_List **dest) { E_Ipc_List *dat; @@ -560,7 +560,7 @@ e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Eina_List **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_3int_4str_list_enc(Eina_List *list, int *size_ret) { E_Ipc_List dat; @@ -568,7 +568,7 @@ e_ipc_codec_3int_4str_list_enc(Eina_List *list, int *size_ret) return eet_data_descriptor_encode(_e_ipc_3int_4str_list_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_3int_3str_dec(char *data, int bytes, E_Ipc_3Int_3Str **dest) { E_Ipc_3Int_3Str *dat; @@ -580,7 +580,7 @@ e_ipc_codec_3int_3str_dec(char *data, int bytes, E_Ipc_3Int_3Str **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, int *size_ret) { E_Ipc_3Int_3Str dat; @@ -594,7 +594,7 @@ e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, const char *str1, const return eet_data_descriptor_encode(_e_ipc_3int_3str_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Eina_List **dest) { E_Ipc_List *dat; @@ -607,7 +607,7 @@ e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Eina_List **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_3int_3str_list_enc(Eina_List *list, int *size_ret) { E_Ipc_List dat; @@ -615,7 +615,7 @@ e_ipc_codec_3int_3str_list_enc(Eina_List *list, int *size_ret) return eet_data_descriptor_encode(_e_ipc_3int_3str_list_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_str_4int_dec(char *data, int bytes, E_Ipc_Str_4Int **dest) { E_Ipc_Str_4Int *dat; @@ -627,7 +627,7 @@ e_ipc_codec_str_4int_dec(char *data, int bytes, E_Ipc_Str_4Int **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_str_4int_enc(const char *str1, int val1, int val2, int val3, int val4, int *size_ret) { E_Ipc_Str_4Int dat; @@ -641,7 +641,7 @@ e_ipc_codec_str_4int_enc(const char *str1, int val1, int val2, int val3, int val return eet_data_descriptor_encode(_e_ipc_str_4int_edd, &dat, size_ret); } -EAPI int +E_API int e_ipc_codec_str_4int_list_dec(char *data, int bytes, Eina_List **dest) { E_Ipc_List *dat; @@ -654,7 +654,7 @@ e_ipc_codec_str_4int_list_dec(char *data, int bytes, Eina_List **dest) return 1; } -EAPI void * +E_API void * e_ipc_codec_str_4int_list_enc(Eina_List *list, int *size_ret) { E_Ipc_List dat; diff --git a/src/bin/e_ipc_codec.h b/src/bin/e_ipc_codec.h index d03eb95..a4bdf5f 100644 --- a/src/bin/e_ipc_codec.h +++ b/src/bin/e_ipc_codec.h @@ -98,57 +98,57 @@ struct _E_Ipc_Str_4Int EINTERN int e_ipc_codec_init(void); EINTERN void e_ipc_codec_shutdown(void); -EAPI int e_ipc_codec_int_dec(char *data, int bytes, int *dest); -EAPI void *e_ipc_codec_int_enc(int val, int *size_ret); -EAPI int e_ipc_codec_double_dec(char *data, int bytes, double *dest); -EAPI void *e_ipc_codec_double_enc(double val, int *size_ret); -EAPI int e_ipc_codec_2int_dec(char *data, int bytes, int *dest, int *dest2x); -EAPI void *e_ipc_codec_2int_enc(int val1, int val2, int *size_ret); - -EAPI int e_ipc_codec_str_dec(char *data, int bytes, char **dest); -EAPI void *e_ipc_codec_str_enc(const char *str, int *size_ret); -EAPI int e_ipc_codec_str_list_dec(char *data, int bytes, Eina_List **dest); -EAPI void *e_ipc_codec_str_list_enc(Eina_List *list, int *size_ret); - -EAPI int e_ipc_codec_2str_dec(char *data, int bytes, E_Ipc_2Str **dest); -EAPI void *e_ipc_codec_2str_enc(const char *str1, const char *str2, int *size_ret); -EAPI int e_ipc_codec_2str_list_dec(char *data, int bytes, Eina_List **dest); -EAPI void *e_ipc_codec_2str_list_enc(Eina_List *list, int *size_ret); - -EAPI int e_ipc_codec_str_int_dec(char *data, int bytes, E_Ipc_Str_Int **dest); -EAPI void *e_ipc_codec_str_int_enc(const char *str, int val, int *size_ret); -EAPI int e_ipc_codec_str_int_list_dec(char *data, int bytes, Eina_List **dest); -EAPI void *e_ipc_codec_str_int_list_enc(Eina_List *list, int *size_ret); - -EAPI int e_ipc_codec_2str_int_dec(char *data, int bytes, E_Ipc_2Str_Int **dest); -EAPI void *e_ipc_codec_2str_int_enc(const char *str1, const char *str2, int val, int *size_ret); -EAPI int e_ipc_codec_2str_int_list_dec(char *data, int bytes, Eina_List **dest); -EAPI void *e_ipc_codec_2str_int_list_enc(Eina_List *list, int *size_ret); - -EAPI int e_ipc_codec_4int_2str_dec(char *data, int bytes, E_Ipc_4Int_2Str **dest); -EAPI void *e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, const char *str1, const char *str2, int *size_ret); -EAPI int e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Eina_List **dest); -EAPI void *e_ipc_codec_4int_2str_list_enc(Eina_List *list, int *size_ret); - -EAPI int e_ipc_codec_5int_2str_dec(char *data, int bytes, E_Ipc_5Int_2Str **dest); -EAPI void *e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, const char *str1, const char *str2, int *size_ret); -EAPI int e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Eina_List **dest); -EAPI void *e_ipc_codec_5int_2str_list_enc(Eina_List *list, int *size_ret); - -EAPI int e_ipc_codec_3int_4str_dec(char *data, int bytes, E_Ipc_3Int_4Str **dest); -EAPI void *e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, const char *str4, int *size_ret); -EAPI int e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Eina_List **dest); -EAPI void *e_ipc_codec_3int_4str_list_enc(Eina_List *list, int *size_ret); - -EAPI int e_ipc_codec_3int_3str_dec(char *data, int bytes, E_Ipc_3Int_3Str **dest); -EAPI void *e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, int *size_ret); -EAPI int e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Eina_List **dest); -EAPI void *e_ipc_codec_3int_3str_list_enc(Eina_List *list, int *size_ret); - -EAPI int e_ipc_codec_str_4int_dec(char *data, int bytes, E_Ipc_Str_4Int **dest); -EAPI void *e_ipc_codec_str_4int_enc(const char *str1, int val1, int val2, int val3, int val4, int *size_ret); -EAPI int e_ipc_codec_str_4int_list_dec(char *data, int bytes, Eina_List **dest); -EAPI void *e_ipc_codec_str_4int_list_enc(Eina_List *list, int *size_ret); +E_API int e_ipc_codec_int_dec(char *data, int bytes, int *dest); +E_API void *e_ipc_codec_int_enc(int val, int *size_ret); +E_API int e_ipc_codec_double_dec(char *data, int bytes, double *dest); +E_API void *e_ipc_codec_double_enc(double val, int *size_ret); +E_API int e_ipc_codec_2int_dec(char *data, int bytes, int *dest, int *dest2x); +E_API void *e_ipc_codec_2int_enc(int val1, int val2, int *size_ret); + +E_API int e_ipc_codec_str_dec(char *data, int bytes, char **dest); +E_API void *e_ipc_codec_str_enc(const char *str, int *size_ret); +E_API int e_ipc_codec_str_list_dec(char *data, int bytes, Eina_List **dest); +E_API void *e_ipc_codec_str_list_enc(Eina_List *list, int *size_ret); + +E_API int e_ipc_codec_2str_dec(char *data, int bytes, E_Ipc_2Str **dest); +E_API void *e_ipc_codec_2str_enc(const char *str1, const char *str2, int *size_ret); +E_API int e_ipc_codec_2str_list_dec(char *data, int bytes, Eina_List **dest); +E_API void *e_ipc_codec_2str_list_enc(Eina_List *list, int *size_ret); + +E_API int e_ipc_codec_str_int_dec(char *data, int bytes, E_Ipc_Str_Int **dest); +E_API void *e_ipc_codec_str_int_enc(const char *str, int val, int *size_ret); +E_API int e_ipc_codec_str_int_list_dec(char *data, int bytes, Eina_List **dest); +E_API void *e_ipc_codec_str_int_list_enc(Eina_List *list, int *size_ret); + +E_API int e_ipc_codec_2str_int_dec(char *data, int bytes, E_Ipc_2Str_Int **dest); +E_API void *e_ipc_codec_2str_int_enc(const char *str1, const char *str2, int val, int *size_ret); +E_API int e_ipc_codec_2str_int_list_dec(char *data, int bytes, Eina_List **dest); +E_API void *e_ipc_codec_2str_int_list_enc(Eina_List *list, int *size_ret); + +E_API int e_ipc_codec_4int_2str_dec(char *data, int bytes, E_Ipc_4Int_2Str **dest); +E_API void *e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, const char *str1, const char *str2, int *size_ret); +E_API int e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Eina_List **dest); +E_API void *e_ipc_codec_4int_2str_list_enc(Eina_List *list, int *size_ret); + +E_API int e_ipc_codec_5int_2str_dec(char *data, int bytes, E_Ipc_5Int_2Str **dest); +E_API void *e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, const char *str1, const char *str2, int *size_ret); +E_API int e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Eina_List **dest); +E_API void *e_ipc_codec_5int_2str_list_enc(Eina_List *list, int *size_ret); + +E_API int e_ipc_codec_3int_4str_dec(char *data, int bytes, E_Ipc_3Int_4Str **dest); +E_API void *e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, const char *str4, int *size_ret); +E_API int e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Eina_List **dest); +E_API void *e_ipc_codec_3int_4str_list_enc(Eina_List *list, int *size_ret); + +E_API int e_ipc_codec_3int_3str_dec(char *data, int bytes, E_Ipc_3Int_3Str **dest); +E_API void *e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, int *size_ret); +E_API int e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Eina_List **dest); +E_API void *e_ipc_codec_3int_3str_list_enc(Eina_List *list, int *size_ret); + +E_API int e_ipc_codec_str_4int_dec(char *data, int bytes, E_Ipc_Str_4Int **dest); +E_API void *e_ipc_codec_str_4int_enc(const char *str1, int val1, int val2, int val3, int val4, int *size_ret); +E_API int e_ipc_codec_str_4int_list_dec(char *data, int bytes, Eina_List **dest); +E_API void *e_ipc_codec_str_4int_list_enc(Eina_List *list, int *size_ret); #endif #endif diff --git a/src/bin/e_layout.c b/src/bin/e_layout.c index 51e7119..33ddbf5 100644 --- a/src/bin/e_layout.c +++ b/src/bin/e_layout.c @@ -47,14 +47,14 @@ static void _e_layout_smart_clip_unset(Evas_Object *obj); static Evas_Smart *_e_smart = NULL; /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_layout_add(Evas *evas) { _e_layout_smart_init(); return evas_object_smart_add(evas, _e_smart); } -EAPI int +E_API int e_layout_freeze(Evas_Object *obj) { E_Smart_Data *sd; @@ -65,7 +65,7 @@ e_layout_freeze(Evas_Object *obj) return sd->frozen; } -EAPI int +E_API int e_layout_thaw(Evas_Object *obj) { E_Smart_Data *sd; @@ -77,7 +77,7 @@ e_layout_thaw(Evas_Object *obj) return sd->frozen; } -EAPI void +E_API void e_layout_virtual_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { E_Smart_Data *sd; @@ -93,7 +93,7 @@ e_layout_virtual_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) if (sd->frozen <= 0) _e_layout_smart_reconfigure(sd); } -EAPI void +E_API void e_layout_virtual_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { E_Smart_Data *sd; @@ -104,7 +104,7 @@ e_layout_virtual_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) if (h) *h = sd->vh; } -EAPI void +E_API void e_layout_coord_canvas_to_virtual(Evas_Object *obj, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy) { E_Smart_Data *sd; @@ -116,7 +116,7 @@ e_layout_coord_canvas_to_virtual(Evas_Object *obj, Evas_Coord cx, Evas_Coord cy, if (vy) *vy = (cy - sd->y) * ((double)(sd->vh) / sd->h); } -EAPI void +E_API void e_layout_coord_virtual_to_canvas(Evas_Object *obj, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy) { E_Smart_Data *sd; @@ -128,7 +128,7 @@ e_layout_coord_virtual_to_canvas(Evas_Object *obj, Evas_Coord vx, Evas_Coord vy, if (cy) *cy = vy * ((double)(sd->h) / sd->vh) + sd->y; } -EAPI void +E_API void e_layout_pack(Evas_Object *obj, Evas_Object *child) { E_Smart_Data *sd; @@ -142,7 +142,7 @@ e_layout_pack(Evas_Object *obj, Evas_Object *child) if (sd->frozen <= 0) _e_layout_smart_move_resize_item(li); } -EAPI void +E_API void e_layout_child_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { E_Layout_Item *li; @@ -155,7 +155,7 @@ e_layout_child_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y) if (li->sd->frozen <= 0) _e_layout_smart_move_resize_item(li); } -EAPI Evas_Object * +E_API Evas_Object * e_layout_child_above_get(Evas_Object *obj) { E_Layout_Item *li; @@ -166,7 +166,7 @@ e_layout_child_above_get(Evas_Object *obj) return li ? li->obj : NULL; } -EAPI Evas_Object * +E_API Evas_Object * e_layout_child_below_get(Evas_Object *obj) { E_Layout_Item *li; @@ -177,7 +177,7 @@ e_layout_child_below_get(Evas_Object *obj) return li ? li->obj : NULL; } -EAPI Evas_Object * +E_API Evas_Object * e_layout_top_child_get(Evas_Object *obj) { E_Smart_Data *sd; @@ -190,7 +190,7 @@ e_layout_top_child_get(Evas_Object *obj) return li->obj; } -EAPI void +E_API void e_layout_child_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { E_Layout_Item *li; @@ -205,7 +205,7 @@ e_layout_child_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h) if (li->sd->frozen <= 0) _e_layout_smart_move_resize_item(li); } -EAPI void +E_API void e_layout_child_lower(Evas_Object *obj) { E_Layout_Item *li; @@ -217,7 +217,7 @@ e_layout_child_lower(Evas_Object *obj) evas_object_lower(obj); } -EAPI void +E_API void e_layout_child_raise(Evas_Object *obj) { E_Layout_Item *li; @@ -229,7 +229,7 @@ e_layout_child_raise(Evas_Object *obj) evas_object_raise(obj); } -EAPI void +E_API void e_layout_child_lower_below(Evas_Object *obj, Evas_Object *below) { E_Layout_Item *li, *li2; @@ -245,7 +245,7 @@ e_layout_child_lower_below(Evas_Object *obj, Evas_Object *below) li->sd->items = eina_inlist_prepend_relative(li->sd->items, EINA_INLIST_GET(li), EINA_INLIST_GET(li2)); } -EAPI void +E_API void e_layout_child_raise_above(Evas_Object *obj, Evas_Object *above) { E_Layout_Item *li, *li2; @@ -261,7 +261,7 @@ e_layout_child_raise_above(Evas_Object *obj, Evas_Object *above) li->sd->items = eina_inlist_append_relative(li->sd->items, EINA_INLIST_GET(li), EINA_INLIST_GET(li2)); } -EAPI void +E_API void e_layout_child_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) { E_Layout_Item *li; @@ -275,7 +275,7 @@ e_layout_child_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas if (h) *h = li->h; } -EAPI void +E_API void e_layout_unpack(Evas_Object *obj) { E_Layout_Item *li; @@ -288,7 +288,7 @@ e_layout_unpack(Evas_Object *obj) _e_layout_smart_disown(obj); } -EAPI Eina_List * +E_API Eina_List * e_layout_children_get(Evas_Object *obj) { E_Smart_Data *sd; @@ -302,7 +302,7 @@ e_layout_children_get(Evas_Object *obj) return l; } -EAPI Evas_Object * +E_API Evas_Object * e_layout_top_child_at_xy_get(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Eina_Bool vis, const Eina_List *ignore) { E_Smart_Data *sd; diff --git a/src/bin/e_layout.h b/src/bin/e_layout.h index 730149a..c38fe34 100644 --- a/src/bin/e_layout.h +++ b/src/bin/e_layout.h @@ -3,30 +3,30 @@ #ifndef E_LAYOUT_H #define E_LAYOUT_H -EAPI Evas_Object *e_layout_add (Evas *evas); -EAPI int e_layout_freeze (Evas_Object *obj); -EAPI int e_layout_thaw (Evas_Object *obj); -EAPI void e_layout_virtual_size_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h); -EAPI void e_layout_virtual_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); +E_API Evas_Object *e_layout_add (Evas *evas); +E_API int e_layout_freeze (Evas_Object *obj); +E_API int e_layout_thaw (Evas_Object *obj); +E_API void e_layout_virtual_size_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h); +E_API void e_layout_virtual_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); -EAPI void e_layout_coord_canvas_to_virtual (Evas_Object *obj, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy); -EAPI void e_layout_coord_virtual_to_canvas (Evas_Object *obj, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy); +E_API void e_layout_coord_canvas_to_virtual (Evas_Object *obj, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy); +E_API void e_layout_coord_virtual_to_canvas (Evas_Object *obj, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy); -EAPI void e_layout_pack (Evas_Object *obj, Evas_Object *child); -EAPI void e_layout_child_move (Evas_Object *obj, Evas_Coord x, Evas_Coord y); -EAPI void e_layout_child_resize (Evas_Object *obj, Evas_Coord w, Evas_Coord h); -EAPI void e_layout_child_raise (Evas_Object *obj); -EAPI void e_layout_child_lower (Evas_Object *obj); -EAPI void e_layout_child_raise_above (Evas_Object *obj, Evas_Object *above); -EAPI void e_layout_child_lower_below (Evas_Object *obj, Evas_Object *below); -EAPI void e_layout_child_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); -EAPI void e_layout_unpack (Evas_Object *obj); +E_API void e_layout_pack (Evas_Object *obj, Evas_Object *child); +E_API void e_layout_child_move (Evas_Object *obj, Evas_Coord x, Evas_Coord y); +E_API void e_layout_child_resize (Evas_Object *obj, Evas_Coord w, Evas_Coord h); +E_API void e_layout_child_raise (Evas_Object *obj); +E_API void e_layout_child_lower (Evas_Object *obj); +E_API void e_layout_child_raise_above (Evas_Object *obj, Evas_Object *above); +E_API void e_layout_child_lower_below (Evas_Object *obj, Evas_Object *below); +E_API void e_layout_child_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); +E_API void e_layout_unpack (Evas_Object *obj); -EAPI Eina_List *e_layout_children_get(Evas_Object *obj); -EAPI Evas_Object *e_layout_top_child_at_xy_get(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Eina_Bool vis, const Eina_List *ignore); +E_API Eina_List *e_layout_children_get(Evas_Object *obj); +E_API Evas_Object *e_layout_top_child_at_xy_get(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Eina_Bool vis, const Eina_List *ignore); -EAPI Evas_Object *e_layout_child_below_get(Evas_Object *obj); -EAPI Evas_Object *e_layout_child_above_get(Evas_Object *obj); -EAPI Evas_Object *e_layout_top_child_get(Evas_Object *obj); +E_API Evas_Object *e_layout_child_below_get(Evas_Object *obj); +E_API Evas_Object *e_layout_child_above_get(Evas_Object *obj); +E_API Evas_Object *e_layout_top_child_get(Evas_Object *obj); #endif #endif diff --git a/src/bin/e_livethumb.c b/src/bin/e_livethumb.c index cbb7980..818e1f0 100644 --- a/src/bin/e_livethumb.c +++ b/src/bin/e_livethumb.c @@ -35,21 +35,21 @@ static void _e_smart_init(void); static Evas_Smart *_e_smart = NULL; /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_livethumb_add(Evas *e) { _e_smart_init(); return evas_object_smart_add(e, _e_smart); } -EAPI Evas * +E_API Evas * e_livethumb_evas_get(Evas_Object *obj) { API_ENTRY return NULL; return sd->evas; } -EAPI void +E_API void e_livethumb_vsize_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { API_ENTRY return; @@ -60,7 +60,7 @@ e_livethumb_vsize_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) if (sd->thumb_obj) evas_object_resize(sd->thumb_obj, sd->vw, sd->vh); } -EAPI void +E_API void e_livethumb_vsize_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { API_ENTRY return; @@ -76,7 +76,7 @@ _e_livethumb_edje_preloaded(void *data EINA_UNUSED, Evas_Object *obj, evas_object_show(obj); } -EAPI void +E_API void e_livethumb_thumb_set(Evas_Object *obj, Evas_Object *thumb) { API_ENTRY return; @@ -101,7 +101,7 @@ e_livethumb_thumb_set(Evas_Object *obj, Evas_Object *thumb) evas_object_resize(sd->thumb_obj, sd->vw, sd->vh); } -EAPI Evas_Object * +E_API Evas_Object * e_livethumb_thumb_get(Evas_Object *obj) { API_ENTRY return NULL; diff --git a/src/bin/e_livethumb.h b/src/bin/e_livethumb.h index 67a78e6..f2026ff 100644 --- a/src/bin/e_livethumb.h +++ b/src/bin/e_livethumb.h @@ -3,12 +3,12 @@ #ifndef E_LIVETHUMB_H #define E_LIVETHUMB_H -EAPI Evas_Object *e_livethumb_add (Evas *e); -EAPI Evas *e_livethumb_evas_get (Evas_Object *obj); -EAPI void e_livethumb_vsize_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h); -EAPI void e_livethumb_vsize_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); -EAPI void e_livethumb_thumb_set (Evas_Object *obj, Evas_Object *thumb); -EAPI Evas_Object *e_livethumb_thumb_get (Evas_Object *obj); +E_API Evas_Object *e_livethumb_add (Evas *e); +E_API Evas *e_livethumb_evas_get (Evas_Object *obj); +E_API void e_livethumb_vsize_set (Evas_Object *obj, Evas_Coord w, Evas_Coord h); +E_API void e_livethumb_vsize_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); +E_API void e_livethumb_thumb_set (Evas_Object *obj, Evas_Object *thumb); +E_API Evas_Object *e_livethumb_thumb_get (Evas_Object *obj); #endif #endif diff --git a/src/bin/e_main.c b/src/bin/e_main.c index 48e7ec0..4c37d22 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -105,14 +105,14 @@ static Ecore_Idle_Enterer *_idle_flush = NULL; static Ecore_Event_Handler *mod_init_end = NULL; /* external variables */ -EAPI Eina_Bool e_precache_end = EINA_FALSE; -EAPI Eina_Bool x_fatal = EINA_FALSE; -EAPI Eina_Bool good = EINA_FALSE; -EAPI Eina_Bool evil = EINA_FALSE; -EAPI Eina_Bool starting = EINA_TRUE; -EAPI Eina_Bool stopping = EINA_FALSE; -EAPI Eina_Bool restart = EINA_FALSE; -EAPI Eina_Bool e_nopause = EINA_FALSE; +E_API Eina_Bool e_precache_end = EINA_FALSE; +E_API Eina_Bool x_fatal = EINA_FALSE; +E_API Eina_Bool good = EINA_FALSE; +E_API Eina_Bool evil = EINA_FALSE; +E_API Eina_Bool starting = EINA_TRUE; +E_API Eina_Bool stopping = EINA_FALSE; +E_API Eina_Bool restart = EINA_FALSE; +E_API Eina_Bool e_nopause = EINA_FALSE; EINTERN const char *e_first_frame = NULL; EINTERN double e_first_frame_start_time = -1; @@ -1065,7 +1065,7 @@ main(int argc, char **argv) return 0; } -EAPI double +E_API double e_main_ts(const char *str) { double ret; diff --git a/src/bin/e_maximize.c b/src/bin/e_maximize.c index b1f557d..6cf3b16 100644 --- a/src/bin/e_maximize.c +++ b/src/bin/e_maximize.c @@ -19,13 +19,13 @@ static void _e_maximize_client_rects_fill_both(E_Client *ec, Eina_List *rects, i static void _e_maximize_client_rects_fill_horiz(E_Client *ec, Eina_List *rects, int *x1, int *x2, int *bx, int *by, int *bw, int *bh); static void _e_maximize_client_rects_fill_vert(E_Client *ec, Eina_List *rects, int *yy1, int *y2, int *bx, int *by, int *bw, int *bh); -EAPI void +E_API void e_maximize_client_shelf_fit(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir) { e_maximize_client_shelf_fill(ec, x1, yy1, x2, y2, dir); } -EAPI void +E_API void e_maximize_client_dock_fit(E_Client *ec, int *x1, int *yy1, int *x2, int *y2) { E_Client *ec2; @@ -123,7 +123,7 @@ e_maximize_client_dock_fit(E_Client *ec, int *x1, int *yy1, int *x2, int *y2) if (y2) *y2 = cy2; } -EAPI void +E_API void e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir) { Eina_List *l, *rects = NULL; @@ -145,7 +145,7 @@ e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, } } -EAPI void +E_API void e_maximize_client_client_fill(E_Client *ec, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir) { Eina_List *rects = NULL; diff --git a/src/bin/e_maximize.h b/src/bin/e_maximize.h index 95d3aa4..ea0852a 100644 --- a/src/bin/e_maximize.h +++ b/src/bin/e_maximize.h @@ -3,10 +3,10 @@ #ifndef E_MAXIMIZE_H #define E_MAXIMIZE_H -EAPI void e_maximize_client_shelf_fit(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir); -EAPI void e_maximize_client_dock_fit(E_Client *ec, int *x1, int *y1, int *x2, int *y2); -EAPI void e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir); -EAPI void e_maximize_client_client_fill(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir); +E_API void e_maximize_client_shelf_fit(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir); +E_API void e_maximize_client_dock_fit(E_Client *ec, int *x1, int *y1, int *x2, int *y2); +E_API void e_maximize_client_shelf_fill(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir); +E_API void e_maximize_client_client_fill(E_Client *ec, int *x1, int *y1, int *x2, int *y2, E_Maximize dir); #endif #endif diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 792c42f..267d509 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -192,7 +192,7 @@ e_menu_shutdown(void) return 1; } -EAPI void +E_API void e_menu_hide_all(void) { E_Menu *m; @@ -208,7 +208,7 @@ e_menu_hide_all(void) } } -EAPI E_Menu * +E_API E_Menu * e_menu_new(void) { E_Menu *m; @@ -221,7 +221,7 @@ e_menu_new(void) return m; } -EAPI void +E_API void e_menu_activate_key(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir) { E_OBJECT_CHECK(m); @@ -294,7 +294,7 @@ e_menu_activate_key(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir } } -EAPI void +E_API void e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir, unsigned int activate_time) { E_Menu_Item *pmi; @@ -360,7 +360,7 @@ e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int d _mouse_up_feed(e_comp->evas, activate_time); } -EAPI void +E_API void e_menu_activate(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir) { E_Menu_Item *pmi; @@ -429,7 +429,7 @@ e_menu_activate(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir) if (pmi) e_menu_item_active_set(pmi, 0); } -EAPI void +E_API void e_menu_deactivate(E_Menu *m) { E_OBJECT_CHECK(m); @@ -441,7 +441,7 @@ e_menu_deactivate(E_Menu *m) m->post_deactivate_cb.func(m->post_deactivate_cb.data, m); } -EAPI int +E_API int e_menu_freeze(E_Menu *m) { E_OBJECT_CHECK_RETURN(m, 0); @@ -450,7 +450,7 @@ e_menu_freeze(E_Menu *m) return m->frozen; } -EAPI int +E_API int e_menu_thaw(E_Menu *m) { E_OBJECT_CHECK_RETURN(m, 0); @@ -460,7 +460,7 @@ e_menu_thaw(E_Menu *m) return m->frozen; } -EAPI void +E_API void e_menu_title_set(E_Menu *m, const char *title) { E_OBJECT_CHECK(m); @@ -483,7 +483,7 @@ e_menu_title_set(E_Menu *m, const char *title) edje_object_message_signal_process(m->bg_object); } -EAPI void +E_API void e_menu_icon_file_set(E_Menu *m EINA_UNUSED, const char *icon EINA_UNUSED) { /* FIXME: support menu icons @@ -492,7 +492,7 @@ e_menu_icon_file_set(E_Menu *m EINA_UNUSED, const char *icon EINA_UNUSED) */ } -EAPI void +E_API void e_menu_category_set(E_Menu *m, const char *category) { E_OBJECT_CHECK(m); @@ -509,7 +509,7 @@ e_menu_category_set(E_Menu *m, const char *category) m->changed = 1; } -EAPI void +E_API void e_menu_category_data_set(char *category, void *data) { E_Menu_Category *cat; @@ -525,7 +525,7 @@ e_menu_category_data_set(char *category, void *data) } } -EAPI E_Menu_Category_Callback * +E_API E_Menu_Category_Callback * e_menu_category_callback_add(char *category, void (*create_cb)(void *data, E_Menu *m, void *category_data), Ecore_Cb free_cb, void *data) { E_Menu_Category *cat; @@ -552,7 +552,7 @@ e_menu_category_callback_add(char *category, void (*create_cb)(void *data, E_Men return cb; } -EAPI void +E_API void e_menu_category_callback_del(E_Menu_Category_Callback *cb) { E_Menu_Category *cat; @@ -567,7 +567,7 @@ e_menu_category_callback_del(E_Menu_Category_Callback *cb) } } -EAPI void +E_API void e_menu_pre_activate_callback_set(E_Menu *m, void (*func)(void *data, E_Menu *m), void *data) { E_OBJECT_CHECK(m); @@ -576,7 +576,7 @@ e_menu_pre_activate_callback_set(E_Menu *m, void (*func)(void *data, E_Menu *m), m->pre_activate_cb.data = data; } -EAPI void +E_API void e_menu_post_deactivate_callback_set(E_Menu *m, void (*func)(void *data, E_Menu *m), void *data) { E_OBJECT_CHECK(m); @@ -585,7 +585,7 @@ e_menu_post_deactivate_callback_set(E_Menu *m, void (*func)(void *data, E_Menu * m->post_deactivate_cb.data = data; } -EAPI E_Menu * +E_API E_Menu * e_menu_root_get(E_Menu *m) { E_Menu *ret; @@ -599,7 +599,7 @@ e_menu_root_get(E_Menu *m) return ret; } -EAPI E_Menu_Item * +E_API E_Menu_Item * e_menu_item_new(E_Menu *m) { E_Menu_Item *mi; @@ -613,7 +613,7 @@ e_menu_item_new(E_Menu *m) return mi; } -EAPI E_Menu_Item * +E_API E_Menu_Item * e_menu_item_new_relative(E_Menu *m, E_Menu_Item *rel) { E_Menu_Item *mi; @@ -646,7 +646,7 @@ e_menu_item_new_relative(E_Menu *m, E_Menu_Item *rel) return mi; } -EAPI E_Menu_Item * +E_API E_Menu_Item * e_menu_item_nth(E_Menu *m, int n) { E_OBJECT_CHECK_RETURN(m, NULL); @@ -654,7 +654,7 @@ e_menu_item_nth(E_Menu *m, int n) return (E_Menu_Item *)eina_list_nth(m->items, n); } -EAPI int +E_API int e_menu_item_num_get(const E_Menu_Item *mi) { const Eina_List *l; @@ -672,7 +672,7 @@ e_menu_item_num_get(const E_Menu_Item *mi) return -1; } -EAPI void +E_API void e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon) { E_OBJECT_CHECK(mi); @@ -694,7 +694,7 @@ e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon) mi->menu->changed = 1; } -EAPI void +E_API void e_menu_item_icon_edje_set(E_Menu_Item *mi, const char *icon, const char *key) { E_OBJECT_CHECK(mi); @@ -709,7 +709,7 @@ e_menu_item_icon_edje_set(E_Menu_Item *mi, const char *icon, const char *key) mi->menu->changed = 1; } -EAPI void +E_API void e_menu_item_label_set(E_Menu_Item *mi, const char *label) { E_OBJECT_CHECK(mi); @@ -724,7 +724,7 @@ e_menu_item_label_set(E_Menu_Item *mi, const char *label) mi->menu->changed = 1; } -EAPI void +E_API void e_menu_item_submenu_set(E_Menu_Item *mi, E_Menu *sub) { Eina_Bool submenu = EINA_FALSE; @@ -810,7 +810,7 @@ out: _e_menu_list_free_unref(tmp); } -EAPI void +E_API void e_menu_item_separator_set(E_Menu_Item *mi, int sep) { E_OBJECT_CHECK(mi); @@ -821,7 +821,7 @@ e_menu_item_separator_set(E_Menu_Item *mi, int sep) mi->menu->changed = 1; } -EAPI void +E_API void e_menu_item_check_set(E_Menu_Item *mi, int chk) { E_OBJECT_CHECK(mi); @@ -832,7 +832,7 @@ e_menu_item_check_set(E_Menu_Item *mi, int chk) mi->menu->changed = 1; } -EAPI void +E_API void e_menu_item_radio_set(E_Menu_Item *mi, int rad) { E_OBJECT_CHECK(mi); @@ -843,7 +843,7 @@ e_menu_item_radio_set(E_Menu_Item *mi, int rad) mi->menu->changed = 1; } -EAPI void +E_API void e_menu_item_radio_group_set(E_Menu_Item *mi, int radg) { E_OBJECT_CHECK(mi); @@ -854,7 +854,7 @@ e_menu_item_radio_group_set(E_Menu_Item *mi, int radg) mi->menu->changed = 1; } -EAPI void +E_API void e_menu_item_toggle_set(E_Menu_Item *mi, int tog) { E_OBJECT_CHECK(mi); @@ -909,7 +909,7 @@ e_menu_item_toggle_set(E_Menu_Item *mi, int tog) } } -EAPI int +E_API int e_menu_item_toggle_get(E_Menu_Item *mi) { E_OBJECT_CHECK_RETURN(mi, 0); @@ -917,7 +917,7 @@ e_menu_item_toggle_get(E_Menu_Item *mi) return mi->toggle; } -EAPI void +E_API void e_menu_item_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *m, E_Menu_Item *mi), const void *data) { E_OBJECT_CHECK(mi); @@ -926,7 +926,7 @@ e_menu_item_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *m, E_ mi->cb.data = (void *)data; } -EAPI void +E_API void e_menu_item_realize_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *m, E_Menu_Item *mi), void *data) { E_OBJECT_CHECK(mi); @@ -935,7 +935,7 @@ e_menu_item_realize_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Men mi->realize_cb.data = data; } -EAPI void +E_API void e_menu_item_submenu_pre_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *m, E_Menu_Item *mi), const void *data) { E_OBJECT_CHECK(mi); @@ -946,7 +946,7 @@ e_menu_item_submenu_pre_callback_set(E_Menu_Item *mi, void (*func)(void *data, E mi->submenu_post_cb.func = _e_menu_cb_item_submenu_post_default; } -EAPI void +E_API void e_menu_item_submenu_post_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *m, E_Menu_Item *mi), const void *data) { E_OBJECT_CHECK(mi); @@ -955,7 +955,7 @@ e_menu_item_submenu_post_callback_set(E_Menu_Item *mi, void (*func)(void *data, mi->submenu_post_cb.data = (void *)data; } -EAPI void +E_API void e_menu_item_drag_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu *m, E_Menu_Item *mi), void *data) { E_OBJECT_CHECK(mi); @@ -964,7 +964,7 @@ e_menu_item_drag_callback_set(E_Menu_Item *mi, void (*func)(void *data, E_Menu * mi->drag_cb.data = data; } -EAPI void +E_API void e_menu_item_active_set(E_Menu_Item *mi, int active) { Eina_List *tmp = NULL; @@ -1047,20 +1047,20 @@ e_menu_item_active_set(E_Menu_Item *mi, int active) _e_menu_list_free_unref(tmp); } -EAPI E_Menu_Item * +E_API E_Menu_Item * e_menu_item_active_get(void) { return _e_active_menu_item; } -EAPI void +E_API void e_menu_active_item_activate(void) { _e_menu_active_call(); _e_menu_deactivate_all(); } -EAPI void +E_API void e_menu_item_disabled_set(E_Menu_Item *mi, int disable) { E_OBJECT_CHECK(mi); @@ -1089,7 +1089,7 @@ e_menu_item_disabled_set(E_Menu_Item *mi, int disable) } } -EAPI void +E_API void e_menu_idler_before(void) { /* when e goes "idle" this gets called so leave all our hard work till */ @@ -1201,7 +1201,7 @@ e_menu_idler_before(void) } } -EAPI Ecore_Window +E_API Ecore_Window e_menu_grab_window_get(void) { return _e_menu_win; diff --git a/src/bin/e_menu.h b/src/bin/e_menu.h index 8206afd..ec9ec51 100644 --- a/src/bin/e_menu.h +++ b/src/bin/e_menu.h @@ -154,56 +154,56 @@ struct _E_Menu_Category_Callback EINTERN int e_menu_init(void); EINTERN int e_menu_shutdown(void); -EAPI void e_menu_hide_all(void); -EAPI E_Menu *e_menu_new(void); -EAPI void e_menu_activate_key(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir); -EAPI void e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir, unsigned int activate_time); -EAPI void e_menu_activate(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir); -EAPI void e_menu_deactivate(E_Menu *m); -EAPI int e_menu_freeze(E_Menu *m); -EAPI int e_menu_thaw(E_Menu *m); -EAPI void e_menu_title_set(E_Menu *m, const char *title); -EAPI void e_menu_icon_file_set(E_Menu *m, const char *icon); +E_API void e_menu_hide_all(void); +E_API E_Menu *e_menu_new(void); +E_API void e_menu_activate_key(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir); +E_API void e_menu_activate_mouse(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir, unsigned int activate_time); +E_API void e_menu_activate(E_Menu *m, E_Zone *zone, int x, int y, int w, int h, int dir); +E_API void e_menu_deactivate(E_Menu *m); +E_API int e_menu_freeze(E_Menu *m); +E_API int e_menu_thaw(E_Menu *m); +E_API void e_menu_title_set(E_Menu *m, const char *title); +E_API void e_menu_icon_file_set(E_Menu *m, const char *icon); /* menu categories functions */ -EAPI void e_menu_category_set(E_Menu *m, const char *category); -EAPI void e_menu_category_data_set(char *category, void *data); -EAPI E_Menu_Category_Callback *e_menu_category_callback_add(char *category, void (*create_cb) (void *data, E_Menu *m, void *category_data), Ecore_Cb free_cb, void *data); -EAPI void e_menu_category_callback_del(E_Menu_Category_Callback *cb); - - -EAPI void e_menu_pre_activate_callback_set(E_Menu *m, void (*func) (void *data, E_Menu *m), void *data); -EAPI void e_menu_post_deactivate_callback_set(E_Menu *m, void (*func) (void *data, E_Menu *m), void *data); - -EAPI E_Menu *e_menu_root_get(E_Menu *m); - -EAPI E_Menu_Item *e_menu_item_new(E_Menu *m); -EAPI E_Menu_Item *e_menu_item_new_relative(E_Menu *m, E_Menu_Item *rel); -EAPI E_Menu_Item *e_menu_item_nth(E_Menu *m, int n); -EAPI int e_menu_item_num_get(const E_Menu_Item *mi); -EAPI void e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon); -EAPI void e_menu_item_icon_edje_set(E_Menu_Item *mi, const char *icon, const char *key); -EAPI void e_menu_item_label_set(E_Menu_Item *mi, const char *label); -EAPI void e_menu_item_submenu_set(E_Menu_Item *mi, E_Menu *sub); -EAPI void e_menu_item_separator_set(E_Menu_Item *mi, int sep); -EAPI void e_menu_item_check_set(E_Menu_Item *mi, int chk); -EAPI void e_menu_item_radio_set(E_Menu_Item *mi, int rad); -EAPI void e_menu_item_radio_group_set(E_Menu_Item *mi, int radg); -EAPI void e_menu_item_toggle_set(E_Menu_Item *mi, int tog); -EAPI int e_menu_item_toggle_get(E_Menu_Item *mi); -EAPI void e_menu_item_callback_set(E_Menu_Item *mi, E_Menu_Cb func, const void *data); -EAPI void e_menu_item_realize_callback_set(E_Menu_Item *mi, E_Menu_Cb func, void *data); -EAPI void e_menu_item_submenu_pre_callback_set(E_Menu_Item *mi, E_Menu_Cb func, const void *data); -EAPI void e_menu_item_submenu_post_callback_set(E_Menu_Item *mi, E_Menu_Cb func, const void *data); -EAPI void e_menu_item_drag_callback_set(E_Menu_Item *mi, E_Menu_Cb func, void *data); -EAPI E_Menu_Item *e_menu_item_active_get(void); -EAPI void e_menu_active_item_activate(void); -EAPI void e_menu_item_active_set(E_Menu_Item *mi, int active); -EAPI void e_menu_item_disabled_set(E_Menu_Item *mi, int disable); - -EAPI void e_menu_idler_before(void); - -EAPI Ecore_Window e_menu_grab_window_get(void); +E_API void e_menu_category_set(E_Menu *m, const char *category); +E_API void e_menu_category_data_set(char *category, void *data); +E_API E_Menu_Category_Callback *e_menu_category_callback_add(char *category, void (*create_cb) (void *data, E_Menu *m, void *category_data), Ecore_Cb free_cb, void *data); +E_API void e_menu_category_callback_del(E_Menu_Category_Callback *cb); + + +E_API void e_menu_pre_activate_callback_set(E_Menu *m, void (*func) (void *data, E_Menu *m), void *data); +E_API void e_menu_post_deactivate_callback_set(E_Menu *m, void (*func) (void *data, E_Menu *m), void *data); + +E_API E_Menu *e_menu_root_get(E_Menu *m); + +E_API E_Menu_Item *e_menu_item_new(E_Menu *m); +E_API E_Menu_Item *e_menu_item_new_relative(E_Menu *m, E_Menu_Item *rel); +E_API E_Menu_Item *e_menu_item_nth(E_Menu *m, int n); +E_API int e_menu_item_num_get(const E_Menu_Item *mi); +E_API void e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon); +E_API void e_menu_item_icon_edje_set(E_Menu_Item *mi, const char *icon, const char *key); +E_API void e_menu_item_label_set(E_Menu_Item *mi, const char *label); +E_API void e_menu_item_submenu_set(E_Menu_Item *mi, E_Menu *sub); +E_API void e_menu_item_separator_set(E_Menu_Item *mi, int sep); +E_API void e_menu_item_check_set(E_Menu_Item *mi, int chk); +E_API void e_menu_item_radio_set(E_Menu_Item *mi, int rad); +E_API void e_menu_item_radio_group_set(E_Menu_Item *mi, int radg); +E_API void e_menu_item_toggle_set(E_Menu_Item *mi, int tog); +E_API int e_menu_item_toggle_get(E_Menu_Item *mi); +E_API void e_menu_item_callback_set(E_Menu_Item *mi, E_Menu_Cb func, const void *data); +E_API void e_menu_item_realize_callback_set(E_Menu_Item *mi, E_Menu_Cb func, void *data); +E_API void e_menu_item_submenu_pre_callback_set(E_Menu_Item *mi, E_Menu_Cb func, const void *data); +E_API void e_menu_item_submenu_post_callback_set(E_Menu_Item *mi, E_Menu_Cb func, const void *data); +E_API void e_menu_item_drag_callback_set(E_Menu_Item *mi, E_Menu_Cb func, void *data); +E_API E_Menu_Item *e_menu_item_active_get(void); +E_API void e_menu_active_item_activate(void); +E_API void e_menu_item_active_set(E_Menu_Item *mi, int active); +E_API void e_menu_item_disabled_set(E_Menu_Item *mi, int disable); + +E_API void e_menu_idler_before(void); + +E_API Ecore_Window e_menu_grab_window_get(void); #endif #endif diff --git a/src/bin/e_module.c b/src/bin/e_module.c index baa8ba8..3d21468 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -30,8 +30,8 @@ static Eina_List *_e_module_path_lists = NULL; static Eina_List *handlers = NULL; static Eina_Hash *_e_module_path_hash = NULL; -EAPI int E_EVENT_MODULE_UPDATE = 0; -EAPI int E_EVENT_MODULE_INIT_END = 0; +E_API int E_EVENT_MODULE_UPDATE = 0; +E_API int E_EVENT_MODULE_INIT_END = 0; static Eina_Stringshare *mod_src_path = NULL; @@ -223,7 +223,7 @@ e_module_shutdown(void) return 1; } -EAPI void +E_API void e_module_all_load(void) { Eina_List *l, *ll; @@ -283,13 +283,13 @@ e_module_all_load(void) unsetenv("E_MODULE_LOAD"); } -EAPI Eina_Bool +E_API Eina_Bool e_module_loading_get(void) { return !_e_modules_init_end; } -EAPI E_Module * +E_API E_Module * e_module_new(const char *name) { E_Module *m; @@ -456,7 +456,7 @@ init_done: return m; } -EAPI int +E_API int e_module_save(E_Module *m) { E_OBJECT_CHECK_RETURN(m, 0); @@ -465,7 +465,7 @@ e_module_save(E_Module *m) return m->func.save ? m->func.save(m) : 1; } -EAPI const char * +E_API const char * e_module_dir_get(E_Module *m) { E_OBJECT_CHECK_RETURN(m, NULL); @@ -473,7 +473,7 @@ e_module_dir_get(E_Module *m) return m->dir; } -EAPI int +E_API int e_module_enable(E_Module *m) { Eina_List *l; @@ -510,7 +510,7 @@ e_module_enable(E_Module *m) return 0; } -EAPI int +E_API int e_module_disable(E_Module *m) { E_Event_Module_Update *ev; @@ -543,7 +543,7 @@ e_module_disable(E_Module *m) return ret; } -EAPI int +E_API int e_module_enabled_get(E_Module *m) { E_OBJECT_CHECK_RETURN(m, 0); @@ -551,7 +551,7 @@ e_module_enabled_get(E_Module *m) return m->enabled; } -EAPI int +E_API int e_module_save_all(void) { Eina_List *l; @@ -570,20 +570,20 @@ e_module_save_all(void) return ret; } -EAPI E_Module * +E_API E_Module * e_module_find(const char *name) { EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL); return eina_hash_find(_e_modules_hash, name); } -EAPI Eina_List * +E_API Eina_List * e_module_list(void) { return _e_modules; } -EAPI void +E_API void e_module_dialog_show(E_Module *m, const char *title, const char *body) { E_Dialog *dia; @@ -631,7 +631,7 @@ e_module_dialog_show(E_Module *m, const char *title, const char *body) e_win_client_icon_set(dia->win, icon); } -EAPI void +E_API void e_module_delayed_set(E_Module *m, int delayed) { Eina_List *l; @@ -652,7 +652,7 @@ e_module_delayed_set(E_Module *m, int delayed) } } -EAPI void +E_API void e_module_priority_set(E_Module *m, int priority) { /* Set the loading order for a module. @@ -675,7 +675,7 @@ e_module_priority_set(E_Module *m, int priority) } } -EAPI Eina_List * +E_API Eina_List * e_module_desktop_list(void) { Eina_List *l = NULL; @@ -684,7 +684,7 @@ e_module_desktop_list(void) return l; } -EAPI void +E_API void e_module_desktop_free(E_Module_Desktop *md) { if (!md) return; diff --git a/src/bin/e_module.h b/src/bin/e_module.h index 72075d1..07a51f8 100644 --- a/src/bin/e_module.h +++ b/src/bin/e_module.h @@ -15,8 +15,8 @@ typedef struct E_Module_Desktop E_Module_Desktop; #define E_MODULE_TYPE 0xE0b0100b -extern EAPI int E_EVENT_MODULE_UPDATE; -extern EAPI int E_EVENT_MODULE_INIT_END; +extern E_API int E_EVENT_MODULE_UPDATE; +extern E_API int E_EVENT_MODULE_INIT_END; struct _E_Event_Module_Update { @@ -62,21 +62,21 @@ struct _E_Module_Api EINTERN int e_module_init(void); EINTERN int e_module_shutdown(void); -EAPI void e_module_all_load(void); -EAPI E_Module *e_module_new(const char *name); -EAPI int e_module_save(E_Module *m); -EAPI const char *e_module_dir_get(E_Module *m); -EAPI int e_module_enable(E_Module *m); -EAPI int e_module_disable(E_Module *m); -EAPI int e_module_enabled_get(E_Module *m); -EAPI int e_module_save_all(void); -EAPI E_Module *e_module_find(const char *name); -EAPI Eina_List *e_module_list(void); -EAPI Eina_List *e_module_desktop_list(void); -EAPI void e_module_desktop_free(E_Module_Desktop *md); -EAPI void e_module_dialog_show(E_Module *m, const char *title, const char *body); -EAPI void e_module_delayed_set(E_Module *m, int delayed); -EAPI void e_module_priority_set(E_Module *m, int priority); -EAPI Eina_Bool e_module_loading_get(void); +E_API void e_module_all_load(void); +E_API E_Module *e_module_new(const char *name); +E_API int e_module_save(E_Module *m); +E_API const char *e_module_dir_get(E_Module *m); +E_API int e_module_enable(E_Module *m); +E_API int e_module_disable(E_Module *m); +E_API int e_module_enabled_get(E_Module *m); +E_API int e_module_save_all(void); +E_API E_Module *e_module_find(const char *name); +E_API Eina_List *e_module_list(void); +E_API Eina_List *e_module_desktop_list(void); +E_API void e_module_desktop_free(E_Module_Desktop *md); +E_API void e_module_dialog_show(E_Module *m, const char *title, const char *body); +E_API void e_module_delayed_set(E_Module *m, int delayed); +E_API void e_module_priority_set(E_Module *m, int priority); +E_API Eina_Bool e_module_loading_get(void); #endif #endif diff --git a/src/bin/e_mouse.c b/src/bin/e_mouse.c index 7cae8ec..5de709d 100644 --- a/src/bin/e_mouse.c +++ b/src/bin/e_mouse.c @@ -1,6 +1,6 @@ #include "e.h" -EAPI int +E_API int e_mouse_update(void) { unsigned char map[256] = { 0 }; diff --git a/src/bin/e_mouse.h b/src/bin/e_mouse.h index 39115c6..f86c0b2 100644 --- a/src/bin/e_mouse.h +++ b/src/bin/e_mouse.h @@ -10,7 +10,7 @@ typedef enum _E_Mouse_Hand #ifndef E_MOUSE_H #define E_MOUSE_H -EAPI int e_mouse_update(void); +E_API int e_mouse_update(void); #endif #endif diff --git a/src/bin/e_moveresize.c b/src/bin/e_moveresize.c index b5a844d..d78d65b 100644 --- a/src/bin/e_moveresize.c +++ b/src/bin/e_moveresize.c @@ -47,13 +47,13 @@ e_moveresize_shutdown(void) return 1; } -EAPI void +E_API void e_moveresize_replace(Eina_Bool enable) { _e_moveresize_enabled = !enable; } -EAPI void +E_API void e_moveresize_client_extents(const E_Client *ec, int *w, int *h) { if ((ec->icccm.base_w >= 0) && diff --git a/src/bin/e_moveresize.h b/src/bin/e_moveresize.h index 11b47ae..273c97c 100644 --- a/src/bin/e_moveresize.h +++ b/src/bin/e_moveresize.h @@ -6,7 +6,7 @@ EINTERN int e_moveresize_init(void); EINTERN int e_moveresize_shutdown(void); -EAPI void e_moveresize_replace(Eina_Bool enable); -EAPI void e_moveresize_client_extents(const E_Client *ec, int *w, int *h); +E_API void e_moveresize_replace(Eina_Bool enable); +E_API void e_moveresize_client_extents(const E_Client *ec, int *w, int *h); #endif #endif diff --git a/src/bin/e_msg.c b/src/bin/e_msg.c index 4edcc43..0b54901 100644 --- a/src/bin/e_msg.c +++ b/src/bin/e_msg.c @@ -51,7 +51,7 @@ e_msg_shutdown(void) return 1; } -EAPI void +E_API void e_msg_send(const char *name, const char *info, int val, E_Object *obj, void *msgdata, void (*afterfunc)(void *data, E_Object *obj, void *msgdata), void *afterdata) { unsigned int size, pos, name_len, info_len; @@ -84,7 +84,7 @@ e_msg_send(const char *name, const char *info, int val, E_Object *obj, void *msg ecore_event_add(E_EVENT_MSG, ev, _e_msg_event_free, NULL); } -EAPI E_Msg_Handler * +E_API E_Msg_Handler * e_msg_handler_add(void (*func)(void *data, const char *name, const char *info, int val, E_Object *obj, void *msgdata), void *data) { E_Msg_Handler *emsgh; @@ -97,7 +97,7 @@ e_msg_handler_add(void (*func)(void *data, const char *name, const char *info, i return emsgh; } -EAPI void +E_API void e_msg_handler_del(E_Msg_Handler *emsgh) { if (processing_handlers > 0) diff --git a/src/bin/e_msg.h b/src/bin/e_msg.h index 247903f..031e15a 100644 --- a/src/bin/e_msg.h +++ b/src/bin/e_msg.h @@ -9,9 +9,9 @@ typedef struct _E_Msg_Handler E_Msg_Handler; EINTERN int e_msg_init(void); EINTERN int e_msg_shutdown(void); -EAPI void e_msg_send(const char *name, const char *info, int val, E_Object *obj, void *msgdata, void (*afterfunc) (void *data, E_Object *obj, void *msgdata), void *afterdata); -EAPI E_Msg_Handler *e_msg_handler_add(void (*func) (void *data, const char *name, const char *info, int val, E_Object *obj, void *msgdata), void *data); -EAPI void e_msg_handler_del(E_Msg_Handler *emsgh); +E_API void e_msg_send(const char *name, const char *info, int val, E_Object *obj, void *msgdata, void (*afterfunc) (void *data, E_Object *obj, void *msgdata), void *afterdata); +E_API E_Msg_Handler *e_msg_handler_add(void (*func) (void *data, const char *name, const char *info, int val, E_Object *obj, void *msgdata), void *data); +E_API void e_msg_handler_del(E_Msg_Handler *emsgh); #endif #endif diff --git a/src/bin/e_msgbus.c b/src/bin/e_msgbus.c index 1c8a934..03f8828 100644 --- a/src/bin/e_msgbus.c +++ b/src/bin/e_msgbus.c @@ -154,7 +154,7 @@ e_msgbus_shutdown(void) return 1; } -EAPI Eldbus_Service_Interface * +E_API Eldbus_Service_Interface * e_msgbus_interface_attach(const Eldbus_Service_Interface_Desc *desc) { if (!_e_msgbus_data->iface) diff --git a/src/bin/e_msgbus.h b/src/bin/e_msgbus.h index ae48572..1e6f621 100644 --- a/src/bin/e_msgbus.h +++ b/src/bin/e_msgbus.h @@ -16,7 +16,7 @@ struct _E_Msgbus_Data EINTERN int e_msgbus_init(void); EINTERN int e_msgbus_shutdown(void); -EAPI Eldbus_Service_Interface *e_msgbus_interface_attach(const Eldbus_Service_Interface_Desc *desc); +E_API Eldbus_Service_Interface *e_msgbus_interface_attach(const Eldbus_Service_Interface_Desc *desc); #endif #endif diff --git a/src/bin/e_notification.c b/src/bin/e_notification.c index ae57eb7..08883c8 100644 --- a/src/bin/e_notification.c +++ b/src/bin/e_notification.c @@ -184,7 +184,7 @@ static const Eldbus_Service_Interface_Desc desc = { INTERFACE, methods, signals, NULL, NULL, NULL }; -EAPI Eina_Bool +E_API Eina_Bool e_notification_server_register(const E_Notification_Server_Info *server_info, E_Notification_Notify_Cb n_cb, E_Notification_Close_Cb close_cb, const void *data) { EINA_SAFETY_ON_NULL_RETURN_VAL(server_info, EINA_FALSE); @@ -206,7 +206,7 @@ e_notification_server_register(const E_Notification_Server_Info *server_info, E_ return EINA_TRUE; } -EAPI void +E_API void e_notification_server_unregister(void) { EINA_SAFETY_ON_NULL_RETURN(n_data); @@ -217,7 +217,7 @@ e_notification_server_unregister(void) n_data = NULL; } -EAPI void +E_API void e_notification_notify_close(E_Notification_Notify *notify, E_Notification_Notify_Closed_Reason reason) { EINA_SAFETY_ON_NULL_RETURN(n_data); @@ -227,7 +227,7 @@ e_notification_notify_close(E_Notification_Notify *notify, E_Notification_Notify notify->id, reason); } -EAPI Evas_Object * +E_API Evas_Object * e_notification_notify_raw_image_get(E_Notification_Notify *notify, Evas *evas) { Evas_Object *o; @@ -392,7 +392,7 @@ normalize_notify(E_Notification_Notify *notify) notify->timeout = -1; } -EAPI Eina_Bool +E_API Eina_Bool e_notification_client_send(E_Notification_Notify *notify, E_Notification_Client_Send_Cb cb, const void *data) { unsigned id; diff --git a/src/bin/e_notification.h b/src/bin/e_notification.h index e97ee00..8f0bbc3 100644 --- a/src/bin/e_notification.h +++ b/src/bin/e_notification.h @@ -68,19 +68,19 @@ typedef struct _E_Notification_Server_Info * * @return EINA_TRUE if server was registered, EINA_FALSE otherwise. */ -EAPI Eina_Bool e_notification_server_register(const E_Notification_Server_Info *server_info, E_Notification_Notify_Cb notify_cb, E_Notification_Close_Cb close_cb, const void *data); +E_API Eina_Bool e_notification_server_register(const E_Notification_Server_Info *server_info, E_Notification_Notify_Cb notify_cb, E_Notification_Close_Cb close_cb, const void *data); /** * Unregister the sole notification server */ -EAPI void e_notification_server_unregister(void); +E_API void e_notification_server_unregister(void); -EAPI void e_notification_notify_close(E_Notification_Notify *notify, E_Notification_Notify_Closed_Reason reason); -EAPI Evas_Object *e_notification_notify_raw_image_get(E_Notification_Notify *notify, Evas *evas); +E_API void e_notification_notify_close(E_Notification_Notify *notify, E_Notification_Notify_Closed_Reason reason); +E_API Evas_Object *e_notification_notify_raw_image_get(E_Notification_Notify *notify, Evas *evas); //client typedef void (*E_Notification_Client_Send_Cb)(void *data, unsigned int id); -EAPI Eina_Bool e_notification_client_send(E_Notification_Notify *notify, E_Notification_Client_Send_Cb cb, const void *data); +E_API Eina_Bool e_notification_client_send(E_Notification_Notify *notify, E_Notification_Client_Send_Cb cb, const void *data); #endif diff --git a/src/bin/e_obj_dialog.c b/src/bin/e_obj_dialog.c index a2a7031..c74f60f 100644 --- a/src/bin/e_obj_dialog.c +++ b/src/bin/e_obj_dialog.c @@ -18,7 +18,7 @@ _key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void _e_obj_dialog_cb_delete(data, NULL, NULL, NULL); } -EAPI E_Obj_Dialog * +E_API E_Obj_Dialog * e_obj_dialog_new(char *title, char *class_name, char *class_class) { E_Obj_Dialog *od; @@ -55,13 +55,13 @@ e_obj_dialog_new(char *title, char *class_name, char *class_class) return od; } -EAPI void +E_API void e_obj_dialog_cb_delete_set(E_Obj_Dialog *od, void (*func)(E_Obj_Dialog *od)) { od->cb_delete = func; } -EAPI void +E_API void e_obj_dialog_icon_set(E_Obj_Dialog *od, char *icon) { E_OBJECT_CHECK(od); @@ -69,7 +69,7 @@ e_obj_dialog_icon_set(E_Obj_Dialog *od, char *icon) e_win_client_icon_set(od->win, icon); } -EAPI void +E_API void e_obj_dialog_show(E_Obj_Dialog *od) { Evas_Coord w, h, mw, mh; @@ -96,7 +96,7 @@ e_obj_dialog_show(E_Obj_Dialog *od) evas_object_show(od->win); } -EAPI void +E_API void e_obj_dialog_obj_part_text_set(E_Obj_Dialog *od, const char *part, const char *text) { E_OBJECT_CHECK(od); @@ -104,7 +104,7 @@ e_obj_dialog_obj_part_text_set(E_Obj_Dialog *od, const char *part, const char *t edje_object_part_text_set(od->bg_object, part, text); } -EAPI void +E_API void e_obj_dialog_obj_theme_set(E_Obj_Dialog *od, char *theme_cat, char *theme_obj) { E_OBJECT_CHECK(od); diff --git a/src/bin/e_obj_dialog.h b/src/bin/e_obj_dialog.h index a6dc952..5ce2dfc 100644 --- a/src/bin/e_obj_dialog.h +++ b/src/bin/e_obj_dialog.h @@ -18,12 +18,12 @@ struct _E_Obj_Dialog void (*cb_delete)(E_Obj_Dialog *od); }; -EAPI E_Obj_Dialog *e_obj_dialog_new(char *title, char *class_name, char *class_class); -EAPI void e_obj_dialog_icon_set(E_Obj_Dialog *od, char *icon); -EAPI void e_obj_dialog_show(E_Obj_Dialog *od); -EAPI void e_obj_dialog_obj_part_text_set(E_Obj_Dialog *od, const char *part, const char *text); -EAPI void e_obj_dialog_obj_theme_set(E_Obj_Dialog *od, char *theme_cat, char *theme_obj); -EAPI void e_obj_dialog_cb_delete_set(E_Obj_Dialog *od, void (*func)(E_Obj_Dialog *od)); +E_API E_Obj_Dialog *e_obj_dialog_new(char *title, char *class_name, char *class_class); +E_API void e_obj_dialog_icon_set(E_Obj_Dialog *od, char *icon); +E_API void e_obj_dialog_show(E_Obj_Dialog *od); +E_API void e_obj_dialog_obj_part_text_set(E_Obj_Dialog *od, const char *part, const char *text); +E_API void e_obj_dialog_obj_theme_set(E_Obj_Dialog *od, char *theme_cat, char *theme_obj); +E_API void e_obj_dialog_cb_delete_set(E_Obj_Dialog *od, void (*func)(E_Obj_Dialog *od)); #endif #endif diff --git a/src/bin/e_object.c b/src/bin/e_object.c index b8bb78e..3af9dce 100644 --- a/src/bin/e_object.c +++ b/src/bin/e_object.c @@ -12,7 +12,7 @@ static sigjmp_buf _e_object_segv_buf; #endif /* externally accessible functions */ -EAPI void * +E_API void * e_object_alloc(int size, int type, E_Object_Cleanup_Func cleanup_func) { E_Object *obj; @@ -37,7 +37,7 @@ _delay_del(void *data) e_object_unref(obj); } -EAPI void +E_API void e_object_del(E_Object *obj) { E_OBJECT_CHECK(obj); @@ -60,35 +60,35 @@ e_object_del(E_Object *obj) e_object_unref(obj); } -EAPI void +E_API void e_object_delay_del_set(E_Object *obj, void *func) { E_OBJECT_CHECK(obj); obj->del_delay_func = func; } -EAPI int +E_API int e_object_is_del(E_Object *obj) { E_OBJECT_CHECK_RETURN(obj, 1); return obj->deleted; } -EAPI void +E_API void e_object_del_func_set(E_Object *obj, E_Object_Cleanup_Func del_func) { E_OBJECT_CHECK(obj); obj->del_func = del_func; } -EAPI void +E_API void e_object_type_set(E_Object *obj, int type) { E_OBJECT_CHECK(obj); obj->type = type; } -EAPI void +E_API void e_object_free(E_Object *obj) { E_OBJECT_CHECK(obj); @@ -119,7 +119,7 @@ e_object_free(E_Object *obj) obj->cleanup_func(obj); } -EAPI int +E_API int e_object_ref(E_Object *obj) { E_OBJECT_CHECK_RETURN(obj, -1); @@ -129,7 +129,7 @@ e_object_ref(E_Object *obj) return obj->references; } -EAPI int +E_API int e_object_unref(E_Object *obj) { int ref; @@ -153,7 +153,7 @@ e_object_unref(E_Object *obj) return ref; } -EAPI int +E_API int e_object_ref_get(E_Object *obj) { E_OBJECT_CHECK_RETURN(obj, 0); @@ -161,7 +161,7 @@ e_object_ref_get(E_Object *obj) } #if 0 -EAPI void +E_API void e_bt(void) { int i, trace_num; @@ -185,7 +185,7 @@ e_bt(void) #endif -EAPI int +E_API int e_object_error(E_Object *obj) { #ifdef OBJECT_PARANOIA_CHECK @@ -302,42 +302,42 @@ e_object_error(E_Object *obj) #endif } -EAPI void +E_API void e_object_data_set(E_Object *obj, const void *data) { E_OBJECT_CHECK(obj); obj->data = (void *)data; } -EAPI void * +E_API void * e_object_data_get(E_Object *obj) { E_OBJECT_CHECK_RETURN(obj, NULL); return obj->data; } -EAPI void +E_API void e_object_free_attach_func_set(E_Object *obj, E_Object_Cleanup_Func func) { E_OBJECT_CHECK(obj); obj->free_att_func = func; } -EAPI void +E_API void e_object_del_attach_func_set(E_Object *obj, E_Object_Cleanup_Func func) { E_OBJECT_CHECK(obj); obj->del_att_func = func; } -EAPI void +E_API void e_object_ref_debug_set(E_Object *obj, Eina_Bool set) { E_OBJECT_CHECK(obj); obj->ref_debug = !!set; } -EAPI void +E_API void e_object_delfn_clear(E_Object *obj) { E_Object_Delfn *dfn; @@ -360,7 +360,7 @@ e_object_delfn_clear(E_Object *obj) } } -EAPI E_Object_Delfn * +E_API E_Object_Delfn * e_object_delfn_add(E_Object *obj, void (*func)(void *data, void *obj), void *data) { E_Object_Delfn *dfn; @@ -373,7 +373,7 @@ e_object_delfn_add(E_Object *obj, void (*func)(void *data, void *obj), void *dat return dfn; } -EAPI void +E_API void e_object_delfn_del(E_Object *obj, E_Object_Delfn *dfn) { E_OBJECT_CHECK(obj); diff --git a/src/bin/e_object.h b/src/bin/e_object.h index 74bb4b5..423e061 100644 --- a/src/bin/e_object.h +++ b/src/bin/e_object.h @@ -81,32 +81,32 @@ struct _E_Object_Delfn Eina_Bool delete_me : 1; }; -EAPI void *e_object_alloc (int size, int type, E_Object_Cleanup_Func cleanup_func); -EAPI void e_object_del (E_Object *obj); -EAPI void e_object_delay_del_set (E_Object *obj, void *func); -EAPI int e_object_is_del (E_Object *obj); -EAPI void e_object_del_func_set (E_Object *obj, E_Object_Cleanup_Func del_func); -EAPI void e_object_type_set (E_Object *obj, int type); -EAPI void e_object_free (E_Object *obj); -EAPI int e_object_ref (E_Object *obj); -EAPI int e_object_unref (E_Object *obj); -EAPI int e_object_ref_get (E_Object *obj); -EAPI int e_object_error (E_Object *obj); -EAPI void e_object_data_set (E_Object *obj, const void *data); -EAPI void *e_object_data_get (E_Object *obj); -EAPI void e_object_free_attach_func_set(E_Object *obj, E_Object_Cleanup_Func func); -EAPI void e_object_del_attach_func_set (E_Object *obj, E_Object_Cleanup_Func func); +E_API void *e_object_alloc (int size, int type, E_Object_Cleanup_Func cleanup_func); +E_API void e_object_del (E_Object *obj); +E_API void e_object_delay_del_set (E_Object *obj, void *func); +E_API int e_object_is_del (E_Object *obj); +E_API void e_object_del_func_set (E_Object *obj, E_Object_Cleanup_Func del_func); +E_API void e_object_type_set (E_Object *obj, int type); +E_API void e_object_free (E_Object *obj); +E_API int e_object_ref (E_Object *obj); +E_API int e_object_unref (E_Object *obj); +E_API int e_object_ref_get (E_Object *obj); +E_API int e_object_error (E_Object *obj); +E_API void e_object_data_set (E_Object *obj, const void *data); +E_API void *e_object_data_get (E_Object *obj); +E_API void e_object_free_attach_func_set(E_Object *obj, E_Object_Cleanup_Func func); +E_API void e_object_del_attach_func_set (E_Object *obj, E_Object_Cleanup_Func func); -EAPI E_Object_Delfn *e_object_delfn_add (E_Object *obj, void (*func) (void *data, void *obj), void *data); -EAPI void e_object_delfn_del (E_Object *obj, E_Object_Delfn *dfn); -EAPI void e_object_delfn_clear(E_Object *obj); +E_API E_Object_Delfn *e_object_delfn_add (E_Object *obj, void (*func) (void *data, void *obj), void *data); +E_API void e_object_delfn_del (E_Object *obj, E_Object_Delfn *dfn); +E_API void e_object_delfn_clear(E_Object *obj); -EAPI void e_object_ref_debug_set(E_Object *obj, Eina_Bool set); +E_API void e_object_ref_debug_set(E_Object *obj, Eina_Bool set); /* -EAPI void e_object_breadcrumb_add (E_Object *obj, char *crumb); -EAPI void e_object_breadcrumb_del (E_Object *obj, char *crumb); -EAPI void e_object_breadcrumb_debug (E_Object *obj); +E_API void e_object_breadcrumb_add (E_Object *obj, char *crumb); +E_API void e_object_breadcrumb_del (E_Object *obj, char *crumb); +E_API void e_object_breadcrumb_debug (E_Object *obj); */ #endif diff --git a/src/bin/e_open.c b/src/bin/e_open.c index 721f275..045fa76 100644 --- a/src/bin/e_open.c +++ b/src/bin/e_open.c @@ -9,6 +9,31 @@ #include #include +# ifdef E_API +# undef E_API +# endif +# ifdef WIN32 +# ifdef BUILDING_DLL +# define E_API __declspec(dllexport) +# else +# define E_API __declspec(dllimport) +# endif +# else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +/* BROKEN in gcc 4 on amd64 */ +# if 0 +# pragma GCC visibility push(hidden) +# endif +# define E_API __attribute__ ((visibility("default"))) +# else +# define E_API +# endif +# else +# define E_API +# endif +# endif + static const char * xdg_defaults_get(const char *path, const char *mime) { @@ -448,7 +473,7 @@ static const Ecore_Getopt options = { } }; -EAPI int +E_API int main(int argc, char *argv[]) { Eina_Bool quit_option = EINA_FALSE; diff --git a/src/bin/e_order.c b/src/bin/e_order.c index 1c0fe7b..6ad33c1 100644 --- a/src/bin/e_order.c +++ b/src/bin/e_order.c @@ -58,7 +58,7 @@ e_order_shutdown(void) return 1; } -EAPI E_Order * +E_API E_Order * e_order_new(const char *path) { E_Order *eo; @@ -75,7 +75,7 @@ e_order_new(const char *path) return eo; } -EAPI E_Order * +E_API E_Order * e_order_clone(const E_Order *eo) { E_Order *eoc; @@ -100,7 +100,7 @@ e_order_clone(const E_Order *eo) return eoc; } -EAPI void +E_API void e_order_update_callback_set(E_Order *eo, void (*cb)(void *data, E_Order *eo), void *data) { E_OBJECT_CHECK(eo); @@ -110,7 +110,7 @@ e_order_update_callback_set(E_Order *eo, void (*cb)(void *data, E_Order *eo), vo eo->cb.data = data; } -EAPI void +E_API void e_order_remove(E_Order *eo, Efreet_Desktop *desktop) { Eina_List *tmp; @@ -125,7 +125,7 @@ e_order_remove(E_Order *eo, Efreet_Desktop *desktop) _e_order_save(eo); } -EAPI void +E_API void e_order_append(E_Order *eo, Efreet_Desktop *desktop) { E_OBJECT_CHECK(eo); @@ -137,7 +137,7 @@ e_order_append(E_Order *eo, Efreet_Desktop *desktop) _e_order_save(eo); } -EAPI void +E_API void e_order_prepend_relative(E_Order *eo, Efreet_Desktop *desktop, Efreet_Desktop *before) { E_OBJECT_CHECK(eo); @@ -149,7 +149,7 @@ e_order_prepend_relative(E_Order *eo, Efreet_Desktop *desktop, Efreet_Desktop *b _e_order_save(eo); } -EAPI void +E_API void e_order_files_append(E_Order *eo, Eina_List *files) { Eina_List *l; @@ -172,7 +172,7 @@ e_order_files_append(E_Order *eo, Eina_List *files) _e_order_save(eo); } -EAPI void +E_API void e_order_files_prepend_relative(E_Order *eo, Eina_List *files, Efreet_Desktop *before) { Eina_List *l; @@ -195,7 +195,7 @@ e_order_files_prepend_relative(E_Order *eo, Eina_List *files, Efreet_Desktop *be _e_order_save(eo); } -EAPI void +E_API void e_order_clear(E_Order *eo) { E_OBJECT_CHECK(eo); diff --git a/src/bin/e_order.h b/src/bin/e_order.h index 566e4a0..4ca93e3 100644 --- a/src/bin/e_order.h +++ b/src/bin/e_order.h @@ -26,16 +26,16 @@ struct _E_Order EINTERN int e_order_init(void); EINTERN int e_order_shutdown(void); -EAPI E_Order *e_order_new(const char *path); -EAPI void e_order_update_callback_set(E_Order *eo, void (*cb)(void *data, E_Order *eo), void *data); - -EAPI void e_order_remove(E_Order *eo, Efreet_Desktop *desktop); -EAPI void e_order_append(E_Order *eo, Efreet_Desktop *desktop); -EAPI void e_order_prepend_relative(E_Order *eo, Efreet_Desktop *desktop, Efreet_Desktop *before); -EAPI void e_order_files_append(E_Order *eo, Eina_List *files); -EAPI void e_order_files_prepend_relative(E_Order *eo, Eina_List *files, Efreet_Desktop *before); -EAPI void e_order_clear(E_Order *eo); -EAPI E_Order *e_order_clone(const E_Order *eo); +E_API E_Order *e_order_new(const char *path); +E_API void e_order_update_callback_set(E_Order *eo, void (*cb)(void *data, E_Order *eo), void *data); + +E_API void e_order_remove(E_Order *eo, Efreet_Desktop *desktop); +E_API void e_order_append(E_Order *eo, Efreet_Desktop *desktop); +E_API void e_order_prepend_relative(E_Order *eo, Efreet_Desktop *desktop, Efreet_Desktop *before); +E_API void e_order_files_append(E_Order *eo, Eina_List *files); +E_API void e_order_files_prepend_relative(E_Order *eo, Eina_List *files, Efreet_Desktop *before); +E_API void e_order_clear(E_Order *eo); +E_API E_Order *e_order_clone(const E_Order *eo); #endif #endif diff --git a/src/bin/e_pan.c b/src/bin/e_pan.c index 5183c4d..ac894a3 100644 --- a/src/bin/e_pan.c +++ b/src/bin/e_pan.c @@ -32,14 +32,14 @@ static void _e_smart_init(void); static Evas_Smart *_e_smart = NULL; /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_pan_add(Evas *evas) { _e_smart_init(); return evas_object_smart_add(evas, _e_smart); } -EAPI void +E_API void e_pan_child_set(Evas_Object *obj, Evas_Object *child) { API_ENTRY return; @@ -75,14 +75,14 @@ e_pan_child_set(Evas_Object *obj, Evas_Object *child) evas_object_smart_callback_call(sd->smart_obj, "changed", NULL); } -EAPI Evas_Object * +E_API Evas_Object * e_pan_child_get(Evas_Object *obj) { API_ENTRY return NULL; return sd->child_obj; } -EAPI void +E_API void e_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { API_ENTRY return; @@ -97,7 +97,7 @@ e_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) evas_object_smart_callback_call(sd->smart_obj, "changed", NULL); } -EAPI void +E_API void e_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) { API_ENTRY return; @@ -105,7 +105,7 @@ e_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) if (y) *y = sd->py; } -EAPI void +E_API void e_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) { API_ENTRY return; @@ -121,7 +121,7 @@ e_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) } } -EAPI void +E_API void e_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { API_ENTRY return; diff --git a/src/bin/e_pan.h b/src/bin/e_pan.h index ddc6aea..6966bbc 100644 --- a/src/bin/e_pan.h +++ b/src/bin/e_pan.h @@ -3,13 +3,13 @@ #ifndef E_PAN_H #define E_PAN_H -EAPI Evas_Object *e_pan_add (Evas *evas); -EAPI void e_pan_child_set (Evas_Object *obj, Evas_Object *child); -EAPI Evas_Object *e_pan_child_get (Evas_Object *obj); -EAPI void e_pan_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y); -EAPI void e_pan_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); -EAPI void e_pan_max_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); -EAPI void e_pan_child_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); +E_API Evas_Object *e_pan_add (Evas *evas); +E_API void e_pan_child_set (Evas_Object *obj, Evas_Object *child); +E_API Evas_Object *e_pan_child_get (Evas_Object *obj); +E_API void e_pan_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y); +E_API void e_pan_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); +E_API void e_pan_max_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); +E_API void e_pan_child_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); #endif #endif diff --git a/src/bin/e_path.c b/src/bin/e_path.c index f19a533..b4b5484 100644 --- a/src/bin/e_path.c +++ b/src/bin/e_path.c @@ -6,7 +6,7 @@ static void _e_path_cache_free(E_Path *ep); static Eina_Bool _e_path_cache_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata); /* externally accessible functions */ -EAPI E_Path * +E_API E_Path * e_path_new(void) { E_Path *ep; @@ -15,7 +15,7 @@ e_path_new(void) return ep; } -EAPI void +E_API void e_path_default_path_append(E_Path *ep, const char *path) { E_OBJECT_CHECK(ep); @@ -58,7 +58,7 @@ e_path_default_path_append(E_Path *ep, const char *path) _e_path_cache_free(ep); } -EAPI void +E_API void e_path_user_path_set(E_Path *ep, Eina_List **user_dir_list) { E_OBJECT_CHECK(ep); @@ -68,7 +68,7 @@ e_path_user_path_set(E_Path *ep, Eina_List **user_dir_list) _e_path_cache_free(ep); } -EAPI void +E_API void e_path_user_path_append(E_Path *ep, const char *path) { E_OBJECT_CHECK(ep); @@ -111,7 +111,7 @@ e_path_user_path_append(E_Path *ep, const char *path) _e_path_cache_free(ep); } -EAPI void +E_API void e_path_user_path_prepend(E_Path *ep, const char *path) { E_OBJECT_CHECK(ep); @@ -154,7 +154,7 @@ e_path_user_path_prepend(E_Path *ep, const char *path) _e_path_cache_free(ep); } -EAPI void +E_API void e_path_user_path_remove(E_Path *ep, const char *path) { Eina_List *l; @@ -214,7 +214,7 @@ e_path_user_path_remove(E_Path *ep, const char *path) } } -EAPI void +E_API void e_path_user_path_clear(E_Path *ep) { E_Path_Dir *epd; @@ -226,7 +226,7 @@ e_path_user_path_clear(E_Path *ep) _e_path_cache_free(ep); } -EAPI Eina_Stringshare * +E_API Eina_Stringshare * e_path_find(E_Path *ep, const char *file) { Eina_List *l; @@ -280,7 +280,7 @@ e_path_find(E_Path *ep, const char *file) return NULL; } -EAPI void +E_API void e_path_evas_append(E_Path *ep, Evas *evas) { Eina_List *dir_list; @@ -301,7 +301,7 @@ e_path_evas_append(E_Path *ep, Evas *evas) } /* combine default_list and and user_list in and easy to use list */ -EAPI Eina_List * +E_API Eina_List * e_path_dir_list_get(E_Path *ep) { Eina_List *dir_list; @@ -331,7 +331,7 @@ e_path_dir_list_get(E_Path *ep) return dir_list; } -EAPI void +E_API void e_path_dir_list_free(Eina_List *dir_list) { E_Path_Dir *epd; diff --git a/src/bin/e_path.h b/src/bin/e_path.h index 421761d..7bf6e2f 100644 --- a/src/bin/e_path.h +++ b/src/bin/e_path.h @@ -26,20 +26,20 @@ struct _E_Path }; /* init and setup */ -EAPI E_Path *e_path_new(void); -EAPI void e_path_user_path_set(E_Path *ep, Eina_List **user_dir_list); -EAPI void e_path_inherit_path_set(E_Path *ep, E_Path *path_inherit); +E_API E_Path *e_path_new(void); +E_API void e_path_user_path_set(E_Path *ep, Eina_List **user_dir_list); +E_API void e_path_inherit_path_set(E_Path *ep, E_Path *path_inherit); /* append a hardcoded path */ -EAPI void e_path_default_path_append(E_Path *ep, const char *path); +E_API void e_path_default_path_append(E_Path *ep, const char *path); /* e_config path manipulation */ -EAPI void e_path_user_path_append(E_Path *ep, const char *path); -EAPI void e_path_user_path_prepend(E_Path *ep, const char *path); -EAPI void e_path_user_path_remove(E_Path *ep, const char *path); -EAPI void e_path_user_path_clear(E_Path *ep); -EAPI Eina_Stringshare *e_path_find(E_Path *ep, const char *file); -EAPI void e_path_evas_append(E_Path *ep, Evas *evas); -EAPI Eina_List *e_path_dir_list_get(E_Path *ep); -EAPI void e_path_dir_list_free(Eina_List *dir_list); +E_API void e_path_user_path_append(E_Path *ep, const char *path); +E_API void e_path_user_path_prepend(E_Path *ep, const char *path); +E_API void e_path_user_path_remove(E_Path *ep, const char *path); +E_API void e_path_user_path_clear(E_Path *ep); +E_API Eina_Stringshare *e_path_find(E_Path *ep, const char *file); +E_API void e_path_evas_append(E_Path *ep, Evas *evas); +E_API Eina_List *e_path_dir_list_get(E_Path *ep); +E_API void e_path_dir_list_free(Eina_List *dir_list); #endif #endif diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c index eff8887..fe6be07 100644 --- a/src/bin/e_pixmap.c +++ b/src/bin/e_pixmap.c @@ -173,7 +173,7 @@ _e_pixmap_find(E_Pixmap_Type type, va_list *l) return NULL; } -EAPI int +E_API int e_pixmap_free(E_Pixmap *cp) { if (!cp) return 0; @@ -183,7 +183,7 @@ e_pixmap_free(E_Pixmap *cp) return 0; } -EAPI E_Pixmap * +E_API E_Pixmap * e_pixmap_ref(E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, NULL); @@ -191,7 +191,7 @@ e_pixmap_ref(E_Pixmap *cp) return cp; } -EAPI E_Pixmap * +E_API E_Pixmap * e_pixmap_new(E_Pixmap_Type type, ...) { E_Pixmap *cp = NULL; @@ -251,14 +251,14 @@ e_pixmap_new(E_Pixmap_Type type, ...) return cp; } -EAPI E_Pixmap_Type +E_API E_Pixmap_Type e_pixmap_type_get(const E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, 9999); return cp->type; } -EAPI void +E_API void e_pixmap_parent_window_set(E_Pixmap *cp, Ecore_Window win) { EINA_SAFETY_ON_NULL_RETURN(cp); @@ -270,7 +270,7 @@ e_pixmap_parent_window_set(E_Pixmap *cp, Ecore_Window win) cp->parent = win; } -EAPI void +E_API void e_pixmap_visual_cmap_set(E_Pixmap *cp, void *visual, unsigned int cmap) { EINA_SAFETY_ON_NULL_RETURN(cp); @@ -284,7 +284,7 @@ e_pixmap_visual_cmap_set(E_Pixmap *cp, void *visual, unsigned int cmap) #endif } -EAPI void * +E_API void * e_pixmap_visual_get(const E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, NULL); @@ -295,28 +295,28 @@ e_pixmap_visual_get(const E_Pixmap *cp) return NULL; } -EAPI void +E_API void e_pixmap_usable_set(E_Pixmap *cp, Eina_Bool set) { EINA_SAFETY_ON_NULL_RETURN(cp); cp->usable = !!set; } -EAPI Eina_Bool +E_API Eina_Bool e_pixmap_usable_get(const E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE); return cp->usable; } -EAPI Eina_Bool +E_API Eina_Bool e_pixmap_dirty_get(E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE); return cp->dirty; } -EAPI void +E_API void e_pixmap_clear(E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN(cp); @@ -324,14 +324,14 @@ e_pixmap_clear(E_Pixmap *cp) cp->dirty = EINA_TRUE; } -EAPI void +E_API void e_pixmap_dirty(E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN(cp); cp->dirty = 1; } -EAPI Eina_Bool +E_API Eina_Bool e_pixmap_refresh(E_Pixmap *cp) { Eina_Bool success = EINA_FALSE; @@ -405,7 +405,7 @@ e_pixmap_refresh(E_Pixmap *cp) return success; } -EAPI Eina_Bool +E_API Eina_Bool e_pixmap_size_changed(E_Pixmap *cp, int w, int h) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE); @@ -413,7 +413,7 @@ e_pixmap_size_changed(E_Pixmap *cp, int w, int h) return (w != cp->w) || (h != cp->h); } -EAPI Eina_Bool +E_API Eina_Bool e_pixmap_size_get(E_Pixmap *cp, int *w, int *h) { if (w) *w = 0; @@ -424,14 +424,14 @@ e_pixmap_size_get(E_Pixmap *cp, int *w, int *h) return (cp->w > 0) && (cp->h > 0); } -EAPI unsigned int +E_API unsigned int e_pixmap_failures_get(const E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, 0); return cp->failures; } -EAPI void +E_API void e_pixmap_client_set(E_Pixmap *cp, E_Client *ec) { EINA_SAFETY_ON_NULL_RETURN(cp); @@ -439,14 +439,14 @@ e_pixmap_client_set(E_Pixmap *cp, E_Client *ec) cp->client = ec; } -EAPI E_Client * +E_API E_Client * e_pixmap_client_get(E_Pixmap *cp) { if (!cp) return NULL; return cp->client; } -EAPI E_Pixmap * +E_API E_Pixmap * e_pixmap_find(E_Pixmap_Type type, ...) { va_list l; @@ -458,7 +458,7 @@ e_pixmap_find(E_Pixmap_Type type, ...) return cp; } -EAPI E_Client * +E_API E_Client * e_pixmap_find_client(E_Pixmap_Type type, ...) { va_list l; @@ -470,14 +470,14 @@ e_pixmap_find_client(E_Pixmap_Type type, ...) return (!cp) ? NULL : cp->client; } -EAPI uint64_t +E_API uint64_t e_pixmap_window_get(E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, 0); return cp->win; } -EAPI void * +E_API void * e_pixmap_resource_get(E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, NULL); @@ -492,7 +492,7 @@ e_pixmap_resource_get(E_Pixmap *cp) return NULL; } -EAPI void +E_API void e_pixmap_resource_set(E_Pixmap *cp, void *resource) { if ((!cp) || (cp->type != E_PIXMAP_TYPE_WL)) return; @@ -548,14 +548,14 @@ e_pixmap_resource_set(E_Pixmap *cp, void *resource) #endif } -EAPI Ecore_Window +E_API Ecore_Window e_pixmap_parent_window_get(E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, 0); return cp->parent; } -EAPI Eina_Bool +E_API Eina_Bool e_pixmap_native_surface_init(E_Pixmap *cp, Evas_Native_Surface *ns) { Eina_Bool ret = EINA_FALSE; @@ -594,7 +594,7 @@ e_pixmap_native_surface_init(E_Pixmap *cp, Evas_Native_Surface *ns) return ret; } -EAPI void +E_API void e_pixmap_image_clear(E_Pixmap *cp, Eina_Bool cache) { EINA_SAFETY_ON_NULL_RETURN(cp); @@ -652,7 +652,7 @@ e_pixmap_image_clear(E_Pixmap *cp, Eina_Bool cache) } } -EAPI Eina_Bool +E_API Eina_Bool e_pixmap_image_refresh(E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE); @@ -692,7 +692,7 @@ e_pixmap_image_refresh(E_Pixmap *cp) return EINA_FALSE; } -EAPI Eina_Bool +E_API Eina_Bool e_pixmap_image_exists(const E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE); @@ -708,7 +708,7 @@ e_pixmap_image_exists(const E_Pixmap *cp) return EINA_FALSE; } -EAPI Eina_Bool +E_API Eina_Bool e_pixmap_image_is_argb(const E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE); @@ -728,7 +728,7 @@ e_pixmap_image_is_argb(const E_Pixmap *cp) return EINA_FALSE; } -EAPI void * +E_API void * e_pixmap_image_data_get(E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, NULL); @@ -752,7 +752,7 @@ e_pixmap_image_data_get(E_Pixmap *cp) return NULL; } -EAPI Eina_Bool +E_API Eina_Bool e_pixmap_image_data_argb_convert(E_Pixmap *cp, void *pix, void *ipix, Eina_Rectangle *r, int stride) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE); @@ -808,7 +808,7 @@ e_pixmap_image_data_argb_convert(E_Pixmap *cp, void *pix, void *ipix, Eina_Recta return EINA_FALSE; } -EAPI Eina_Bool +E_API Eina_Bool e_pixmap_image_draw(E_Pixmap *cp, const Eina_Rectangle *r) { EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE); @@ -832,7 +832,7 @@ e_pixmap_image_draw(E_Pixmap *cp, const Eina_Rectangle *r) return EINA_FALSE; } -EAPI void +E_API void e_pixmap_image_draw_done(E_Pixmap *cp) { EINA_SAFETY_ON_NULL_RETURN(cp); @@ -847,7 +847,7 @@ e_pixmap_image_draw_done(E_Pixmap *cp) #endif } -EAPI void +E_API void e_pixmap_image_opaque_set(E_Pixmap *cp, int x, int y, int w, int h) { EINA_SAFETY_ON_NULL_RETURN(cp); @@ -861,7 +861,7 @@ e_pixmap_image_opaque_set(E_Pixmap *cp, int x, int y, int w, int h) #endif } -EAPI void +E_API void e_pixmap_image_opaque_get(E_Pixmap *cp, int *x, int *y, int *w, int *h) { EINA_SAFETY_ON_NULL_RETURN(cp); diff --git a/src/bin/e_pixmap.h b/src/bin/e_pixmap.h index 3ee277e..98ffe4a 100644 --- a/src/bin/e_pixmap.h +++ b/src/bin/e_pixmap.h @@ -13,41 +13,41 @@ typedef enum # ifndef E_PIXMAP_H # define E_PIXMAP_H -EAPI int e_pixmap_free(E_Pixmap *cp); -EAPI E_Pixmap *e_pixmap_ref(E_Pixmap *cp); -EAPI E_Pixmap *e_pixmap_new(E_Pixmap_Type type, ...); -EAPI E_Pixmap_Type e_pixmap_type_get(const E_Pixmap *cp); -EAPI void *e_pixmap_resource_get(E_Pixmap *cp); -EAPI void e_pixmap_resource_set(E_Pixmap *cp, void *resource); -EAPI void e_pixmap_parent_window_set(E_Pixmap *cp, Ecore_Window win); -EAPI void e_pixmap_visual_cmap_set(E_Pixmap *cp, void *visual, unsigned int cmap); -EAPI unsigned int e_pixmap_failures_get(const E_Pixmap *cp); -EAPI void *e_pixmap_visual_get(const E_Pixmap *cp); -EAPI Eina_Bool e_pixmap_dirty_get(E_Pixmap *cp); -EAPI void e_pixmap_clear(E_Pixmap *cp); -EAPI void e_pixmap_usable_set(E_Pixmap *cp, Eina_Bool set); -EAPI Eina_Bool e_pixmap_usable_get(const E_Pixmap *cp); -EAPI void e_pixmap_dirty(E_Pixmap *cp); -EAPI Eina_Bool e_pixmap_refresh(E_Pixmap *cp); -EAPI Eina_Bool e_pixmap_size_changed(E_Pixmap *cp, int w, int h); -EAPI Eina_Bool e_pixmap_size_get(E_Pixmap *cp, int *w, int *h); -EAPI void e_pixmap_client_set(E_Pixmap *cp, E_Client *ec); -EAPI E_Client *e_pixmap_client_get(E_Pixmap *cp); -EAPI E_Pixmap *e_pixmap_find(E_Pixmap_Type type, ...); -EAPI E_Client *e_pixmap_find_client(E_Pixmap_Type type, ...); -EAPI uint64_t e_pixmap_window_get(E_Pixmap *cp); -EAPI Ecore_Window e_pixmap_parent_window_get(E_Pixmap *cp); -EAPI Eina_Bool e_pixmap_native_surface_init(E_Pixmap *cp, Evas_Native_Surface *ns); -EAPI void e_pixmap_image_clear(E_Pixmap *cp, Eina_Bool cache); -EAPI Eina_Bool e_pixmap_image_refresh(E_Pixmap *cp); -EAPI Eina_Bool e_pixmap_image_exists(const E_Pixmap *cp); -EAPI Eina_Bool e_pixmap_image_is_argb(const E_Pixmap *cp); -EAPI void *e_pixmap_image_data_get(E_Pixmap *cp); -EAPI Eina_Bool e_pixmap_image_data_argb_convert(E_Pixmap *cp, void *pix, void *ipix, Eina_Rectangle *r, int stride); -EAPI Eina_Bool e_pixmap_image_draw(E_Pixmap *cp, const Eina_Rectangle *r); - -EAPI void e_pixmap_image_opaque_set(E_Pixmap *cp, int x, int y, int w, int h); -EAPI void e_pixmap_image_opaque_get(E_Pixmap *cp, int *x, int *y, int *w, int *h); +E_API int e_pixmap_free(E_Pixmap *cp); +E_API E_Pixmap *e_pixmap_ref(E_Pixmap *cp); +E_API E_Pixmap *e_pixmap_new(E_Pixmap_Type type, ...); +E_API E_Pixmap_Type e_pixmap_type_get(const E_Pixmap *cp); +E_API void *e_pixmap_resource_get(E_Pixmap *cp); +E_API void e_pixmap_resource_set(E_Pixmap *cp, void *resource); +E_API void e_pixmap_parent_window_set(E_Pixmap *cp, Ecore_Window win); +E_API void e_pixmap_visual_cmap_set(E_Pixmap *cp, void *visual, unsigned int cmap); +E_API unsigned int e_pixmap_failures_get(const E_Pixmap *cp); +E_API void *e_pixmap_visual_get(const E_Pixmap *cp); +E_API Eina_Bool e_pixmap_dirty_get(E_Pixmap *cp); +E_API void e_pixmap_clear(E_Pixmap *cp); +E_API void e_pixmap_usable_set(E_Pixmap *cp, Eina_Bool set); +E_API Eina_Bool e_pixmap_usable_get(const E_Pixmap *cp); +E_API void e_pixmap_dirty(E_Pixmap *cp); +E_API Eina_Bool e_pixmap_refresh(E_Pixmap *cp); +E_API Eina_Bool e_pixmap_size_changed(E_Pixmap *cp, int w, int h); +E_API Eina_Bool e_pixmap_size_get(E_Pixmap *cp, int *w, int *h); +E_API void e_pixmap_client_set(E_Pixmap *cp, E_Client *ec); +E_API E_Client *e_pixmap_client_get(E_Pixmap *cp); +E_API E_Pixmap *e_pixmap_find(E_Pixmap_Type type, ...); +E_API E_Client *e_pixmap_find_client(E_Pixmap_Type type, ...); +E_API uint64_t e_pixmap_window_get(E_Pixmap *cp); +E_API Ecore_Window e_pixmap_parent_window_get(E_Pixmap *cp); +E_API Eina_Bool e_pixmap_native_surface_init(E_Pixmap *cp, Evas_Native_Surface *ns); +E_API void e_pixmap_image_clear(E_Pixmap *cp, Eina_Bool cache); +E_API Eina_Bool e_pixmap_image_refresh(E_Pixmap *cp); +E_API Eina_Bool e_pixmap_image_exists(const E_Pixmap *cp); +E_API Eina_Bool e_pixmap_image_is_argb(const E_Pixmap *cp); +E_API void *e_pixmap_image_data_get(E_Pixmap *cp); +E_API Eina_Bool e_pixmap_image_data_argb_convert(E_Pixmap *cp, void *pix, void *ipix, Eina_Rectangle *r, int stride); +E_API Eina_Bool e_pixmap_image_draw(E_Pixmap *cp, const Eina_Rectangle *r); + +E_API void e_pixmap_image_opaque_set(E_Pixmap *cp, int x, int y, int w, int h); +E_API void e_pixmap_image_opaque_get(E_Pixmap *cp, int *x, int *y, int *w, int *h); static inline Eina_Bool e_pixmap_is_x(const E_Pixmap *cp) diff --git a/src/bin/e_place.c b/src/bin/e_place.c index e35496f..628c000 100644 --- a/src/bin/e_place.c +++ b/src/bin/e_place.c @@ -1,6 +1,6 @@ #include "e.h" -EAPI void +E_API void e_place_zone_region_smart_cleanup(E_Zone *zone) { E_Desk *desk; @@ -122,7 +122,7 @@ _e_place_coverage_shelf_add(E_Desk *desk, int ar, int x, int y, int w, int h) return ar; } -EAPI int +E_API int e_place_desk_region_smart(E_Desk *desk, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry) { int a_w = 0, a_h = 0, a_alloc_w = 0, a_alloc_h = 0; @@ -433,14 +433,14 @@ done: return 1; } -EAPI int +E_API int e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry) { return e_place_desk_region_smart(e_desk_current_get(zone), skiplist, x, y, w, h, rx, ry); } -EAPI int +E_API int e_place_zone_cursor(E_Zone *zone, int x EINA_UNUSED, int y EINA_UNUSED, int w, int h, int it, int *rx, int *ry) { int cursor_x = 0, cursor_y = 0; @@ -470,7 +470,7 @@ e_place_zone_cursor(E_Zone *zone, int x EINA_UNUSED, int y EINA_UNUSED, int w, i return 1; } -EAPI int +E_API int e_place_zone_manual(E_Zone *zone, int w, int h, int *rx, int *ry) { int cursor_x = 0, cursor_y = 0; diff --git a/src/bin/e_place.h b/src/bin/e_place.h index 4787446..bb5be25 100644 --- a/src/bin/e_place.h +++ b/src/bin/e_place.h @@ -3,11 +3,11 @@ #ifndef E_PLACE_H #define E_PLACE_H -EAPI void e_place_zone_region_smart_cleanup(E_Zone *zone); -EAPI int e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry); -EAPI int e_place_desk_region_smart(E_Desk *desk, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry); -EAPI int e_place_zone_cursor(E_Zone *zone, int x, int y, int w, int h, int it, int *rx, int *ry); -EAPI int e_place_zone_manual(E_Zone *zone, int w, int h, int *rx, int *ry); +E_API void e_place_zone_region_smart_cleanup(E_Zone *zone); +E_API int e_place_zone_region_smart(E_Zone *zone, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry); +E_API int e_place_desk_region_smart(E_Desk *desk, Eina_List *skiplist, int x, int y, int w, int h, int *rx, int *ry); +E_API int e_place_zone_cursor(E_Zone *zone, int x, int y, int w, int h, int it, int *rx, int *ry); +E_API int e_place_zone_manual(E_Zone *zone, int w, int h, int *rx, int *ry); #endif #endif diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c index a36d1e0..696658a 100644 --- a/src/bin/e_pointer.c +++ b/src/bin/e_pointer.c @@ -463,7 +463,7 @@ e_pointer_shutdown(void) return 1; } -EAPI E_Pointer * +E_API E_Pointer * e_pointer_window_new(Ecore_Window win, Eina_Bool filled) { E_Pointer *ptr = NULL; @@ -491,7 +491,7 @@ e_pointer_window_new(Ecore_Window win, Eina_Bool filled) return ptr; } -EAPI E_Pointer * +E_API E_Pointer * e_pointer_canvas_new(Ecore_Evas *ee, Eina_Bool filled) { E_Pointer *ptr = NULL; @@ -534,7 +534,7 @@ e_pointer_canvas_new(Ecore_Evas *ee, Eina_Bool filled) return ptr; } -EAPI void +E_API void e_pointers_size_set(int size) { Eina_List *l; @@ -560,7 +560,7 @@ e_pointers_size_set(int size) } } -EAPI void +E_API void e_pointer_hide(E_Pointer *ptr) { if ((ptr->evas) && (!ptr->canvas)) @@ -572,7 +572,7 @@ e_pointer_hide(E_Pointer *ptr) #endif } -EAPI void +E_API void e_pointer_type_push(E_Pointer *ptr, void *obj, const char *type) { E_Pointer_Stack *stack; @@ -587,7 +587,7 @@ e_pointer_type_push(E_Pointer *ptr, void *obj, const char *type) ptr->stack = eina_list_prepend(ptr->stack, stack); } -EAPI void +E_API void e_pointer_type_pop(E_Pointer *ptr, void *obj, const char *type) { Eina_List *l, *ll; @@ -620,7 +620,7 @@ e_pointer_type_pop(E_Pointer *ptr, void *obj, const char *type) eina_stringshare_refplace(&ptr->type, stack->type); } -EAPI void +E_API void e_pointer_mode_push(void *obj, E_Pointer_Mode mode) { switch (mode) @@ -665,7 +665,7 @@ e_pointer_mode_push(void *obj, E_Pointer_Mode mode) } } -EAPI void +E_API void e_pointer_mode_pop(void *obj, E_Pointer_Mode mode) { switch (mode) @@ -710,7 +710,7 @@ e_pointer_mode_pop(void *obj, E_Pointer_Mode mode) } } -EAPI void +E_API void e_pointer_idler_before(void) { Eina_List *l; @@ -747,7 +747,7 @@ e_pointer_idler_before(void) } } -EAPI void +E_API void e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int y) { Evas_Object *o; diff --git a/src/bin/e_pointer.h b/src/bin/e_pointer.h index 0535474..ba38398 100644 --- a/src/bin/e_pointer.h +++ b/src/bin/e_pointer.h @@ -59,16 +59,16 @@ struct _E_Pointer EINTERN int e_pointer_init(void); EINTERN int e_pointer_shutdown(void); -EAPI E_Pointer *e_pointer_window_new(Ecore_Window win, Eina_Bool filled); -EAPI E_Pointer *e_pointer_canvas_new(Ecore_Evas *ee, Eina_Bool filled); +E_API E_Pointer *e_pointer_window_new(Ecore_Window win, Eina_Bool filled); +E_API E_Pointer *e_pointer_canvas_new(Ecore_Evas *ee, Eina_Bool filled); -EAPI void e_pointers_size_set(int size); -EAPI void e_pointer_hide(E_Pointer *ptr); -EAPI void e_pointer_type_push(E_Pointer *ptr, void *obj, const char *type); -EAPI void e_pointer_type_pop(E_Pointer *ptr, void *obj, const char *type); -EAPI void e_pointer_mode_push(void *obj, E_Pointer_Mode mode); -EAPI void e_pointer_mode_pop(void *obj, E_Pointer_Mode mode); -EAPI void e_pointer_idler_before(void); -EAPI void e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int y); +E_API void e_pointers_size_set(int size); +E_API void e_pointer_hide(E_Pointer *ptr); +E_API void e_pointer_type_push(E_Pointer *ptr, void *obj, const char *type); +E_API void e_pointer_type_pop(E_Pointer *ptr, void *obj, const char *type); +E_API void e_pointer_mode_push(void *obj, E_Pointer_Mode mode); +E_API void e_pointer_mode_pop(void *obj, E_Pointer_Mode mode); +E_API void e_pointer_idler_before(void); +E_API void e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int x, int y); # endif #endif diff --git a/src/bin/e_powersave.c b/src/bin/e_powersave.c index d3c81cc..d51c082 100644 --- a/src/bin/e_powersave.c +++ b/src/bin/e_powersave.c @@ -13,8 +13,8 @@ static void _e_powersave_mode_eval(void); static void _e_powersave_event_update_free(void *data EINA_UNUSED, void *event); /* local subsystem globals */ -EAPI int E_EVENT_POWERSAVE_UPDATE = 0; -EAPI int E_EVENT_POWERSAVE_CONFIG_UPDATE = 0; +E_API int E_EVENT_POWERSAVE_UPDATE = 0; +E_API int E_EVENT_POWERSAVE_CONFIG_UPDATE = 0; static int walking_deferred_actions = 0; static Eina_List *deferred_actions = NULL; static Ecore_Timer *deferred_timer = NULL; @@ -37,7 +37,7 @@ e_powersave_shutdown(void) return 1; } -EAPI E_Powersave_Deferred_Action * +E_API E_Powersave_Deferred_Action * e_powersave_deferred_action_add(void (*func)(void *data), const void *data) { E_Powersave_Deferred_Action *pa; @@ -54,7 +54,7 @@ e_powersave_deferred_action_add(void (*func)(void *data), const void *data) return pa; } -EAPI void +E_API void e_powersave_deferred_action_del(E_Powersave_Deferred_Action *pa) { if (walking_deferred_actions) @@ -77,7 +77,7 @@ e_powersave_deferred_action_del(E_Powersave_Deferred_Action *pa) } } -EAPI void +E_API void e_powersave_mode_set(E_Powersave_Mode mode) { E_Event_Powersave_Update *ev; @@ -95,19 +95,19 @@ e_powersave_mode_set(E_Powersave_Mode mode) _e_powersave_mode_eval(); } -EAPI E_Powersave_Mode +E_API E_Powersave_Mode e_powersave_mode_get(void) { return powersave_mode; } -EAPI E_Powersave_Mode +E_API E_Powersave_Mode e_powersave_mode_min_get(void) { return e_config->powersave.min; } -EAPI E_Powersave_Mode +E_API E_Powersave_Mode e_powersave_mode_max_get(void) { return e_config->powersave.max; diff --git a/src/bin/e_powersave.h b/src/bin/e_powersave.h index b640da2..97791a4 100644 --- a/src/bin/e_powersave.h +++ b/src/bin/e_powersave.h @@ -16,8 +16,8 @@ typedef struct _E_Event_Powersave_Update E_Event_Powersave_Update; #ifndef E_POWERSAVE_H #define E_POWERSAVE_H -extern EAPI int E_EVENT_POWERSAVE_UPDATE; -extern EAPI int E_EVENT_POWERSAVE_CONFIG_UPDATE; +extern E_API int E_EVENT_POWERSAVE_UPDATE; +extern E_API int E_EVENT_POWERSAVE_CONFIG_UPDATE; struct _E_Event_Powersave_Update { @@ -27,10 +27,10 @@ struct _E_Event_Powersave_Update EINTERN int e_powersave_init(void); EINTERN int e_powersave_shutdown(void); -EAPI E_Powersave_Deferred_Action *e_powersave_deferred_action_add(void (*func) (void *data), const void *data); -EAPI void e_powersave_deferred_action_del(E_Powersave_Deferred_Action *pa); -EAPI void e_powersave_mode_set(E_Powersave_Mode mode); -EAPI E_Powersave_Mode e_powersave_mode_get(void); +E_API E_Powersave_Deferred_Action *e_powersave_deferred_action_add(void (*func) (void *data), const void *data); +E_API void e_powersave_deferred_action_del(E_Powersave_Deferred_Action *pa); +E_API void e_powersave_mode_set(E_Powersave_Mode mode); +E_API E_Powersave_Mode e_powersave_mode_get(void); /* FIXME: in the powersave system add things like pre-loading entire files * int memory for pre-caching to avoid disk spinup, when in an appropriate diff --git a/src/bin/e_prefix.c b/src/bin/e_prefix.c index 583073a..b32fbd6 100644 --- a/src/bin/e_prefix.c +++ b/src/bin/e_prefix.c @@ -6,7 +6,7 @@ static const char *_prefix_path_data = NULL; static unsigned int _prefix_path_data_len = 0; /* externally accessible functions */ -EAPI int +E_API int e_prefix_determine(char *argv0) { if (pfx) return 1; @@ -60,54 +60,54 @@ e_prefix_shutdown(void) pfx = NULL; } -EAPI void +E_API void e_prefix_fallback(void) { } -EAPI const char * +E_API const char * e_prefix_get(void) { return eina_prefix_get(pfx); } -EAPI const char * +E_API const char * e_prefix_locale_get(void) { return eina_prefix_locale_get(pfx); } -EAPI const char * +E_API const char * e_prefix_bin_get(void) { return eina_prefix_bin_get(pfx); } -EAPI const char * +E_API const char * e_prefix_data_get(void) { return eina_prefix_data_get(pfx); } -EAPI const char * +E_API const char * e_prefix_lib_get(void) { return eina_prefix_lib_get(pfx); } -EAPI size_t +E_API size_t e_prefix_data_concat_len(char *dst, size_t size, const char *path, size_t path_len) { return eina_str_join_len(dst, size, '/', _prefix_path_data, _prefix_path_data_len, path, path_len); } -EAPI size_t +E_API size_t e_prefix_data_concat(char *dst, size_t size, const char *path) { return e_prefix_data_concat_len(dst, size, path, strlen(path)); } -EAPI size_t +E_API size_t e_prefix_data_snprintf(char *dst, size_t size, const char *fmt, ...) { size_t off, ret; diff --git a/src/bin/e_prefix.h b/src/bin/e_prefix.h index d2aa994..03be4a9 100644 --- a/src/bin/e_prefix.h +++ b/src/bin/e_prefix.h @@ -4,18 +4,18 @@ #ifndef E_PREFIX_H #define E_PREFIX_H -EAPI int e_prefix_determine(char *argv0); +E_API int e_prefix_determine(char *argv0); EINTERN void e_prefix_shutdown(void); -EAPI void e_prefix_fallback(void); -EAPI const char *e_prefix_get(void); -EAPI const char *e_prefix_locale_get(void); -EAPI const char *e_prefix_bin_get(void); -EAPI const char *e_prefix_data_get(void); -EAPI const char *e_prefix_lib_get(void); +E_API void e_prefix_fallback(void); +E_API const char *e_prefix_get(void); +E_API const char *e_prefix_locale_get(void); +E_API const char *e_prefix_bin_get(void); +E_API const char *e_prefix_data_get(void); +E_API const char *e_prefix_lib_get(void); -EAPI size_t e_prefix_data_concat_len(char *dst, size_t size, const char *path, size_t path_len); -EAPI size_t e_prefix_data_concat(char *dst, size_t size, const char *path); -EAPI size_t e_prefix_data_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3, 4); +E_API size_t e_prefix_data_concat_len(char *dst, size_t size, const char *path, size_t path_len); +E_API size_t e_prefix_data_concat(char *dst, size_t size, const char *path); +E_API size_t e_prefix_data_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3, 4); #define e_prefix_data_concat_static(dst, path) e_prefix_data_concat_len(dst, sizeof(dst), path, (sizeof(path) > 0) ? sizeof(path) - 1 : 0) diff --git a/src/bin/e_randr2.c b/src/bin/e_randr2.c index 61ddb99..ddf8c60 100644 --- a/src/bin/e_randr2.c +++ b/src/bin/e_randr2.c @@ -35,10 +35,10 @@ static Eina_Bool event_screen = EINA_FALSE; static Eina_Bool event_ignore = EINA_FALSE; ///////////////////////////////////////////////////////////////////////// -EAPI E_Config_Randr2 *e_randr2_cfg = NULL; -EAPI E_Randr2 *e_randr2 = NULL; +E_API E_Config_Randr2 *e_randr2_cfg = NULL; +E_API E_Randr2 *e_randr2 = NULL; -EAPI int E_EVENT_RANDR_CHANGE = 0; +E_API int E_EVENT_RANDR_CHANGE = 0; ///////////////////////////////////////////////////////////////////////// EINTERN Eina_Bool @@ -122,20 +122,20 @@ e_randr2_shutdown(void) return 1; } -EAPI Eina_Bool +E_API Eina_Bool e_randr2_config_save(void) { // save our config return _config_save(e_randr2, e_randr2_cfg); } -EAPI void +E_API void e_randr2_config_apply(void) { _animated_apply(); } -EAPI void +E_API void e_randr2_screeninfo_update(void) { // re-fetch/update current screen info @@ -859,7 +859,7 @@ _screen_sort_cb(const void *data1, const void *data2) return dif; } -EAPI void +E_API void e_randr2_screen_refresh_queue(Eina_Bool lid_event) { // delay handling of screen shances as they can come in in a series over @@ -871,7 +871,7 @@ e_randr2_screen_refresh_queue(Eina_Bool lid_event) event_screen |= !!lid_event; } -EAPI E_Config_Randr2_Screen * +E_API E_Config_Randr2_Screen * e_randr2_config_screen_find(E_Randr2_Screen *s, E_Config_Randr2 *cfg) { Eina_List *l; @@ -887,7 +887,7 @@ e_randr2_config_screen_find(E_Randr2_Screen *s, E_Config_Randr2 *cfg) return NULL; } -EAPI void +E_API void e_randr2_screens_setup(int rw, int rh) { int i; diff --git a/src/bin/e_randr2.h b/src/bin/e_randr2.h index 870734f..779be2a 100644 --- a/src/bin/e_randr2.h +++ b/src/bin/e_randr2.h @@ -109,19 +109,19 @@ struct _E_Config_Randr2_Screen unsigned char enabled; }; -extern EAPI E_Config_Randr2 *e_randr2_cfg; -extern EAPI E_Randr2 *e_randr2; +extern E_API E_Config_Randr2 *e_randr2_cfg; +extern E_API E_Randr2 *e_randr2; -extern EAPI int E_EVENT_RANDR_CHANGE; +extern E_API int E_EVENT_RANDR_CHANGE; EINTERN Eina_Bool e_randr2_init(void); EINTERN int e_randr2_shutdown(void); -EAPI Eina_Bool e_randr2_config_save(void); -EAPI void e_randr2_config_apply(void); -EAPI void e_randr2_screeninfo_update(void); +E_API Eina_Bool e_randr2_config_save(void); +E_API void e_randr2_config_apply(void); +E_API void e_randr2_screeninfo_update(void); -EAPI void e_randr2_screen_refresh_queue(Eina_Bool lid_event); -EAPI E_Config_Randr2_Screen *e_randr2_config_screen_find(E_Randr2_Screen *s, E_Config_Randr2 *cfg); -EAPI void e_randr2_screens_setup(int rw, int rh); +E_API void e_randr2_screen_refresh_queue(Eina_Bool lid_event); +E_API E_Config_Randr2_Screen *e_randr2_config_screen_find(E_Randr2_Screen *s, E_Config_Randr2 *cfg); +E_API void e_randr2_screens_setup(int rw, int rh); #endif #endif diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c index 9a60961..4651703 100644 --- a/src/bin/e_remember.c +++ b/src/bin/e_remember.c @@ -3,8 +3,8 @@ #define REMEMBER_HIERARCHY 1 #define REMEMBER_SIMPLE 0 -EAPI int E_EVENT_REMEMBER_UPDATE = -1; -EAPI E_Config_DD *e_remember_edd = NULL; //created in e_config.c +E_API int E_EVENT_REMEMBER_UPDATE = -1; +E_API E_Config_DD *e_remember_edd = NULL; //created in e_config.c typedef struct _E_Remember_List E_Remember_List; @@ -95,7 +95,7 @@ e_remember_shutdown(void) return 1; } -EAPI void +E_API void e_remember_internal_save(void) { const Eina_List *l; @@ -208,7 +208,7 @@ _e_remember_restore_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event return ECORE_CALLBACK_PASS_ON; } -EAPI E_Remember * +E_API E_Remember * e_remember_new(void) { E_Remember *rem; @@ -219,14 +219,14 @@ e_remember_new(void) return rem; } -EAPI int +E_API int e_remember_usable_get(E_Remember *rem) { if ((rem->apply_first_only) && (rem->used_count > 0)) return 0; return 1; } -EAPI void +E_API void e_remember_use(E_Remember *rem) { rem->used_count++; @@ -245,13 +245,13 @@ e_remember_use(E_Remember *rem) } } -EAPI void +E_API void e_remember_unuse(E_Remember *rem) { rem->used_count--; } -EAPI void +E_API void e_remember_del(E_Remember *rem) { const Eina_List *l; @@ -268,7 +268,7 @@ e_remember_del(E_Remember *rem) _e_remember_free(rem); } -EAPI E_Remember * +E_API E_Remember * e_remember_find_usable(E_Client *ec) { E_Remember *rem; @@ -277,7 +277,7 @@ e_remember_find_usable(E_Client *ec) return rem; } -EAPI E_Remember * +E_API E_Remember * e_remember_find(E_Client *ec) { E_Remember *rem; @@ -286,7 +286,7 @@ e_remember_find(E_Client *ec) return rem; } -EAPI void +E_API void e_remember_match_update(E_Remember *rem) { int max_count = 0; @@ -322,7 +322,7 @@ e_remember_match_update(E_Remember *rem) } } -EAPI int +E_API int e_remember_default_match_set(E_Remember *rem, E_Client *ec) { const char *title, *clasz, *name, *role; @@ -373,7 +373,7 @@ e_remember_default_match_set(E_Remember *rem, E_Client *ec) return match; } -EAPI void +E_API void e_remember_update(E_Client *ec) { if (ec->new_client) return; diff --git a/src/bin/e_remember.h b/src/bin/e_remember.h index ae9e49e..1182cd8 100644 --- a/src/bin/e_remember.h +++ b/src/bin/e_remember.h @@ -1,7 +1,7 @@ #ifdef E_TYPEDEFS -EAPI extern int E_EVENT_REMEMBER_UPDATE; -EAPI extern E_Config_DD *e_remember_edd; +E_API extern int E_EVENT_REMEMBER_UPDATE; +E_API extern E_Config_DD *e_remember_edd; typedef struct E_Event_Remember_Update { E_Client *ec; @@ -113,16 +113,16 @@ struct _E_Remember EINTERN int e_remember_init(E_Startup_Mode mode); EINTERN int e_remember_shutdown(void); -EAPI E_Remember *e_remember_new(void); -EAPI int e_remember_usable_get(E_Remember *rem); -EAPI void e_remember_use(E_Remember *rem); -EAPI void e_remember_unuse(E_Remember *rem); -EAPI void e_remember_del(E_Remember *rem); -EAPI E_Remember *e_remember_find(E_Client *ec); -EAPI E_Remember *e_remember_find_usable(E_Client *ec); -EAPI void e_remember_match_update(E_Remember *rem); -EAPI void e_remember_update(E_Client *ec); -EAPI int e_remember_default_match_set(E_Remember *rem, E_Client *ec); -EAPI void e_remember_internal_save(void); +E_API E_Remember *e_remember_new(void); +E_API int e_remember_usable_get(E_Remember *rem); +E_API void e_remember_use(E_Remember *rem); +E_API void e_remember_unuse(E_Remember *rem); +E_API void e_remember_del(E_Remember *rem); +E_API E_Remember *e_remember_find(E_Client *ec); +E_API E_Remember *e_remember_find_usable(E_Client *ec); +E_API void e_remember_match_update(E_Remember *rem); +E_API void e_remember_update(E_Client *ec); +E_API int e_remember_default_match_set(E_Remember *rem, E_Client *ec); +E_API void e_remember_internal_save(void); #endif #endif diff --git a/src/bin/e_resist.c b/src/bin/e_resist.c index ea0b830..9ad60f8 100644 --- a/src/bin/e_resist.c +++ b/src/bin/e_resist.c @@ -11,7 +11,7 @@ struct _E_Resist_Rect static void _e_resist_rects(Eina_List *rects, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh); -EAPI int +E_API int e_resist_client_position(Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, @@ -87,7 +87,7 @@ e_resist_client_position(Eina_List *skiplist, return 1; } -EAPI int +E_API int e_resist_gadman_position(Eina_List *skiplist EINA_UNUSED, int px, int py, int pw, int ph, int x, int y, int w, int h, diff --git a/src/bin/e_resist.h b/src/bin/e_resist.h index e4a4272..7774295 100644 --- a/src/bin/e_resist.h +++ b/src/bin/e_resist.h @@ -3,8 +3,8 @@ #ifndef E_RESIST_H #define E_RESIST_H -EAPI int e_resist_client_position(Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh); -EAPI int e_resist_gadman_position(Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry); +E_API int e_resist_client_position(Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh); +E_API int e_resist_gadman_position(Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry); #endif #endif diff --git a/src/bin/e_scale.c b/src/bin/e_scale.c index 66f4f0e..468d313 100644 --- a/src/bin/e_scale.c +++ b/src/bin/e_scale.c @@ -1,6 +1,6 @@ #include "e.h" -EAPI double e_scale = 1.0; +E_API double e_scale = 1.0; EINTERN int e_scale_init(void) @@ -15,7 +15,7 @@ e_scale_shutdown(void) return 1; } -EAPI void +E_API void e_scale_update(void) { char buf[128]; diff --git a/src/bin/e_scale.h b/src/bin/e_scale.h index 6468c33..8a2591c 100644 --- a/src/bin/e_scale.h +++ b/src/bin/e_scale.h @@ -5,9 +5,9 @@ EINTERN int e_scale_init(void); EINTERN int e_scale_shutdown(void); -EAPI void e_scale_update(void); +E_API void e_scale_update(void); -extern EAPI double e_scale; +extern E_API double e_scale; #endif #endif diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c index ef10712..4efc8e8 100644 --- a/src/bin/e_screensaver.c +++ b/src/bin/e_screensaver.c @@ -22,10 +22,10 @@ static int _e_screensaver_expose = 0; static Ecore_Timer *_e_screensaver_suspend_timer = NULL; static Eina_Bool _e_screensaver_on = EINA_FALSE; -EAPI int E_EVENT_SCREENSAVER_ON = -1; -EAPI int E_EVENT_SCREENSAVER_OFF = -1; +E_API int E_EVENT_SCREENSAVER_ON = -1; +E_API int E_EVENT_SCREENSAVER_OFF = -1; -EAPI int +E_API int e_screensaver_timeout_get(Eina_Bool use_idle) { int timeout = 0, count = (1 + _e_screensaver_ask_presentation_count); @@ -49,7 +49,7 @@ e_screensaver_timeout_get(Eina_Bool use_idle) return timeout; } -EAPI void +E_API void e_screensaver_update(void) { #ifndef HAVE_WAYLAND_ONLY @@ -91,7 +91,7 @@ e_screensaver_update(void) #endif } -EAPI void +E_API void e_screensaver_force_update(void) { #ifndef HAVE_WAYLAND_ONLY @@ -421,7 +421,7 @@ e_screensaver_shutdown(void) return 1; } -EAPI void +E_API void e_screensaver_attrs_set(int timeout, int blanking, int expose) { _e_screensaver_timeout = timeout; @@ -430,13 +430,13 @@ e_screensaver_attrs_set(int timeout, int blanking, int expose) _e_screensaver_expose = expose; } -EAPI Eina_Bool +E_API Eina_Bool e_screensaver_on_get(void) { return _e_screensaver_on; } -EAPI void +E_API void e_screensaver_activate(void) { #ifndef HAVE_WAYLAND_ONLY @@ -448,7 +448,7 @@ e_screensaver_activate(void) #endif } -EAPI void +E_API void e_screensaver_deactivate(void) { #ifndef HAVE_WAYLAND_ONLY diff --git a/src/bin/e_screensaver.h b/src/bin/e_screensaver.h index 511610e..3ca5c9c 100644 --- a/src/bin/e_screensaver.h +++ b/src/bin/e_screensaver.h @@ -7,17 +7,17 @@ EINTERN void e_screensaver_preinit(void); EINTERN int e_screensaver_init(void); EINTERN int e_screensaver_shutdown(void); -EAPI void e_screensaver_update(void); -EAPI void e_screensaver_force_update(void); +E_API void e_screensaver_update(void); +E_API void e_screensaver_force_update(void); -EAPI int e_screensaver_timeout_get(Eina_Bool use_idle); -EAPI void e_screensaver_attrs_set(int timeout, int blanking, int expose); -EAPI Eina_Bool e_screensaver_on_get(void); -EAPI void e_screensaver_activate(void); -EAPI void e_screensaver_deactivate(void); +E_API int e_screensaver_timeout_get(Eina_Bool use_idle); +E_API void e_screensaver_attrs_set(int timeout, int blanking, int expose); +E_API Eina_Bool e_screensaver_on_get(void); +E_API void e_screensaver_activate(void); +E_API void e_screensaver_deactivate(void); -EAPI extern int E_EVENT_SCREENSAVER_ON; -EAPI extern int E_EVENT_SCREENSAVER_OFF; +E_API extern int E_EVENT_SCREENSAVER_ON; +E_API extern int E_EVENT_SCREENSAVER_OFF; #endif #endif diff --git a/src/bin/e_scrollframe.c b/src/bin/e_scrollframe.c index 9935d53..450d46a 100644 --- a/src/bin/e_scrollframe.c +++ b/src/bin/e_scrollframe.c @@ -99,14 +99,14 @@ static void _e_smart_init(void); static Evas_Smart *_e_smart = NULL; /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_scrollframe_add(Evas *evas) { _e_smart_init(); return evas_object_smart_add(evas, _e_smart); } -EAPI void +E_API void e_scrollframe_child_set(Evas_Object *obj, Evas_Object *child) { Evas_Object *o; @@ -150,7 +150,7 @@ e_scrollframe_child_set(Evas_Object *obj, Evas_Object *child) _e_smart_scrollbar_reset(sd); } -EAPI void +E_API void e_scrollframe_extern_pan_set(Evas_Object *obj, Evas_Object *pan, void (*pan_set)(Evas_Object *obj, Evas_Coord x, Evas_Coord y), void (*pan_get)(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y), @@ -196,7 +196,7 @@ e_scrollframe_extern_pan_set(Evas_Object *obj, Evas_Object *pan, evas_object_show(sd->pan_obj); } -EAPI int +E_API int e_scrollframe_custom_theme_set(Evas_Object *obj, const char *custom_category, const char *custom_group) { API_ENTRY return 0; @@ -211,7 +211,7 @@ e_scrollframe_custom_theme_set(Evas_Object *obj, const char *custom_category, co return 1; } -EAPI int +E_API int e_scrollframe_custom_edje_file_set(Evas_Object *obj, const char *file, const char *group) { API_ENTRY return 0; @@ -225,7 +225,7 @@ e_scrollframe_custom_edje_file_set(Evas_Object *obj, const char *file, const cha return 1; } -EAPI void +E_API void e_scrollframe_child_pos_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { Evas_Coord mx = 0, my = 0; @@ -249,7 +249,7 @@ e_scrollframe_child_pos_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) sd->pan_func.set(sd->pan_obj, x, y); } -EAPI void +E_API void e_scrollframe_child_pos_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) { API_ENTRY return; @@ -262,7 +262,7 @@ e_scrollframe_child_pos_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) } } -EAPI void +E_API void e_scrollframe_child_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) { Evas_Coord mx = 0, my = 0, cw = 0, ch = 0, px = 0, py = 0, nx, ny, vw, vh; @@ -296,7 +296,7 @@ e_scrollframe_child_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Ev e_scrollframe_child_pos_set(obj, nx, ny); } -EAPI void +E_API void e_scrollframe_child_viewport_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { API_ENTRY return; @@ -305,7 +305,7 @@ e_scrollframe_child_viewport_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coor "e.swallow.content", NULL, NULL, w, h); } -EAPI void +E_API void e_scrollframe_step_size_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { API_ENTRY return; @@ -316,7 +316,7 @@ e_scrollframe_step_size_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) _e_smart_scrollbar_size_adjust(sd); } -EAPI void +E_API void e_scrollframe_step_size_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) { API_ENTRY return; @@ -324,7 +324,7 @@ e_scrollframe_step_size_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) if (y) *y = sd->step.y; } -EAPI void +E_API void e_scrollframe_page_size_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { API_ENTRY return; @@ -333,7 +333,7 @@ e_scrollframe_page_size_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) _e_smart_scrollbar_size_adjust(sd); } -EAPI void +E_API void e_scrollframe_page_size_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) { API_ENTRY return; @@ -341,7 +341,7 @@ e_scrollframe_page_size_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) if (y) *y = sd->page.y; } -EAPI void +E_API void e_scrollframe_policy_set(Evas_Object *obj, E_Scrollframe_Policy hbar, E_Scrollframe_Policy vbar) { API_ENTRY return; @@ -353,7 +353,7 @@ e_scrollframe_policy_set(Evas_Object *obj, E_Scrollframe_Policy hbar, E_Scrollfr _e_smart_scrollbar_size_adjust(sd); } -EAPI void +E_API void e_scrollframe_policy_get(Evas_Object *obj, E_Scrollframe_Policy *hbar, E_Scrollframe_Policy *vbar) { API_ENTRY return; @@ -361,35 +361,35 @@ e_scrollframe_policy_get(Evas_Object *obj, E_Scrollframe_Policy *hbar, E_Scrollf if (vbar) *vbar = sd->vbar_flags; } -EAPI Evas_Object * +E_API Evas_Object * e_scrollframe_edje_object_get(Evas_Object *obj) { API_ENTRY return NULL; return sd->edje_obj; } -EAPI void +E_API void e_scrollframe_single_dir_set(Evas_Object *obj, Eina_Bool single_dir) { API_ENTRY return; sd->one_dir_at_a_time = single_dir; } -EAPI Eina_Bool +E_API Eina_Bool e_scrollframe_single_dir_get(Evas_Object *obj) { API_ENTRY return EINA_FALSE; return sd->one_dir_at_a_time; } -EAPI void +E_API void e_scrollframe_thumbscroll_force(Evas_Object *obj, Eina_Bool forced) { API_ENTRY return; sd->thumbscroll.forced = forced; } -EAPI void +E_API void e_scrollframe_key_navigation_set(Evas_Object *obj, Eina_Bool enabled) { API_ENTRY return; diff --git a/src/bin/e_scrollframe.h b/src/bin/e_scrollframe.h index b37e58b..7f2f8f6 100644 --- a/src/bin/e_scrollframe.h +++ b/src/bin/e_scrollframe.h @@ -11,26 +11,26 @@ typedef enum _E_Scrollframe_Policy } E_Scrollframe_Policy; -EAPI Evas_Object *e_scrollframe_add (Evas *evas); -EAPI void e_scrollframe_child_set (Evas_Object *obj, Evas_Object *child); -EAPI void e_scrollframe_extern_pan_set (Evas_Object *obj, Evas_Object *pan, void (*pan_set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y), void (*pan_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y), void (*pan_max_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y), void (*pan_child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)); -EAPI int e_scrollframe_custom_theme_set (Evas_Object *obj, const char *custom_category, const char *custom_group); -EAPI int e_scrollframe_custom_edje_file_set (Evas_Object *obj, const char *file, const char *group); -EAPI void e_scrollframe_child_pos_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y); -EAPI void e_scrollframe_child_pos_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); -EAPI void e_scrollframe_child_region_show (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); -EAPI void e_scrollframe_child_viewport_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); -EAPI void e_scrollframe_step_size_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y); -EAPI void e_scrollframe_step_size_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); -EAPI void e_scrollframe_page_size_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y); -EAPI void e_scrollframe_page_size_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); -EAPI void e_scrollframe_policy_set (Evas_Object *obj, E_Scrollframe_Policy hbar, E_Scrollframe_Policy vbar); -EAPI void e_scrollframe_policy_get (Evas_Object *obj, E_Scrollframe_Policy *hbar, E_Scrollframe_Policy *vbar); -EAPI Evas_Object *e_scrollframe_edje_object_get (Evas_Object *obj); -EAPI void e_scrollframe_single_dir_set (Evas_Object *obj, Eina_Bool single_dir); -EAPI Eina_Bool e_scrollframe_single_dir_get (Evas_Object *obj); -EAPI void e_scrollframe_thumbscroll_force (Evas_Object *obj, Eina_Bool forced); -EAPI void e_scrollframe_key_navigation_set (Evas_Object *obj, Eina_Bool enabled); +E_API Evas_Object *e_scrollframe_add (Evas *evas); +E_API void e_scrollframe_child_set (Evas_Object *obj, Evas_Object *child); +E_API void e_scrollframe_extern_pan_set (Evas_Object *obj, Evas_Object *pan, void (*pan_set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y), void (*pan_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y), void (*pan_max_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y), void (*pan_child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)); +E_API int e_scrollframe_custom_theme_set (Evas_Object *obj, const char *custom_category, const char *custom_group); +E_API int e_scrollframe_custom_edje_file_set (Evas_Object *obj, const char *file, const char *group); +E_API void e_scrollframe_child_pos_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y); +E_API void e_scrollframe_child_pos_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); +E_API void e_scrollframe_child_region_show (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); +E_API void e_scrollframe_child_viewport_size_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); +E_API void e_scrollframe_step_size_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y); +E_API void e_scrollframe_step_size_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); +E_API void e_scrollframe_page_size_set (Evas_Object *obj, Evas_Coord x, Evas_Coord y); +E_API void e_scrollframe_page_size_get (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); +E_API void e_scrollframe_policy_set (Evas_Object *obj, E_Scrollframe_Policy hbar, E_Scrollframe_Policy vbar); +E_API void e_scrollframe_policy_get (Evas_Object *obj, E_Scrollframe_Policy *hbar, E_Scrollframe_Policy *vbar); +E_API Evas_Object *e_scrollframe_edje_object_get (Evas_Object *obj); +E_API void e_scrollframe_single_dir_set (Evas_Object *obj, Eina_Bool single_dir); +E_API Eina_Bool e_scrollframe_single_dir_get (Evas_Object *obj); +E_API void e_scrollframe_thumbscroll_force (Evas_Object *obj, Eina_Bool forced); +E_API void e_scrollframe_key_navigation_set (Evas_Object *obj, Eina_Bool enabled); #endif #endif diff --git a/src/bin/e_sha1.c b/src/bin/e_sha1.c index 1b52ebf..375b264 100644 --- a/src/bin/e_sha1.c +++ b/src/bin/e_sha1.c @@ -17,7 +17,7 @@ * when handling the last 64 bytes in a buffer to just keep it short. it * still generates decent hashes either way... */ -EAPI int +E_API int e_sha1_sum(unsigned char *data, int size, unsigned char *dst) { unsigned int digest[5], word[80], wa, wb, wc, wd, we, t; diff --git a/src/bin/e_sha1.h b/src/bin/e_sha1.h index 7e8b1a4..ce65416 100644 --- a/src/bin/e_sha1.h +++ b/src/bin/e_sha1.h @@ -4,12 +4,12 @@ #ifndef E_SHA1_H #define E_SHA1_H -#ifndef EAPI +#ifndef E_API # ifdef WIN32 # ifdef BUILDING_DLL -# define EAPI __declspec(dllexport) +# define E_API __declspec(dllexport) # else -# define EAPI __declspec(dllimport) +# define E_API __declspec(dllimport) # endif # else # ifdef __GNUC__ @@ -18,17 +18,17 @@ #if 0 # pragma GCC visibility push(hidden) #endif -# define EAPI __attribute__ ((visibility("default"))) +# define E_API __attribute__ ((visibility("default"))) # else -# define EAPI +# define E_API # endif # else -# define EAPI +# define E_API # endif # endif #endif -EAPI int e_sha1_sum(unsigned char *data, int size, unsigned char *dst); +E_API int e_sha1_sum(unsigned char *data, int size, unsigned char *dst); #endif #endif diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c index c29e27e..b87b694 100644 --- a/src/bin/e_shelf.c +++ b/src/bin/e_shelf.c @@ -79,9 +79,9 @@ static const char *orient_names[] = [E_GADCON_ORIENT_CORNER_RB] = N_("Right-bottom Corner") }; -EAPI int E_EVENT_SHELF_RENAME = -1; -EAPI int E_EVENT_SHELF_ADD = -1; -EAPI int E_EVENT_SHELF_DEL = -1; +E_API int E_EVENT_SHELF_RENAME = -1; +E_API int E_EVENT_SHELF_ADD = -1; +E_API int E_EVENT_SHELF_DEL = -1; static Ecore_Event_Handler *_e_shelf_gadcon_populate_handler = NULL; static Ecore_Event_Handler *_e_shelf_module_init_end_handler = NULL; static Ecore_Event_Handler *_e_shelf_zone_moveresize_handler = NULL; @@ -118,7 +118,7 @@ e_shelf_shutdown(void) return 1; } -EAPI void +E_API void e_shelf_config_update(void) { Eina_List *l; @@ -145,7 +145,7 @@ e_shelf_config_update(void) } } -EAPI Eina_List * +E_API Eina_List * e_shelf_list_all(void) { Eina_List *d = NULL, *s = NULL, *ret = NULL; @@ -161,14 +161,14 @@ e_shelf_list_all(void) return ret; } -EAPI Eina_List * +E_API Eina_List * e_shelf_list(void) { shelves = eina_list_sort(shelves, -1, _e_shelf_cb_id_sort); return shelves; } -EAPI E_Shelf * +E_API E_Shelf * e_shelf_zone_dummy_new(E_Zone *zone, Evas_Object *obj, int id) { E_Shelf *es; @@ -194,7 +194,7 @@ e_shelf_zone_dummy_new(E_Zone *zone, Evas_Object *obj, int id) return es; } -EAPI E_Shelf * +E_API E_Shelf * e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, E_Layer layer, int id) { E_Shelf *es; @@ -295,7 +295,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, E_Layer laye return es; } -EAPI void +E_API void e_shelf_rename_dialog(E_Shelf *es) { if (!es) return; @@ -303,7 +303,7 @@ e_shelf_rename_dialog(E_Shelf *es) _e_shelf_cb_menu_rename(es, NULL, NULL); } -EAPI void +E_API void e_shelf_zone_move_resize_handle(E_Zone *zone) { Eina_List *l; @@ -334,7 +334,7 @@ e_shelf_zone_move_resize_handle(E_Zone *zone) } } -EAPI void +E_API void e_shelf_populate(E_Shelf *es) { E_OBJECT_CHECK(es); @@ -342,7 +342,7 @@ e_shelf_populate(E_Shelf *es) e_gadcon_populate(es->gadcon); } -EAPI void +E_API void e_shelf_show(E_Shelf *es) { E_OBJECT_CHECK(es); @@ -350,7 +350,7 @@ e_shelf_show(E_Shelf *es) evas_object_show(es->comp_object); } -EAPI void +E_API void e_shelf_hide(E_Shelf *es) { E_OBJECT_CHECK(es); @@ -358,7 +358,7 @@ e_shelf_hide(E_Shelf *es) evas_object_hide(es->comp_object); } -EAPI void +E_API void e_shelf_locked_set(E_Shelf *es, int lock) { if (lock) @@ -375,7 +375,7 @@ e_shelf_locked_set(E_Shelf *es, int lock) } } -EAPI void +E_API void e_shelf_name_set(E_Shelf *es, const char *name) { E_Event_Shelf *ev; @@ -393,7 +393,7 @@ e_shelf_name_set(E_Shelf *es, const char *name) e_gadcon_name_set(es->gadcon, name); } -EAPI void +E_API void e_shelf_toggle(E_Shelf *es, int show) { E_OBJECT_CHECK(es); @@ -461,14 +461,14 @@ e_shelf_toggle(E_Shelf *es, int show) } } -EAPI void +E_API void e_shelf_urgent_show(E_Shelf *es) { e_shelf_toggle(es, 1); es->urgent_show = 1; } -EAPI void +E_API void e_shelf_move(E_Shelf *es, int x, int y) { E_OBJECT_CHECK(es); @@ -478,7 +478,7 @@ e_shelf_move(E_Shelf *es, int x, int y) evas_object_move(es->comp_object, es->zone->x + es->x, es->zone->y + es->y); } -EAPI void +E_API void e_shelf_resize(E_Shelf *es, int w, int h) { E_OBJECT_CHECK(es); @@ -488,7 +488,7 @@ e_shelf_resize(E_Shelf *es, int w, int h) evas_object_resize(es->comp_object, es->w, es->h); } -EAPI void +E_API void e_shelf_move_resize(E_Shelf *es, int x, int y, int w, int h) { E_OBJECT_CHECK(es); @@ -501,7 +501,7 @@ e_shelf_move_resize(E_Shelf *es, int x, int y, int w, int h) evas_object_resize(es->comp_object, es->w, es->h); } -EAPI void +E_API void e_shelf_save(E_Shelf *es) { E_OBJECT_CHECK(es); @@ -534,7 +534,7 @@ e_shelf_save(E_Shelf *es) e_config_save_queue(); } -EAPI void +E_API void e_shelf_unsave(E_Shelf *es) { E_OBJECT_CHECK(es); @@ -542,7 +542,7 @@ e_shelf_unsave(E_Shelf *es) es->cfg_delete = 1; } -EAPI void +E_API void e_shelf_orient(E_Shelf *es, E_Gadcon_Orient orient) { char buf[4096]; @@ -566,7 +566,7 @@ e_shelf_orient(E_Shelf *es, E_Gadcon_Orient orient) e_zone_useful_geometry_dirty(es->zone); } -EAPI const char * +E_API const char * e_shelf_orient_string_get(E_Shelf *es) { const char *sig = ""; @@ -639,7 +639,7 @@ e_shelf_orient_string_get(E_Shelf *es) return sig; } -EAPI void +E_API void e_shelf_position_calc(E_Shelf *es) { E_Gadcon_Orient orient = E_GADCON_ORIENT_FLOAT; @@ -819,7 +819,7 @@ e_shelf_position_calc(E_Shelf *es) } while (0); } -EAPI Eina_Bool +E_API Eina_Bool e_shelf_desk_visible(const E_Shelf *es, const E_Desk *desk) { Eina_List *ll; @@ -853,7 +853,7 @@ e_shelf_desk_visible(const E_Shelf *es, const E_Desk *desk) return EINA_FALSE; } -EAPI void +E_API void e_shelf_style_set(E_Shelf *es, const char *style) { const char *option; @@ -887,7 +887,7 @@ e_shelf_style_set(E_Shelf *es, const char *style) es->instant_delay = -1.0; } -EAPI void +E_API void e_shelf_autohide_set(E_Shelf *es, int autohide_type) { E_OBJECT_CHECK(es); @@ -930,7 +930,7 @@ e_shelf_autohide_set(E_Shelf *es, int autohide_type) */ } -EAPI E_Shelf * +E_API E_Shelf * e_shelf_config_new(E_Zone *zone, E_Config_Shelf *cf_es) { E_Shelf *es; @@ -963,7 +963,7 @@ e_shelf_config_new(E_Zone *zone, E_Config_Shelf *cf_es) return es; } -EAPI E_Entry_Dialog * +E_API E_Entry_Dialog * e_shelf_new_dialog(E_Zone *zone) { char buf[256]; diff --git a/src/bin/e_shelf.h b/src/bin/e_shelf.h index 0a23404..5f19ddc 100644 --- a/src/bin/e_shelf.h +++ b/src/bin/e_shelf.h @@ -60,38 +60,38 @@ typedef struct E_Event_Shelf E_Event_Shelf_Rename; typedef struct E_Event_Shelf E_Event_Shelf_Add; typedef struct E_Event_Shelf E_Event_Shelf_Del; -EAPI extern int E_EVENT_SHELF_RENAME; -EAPI extern int E_EVENT_SHELF_ADD; -EAPI extern int E_EVENT_SHELF_DEL; +E_API extern int E_EVENT_SHELF_RENAME; +E_API extern int E_EVENT_SHELF_ADD; +E_API extern int E_EVENT_SHELF_DEL; EINTERN int e_shelf_init(void); EINTERN int e_shelf_shutdown(void); -EAPI void e_shelf_config_update(void); -EAPI E_Entry_Dialog *e_shelf_new_dialog(E_Zone *zone); -EAPI Eina_List *e_shelf_list(void); -EAPI Eina_List *e_shelf_list_all(void); // includes dummy shelves -EAPI E_Shelf *e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, E_Layer layer, int id); -EAPI E_Shelf *e_shelf_zone_dummy_new(E_Zone *zone, Evas_Object *obj, int id); -EAPI void e_shelf_zone_move_resize_handle(E_Zone *zone); -EAPI void e_shelf_populate(E_Shelf *es); -EAPI void e_shelf_show(E_Shelf *es); -EAPI void e_shelf_hide(E_Shelf *es); -EAPI void e_shelf_locked_set(E_Shelf *es, int lock); -EAPI void e_shelf_toggle(E_Shelf *es, int show); -EAPI void e_shelf_urgent_show(E_Shelf *es); -EAPI void e_shelf_move(E_Shelf *es, int x, int y); -EAPI void e_shelf_resize(E_Shelf *es, int w, int h); -EAPI void e_shelf_move_resize(E_Shelf *es, int x, int y, int w, int h); -EAPI void e_shelf_save(E_Shelf *es); -EAPI void e_shelf_unsave(E_Shelf *es); -EAPI void e_shelf_orient(E_Shelf *es, E_Gadcon_Orient orient); -EAPI const char *e_shelf_orient_string_get(E_Shelf *es); -EAPI void e_shelf_position_calc(E_Shelf *es); -EAPI void e_shelf_style_set(E_Shelf *es, const char *style); -EAPI E_Shelf *e_shelf_config_new(E_Zone *zone, E_Config_Shelf *cf_es); -EAPI void e_shelf_name_set(E_Shelf *es, const char *name); -EAPI void e_shelf_rename_dialog(E_Shelf *es); -EAPI void e_shelf_autohide_set(E_Shelf *es, int autohide_type); -EAPI Eina_Bool e_shelf_desk_visible(const E_Shelf *es, const E_Desk *desk); +E_API void e_shelf_config_update(void); +E_API E_Entry_Dialog *e_shelf_new_dialog(E_Zone *zone); +E_API Eina_List *e_shelf_list(void); +E_API Eina_List *e_shelf_list_all(void); // includes dummy shelves +E_API E_Shelf *e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, E_Layer layer, int id); +E_API E_Shelf *e_shelf_zone_dummy_new(E_Zone *zone, Evas_Object *obj, int id); +E_API void e_shelf_zone_move_resize_handle(E_Zone *zone); +E_API void e_shelf_populate(E_Shelf *es); +E_API void e_shelf_show(E_Shelf *es); +E_API void e_shelf_hide(E_Shelf *es); +E_API void e_shelf_locked_set(E_Shelf *es, int lock); +E_API void e_shelf_toggle(E_Shelf *es, int show); +E_API void e_shelf_urgent_show(E_Shelf *es); +E_API void e_shelf_move(E_Shelf *es, int x, int y); +E_API void e_shelf_resize(E_Shelf *es, int w, int h); +E_API void e_shelf_move_resize(E_Shelf *es, int x, int y, int w, int h); +E_API void e_shelf_save(E_Shelf *es); +E_API void e_shelf_unsave(E_Shelf *es); +E_API void e_shelf_orient(E_Shelf *es, E_Gadcon_Orient orient); +E_API const char *e_shelf_orient_string_get(E_Shelf *es); +E_API void e_shelf_position_calc(E_Shelf *es); +E_API void e_shelf_style_set(E_Shelf *es, const char *style); +E_API E_Shelf *e_shelf_config_new(E_Zone *zone, E_Config_Shelf *cf_es); +E_API void e_shelf_name_set(E_Shelf *es, const char *name); +E_API void e_shelf_rename_dialog(E_Shelf *es); +E_API void e_shelf_autohide_set(E_Shelf *es, int autohide_type); +E_API Eina_Bool e_shelf_desk_visible(const E_Shelf *es, const E_Desk *desk); #endif #endif diff --git a/src/bin/e_signals.c b/src/bin/e_signals.c index a508b33..264dbc8 100644 --- a/src/bin/e_signals.c +++ b/src/bin/e_signals.c @@ -66,7 +66,7 @@ _e_write_safe_int(int fd, const char *buf, size_t size) /* a tricky little devil, requires e and it's libs to be built * with the -rdynamic flag to GCC for any sort of decent output. */ -EAPI void +E_API void e_sigseg_act(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNUSED) { #ifdef HAVE_WAYLAND_ONLY @@ -94,7 +94,7 @@ e_sigseg_act(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNU #endif } -EAPI void +E_API void e_sigill_act(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNUSED) { // In case of a sigill in Enlightenment, Enlightenment start will catch the sigill and continue, @@ -112,7 +112,7 @@ e_sigill_act(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNU /* e_alert_show(); */ } -EAPI void +E_API void e_sigfpe_act(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNUSED) { #ifdef HAVE_WAYLAND_ONLY @@ -140,7 +140,7 @@ e_sigfpe_act(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNU #endif } -EAPI void +E_API void e_sigbus_act(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNUSED) { #ifdef HAVE_WAYLAND_ONLY @@ -168,7 +168,7 @@ e_sigbus_act(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNU #endif } -EAPI void +E_API void e_sigabrt_act(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UNUSED) { #ifdef HAVE_WAYLAND_ONLY diff --git a/src/bin/e_signals.h b/src/bin/e_signals.h index b4fc5b8..8050ff1 100644 --- a/src/bin/e_signals.h +++ b/src/bin/e_signals.h @@ -4,11 +4,11 @@ #ifndef E_SIGNALS_H #define E_SIGNALS_H -EAPI void e_sigseg_act(int x, siginfo_t *info, void *data); -EAPI void e_sigill_act(int x, siginfo_t *info, void *data); -EAPI void e_sigfpe_act(int x, siginfo_t *info, void *data); -EAPI void e_sigbus_act(int x, siginfo_t *info, void *data); -EAPI void e_sigabrt_act(int x, siginfo_t *info, void *data); +E_API void e_sigseg_act(int x, siginfo_t *info, void *data); +E_API void e_sigill_act(int x, siginfo_t *info, void *data); +E_API void e_sigfpe_act(int x, siginfo_t *info, void *data); +E_API void e_sigbus_act(int x, siginfo_t *info, void *data); +E_API void e_sigabrt_act(int x, siginfo_t *info, void *data); #endif #endif diff --git a/src/bin/e_slidecore.c b/src/bin/e_slidecore.c index 081c722..9af0d46 100644 --- a/src/bin/e_slidecore.c +++ b/src/bin/e_slidecore.c @@ -50,14 +50,14 @@ static void _e_smart_init(void); static Evas_Smart *_e_smart = NULL; /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_slidecore_add(Evas *evas) { _e_smart_init(); return evas_object_smart_add(evas, _e_smart); } -EAPI void +E_API void e_slidecore_item_distance_set(Evas_Object *obj, Evas_Coord dist) { API_ENTRY return; @@ -66,7 +66,7 @@ e_slidecore_item_distance_set(Evas_Object *obj, Evas_Coord dist) _e_smart_reconfigure(sd); } -EAPI void +E_API void e_slidecore_item_add(Evas_Object *obj, const char *label, const char *icon, void (*func)(void *data), void *data) { E_Smart_Item *it; @@ -82,7 +82,7 @@ e_slidecore_item_add(Evas_Object *obj, const char *label, const char *icon, void _e_smart_reconfigure(sd); } -EAPI void +E_API void e_slidecore_jump(Evas_Object *obj, int num) { API_ENTRY return; @@ -95,7 +95,7 @@ e_slidecore_jump(Evas_Object *obj, int num) sd->slide_start = ecore_loop_time_get(); } -EAPI void +E_API void e_slidecore_slide_time_set(Evas_Object *obj, double t) { API_ENTRY return; diff --git a/src/bin/e_slidecore.h b/src/bin/e_slidecore.h index 4af1663..8ce8505 100644 --- a/src/bin/e_slidecore.h +++ b/src/bin/e_slidecore.h @@ -3,11 +3,11 @@ #ifndef E_SLIDECORE_H #define E_SLIDECORE_H -EAPI Evas_Object *e_slidecore_add (Evas *evas); -EAPI void e_slidecore_item_distance_set(Evas_Object *obj, Evas_Coord dist); -EAPI void e_slidecore_item_add (Evas_Object *obj, const char *label, const char *icon, void (*func) (void *data), void *data); -EAPI void e_slidecore_jump (Evas_Object *obj, int num); -EAPI void e_slidecore_slide_time_set (Evas_Object *obj, double t); +E_API Evas_Object *e_slidecore_add (Evas *evas); +E_API void e_slidecore_item_distance_set(Evas_Object *obj, Evas_Coord dist); +E_API void e_slidecore_item_add (Evas_Object *obj, const char *label, const char *icon, void (*func) (void *data), void *data); +E_API void e_slidecore_jump (Evas_Object *obj, int num); +E_API void e_slidecore_slide_time_set (Evas_Object *obj, double t); #endif #endif diff --git a/src/bin/e_slider.c b/src/bin/e_slider.c index 7445256..c96dff8 100644 --- a/src/bin/e_slider.c +++ b/src/bin/e_slider.c @@ -61,14 +61,14 @@ static void _e_smart_init(void); static Evas_Smart *_e_smart = NULL; /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_slider_add(Evas *evas) { _e_smart_init(); return evas_object_smart_add(evas, _e_smart); } -EAPI void +E_API void e_slider_orientation_set(Evas_Object *obj, int horizontal) { API_ENTRY return; @@ -84,14 +84,14 @@ e_slider_orientation_set(Evas_Object *obj, int horizontal) _e_smart_value_update(sd); } -EAPI int +E_API int e_slider_orientation_get(Evas_Object *obj) { API_ENTRY return 0; return sd->horizontal; } -EAPI void +E_API void e_slider_value_set(Evas_Object *obj, double val) { API_ENTRY return; @@ -99,14 +99,14 @@ e_slider_value_set(Evas_Object *obj, double val) _e_smart_value_update_now(sd); } -EAPI double +E_API double e_slider_value_get(Evas_Object *obj) { API_ENTRY return 0.0; return sd->val; } -EAPI void +E_API void e_slider_value_range_set(Evas_Object *obj, double min, double max) { API_ENTRY return; @@ -119,7 +119,7 @@ e_slider_value_range_set(Evas_Object *obj, double min, double max) _e_smart_value_update_now(sd); } -EAPI void +E_API void e_slider_value_range_get(Evas_Object *obj, double *min, double *max) { API_ENTRY return; @@ -127,7 +127,7 @@ e_slider_value_range_get(Evas_Object *obj, double *min, double *max) if (max) *max = sd->val_max; } -EAPI void +E_API void e_slider_value_step_size_set(Evas_Object *obj, double step_size) { double step; @@ -145,14 +145,14 @@ e_slider_value_step_size_set(Evas_Object *obj, double step_size) _e_smart_value_update_now(sd); } -EAPI double +E_API double e_slider_value_step_size_get(Evas_Object *obj) { API_ENTRY return 0.0; return sd->step_size; } -EAPI void +E_API void e_slider_value_step_count_set(Evas_Object *obj, int step_count) { API_ENTRY return; @@ -162,14 +162,14 @@ e_slider_value_step_count_set(Evas_Object *obj, int step_count) _e_smart_value_update_now(sd); } -EAPI int +E_API int e_slider_value_step_count_get(Evas_Object *obj) { API_ENTRY return 0; return sd->step_count; } -EAPI void +E_API void e_slider_value_format_display_set(Evas_Object *obj, const char *format) { int changed = 0; @@ -191,14 +191,14 @@ e_slider_value_format_display_set(Evas_Object *obj, const char *format) edje_object_size_min_calc(sd->edje_obj, &(sd->minw), &(sd->minh)); } -EAPI const char * +E_API const char * e_slider_value_format_display_get(Evas_Object *obj) { API_ENTRY return NULL; return sd->format; } -EAPI void +E_API void e_slider_direction_set(Evas_Object *obj, int reversed) { API_ENTRY return; @@ -206,7 +206,7 @@ e_slider_direction_set(Evas_Object *obj, int reversed) _e_smart_value_update_now(sd); } -EAPI void +E_API void e_slider_disabled_set(Evas_Object *obj, Eina_Bool disable) { API_ENTRY return; @@ -220,14 +220,14 @@ e_slider_disabled_set(Evas_Object *obj, Eina_Bool disable) edje_object_signal_emit(sd->edje_obj, "e,state,enabled", "e"); } -EAPI int +E_API int e_slider_direction_get(Evas_Object *obj) { API_ENTRY return 0; return sd->reversed; } -EAPI void +E_API void e_slider_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) { API_ENTRY return; @@ -235,14 +235,14 @@ e_slider_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) if (minh) *minh = sd->minh; } -EAPI Evas_Object * +E_API Evas_Object * e_slider_edje_object_get(Evas_Object *obj) { API_ENTRY return NULL; return sd->edje_obj; } -EAPI void +E_API void e_slider_special_value_add(Evas_Object *obj, double value, double error, const char *label) { E_Slider_Special_Value *sv; diff --git a/src/bin/e_slider.h b/src/bin/e_slider.h index 2c9ab8b..5a8aac2 100644 --- a/src/bin/e_slider.h +++ b/src/bin/e_slider.h @@ -3,24 +3,24 @@ #ifndef E_SLIDER_H #define E_SLIDER_H -EAPI Evas_Object *e_slider_add (Evas *evas); -EAPI void e_slider_orientation_set (Evas_Object *obj, int horizontal); -EAPI int e_slider_orientation_get (Evas_Object *obj); -EAPI void e_slider_value_set (Evas_Object *obj, double val); -EAPI double e_slider_value_get (Evas_Object *obj); -EAPI void e_slider_value_range_set (Evas_Object *obj, double min, double max); -EAPI void e_slider_value_range_get (Evas_Object *obj, double *min, double *max); -EAPI void e_slider_value_step_size_set (Evas_Object *obj, double step_size); -EAPI double e_slider_value_step_size_get (Evas_Object *obj); -EAPI void e_slider_value_step_count_set (Evas_Object *obj, int step_count); -EAPI int e_slider_value_step_count_get (Evas_Object *obj); -EAPI void e_slider_value_format_display_set (Evas_Object *obj, const char *format); -EAPI const char *e_slider_value_format_display_get (Evas_Object *obj); -EAPI void e_slider_direction_set (Evas_Object *obj, int reversed); -EAPI int e_slider_direction_get (Evas_Object *obj); -EAPI void e_slider_size_min_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh); -EAPI Evas_Object *e_slider_edje_object_get (Evas_Object *obj); -EAPI void e_slider_disabled_set(Evas_Object *obj, Eina_Bool disable); -EAPI void e_slider_special_value_add (Evas_Object *obj, double value, double error, const char *label); +E_API Evas_Object *e_slider_add (Evas *evas); +E_API void e_slider_orientation_set (Evas_Object *obj, int horizontal); +E_API int e_slider_orientation_get (Evas_Object *obj); +E_API void e_slider_value_set (Evas_Object *obj, double val); +E_API double e_slider_value_get (Evas_Object *obj); +E_API void e_slider_value_range_set (Evas_Object *obj, double min, double max); +E_API void e_slider_value_range_get (Evas_Object *obj, double *min, double *max); +E_API void e_slider_value_step_size_set (Evas_Object *obj, double step_size); +E_API double e_slider_value_step_size_get (Evas_Object *obj); +E_API void e_slider_value_step_count_set (Evas_Object *obj, int step_count); +E_API int e_slider_value_step_count_get (Evas_Object *obj); +E_API void e_slider_value_format_display_set (Evas_Object *obj, const char *format); +E_API const char *e_slider_value_format_display_get (Evas_Object *obj); +E_API void e_slider_direction_set (Evas_Object *obj, int reversed); +E_API int e_slider_direction_get (Evas_Object *obj); +E_API void e_slider_size_min_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh); +E_API Evas_Object *e_slider_edje_object_get (Evas_Object *obj); +E_API void e_slider_disabled_set(Evas_Object *obj, Eina_Bool disable); +E_API void e_slider_special_value_add (Evas_Object *obj, double value, double error, const char *label); #endif #endif diff --git a/src/bin/e_slidesel.c b/src/bin/e_slidesel.c index c1e73bd..33f96a9 100644 --- a/src/bin/e_slidesel.c +++ b/src/bin/e_slidesel.c @@ -62,21 +62,21 @@ _e_smart_label_change(void *data) } /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_slidesel_add(Evas *evas) { _e_smart_init(); return evas_object_smart_add(evas, _e_smart); } -EAPI void +E_API void e_slidesel_item_distance_set(Evas_Object *obj, Evas_Coord dist) { API_ENTRY return; e_slidecore_item_distance_set(sd->slide_obj, dist); } -EAPI void +E_API void e_slidesel_item_add(Evas_Object *obj, const char *label, const char *icon, void (*func)(void *data), void *data) { E_Smart_Item *it; @@ -93,7 +93,7 @@ e_slidesel_item_add(Evas_Object *obj, const char *label, const char *icon, void e_slidecore_item_add(sd->slide_obj, label, icon, _e_smart_label_change, it); } -EAPI void +E_API void e_slidesel_jump(Evas_Object *obj, int num) { API_ENTRY return; diff --git a/src/bin/e_slidesel.h b/src/bin/e_slidesel.h index f47e4d4..21c283e 100644 --- a/src/bin/e_slidesel.h +++ b/src/bin/e_slidesel.h @@ -3,10 +3,10 @@ #ifndef E_SLIDESEL_H #define E_SLIDESEL_H -EAPI Evas_Object *e_slidesel_add (Evas *evas); -EAPI void e_slidesel_item_distance_set (Evas_Object *obj, Evas_Coord dist); -EAPI void e_slidesel_item_add (Evas_Object *obj, const char *label, const char *icon, void (*func) (void *data), void *data); -EAPI void e_slidesel_jump (Evas_Object *obj, int num); +E_API Evas_Object *e_slidesel_add (Evas *evas); +E_API void e_slidesel_item_distance_set (Evas_Object *obj, Evas_Coord dist); +E_API void e_slidesel_item_add (Evas_Object *obj, const char *label, const char *icon, void (*func) (void *data), void *data); +E_API void e_slidesel_jump (Evas_Object *obj, int num); #endif #endif diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c index 80bacf3..d2a997a 100644 --- a/src/bin/e_start_main.c +++ b/src/bin/e_start_main.c @@ -34,12 +34,37 @@ #include #include +# ifdef E_API +# undef E_API +# endif +# ifdef WIN32 +# ifdef BUILDING_DLL +# define E_API __declspec(dllexport) +# else +# define E_API __declspec(dllimport) +# endif +# else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +/* BROKEN in gcc 4 on amd64 */ +# if 0 +# pragma GCC visibility push(hidden) +# endif +# define E_API __attribute__ ((visibility("default"))) +# else +# define E_API +# endif +# else +# define E_API +# endif +# endif + # define E_CSERVE static Eina_Bool stop_ptrace = EINA_FALSE; static void env_set(const char *var, const char *val); -EAPI int prefix_determine(char *argv0); +E_API int prefix_determine(char *argv0); static void env_set(const char *var, const char *val) @@ -72,7 +97,7 @@ env_set(const char *var, const char *val) static Eina_Prefix *pfx = NULL; /* externally accessible functions */ -EAPI int +E_API int prefix_determine(char *argv0) { pfx = eina_prefix_new(argv0, prefix_determine, diff --git a/src/bin/e_startup.c b/src/bin/e_startup.c index bb9cff6..7a87957 100644 --- a/src/bin/e_startup.c +++ b/src/bin/e_startup.c @@ -16,7 +16,7 @@ static int start_app_pos = -1; static Ecore_Event_Handler *desktop_cache_update_handler = NULL; /* externally accessible functions */ -EAPI void +E_API void e_startup(E_Startup_Mode mode) { char buf[PATH_MAX]; diff --git a/src/bin/e_startup.h b/src/bin/e_startup.h index 5abf51b..a902aa9 100644 --- a/src/bin/e_startup.h +++ b/src/bin/e_startup.h @@ -10,7 +10,7 @@ typedef enum _E_Startup_Mode #ifndef E_STARTUP_H #define E_STARTUP_H -EAPI void e_startup(E_Startup_Mode mode); +E_API void e_startup(E_Startup_Mode mode); #endif #endif diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c index 37a568a..25602dd 100644 --- a/src/bin/e_sys.c +++ b/src/bin/e_sys.c @@ -55,9 +55,9 @@ static Ecore_Timer *action_timeout = NULL; static Eldbus_Proxy *login1_manger_proxy = NULL; -EAPI int E_EVENT_SYS_SUSPEND = -1; -EAPI int E_EVENT_SYS_HIBERNATE = -1; -EAPI int E_EVENT_SYS_RESUME = -1; +E_API int E_EVENT_SYS_SUSPEND = -1; +E_API int E_EVENT_SYS_HIBERNATE = -1; +E_API int E_EVENT_SYS_RESUME = -1; static void _e_sys_comp_done_cb(void *data, Evas_Object *obj, const char *sig, const char *src) @@ -226,7 +226,7 @@ e_sys_shutdown(void) return 1; } -EAPI int +E_API int e_sys_action_possible_get(E_Sys_Action a) { switch (a) @@ -258,7 +258,7 @@ e_sys_action_possible_get(E_Sys_Action a) return 0; } -EAPI int +E_API int e_sys_action_do(E_Sys_Action a, char *param) { int ret = 0; @@ -297,7 +297,7 @@ e_sys_action_do(E_Sys_Action a, char *param) return ret; } -EAPI int +E_API int e_sys_action_raw_do(E_Sys_Action a, char *param) { int ret = 0; @@ -318,7 +318,7 @@ e_sys_action_raw_do(E_Sys_Action a, char *param) static Eina_List *extra_actions = NULL; -EAPI E_Sys_Con_Action * +E_API E_Sys_Con_Action * e_sys_con_extra_action_register(const char *label, const char *icon_group, const char *button_name, @@ -340,7 +340,7 @@ e_sys_con_extra_action_register(const char *label, return sca; } -EAPI void +E_API void e_sys_con_extra_action_unregister(E_Sys_Con_Action *sca) { extra_actions = eina_list_remove(extra_actions, sca); @@ -350,7 +350,7 @@ e_sys_con_extra_action_unregister(E_Sys_Con_Action *sca) free(sca); } -EAPI const Eina_List * +E_API const Eina_List * e_sys_con_extra_action_list_get(void) { return extra_actions; diff --git a/src/bin/e_sys.h b/src/bin/e_sys.h index f0e308f..cf1e735 100644 --- a/src/bin/e_sys.h +++ b/src/bin/e_sys.h @@ -30,23 +30,23 @@ struct _E_Sys_Con_Action #ifndef E_SYS_H #define E_SYS_H -EAPI extern int E_EVENT_SYS_SUSPEND; -EAPI extern int E_EVENT_SYS_HIBERNATE; -EAPI extern int E_EVENT_SYS_RESUME; +E_API extern int E_EVENT_SYS_SUSPEND; +E_API extern int E_EVENT_SYS_HIBERNATE; +E_API extern int E_EVENT_SYS_RESUME; EINTERN int e_sys_init(void); EINTERN int e_sys_shutdown(void); -EAPI int e_sys_action_possible_get(E_Sys_Action a); -EAPI int e_sys_action_do(E_Sys_Action a, char *param); -EAPI int e_sys_action_raw_do(E_Sys_Action a, char *param); +E_API int e_sys_action_possible_get(E_Sys_Action a); +E_API int e_sys_action_do(E_Sys_Action a, char *param); +E_API int e_sys_action_raw_do(E_Sys_Action a, char *param); -EAPI E_Sys_Con_Action *e_sys_con_extra_action_register(const char *label, +E_API E_Sys_Con_Action *e_sys_con_extra_action_register(const char *label, const char *icon_group, const char *button_name, void (*func) (void *data), const void *data); -EAPI void e_sys_con_extra_action_unregister(E_Sys_Con_Action *sca); -EAPI const Eina_List *e_sys_con_extra_action_list_get(void); +E_API void e_sys_con_extra_action_unregister(E_Sys_Con_Action *sca); +E_API const Eina_List *e_sys_con_extra_action_list_get(void); #endif #endif diff --git a/src/bin/e_test.c b/src/bin/e_test.c index 6ac89bc..1303d9b 100644 --- a/src/bin/e_test.c +++ b/src/bin/e_test.c @@ -27,7 +27,7 @@ deskmirror_test(void *d EINA_UNUSED) #endif -EAPI void +E_API void e_test(void) { _e_test_internal(); diff --git a/src/bin/e_test.h b/src/bin/e_test.h index e3167e8..4b31946 100644 --- a/src/bin/e_test.h +++ b/src/bin/e_test.h @@ -3,7 +3,7 @@ #ifndef E_TEST_H #define E_TEST_H -EAPI void e_test(void); +E_API void e_test(void); #endif #endif diff --git a/src/bin/e_theme.c b/src/bin/e_theme.c index cc6b59e..d77640d 100644 --- a/src/bin/e_theme.c +++ b/src/bin/e_theme.c @@ -29,7 +29,7 @@ e_theme_shutdown(void) return 1; } -EAPI Eina_List * +E_API Eina_List * e_theme_collection_items_find(const char *base EINA_UNUSED, const char *collname) { Eina_List *list, *list2 = NULL, *l; @@ -58,7 +58,7 @@ e_theme_collection_items_find(const char *base EINA_UNUSED, const char *collname return list2; } -EAPI int +E_API int e_theme_edje_object_set(Evas_Object *o, const char *category EINA_UNUSED, const char *group) { const char *file; @@ -69,7 +69,7 @@ e_theme_edje_object_set(Evas_Object *o, const char *category EINA_UNUSED, const return 1; } -EAPI const char * +E_API const char * e_theme_edje_file_get(const char *category EINA_UNUSED, const char *group) { const char *file = elm_theme_group_path_find(NULL, group); @@ -77,7 +77,7 @@ e_theme_edje_file_get(const char *category EINA_UNUSED, const char *group) return file; } -EAPI const char * +E_API const char * e_theme_edje_icon_fallback_file_get(const char *group) { const char *file; @@ -88,7 +88,7 @@ e_theme_edje_icon_fallback_file_get(const char *group) return file; } -EAPI int +E_API int e_theme_transition_find(const char *transition) { Eina_List *trans = NULL; @@ -102,13 +102,13 @@ e_theme_transition_find(const char *transition) return found; } -EAPI Eina_List * +E_API Eina_List * e_theme_transition_list(void) { return e_theme_collection_items_find(NULL, "e/transitions"); } -EAPI int +E_API int e_theme_border_find(const char *border) { Eina_List *bds = NULL; @@ -122,13 +122,13 @@ e_theme_border_find(const char *border) return found; } -EAPI Eina_List * +E_API Eina_List * e_theme_border_list(void) { return e_theme_collection_items_find(NULL, "e/widgets/border"); } -EAPI int +E_API int e_theme_shelf_find(const char *shelf) { Eina_List *shelfs = NULL; @@ -142,13 +142,13 @@ e_theme_shelf_find(const char *shelf) return found; } -EAPI Eina_List * +E_API Eina_List * e_theme_shelf_list(void) { return e_theme_collection_items_find(NULL, "e/shelf"); } -EAPI int +E_API int e_theme_comp_frame_find(const char *comp) { Eina_List *comps = NULL; @@ -162,7 +162,7 @@ e_theme_comp_frame_find(const char *comp) return found; } -EAPI Eina_List * +E_API Eina_List * e_theme_comp_frame_list(void) { return e_theme_collection_items_find(NULL, "e/comp/frame"); diff --git a/src/bin/e_theme.h b/src/bin/e_theme.h index fcc279c..77bc99c 100644 --- a/src/bin/e_theme.h +++ b/src/bin/e_theme.h @@ -6,19 +6,19 @@ EINTERN int e_theme_init(void); EINTERN int e_theme_shutdown(void); -EAPI Eina_List *e_theme_collection_items_find(const char *category, const char *grp); -EAPI int e_theme_edje_object_set(Evas_Object *o, const char *category, const char *group); -EAPI const char *e_theme_edje_file_get(const char *category, const char *group); -EAPI const char *e_theme_edje_icon_fallback_file_get(const char *group); +E_API Eina_List *e_theme_collection_items_find(const char *category, const char *grp); +E_API int e_theme_edje_object_set(Evas_Object *o, const char *category, const char *group); +E_API const char *e_theme_edje_file_get(const char *category, const char *group); +E_API const char *e_theme_edje_icon_fallback_file_get(const char *group); -EAPI int e_theme_transition_find(const char *transition); -EAPI Eina_List *e_theme_transition_list(void); -EAPI int e_theme_border_find(const char *border); -EAPI Eina_List *e_theme_border_list(void); -EAPI int e_theme_shelf_find(const char *shelf); -EAPI Eina_List *e_theme_shelf_list(void); -EAPI int e_theme_comp_frame_find(const char *theme); -EAPI Eina_List *e_theme_comp_frame_list(void); +E_API int e_theme_transition_find(const char *transition); +E_API Eina_List *e_theme_transition_list(void); +E_API int e_theme_border_find(const char *border); +E_API Eina_List *e_theme_border_list(void); +E_API int e_theme_shelf_find(const char *shelf); +E_API Eina_List *e_theme_shelf_list(void); +E_API int e_theme_comp_frame_find(const char *theme); +E_API Eina_List *e_theme_comp_frame_list(void); #endif #endif diff --git a/src/bin/e_theme_about.c b/src/bin/e_theme_about.c index 5006d62..1db4be1 100644 --- a/src/bin/e_theme_about.c +++ b/src/bin/e_theme_about.c @@ -11,7 +11,7 @@ _cb_settings_theme(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const c /* externally accessible functions */ -EAPI E_Theme_About * +E_API E_Theme_About * e_theme_about_new(void) { E_Obj_Dialog *od; @@ -27,7 +27,7 @@ e_theme_about_new(void) return (E_Theme_About *)od; } -EAPI void +E_API void e_theme_about_show(E_Theme_About *about) { e_obj_dialog_show((E_Obj_Dialog *)about); diff --git a/src/bin/e_theme_about.h b/src/bin/e_theme_about.h index 6e348b1..12b377d 100644 --- a/src/bin/e_theme_about.h +++ b/src/bin/e_theme_about.h @@ -6,8 +6,8 @@ typedef struct _E_Obj_Dialog E_Theme_About; #ifndef E_THEME_ABOUT_H #define E_THEME_ABOUT_H -EAPI E_Theme_About *e_theme_about_new (void); -EAPI void e_theme_about_show (E_Theme_About *about); +E_API E_Theme_About *e_theme_about_new (void); +E_API void e_theme_about_show (E_Theme_About *about); #endif #endif diff --git a/src/bin/e_thumb.c b/src/bin/e_thumb.c index d1b016e..d73b1a8 100644 --- a/src/bin/e_thumb.c +++ b/src/bin/e_thumb.c @@ -71,7 +71,7 @@ _thumb_preloaded(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUS evas_object_smart_callback_call(data, "e_thumb_gen", NULL); } -EAPI Evas_Object * +E_API Evas_Object * e_thumb_icon_add(Evas *evas) { Evas_Object *obj; @@ -91,7 +91,7 @@ e_thumb_icon_add(Evas *evas) return obj; } -EAPI void +E_API void e_thumb_icon_file_set(Evas_Object *obj, const char *file, const char *key) { E_Thumb *eth; @@ -103,7 +103,7 @@ e_thumb_icon_file_set(Evas_Object *obj, const char *file, const char *key) E_FREE(eth->sort_id); } -EAPI void +E_API void e_thumb_icon_size_set(Evas_Object *obj, int w, int h) { E_Thumb *eth; @@ -115,7 +115,7 @@ e_thumb_icon_size_set(Evas_Object *obj, int w, int h) eth->h = h; } -EAPI void +E_API void e_thumb_icon_begin(Evas_Object *obj) { E_Thumb *eth, *eth2; @@ -156,7 +156,7 @@ e_thumb_icon_begin(Evas_Object *obj) _e_thumb_gen_begin(eth->objid, eth->file, eth->key, eth->w, eth->h); } -EAPI void +E_API void e_thumb_icon_end(Evas_Object *obj) { E_Thumb *eth; @@ -177,7 +177,7 @@ e_thumb_icon_end(Evas_Object *obj) } } -EAPI void +E_API void e_thumb_icon_rethumb(Evas_Object *obj) { E_Thumb *eth; @@ -218,7 +218,7 @@ _e_thumb_key_load(E_Thumb *eth, const char *icon) eet_close(ef); } -EAPI const char * +E_API const char * e_thumb_sort_id_get(Evas_Object *obj) { E_Thumb *eth; @@ -228,7 +228,7 @@ e_thumb_sort_id_get(Evas_Object *obj) return eth->sort_id; } -EAPI void +E_API void e_thumb_client_data(Ecore_Ipc_Event_Client_Data *e) { int objid; @@ -279,7 +279,7 @@ e_thumb_client_data(Ecore_Ipc_Event_Client_Data *e) } } -EAPI void +E_API void e_thumb_client_del(Ecore_Ipc_Event_Client_Del *e) { if (!eina_list_data_find(_thumbnailers, e->client)) return; diff --git a/src/bin/e_thumb.h b/src/bin/e_thumb.h index 8a17936..bb13ac6 100644 --- a/src/bin/e_thumb.h +++ b/src/bin/e_thumb.h @@ -8,16 +8,16 @@ EINTERN int e_thumb_init(void); EINTERN int e_thumb_shutdown(void); -EAPI Evas_Object *e_thumb_icon_add(Evas *evas); -EAPI void e_thumb_icon_file_set(Evas_Object *obj, const char *file, const char *key); -EAPI void e_thumb_icon_size_set(Evas_Object *obj, int w, int h); -EAPI void e_thumb_icon_begin(Evas_Object *obj); -EAPI void e_thumb_icon_end(Evas_Object *obj); -EAPI void e_thumb_icon_rethumb(Evas_Object *obj); -EAPI const char *e_thumb_sort_id_get(Evas_Object *obj); +E_API Evas_Object *e_thumb_icon_add(Evas *evas); +E_API void e_thumb_icon_file_set(Evas_Object *obj, const char *file, const char *key); +E_API void e_thumb_icon_size_set(Evas_Object *obj, int w, int h); +E_API void e_thumb_icon_begin(Evas_Object *obj); +E_API void e_thumb_icon_end(Evas_Object *obj); +E_API void e_thumb_icon_rethumb(Evas_Object *obj); +E_API const char *e_thumb_sort_id_get(Evas_Object *obj); -EAPI void e_thumb_client_data(Ecore_Ipc_Event_Client_Data *e); -EAPI void e_thumb_client_del(Ecore_Ipc_Event_Client_Del *e); +E_API void e_thumb_client_data(Ecore_Ipc_Event_Client_Data *e); +E_API void e_thumb_client_del(Ecore_Ipc_Event_Client_Del *e); #endif #endif diff --git a/src/bin/e_toolbar.c b/src/bin/e_toolbar.c index 01a0cf1..d038d43 100644 --- a/src/bin/e_toolbar.c +++ b/src/bin/e_toolbar.c @@ -149,7 +149,7 @@ e_toolbar_shutdown(void) return 1; } -EAPI E_Toolbar * +E_API E_Toolbar * e_toolbar_new(Evas *evas, const char *name, Evas_Object *fwin, Evas_Object *fm2) { E_Toolbar *tbar = NULL; @@ -211,7 +211,7 @@ e_toolbar_new(Evas *evas, const char *name, Evas_Object *fwin, Evas_Object *fm2) return tbar; } -EAPI void +E_API void e_toolbar_fwin_set(E_Toolbar *tbar, Evas_Object *fwin) { E_OBJECT_CHECK(tbar); @@ -219,7 +219,7 @@ e_toolbar_fwin_set(E_Toolbar *tbar, Evas_Object *fwin) tbar->fwin = fwin; } -EAPI Evas_Object * +E_API Evas_Object * e_toolbar_fwin_get(E_Toolbar *tbar) { E_OBJECT_CHECK_RETURN(tbar, NULL); @@ -227,7 +227,7 @@ e_toolbar_fwin_get(E_Toolbar *tbar) return tbar->fwin; } -EAPI void +E_API void e_toolbar_fm2_set(E_Toolbar *tbar, Evas_Object *fm2) { E_OBJECT_CHECK(tbar); @@ -235,7 +235,7 @@ e_toolbar_fm2_set(E_Toolbar *tbar, Evas_Object *fm2) tbar->fm2 = fm2; } -EAPI Evas_Object * +E_API Evas_Object * e_toolbar_fm2_get(E_Toolbar *tbar) { E_OBJECT_CHECK_RETURN(tbar, NULL); @@ -243,7 +243,7 @@ e_toolbar_fm2_get(E_Toolbar *tbar) return tbar->fm2; } -EAPI void +E_API void e_toolbar_orient(E_Toolbar *tbar, E_Gadcon_Orient orient) { char buf[4096]; @@ -257,7 +257,7 @@ e_toolbar_orient(E_Toolbar *tbar, E_Gadcon_Orient orient) edje_object_message_signal_process(tbar->o_base); } -EAPI void +E_API void e_toolbar_populate(E_Toolbar *tbar) { E_OBJECT_CHECK(tbar); diff --git a/src/bin/e_toolbar.h b/src/bin/e_toolbar.h index 3194e0a..a445f94 100644 --- a/src/bin/e_toolbar.h +++ b/src/bin/e_toolbar.h @@ -28,13 +28,13 @@ struct _E_Toolbar EINTERN int e_toolbar_init(void); EINTERN int e_toolbar_shutdown(void); -EAPI E_Toolbar *e_toolbar_new(Evas *evas, const char *name, Evas_Object *fwin, Evas_Object *fm2); -EAPI void e_toolbar_fwin_set(E_Toolbar *tbar, Evas_Object *fwin); -EAPI Evas_Object *e_toolbar_fwin_get(E_Toolbar *tbar); -EAPI void e_toolbar_fm2_set(E_Toolbar *tbar, Evas_Object *fm2); -EAPI Evas_Object *e_toolbar_fm2_get(E_Toolbar *tbar); -EAPI void e_toolbar_orient(E_Toolbar *tbar, E_Gadcon_Orient orient); -EAPI void e_toolbar_populate(E_Toolbar *tbar); +E_API E_Toolbar *e_toolbar_new(Evas *evas, const char *name, Evas_Object *fwin, Evas_Object *fm2); +E_API void e_toolbar_fwin_set(E_Toolbar *tbar, Evas_Object *fwin); +E_API Evas_Object *e_toolbar_fwin_get(E_Toolbar *tbar); +E_API void e_toolbar_fm2_set(E_Toolbar *tbar, Evas_Object *fm2); +E_API Evas_Object *e_toolbar_fm2_get(E_Toolbar *tbar); +E_API void e_toolbar_orient(E_Toolbar *tbar, E_Gadcon_Orient orient); +E_API void e_toolbar_populate(E_Toolbar *tbar); #endif #endif diff --git a/src/bin/e_user.c b/src/bin/e_user.c index 2576690..e79717a 100644 --- a/src/bin/e_user.c +++ b/src/bin/e_user.c @@ -4,7 +4,7 @@ static const char *_e_user_homedir = NULL; static size_t _e_user_homedir_len = 0; /* externally accessible functions */ -EAPI const char * +E_API const char * e_user_homedir_get(void) { char *d; @@ -36,7 +36,7 @@ e_user_homedir_get(void) * @return similar to snprintf(), this returns the number of bytes written or * that would be required to write if greater or equal than size. */ -EAPI size_t +E_API size_t e_user_homedir_concat_len(char *dst, size_t size, const char *path, size_t path_len) { if (!_e_user_homedir) @@ -45,7 +45,7 @@ e_user_homedir_concat_len(char *dst, size_t size, const char *path, size_t path_ return eina_str_join_len(dst, size, '/', _e_user_homedir, _e_user_homedir_len, path, path_len); } -EAPI size_t +E_API size_t e_user_homedir_concat(char *dst, size_t size, const char *path) { return e_user_homedir_concat_len(dst, size, path, strlen(path)); @@ -54,7 +54,7 @@ e_user_homedir_concat(char *dst, size_t size, const char *path) /** * same as snprintf("~/"fmt, ...). */ -EAPI size_t +E_API size_t e_user_homedir_snprintf(char *dst, size_t size, const char *fmt, ...) { size_t off, ret; @@ -93,7 +93,7 @@ e_user_homedir_snprintf(char *dst, size_t size, const char *fmt, ...) * If the directory does not exist, it will be created. If it cannot be * created, a dialog will be displayed an NULL will be returned */ -EAPI const char * +E_API const char * e_user_desktop_dir_get(void) { static char dir[PATH_MAX] = ""; @@ -109,7 +109,7 @@ e_user_desktop_dir_get(void) * If the directory does not exist, it will be created. If it cannot be * created, a dialog will be displayed an NULL will be returned */ -EAPI const char * +E_API const char * e_user_icon_dir_get(void) { static char dir[PATH_MAX] = ""; @@ -126,7 +126,7 @@ static size_t _e_user_dir_len = 0; /** * Return ~/.e/e */ -EAPI const char * +E_API const char * e_user_dir_get(void) { static char dir[PATH_MAX] = ""; @@ -171,7 +171,7 @@ e_user_dir_get(void) * @return similar to snprintf(), this returns the number of bytes written or * that would be required to write if greater or equal than size. */ -EAPI size_t +E_API size_t e_user_dir_concat_len(char *dst, size_t size, const char *path, size_t path_len) { if (!_e_user_dir) @@ -180,7 +180,7 @@ e_user_dir_concat_len(char *dst, size_t size, const char *path, size_t path_len) return eina_str_join_len(dst, size, '/', _e_user_dir, _e_user_dir_len, path, path_len); } -EAPI size_t +E_API size_t e_user_dir_concat(char *dst, size_t size, const char *path) { return e_user_dir_concat_len(dst, size, path, strlen(path)); @@ -189,7 +189,7 @@ e_user_dir_concat(char *dst, size_t size, const char *path) /** * same as snprintf("~/.e/e/"fmt, ...). */ -EAPI size_t +E_API size_t e_user_dir_snprintf(char *dst, size_t size, const char *fmt, ...) { size_t off, ret; diff --git a/src/bin/e_user.h b/src/bin/e_user.h index 13e49ef..32e39ef 100644 --- a/src/bin/e_user.h +++ b/src/bin/e_user.h @@ -3,22 +3,22 @@ #ifndef E_USER_H #define E_USER_H -EAPI const char *e_user_homedir_get(void); -EAPI size_t e_user_homedir_concat_len(char *dst, size_t size, const char *path, size_t path_len); -EAPI size_t e_user_homedir_concat(char *dst, size_t size, const char *path); -EAPI size_t e_user_homedir_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3, 4); +E_API const char *e_user_homedir_get(void); +E_API size_t e_user_homedir_concat_len(char *dst, size_t size, const char *path, size_t path_len); +E_API size_t e_user_homedir_concat(char *dst, size_t size, const char *path); +E_API size_t e_user_homedir_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3, 4); #define e_user_homedir_concat_static(dst, path) e_user_homedir_concat_len(dst, sizeof(dst), path, (sizeof(path) > 0) ? sizeof(path) - 1 : 0) -EAPI const char *e_user_dir_get(void); -EAPI size_t e_user_dir_concat_len(char *dst, size_t size, const char *path, size_t path_len); -EAPI size_t e_user_dir_concat(char *dst, size_t size, const char *path); -EAPI size_t e_user_dir_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3, 4); +E_API const char *e_user_dir_get(void); +E_API size_t e_user_dir_concat_len(char *dst, size_t size, const char *path, size_t path_len); +E_API size_t e_user_dir_concat(char *dst, size_t size, const char *path); +E_API size_t e_user_dir_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3, 4); #define e_user_dir_concat_static(dst, path) e_user_dir_concat_len(dst, sizeof(dst), path, (sizeof(path) > 0) ? sizeof(path) - 1 : 0) -EAPI const char *e_user_desktop_dir_get(void); -EAPI const char *e_user_icon_dir_get(void); +E_API const char *e_user_desktop_dir_get(void); +E_API const char *e_user_icon_dir_get(void); #endif #endif diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c index 351c3c2..3458c24 100644 --- a/src/bin/e_utils.c +++ b/src/bin/e_utils.c @@ -1,12 +1,12 @@ #include "e.h" -EAPI E_Path * path_data = NULL; -EAPI E_Path * path_images = NULL; -EAPI E_Path * path_fonts = NULL; -EAPI E_Path * path_icons = NULL; -EAPI E_Path * path_modules = NULL; -EAPI E_Path * path_backgrounds = NULL; -EAPI E_Path * path_messages = NULL; +E_API E_Path * path_data = NULL; +E_API E_Path * path_images = NULL; +E_API E_Path * path_fonts = NULL; +E_API E_Path * path_icons = NULL; +E_API E_Path * path_modules = NULL; +E_API E_Path * path_backgrounds = NULL; +E_API E_Path * path_messages = NULL; /* local subsystem functions */ static Eina_Bool _e_util_cb_delayed_del(void *data); @@ -20,14 +20,14 @@ static void _e_util_cb_delayed_cancel(void *data, void *obj); static Ecore_Timer *_e_util_dummy_timer = NULL; /* externally accessible functions */ -EAPI void +E_API void e_util_wakeup(void) { if (_e_util_dummy_timer) return; _e_util_dummy_timer = ecore_timer_add(0.0, _e_util_wakeup_cb, NULL); } -EAPI void +E_API void e_util_env_set(const char *var, const char *val) { if (val) @@ -51,7 +51,7 @@ e_util_env_set(const char *var, const char *val) } } -EAPI int +E_API int e_util_glob_match(const char *str, const char *pattern) { if ((!str) || (!pattern)) return 0; @@ -66,7 +66,7 @@ e_util_glob_match(const char *str, const char *pattern) return 0; } -EAPI int +E_API int e_util_glob_case_match(const char *str, const char *pattern) { const char *p; @@ -91,7 +91,7 @@ e_util_glob_case_match(const char *str, const char *pattern) return 0; } -EAPI int +E_API int e_util_strcmp(const char *s1, const char *s2) { if ((s1) && (s2)) @@ -102,7 +102,7 @@ e_util_strcmp(const char *s1, const char *s2) return 0x7fffffff; } -EAPI int +E_API int e_util_strcasecmp(const char *s1, const char *s2) { if ((!s1) && (!s2)) return 0; @@ -111,7 +111,7 @@ e_util_strcasecmp(const char *s1, const char *s2) return strcasecmp(s1, s2); } -EAPI int +E_API int e_util_both_str_empty(const char *s1, const char *s2) { int empty = 0; @@ -123,7 +123,7 @@ e_util_both_str_empty(const char *s1, const char *s2) return 0; } -EAPI int +E_API int e_util_immortal_check(void) { Eina_List *wins; @@ -144,7 +144,7 @@ e_util_immortal_check(void) return 0; } -EAPI int +E_API int e_util_edje_icon_check(const char *name) { const char *file; @@ -160,7 +160,7 @@ e_util_edje_icon_check(const char *name) /* WARNING This function is deprecated,. must be made static. * You should use e_util_icon_theme_set instead */ -EAPI int +E_API int e_util_edje_icon_set(Evas_Object *obj, const char *name) { const char *file; @@ -219,7 +219,7 @@ _e_util_icon_fdo_set(Evas_Object *obj, const char *icon) } /* use e_icon_size_scale_set(obj, size) to set the preferred icon size */ -EAPI int +E_API int e_util_icon_theme_set(Evas_Object *obj, const char *icon) { if (icon && (icon[0] == '/')) @@ -272,7 +272,7 @@ _e_util_menu_item_edje_icon_set(E_Menu_Item *mi, const char *name, Eina_Bool fal return 0; } -EAPI unsigned int +E_API unsigned int e_util_icon_size_normalize(unsigned int desired) { const unsigned int *itr, known_sizes[] = @@ -301,7 +301,7 @@ _e_util_menu_item_fdo_icon_set(E_Menu_Item *mi, const char *icon) return 1; } -EAPI int +E_API int e_util_menu_item_theme_icon_set(E_Menu_Item *mi, const char *icon) { if (e_config->icon_theme_overrides) @@ -322,7 +322,7 @@ e_util_menu_item_theme_icon_set(E_Menu_Item *mi, const char *icon) } } -EAPI const char * +E_API const char * e_util_mime_icon_get(const char *mime, unsigned int size) { char buf[1024]; @@ -340,7 +340,7 @@ e_util_mime_icon_get(const char *mime, unsigned int size) return efreet_mime_type_icon_get(mime, e_config->icon_theme, e_util_icon_size_normalize(size)); } -EAPI E_Client * +E_API E_Client * e_util_desk_client_above(E_Client *ec) { E_Client *ec2; @@ -355,7 +355,7 @@ e_util_desk_client_above(E_Client *ec) return NULL; } -EAPI E_Client * +E_API E_Client * e_util_desk_client_below(E_Client *ec) { E_Client *ec2; @@ -370,7 +370,7 @@ e_util_desk_client_below(E_Client *ec) return NULL; } -EAPI int +E_API int e_util_edje_collection_exists(const char *file, const char *coll) { Eina_List *clist; @@ -387,7 +387,7 @@ e_util_edje_collection_exists(const char *file, const char *coll) return ret; } -EAPI E_Dialog * +E_API E_Dialog * e_util_dialog_internal(const char *title, const char *txt) { E_Dialog *dia; @@ -404,7 +404,7 @@ e_util_dialog_internal(const char *title, const char *txt) return dia; } -EAPI const char * +E_API const char * e_util_filename_escape(const char *filename) { const char *p; @@ -440,7 +440,7 @@ e_util_filename_escape(const char *filename) } -EAPI char * +E_API char * e_util_shell_env_path_eval(const char *path) { /* evaluate things like: @@ -542,7 +542,7 @@ e_util_shell_env_path_eval(const char *path) return strdup(buf); } -EAPI char * +E_API char * e_util_size_string_get(off_t size) { double dsize; @@ -573,7 +573,7 @@ e_util_size_string_get(off_t size) return strdup(buf); } -EAPI char * +E_API char * e_util_file_time_get(time_t ftime) { time_t diff, ltime, test; @@ -628,20 +628,20 @@ e_util_file_time_get(time_t ftime) return s; } -EAPI Evas_Object * +E_API Evas_Object * e_util_icon_add(const char *path, Evas *evas) { return _e_util_icon_add(path, evas, 64); } -EAPI Evas_Object * +E_API Evas_Object * e_util_desktop_icon_add(Efreet_Desktop *desktop, unsigned int size, Evas *evas) { if ((!desktop) || (!desktop->icon)) return NULL; return e_util_icon_theme_icon_add(desktop->icon, size, evas); } -EAPI Evas_Object * +E_API Evas_Object * e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas) { if (!icon_name) return NULL; @@ -661,7 +661,7 @@ e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas) return NULL; } -EAPI void +E_API void e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, unsigned int size, E_Menu_Item *mi) { const char *path = NULL; @@ -688,7 +688,7 @@ e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, unsigned int size, E_ } } -EAPI int +E_API int e_util_dir_check(const char *dir) { if (!ecore_file_exists(dir)) @@ -710,7 +710,7 @@ e_util_dir_check(const char *dir) return 1; } -EAPI void +E_API void e_util_defer_object_del(E_Object *obj) { if (stopping) @@ -724,7 +724,7 @@ e_util_defer_object_del(E_Object *obj) } } -EAPI const char * +E_API const char * e_util_winid_str_get(Ecore_X_Window win) { const char *vals = "qWeRtYuIoP5-$&<~"; @@ -763,7 +763,7 @@ _win_auto_size_calc(int max, int min) return min; } -EAPI void +E_API void e_util_win_auto_resize_fill(Evas_Object *win) { E_Zone *zone = NULL; @@ -884,7 +884,7 @@ _e_util_conf_timer_new(void *data) return ECORE_CALLBACK_CANCEL; } -EAPI Eina_Bool +E_API Eina_Bool e_util_module_config_check(const char *module_name, int loaded, int current) { if (loaded > current) @@ -905,7 +905,7 @@ e_util_module_config_check(const char *module_name, int loaded, int current) /** * Checks whenever the current manager/comp/zone have fullscreen windows. */ -EAPI Eina_Bool +E_API Eina_Bool e_util_fullscreen_current_any(void) { E_Zone *zone = e_zone_current_get(); @@ -920,7 +920,7 @@ e_util_fullscreen_current_any(void) /** * Checks whenever any manager/comp/zone have fullscreen windows. */ -EAPI Eina_Bool +E_API Eina_Bool e_util_fullscreen_any(void) { E_Zone *zone; @@ -943,7 +943,7 @@ e_util_fullscreen_any(void) return EINA_FALSE; } -EAPI const char * +E_API const char * e_util_time_str_get(long int seconds) { static char buf[1024]; @@ -1033,7 +1033,7 @@ _e_util_size_debug(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj fprintf(stderr, "%s %d OBJ[%s%s%p]: (%d,%d) - %dx%d\n", evas_object_visible_get(obj) ? "VIS" : "HID", evas_object_layer_get(obj), name ?: "", name ? "|" : "", obj, x, y, w, h); } -EAPI void +E_API void e_util_size_debug_set(Evas_Object *obj, Eina_Bool enable) { if (enable) @@ -1070,7 +1070,7 @@ e_util_size_debug_set(Evas_Object *obj, Eina_Bool enable) } } -EAPI void +E_API void e_util_string_list_free(Eina_List *l) { char *s; @@ -1098,7 +1098,7 @@ _e_util_default_terminal_get(const char *defaults_list) return tdesktop; } -EAPI Efreet_Desktop * +E_API Efreet_Desktop * e_util_terminal_desktop_get(void) { const char *terms[] = @@ -1151,7 +1151,7 @@ e_util_terminal_desktop_get(void) return tdesktop; } -EAPI E_Config_Binding_Key * +E_API E_Config_Binding_Key * e_util_binding_match(const Eina_List *bindlist, Ecore_Event_Key *ev, unsigned int *num, const E_Config_Binding_Key *skip) { E_Config_Binding_Key *bi; @@ -1185,7 +1185,7 @@ e_util_binding_match(const Eina_List *bindlist, Ecore_Event_Key *ev, unsigned in return NULL; } -EAPI void +E_API void e_util_gadcon_orient_icon_set(E_Gadcon_Orient orient, Evas_Object *obj) { switch (orient) @@ -1244,7 +1244,7 @@ e_util_gadcon_orient_icon_set(E_Gadcon_Orient orient, Evas_Object *obj) } } -EAPI void +E_API void e_util_gadcon_orient_menu_item_icon_set(E_Gadcon_Orient orient, E_Menu_Item *mi) { switch (orient) @@ -1303,7 +1303,7 @@ e_util_gadcon_orient_menu_item_icon_set(E_Gadcon_Orient orient, E_Menu_Item *mi) } } -EAPI char * +E_API char * e_util_string_append_char(char *str, size_t *size, size_t *len, char c) { if (!str) @@ -1336,7 +1336,7 @@ e_util_string_append_char(char *str, size_t *size, size_t *len, char c) return str; } -EAPI char * +E_API char * e_util_string_append_quoted(char *str, size_t *size, size_t *len, const char *src) { str = e_util_string_append_char(str, size, len, '\''); @@ -1370,7 +1370,7 @@ e_util_string_append_quoted(char *str, size_t *size, size_t *len, const char *sr return str; } -EAPI void +E_API void e_util_evas_objects_above_print(Evas_Object *o) { Evas_Object *a, *oo; @@ -1393,7 +1393,7 @@ e_util_evas_objects_above_print(Evas_Object *o) } } -EAPI void +E_API void e_util_evas_objects_above_print_smart(Evas_Object *o) { Evas_Object *a, *oo; @@ -1436,7 +1436,7 @@ e_util_evas_objects_above_print_smart(Evas_Object *o) */ static void *(* const volatile memset_ptr)(void *, int, size_t) = memset; -EAPI void +E_API void e_util_memclear(void *s, size_t n) { memset_ptr(s, 0, n); diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h index b17e2ff..574894c 100644 --- a/src/bin/e_utils.h +++ b/src/bin/e_utils.h @@ -12,58 +12,58 @@ e_util_dialog_internal(title, __tmpbuf); \ } -EAPI void e_util_wakeup(void); -EAPI void e_util_env_set(const char *var, const char *val); -EAPI int e_util_glob_match(const char *str, const char *glob); -EAPI int e_util_glob_case_match(const char *str, const char *glob); -EAPI int e_util_strcasecmp(const char *s1, const char *s2); -EAPI int e_util_strcmp(const char *s1, const char *s2); -EAPI int e_util_both_str_empty(const char *s1, const char *s2); -EAPI int e_util_immortal_check(void); -EAPI int e_util_edje_icon_check(const char *name); -EAPI int e_util_edje_icon_set(Evas_Object *obj, const char *name); -EAPI int e_util_icon_theme_set(Evas_Object *obj, const char *icon); -EAPI unsigned int e_util_icon_size_normalize(unsigned int desired); -EAPI int e_util_menu_item_theme_icon_set(E_Menu_Item *mi, const char *icon); -EAPI const char *e_util_mime_icon_get(const char *mime, unsigned int size); -EAPI E_Client *e_util_desk_client_above(E_Client *ec); -EAPI E_Client *e_util_desk_client_below(E_Client *ec); -EAPI int e_util_edje_collection_exists(const char *file, const char *coll); -EAPI E_Dialog *e_util_dialog_internal(const char *title, const char *txt); -EAPI const char *e_util_filename_escape(const char *filename); -EAPI char *e_util_shell_env_path_eval(const char *path); -EAPI char *e_util_size_string_get(off_t size); -EAPI char *e_util_file_time_get(time_t ftime); -EAPI Evas_Object *e_util_icon_add(const char *path, Evas *evas); -EAPI Evas_Object *e_util_desktop_icon_add(Efreet_Desktop *desktop, unsigned int size, Evas *evas); -EAPI Evas_Object *e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas); -EAPI void e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, unsigned int size, E_Menu_Item *mi); -EAPI int e_util_dir_check(const char *dir); -EAPI void e_util_defer_object_del(E_Object *obj); -EAPI const char *e_util_winid_str_get(Ecore_X_Window win); -EAPI void e_util_win_auto_resize_fill(Evas_Object *win); +E_API void e_util_wakeup(void); +E_API void e_util_env_set(const char *var, const char *val); +E_API int e_util_glob_match(const char *str, const char *glob); +E_API int e_util_glob_case_match(const char *str, const char *glob); +E_API int e_util_strcasecmp(const char *s1, const char *s2); +E_API int e_util_strcmp(const char *s1, const char *s2); +E_API int e_util_both_str_empty(const char *s1, const char *s2); +E_API int e_util_immortal_check(void); +E_API int e_util_edje_icon_check(const char *name); +E_API int e_util_edje_icon_set(Evas_Object *obj, const char *name); +E_API int e_util_icon_theme_set(Evas_Object *obj, const char *icon); +E_API unsigned int e_util_icon_size_normalize(unsigned int desired); +E_API int e_util_menu_item_theme_icon_set(E_Menu_Item *mi, const char *icon); +E_API const char *e_util_mime_icon_get(const char *mime, unsigned int size); +E_API E_Client *e_util_desk_client_above(E_Client *ec); +E_API E_Client *e_util_desk_client_below(E_Client *ec); +E_API int e_util_edje_collection_exists(const char *file, const char *coll); +E_API E_Dialog *e_util_dialog_internal(const char *title, const char *txt); +E_API const char *e_util_filename_escape(const char *filename); +E_API char *e_util_shell_env_path_eval(const char *path); +E_API char *e_util_size_string_get(off_t size); +E_API char *e_util_file_time_get(time_t ftime); +E_API Evas_Object *e_util_icon_add(const char *path, Evas *evas); +E_API Evas_Object *e_util_desktop_icon_add(Efreet_Desktop *desktop, unsigned int size, Evas *evas); +E_API Evas_Object *e_util_icon_theme_icon_add(const char *icon_name, unsigned int size, Evas *evas); +E_API void e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop, unsigned int size, E_Menu_Item *mi); +E_API int e_util_dir_check(const char *dir); +E_API void e_util_defer_object_del(E_Object *obj); +E_API const char *e_util_winid_str_get(Ecore_X_Window win); +E_API void e_util_win_auto_resize_fill(Evas_Object *win); /* check if loaded config version matches the current version, show a dialog warning if loaded version is older or newer than current */ -EAPI Eina_Bool e_util_module_config_check(const char *module_name, int loaded, int current); +E_API Eina_Bool e_util_module_config_check(const char *module_name, int loaded, int current); -EAPI E_Config_Binding_Key *e_util_binding_match(const Eina_List *bindlist, Ecore_Event_Key *ev, unsigned int *num, const E_Config_Binding_Key *skip); -EAPI Eina_Bool e_util_fullscreen_current_any(void); -EAPI Eina_Bool e_util_fullscreen_any(void); -EAPI const char *e_util_time_str_get(long int seconds); -EAPI void e_util_size_debug_set(Evas_Object *obj, Eina_Bool enable); -EAPI Efreet_Desktop *e_util_terminal_desktop_get(void); -EAPI void e_util_gadcon_orient_icon_set(E_Gadcon_Orient orient, Evas_Object *obj); -EAPI void e_util_gadcon_orient_menu_item_icon_set(E_Gadcon_Orient orient, E_Menu_Item *mi); +E_API E_Config_Binding_Key *e_util_binding_match(const Eina_List *bindlist, Ecore_Event_Key *ev, unsigned int *num, const E_Config_Binding_Key *skip); +E_API Eina_Bool e_util_fullscreen_current_any(void); +E_API Eina_Bool e_util_fullscreen_any(void); +E_API const char *e_util_time_str_get(long int seconds); +E_API void e_util_size_debug_set(Evas_Object *obj, Eina_Bool enable); +E_API Efreet_Desktop *e_util_terminal_desktop_get(void); +E_API void e_util_gadcon_orient_icon_set(E_Gadcon_Orient orient, Evas_Object *obj); +E_API void e_util_gadcon_orient_menu_item_icon_set(E_Gadcon_Orient orient, E_Menu_Item *mi); -EAPI char *e_util_string_append_char(char *str, size_t *size, size_t *len, char c); -EAPI char *e_util_string_append_quoted(char *str, size_t *size, size_t *len, const char *src); +E_API char *e_util_string_append_char(char *str, size_t *size, size_t *len, char c); +E_API char *e_util_string_append_quoted(char *str, size_t *size, size_t *len, const char *src); -EAPI void e_util_evas_objects_above_print(Evas_Object *o); -EAPI void e_util_evas_objects_above_print_smart(Evas_Object *o); +E_API void e_util_evas_objects_above_print(Evas_Object *o); +E_API void e_util_evas_objects_above_print_smart(Evas_Object *o); -EAPI void e_util_string_list_free(Eina_List *l); +E_API void e_util_string_list_free(Eina_List *l); -EAPI void e_util_memclear(void *s, size_t n); +E_API void e_util_memclear(void *s, size_t n); static inline void e_util_pointer_center(const E_Client *ec) diff --git a/src/bin/e_uuid_store.h b/src/bin/e_uuid_store.h index c9f6e1e..855c57d 100644 --- a/src/bin/e_uuid_store.h +++ b/src/bin/e_uuid_store.h @@ -29,8 +29,8 @@ struct uuid_store { EINTERN int e_uuid_store_init(void); EINTERN int e_uuid_store_shutdown(void); -EAPI void e_uuid_dump(void); -EAPI Eina_Bool e_uuid_store_reload(void); -EAPI Eina_Bool e_uuid_store_entry_del(uuid_t uuid); -EAPI Eina_Bool e_uuid_store_entry_update(uuid_t uuid, E_Client *ec); +E_API void e_uuid_dump(void); +E_API Eina_Bool e_uuid_store_reload(void); +E_API Eina_Bool e_uuid_store_entry_del(uuid_t uuid); +E_API Eina_Bool e_uuid_store_entry_update(uuid_t uuid, E_Client *ec); #endif diff --git a/src/bin/e_widget.c b/src/bin/e_widget.c index 8107b0f..ac898dd 100644 --- a/src/bin/e_widget.c +++ b/src/bin/e_widget.c @@ -54,42 +54,42 @@ _e_widget_hint(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_in static Evas_Smart *_e_smart = NULL; /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_add(Evas *evas) { _e_smart_init(); return evas_object_smart_add(evas, _e_smart); } -EAPI void +E_API void e_widget_del_hook_set(Evas_Object *obj, void (*func)(Evas_Object *obj)) { API_ENTRY return; sd->del_func = func; } -EAPI void +E_API void e_widget_focus_hook_set(Evas_Object *obj, void (*func)(Evas_Object *obj)) { API_ENTRY return; sd->focus_func = func; } -EAPI void +E_API void e_widget_activate_hook_set(Evas_Object *obj, void (*func)(Evas_Object *obj)) { API_ENTRY return; sd->activate_func = func; } -EAPI void +E_API void e_widget_disable_hook_set(Evas_Object *obj, void (*func)(Evas_Object *obj)) { API_ENTRY return; sd->disable_func = func; } -EAPI void +E_API void e_widget_on_focus_hook_set(Evas_Object *obj, void (*func)(void *data, Evas_Object *obj), void *data) { API_ENTRY return; @@ -97,7 +97,7 @@ e_widget_on_focus_hook_set(Evas_Object *obj, void (*func)(void *data, Evas_Objec sd->on_focus_data = data; } -EAPI void +E_API void e_widget_on_change_hook_set(Evas_Object *obj, void (*func)(void *data, Evas_Object *obj), void *data) { API_ENTRY return; @@ -105,7 +105,7 @@ e_widget_on_change_hook_set(Evas_Object *obj, void (*func)(void *data, Evas_Obje sd->on_change_data = data; } -EAPI void +E_API void e_widget_on_disable_hook_set(Evas_Object *obj, void (*func)(void *data, Evas_Object *obj), void *data) { API_ENTRY return; @@ -113,27 +113,27 @@ e_widget_on_disable_hook_set(Evas_Object *obj, void (*func)(void *data, Evas_Obj sd->on_disable_data = data; } -EAPI void +E_API void e_widget_data_set(Evas_Object *obj, void *data) { API_ENTRY return; sd->data = data; } -EAPI void * +E_API void * e_widget_data_get(Evas_Object *obj) { API_ENTRY return NULL; return sd->data; } -EAPI void +E_API void e_widget_size_min_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh) { evas_object_size_hint_min_set(obj, minw, minh); } -EAPI void +E_API void e_widget_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) { evas_object_size_hint_min_get(obj, minw, minh); @@ -151,7 +151,7 @@ _sub_obj_del(void *data, evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, _sub_obj_del); } -EAPI void +E_API void e_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj) { API_ENTRY return; @@ -175,7 +175,7 @@ e_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj) evas_object_event_callback_del_full(sobj, EVAS_CALLBACK_DEL, _sub_obj_del, sd); } -EAPI void +E_API void e_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj) { API_ENTRY return; @@ -187,7 +187,7 @@ e_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj) } } -EAPI void +E_API void e_widget_resize_object_set(Evas_Object *obj, Evas_Object *sobj) { int w, h; @@ -203,14 +203,14 @@ e_widget_resize_object_set(Evas_Object *obj, Evas_Object *sobj) evas_object_size_hint_min_set(obj, w, h); } -EAPI void +E_API void e_widget_can_focus_set(Evas_Object *obj, int can_focus) { API_ENTRY return; sd->can_focus = can_focus; } -EAPI int +E_API int e_widget_can_focus_get(Evas_Object *obj) { API_ENTRY return 0; @@ -220,14 +220,14 @@ e_widget_can_focus_get(Evas_Object *obj) return 0; } -EAPI int +E_API int e_widget_focus_get(Evas_Object *obj) { API_ENTRY return 0; return sd->focused; } -EAPI Evas_Object * +E_API Evas_Object * e_widget_focused_object_get(Evas_Object *obj) { Eina_List *l = NULL; @@ -243,7 +243,7 @@ e_widget_focused_object_get(Evas_Object *obj) return obj; } -EAPI int +E_API int e_widget_focus_jump(Evas_Object *obj, int forward) { API_ENTRY return 0; @@ -336,7 +336,7 @@ e_widget_focus_jump(Evas_Object *obj, int forward) return 0; } -EAPI void +E_API void e_widget_focus_set(Evas_Object *obj, int first) { API_ENTRY return; @@ -382,14 +382,14 @@ e_widget_focus_set(Evas_Object *obj, int first) } } -EAPI Evas_Object * +E_API Evas_Object * e_widget_parent_get(Evas_Object *obj) { API_ENTRY return NULL; return sd->parent_obj; } -EAPI void +E_API void e_widget_focused_object_clear(Evas_Object *obj) { Eina_List *l = NULL; @@ -409,7 +409,7 @@ e_widget_focused_object_clear(Evas_Object *obj) if (sd->focus_func) sd->focus_func(obj); } -EAPI void +E_API void e_widget_focus_steal(Evas_Object *obj) { Evas_Object *parent = NULL, *o = NULL; @@ -438,7 +438,7 @@ e_widget_focus_steal(Evas_Object *obj) if (sd->focus_func) sd->focus_func(obj); } -EAPI void +E_API void e_widget_activate(Evas_Object *obj) { API_ENTRY return; @@ -446,7 +446,7 @@ e_widget_activate(Evas_Object *obj) if (sd->activate_func) sd->activate_func(obj); } -EAPI void +E_API void e_widget_change(Evas_Object *obj) { API_ENTRY return; @@ -454,7 +454,7 @@ e_widget_change(Evas_Object *obj) if (sd->on_change_func) sd->on_change_func(sd->on_change_data, obj); } -EAPI void +E_API void e_widget_disabled_set(Evas_Object *obj, int disabled) { API_ENTRY return; @@ -482,14 +482,14 @@ e_widget_disabled_set(Evas_Object *obj, int disabled) if (sd->on_disable_func) sd->on_disable_func(sd->on_disable_data, obj); } -EAPI int +E_API int e_widget_disabled_get(Evas_Object *obj) { API_ENTRY return 0; return sd->disabled; } -EAPI E_Pointer * +E_API E_Pointer * e_widget_pointer_get(Evas_Object *obj) { Evas_Object *win = NULL; @@ -500,7 +500,7 @@ e_widget_pointer_get(Evas_Object *obj) return NULL; } -EAPI void +E_API void e_widget_size_min_resize(Evas_Object *obj) { Evas_Coord minw, minh; diff --git a/src/bin/e_widget.h b/src/bin/e_widget.h index 0a8a2d3..b88f323 100644 --- a/src/bin/e_widget.h +++ b/src/bin/e_widget.h @@ -3,36 +3,36 @@ #ifndef E_WIDGET_H #define E_WIDGET_H -EAPI Evas_Object *e_widget_add(Evas *evas); -EAPI void e_widget_del_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj)); -EAPI void e_widget_focus_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj)); -EAPI void e_widget_activate_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj)); -EAPI void e_widget_disable_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj)); -EAPI void e_widget_on_disable_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data); -EAPI void e_widget_on_focus_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data); -EAPI void e_widget_on_change_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data); -EAPI void e_widget_data_set(Evas_Object *obj, void *data); -EAPI void *e_widget_data_get(Evas_Object *obj); -EAPI void e_widget_size_min_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh); -EAPI void e_widget_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh); -EAPI void e_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj); -EAPI void e_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj); -EAPI void e_widget_resize_object_set(Evas_Object *obj, Evas_Object *sobj); -EAPI void e_widget_can_focus_set(Evas_Object *obj, int can_focus); -EAPI int e_widget_can_focus_get(Evas_Object *obj); -EAPI int e_widget_focus_get(Evas_Object *obj); -EAPI Evas_Object *e_widget_focused_object_get(Evas_Object *obj); -EAPI int e_widget_focus_jump(Evas_Object *obj, int forward); -EAPI void e_widget_focus_set(Evas_Object *obj, int first); -EAPI void e_widget_focused_object_clear(Evas_Object *obj); -EAPI Evas_Object *e_widget_parent_get(Evas_Object *obj); -EAPI void e_widget_focus_steal(Evas_Object *obj); -EAPI void e_widget_activate(Evas_Object *obj); -EAPI void e_widget_change(Evas_Object *obj); -EAPI void e_widget_disabled_set(Evas_Object *obj, int disabled); -EAPI int e_widget_disabled_get(Evas_Object *obj); -EAPI E_Pointer *e_widget_pointer_get(Evas_Object *obj); -EAPI void e_widget_size_min_resize(Evas_Object *obj); +E_API Evas_Object *e_widget_add(Evas *evas); +E_API void e_widget_del_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj)); +E_API void e_widget_focus_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj)); +E_API void e_widget_activate_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj)); +E_API void e_widget_disable_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj)); +E_API void e_widget_on_disable_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data); +E_API void e_widget_on_focus_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data); +E_API void e_widget_on_change_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data); +E_API void e_widget_data_set(Evas_Object *obj, void *data); +E_API void *e_widget_data_get(Evas_Object *obj); +E_API void e_widget_size_min_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh); +E_API void e_widget_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh); +E_API void e_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj); +E_API void e_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj); +E_API void e_widget_resize_object_set(Evas_Object *obj, Evas_Object *sobj); +E_API void e_widget_can_focus_set(Evas_Object *obj, int can_focus); +E_API int e_widget_can_focus_get(Evas_Object *obj); +E_API int e_widget_focus_get(Evas_Object *obj); +E_API Evas_Object *e_widget_focused_object_get(Evas_Object *obj); +E_API int e_widget_focus_jump(Evas_Object *obj, int forward); +E_API void e_widget_focus_set(Evas_Object *obj, int first); +E_API void e_widget_focused_object_clear(Evas_Object *obj); +E_API Evas_Object *e_widget_parent_get(Evas_Object *obj); +E_API void e_widget_focus_steal(Evas_Object *obj); +E_API void e_widget_activate(Evas_Object *obj); +E_API void e_widget_change(Evas_Object *obj); +E_API void e_widget_disabled_set(Evas_Object *obj, int disabled); +E_API int e_widget_disabled_get(Evas_Object *obj); +E_API E_Pointer *e_widget_pointer_get(Evas_Object *obj); +E_API void e_widget_size_min_resize(Evas_Object *obj); #endif #endif diff --git a/src/bin/e_widget_aspect.c b/src/bin/e_widget_aspect.c index 7232599..4f9c9af 100644 --- a/src/bin/e_widget_aspect.c +++ b/src/bin/e_widget_aspect.c @@ -69,7 +69,7 @@ _cb_reconfigure(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v _e_wid_reconfigure(wd); } -EAPI Evas_Object * +E_API Evas_Object * e_widget_aspect_add(Evas *evas, int w, int h) { Evas_Object *obj; @@ -93,7 +93,7 @@ e_widget_aspect_add(Evas *evas, int w, int h) return obj; } -EAPI void +E_API void e_widget_aspect_aspect_set(Evas_Object *obj, int w, int h) { E_Widget_Data *wd; @@ -106,7 +106,7 @@ e_widget_aspect_aspect_set(Evas_Object *obj, int w, int h) _e_wid_reconfigure(wd); } -EAPI void +E_API void e_widget_aspect_align_set(Evas_Object *obj, double align_x, double align_y) { E_Widget_Data *wd; @@ -119,7 +119,7 @@ e_widget_aspect_align_set(Evas_Object *obj, double align_x, double align_y) _e_wid_reconfigure(wd); } -EAPI void +E_API void e_widget_aspect_child_set(Evas_Object *obj, Evas_Object *child) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_aspect.h b/src/bin/e_widget_aspect.h index 171497d..539b648 100644 --- a/src/bin/e_widget_aspect.h +++ b/src/bin/e_widget_aspect.h @@ -1,9 +1,9 @@ #ifndef E_WIDGET_ASPECT_H #define E_WIDGET_ASPECT_H -EAPI Evas_Object *e_widget_aspect_add(Evas *evas, int w, int h); -EAPI void e_widget_aspect_aspect_set(Evas_Object *obj, int w, int h); -EAPI void e_widget_aspect_child_set(Evas_Object *obj, Evas_Object *child); -EAPI void e_widget_aspect_align_set(Evas_Object *obj, double align_x, double align_y); +E_API Evas_Object *e_widget_aspect_add(Evas *evas, int w, int h); +E_API void e_widget_aspect_aspect_set(Evas_Object *obj, int w, int h); +E_API void e_widget_aspect_child_set(Evas_Object *obj, Evas_Object *child); +E_API void e_widget_aspect_align_set(Evas_Object *obj, double align_x, double align_y); #endif diff --git a/src/bin/e_widget_bgpreview.c b/src/bin/e_widget_bgpreview.c index 4c9af31..52a9172 100644 --- a/src/bin/e_widget_bgpreview.c +++ b/src/bin/e_widget_bgpreview.c @@ -26,7 +26,7 @@ static void _e_wid_desk_cb_config(void *data, Evas *evas, Evas_Object *obj, static void _e_wid_cb_resize(void *data, Evas *evas, Evas_Object *obj, void *event); static Eina_Bool _e_wid_cb_bg_update(void *data, int type, void *event); -EAPI Evas_Object * +E_API Evas_Object * e_widget_bgpreview_add(Evas *evas, int nx, int ny) { Evas_Object *obj; @@ -54,7 +54,7 @@ e_widget_bgpreview_add(Evas *evas, int nx, int ny) return obj; } -EAPI void +E_API void e_widget_bgpreview_num_desks_set(Evas_Object *obj, int nx, int ny) { E_Widget_Data *wd; @@ -65,7 +65,7 @@ e_widget_bgpreview_num_desks_set(Evas_Object *obj, int nx, int ny) _e_wid_reconfigure(wd); } -EAPI Evas_Object * +E_API Evas_Object * e_widget_bgpreview_desk_add(Evas *e, E_Zone *zone, int x, int y) { E_Widget_Desk_Data *dd; @@ -96,7 +96,7 @@ e_widget_bgpreview_desk_add(Evas *e, E_Zone *zone, int x, int y) return dd->live; } -EAPI void +E_API void e_widget_bgpreview_desk_configurable_set(Evas_Object *obj, Eina_Bool enable) { E_Widget_Desk_Data *dd; diff --git a/src/bin/e_widget_bgpreview.h b/src/bin/e_widget_bgpreview.h index adada53..098ed76 100644 --- a/src/bin/e_widget_bgpreview.h +++ b/src/bin/e_widget_bgpreview.h @@ -1,9 +1,9 @@ #ifndef E_WIDGET_DESK_PREVIEW_H #define E_WIDGET_DESK_PREVIEW_H -EAPI Evas_Object *e_widget_bgpreview_add(Evas *evas, int nx, int ny); -EAPI void e_widget_bgpreview_num_desks_set(Evas_Object *obj, int nx, int ny); -EAPI Evas_Object *e_widget_bgpreview_desk_add(Evas *e, E_Zone *zone, int x, int y); -EAPI void e_widget_bgpreview_desk_configurable_set(Evas_Object *obj, Eina_Bool enable); +E_API Evas_Object *e_widget_bgpreview_add(Evas *evas, int nx, int ny); +E_API void e_widget_bgpreview_num_desks_set(Evas_Object *obj, int nx, int ny); +E_API Evas_Object *e_widget_bgpreview_desk_add(Evas *e, E_Zone *zone, int x, int y); +E_API void e_widget_bgpreview_desk_configurable_set(Evas_Object *obj, Eina_Bool enable); #endif diff --git a/src/bin/e_widget_button.c b/src/bin/e_widget_button.c index b0cbb69..738050b 100644 --- a/src/bin/e_widget_button.c +++ b/src/bin/e_widget_button.c @@ -19,7 +19,7 @@ static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *even /* local subsystem functions */ /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func)(void *data, void *data2), void *data, void *data2) { Evas_Object *obj, *o; @@ -64,7 +64,7 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func return obj; } -EAPI void +E_API void e_widget_button_label_set(Evas_Object *obj, const char *label) { E_Widget_Data *wd; @@ -73,7 +73,7 @@ e_widget_button_label_set(Evas_Object *obj, const char *label) elm_object_text_set(wd->o_button, label); } -EAPI void +E_API void e_widget_button_icon_set(Evas_Object *obj, Evas_Object *icon) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_button.h b/src/bin/e_widget_button.h index 0ebe6d8..a12aaf8 100644 --- a/src/bin/e_widget_button.h +++ b/src/bin/e_widget_button.h @@ -3,9 +3,9 @@ #ifndef E_WIDGET_BUTTON_H #define E_WIDGET_BUTTON_H -EAPI Evas_Object *e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func) (void *data, void *data2), void *data, void *data2); -EAPI void e_widget_button_label_set(Evas_Object *obj, const char *label); -EAPI void e_widget_button_icon_set(Evas_Object *obj, Evas_Object *icon); +E_API Evas_Object *e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func) (void *data, void *data2), void *data, void *data2); +E_API void e_widget_button_label_set(Evas_Object *obj, const char *label); +E_API void e_widget_button_icon_set(Evas_Object *obj, Evas_Object *icon); #endif #endif diff --git a/src/bin/e_widget_check.c b/src/bin/e_widget_check.c index 52126e6..14906be 100644 --- a/src/bin/e_widget_check.c +++ b/src/bin/e_widget_check.c @@ -130,7 +130,7 @@ _e_wid_focus_steal(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED * @param val pointer to int where changes are stored * @return the newly created evas object */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_check_add(Evas *evas, const char *label, int *val) { Evas_Object *obj, *o; @@ -174,7 +174,7 @@ e_widget_check_add(Evas *evas, const char *label, int *val) * @param check the check box widget * @param checked the value to set the widget too */ -EAPI void +E_API void e_widget_check_checked_set(Evas_Object *check, int checked) { E_Widget_Data *wd; @@ -194,7 +194,7 @@ e_widget_check_checked_set(Evas_Object *check, int checked) * @param check the check box widget * @param val pointer to int where changes are stored */ -EAPI void +E_API void e_widget_check_valptr_set(Evas_Object *check, int *val) { E_Widget_Data *wd; @@ -216,7 +216,7 @@ e_widget_check_valptr_set(Evas_Object *check, int *val) * @param check the check box widget * @return the value of the check box */ -EAPI int +E_API int e_widget_check_checked_get(Evas_Object *check) { E_Widget_Data *wd; @@ -236,7 +236,7 @@ e_widget_check_checked_get(Evas_Object *check) * @param check the check box widget * @param obj the object to disable when @p check is checked */ -EAPI void +E_API void e_widget_check_widget_disable_on_checked_add(Evas_Object *check, Evas_Object *obj) { E_Widget_Data *wd; @@ -256,7 +256,7 @@ e_widget_check_widget_disable_on_checked_add(Evas_Object *check, Evas_Object *ob * @param check the check box widget * @param obj the object to disable when @p check is not unchecked */ -EAPI void +E_API void e_widget_check_widget_disable_on_unchecked_add(Evas_Object *check, Evas_Object *obj) { E_Widget_Data *wd; @@ -283,7 +283,7 @@ e_widget_check_widget_disable_on_unchecked_add(Evas_Object *check, Evas_Object * * @param val pointer to int where changes are stored * @return the newly created evas object */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_check_icon_add(Evas *evas, const char *label, const char *icon, int icon_w, int icon_h, int *val) { Evas_Object *obj, *o, *o2; diff --git a/src/bin/e_widget_check.h b/src/bin/e_widget_check.h index 8bca82e..dbea6e8 100644 --- a/src/bin/e_widget_check.h +++ b/src/bin/e_widget_check.h @@ -3,13 +3,13 @@ #ifndef E_WIDGET_CHECK_H #define E_WIDGET_CHECK_H -EAPI Evas_Object *e_widget_check_add(Evas *evas, const char *label, int *val); -EAPI void e_widget_check_checked_set(Evas_Object *check, int checked); -EAPI int e_widget_check_checked_get(Evas_Object *check); -EAPI void e_widget_check_valptr_set(Evas_Object *check, int *val); -EAPI Evas_Object *e_widget_check_icon_add(Evas *evas, const char *label, const char *icon, int icon_w, int icon_h, int *val); +E_API Evas_Object *e_widget_check_add(Evas *evas, const char *label, int *val); +E_API void e_widget_check_checked_set(Evas_Object *check, int checked); +E_API int e_widget_check_checked_get(Evas_Object *check); +E_API void e_widget_check_valptr_set(Evas_Object *check, int *val); +E_API Evas_Object *e_widget_check_icon_add(Evas *evas, const char *label, const char *icon, int icon_w, int icon_h, int *val); -EAPI void e_widget_check_widget_disable_on_checked_add(Evas_Object *check, Evas_Object *obj); -EAPI void e_widget_check_widget_disable_on_unchecked_add(Evas_Object *check, Evas_Object *obj); +E_API void e_widget_check_widget_disable_on_checked_add(Evas_Object *check, Evas_Object *obj); +E_API void e_widget_check_widget_disable_on_unchecked_add(Evas_Object *check, Evas_Object *obj); #endif #endif diff --git a/src/bin/e_widget_color_well.h b/src/bin/e_widget_color_well.h index 82ee8b3..403e3df 100644 --- a/src/bin/e_widget_color_well.h +++ b/src/bin/e_widget_color_well.h @@ -1,8 +1,8 @@ #ifndef E_WIDGET_COLOR_WELL_H #define E_WIDGET_COLOR_WELL_H -EAPI Evas_Object *e_widget_color_well_add (Evas *evas, E_Color *color, Eina_Bool show_color_dialog); -EAPI Evas_Object *e_widget_color_well_add_full (Evas *evas, E_Color *color, Eina_Bool show_color_dialog, Eina_Bool alpha_enabled); -EAPI void e_widget_color_well_update (Evas_Object *obj); +E_API Evas_Object *e_widget_color_well_add (Evas *evas, E_Color *color, Eina_Bool show_color_dialog); +E_API Evas_Object *e_widget_color_well_add_full (Evas *evas, E_Color *color, Eina_Bool show_color_dialog, Eina_Bool alpha_enabled); +E_API void e_widget_color_well_update (Evas_Object *obj); #endif diff --git a/src/bin/e_widget_config_list.c b/src/bin/e_widget_config_list.c index d6d6522..13c8d40 100644 --- a/src/bin/e_widget_config_list.c +++ b/src/bin/e_widget_config_list.c @@ -31,7 +31,7 @@ struct _E_Widget_Data }; /* Externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_config_list_add(Evas *evas, Evas_Object * (*func_entry_add)(Evas_Object *, char **val, void (*func)(void *data, void *data2), void *data, void *data2), const char *label, int listspan EINA_UNUSED) { Evas_Object *obj, *o; @@ -96,7 +96,7 @@ e_widget_config_list_add(Evas *evas, Evas_Object * (*func_entry_add)(Evas_Object return obj; } -EAPI int +E_API int e_widget_config_list_count(Evas_Object *obj) { E_Widget_Data *wd; @@ -105,7 +105,7 @@ e_widget_config_list_count(Evas_Object *obj) return e_widget_ilist_count(wd->gui.list); } -EAPI void +E_API void e_widget_config_list_clear(Evas_Object *obj) { E_Widget_Data *wd; @@ -115,7 +115,7 @@ e_widget_config_list_clear(Evas_Object *obj) _list_select_num(wd, -1); } -EAPI const char * +E_API const char * e_widget_config_list_nth_get(Evas_Object *obj, int n) { E_Widget_Data *wd; @@ -124,7 +124,7 @@ e_widget_config_list_nth_get(Evas_Object *obj, int n) return e_widget_ilist_nth_label_get(wd->gui.list, n); } -EAPI void +E_API void e_widget_config_list_append(Evas_Object *obj, const char *entry) { E_Widget_Data *wd; @@ -137,7 +137,7 @@ e_widget_config_list_append(Evas_Object *obj, const char *entry) e_widget_ilist_selected_set(wd->gui.list, count - 1); } -EAPI void +E_API void e_widget_config_list_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_config_list.h b/src/bin/e_widget_config_list.h index 817b795..4019687 100644 --- a/src/bin/e_widget_config_list.h +++ b/src/bin/e_widget_config_list.h @@ -4,12 +4,12 @@ #define E_WIDGET_CONFIG_LIST_H -EAPI Evas_Object *e_widget_config_list_add(Evas *evas, Evas_Object *(*func_entry_add) (Evas_Object *, char **val, void (*func) (void *data, void *data2), void *data, void *data2), const char *label, int listspan); -EAPI int e_widget_config_list_count(Evas_Object *obj); -EAPI const char *e_widget_config_list_nth_get(Evas_Object *obj, int n); -EAPI void e_widget_config_list_append(Evas_Object *obj, const char *entry); -EAPI void e_widget_config_list_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h); -EAPI void e_widget_config_list_clear(Evas_Object *obj); +E_API Evas_Object *e_widget_config_list_add(Evas *evas, Evas_Object *(*func_entry_add) (Evas_Object *, char **val, void (*func) (void *data, void *data2), void *data, void *data2), const char *label, int listspan); +E_API int e_widget_config_list_count(Evas_Object *obj); +E_API const char *e_widget_config_list_nth_get(Evas_Object *obj, int n); +E_API void e_widget_config_list_append(Evas_Object *obj, const char *entry); +E_API void e_widget_config_list_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h); +E_API void e_widget_config_list_clear(Evas_Object *obj); #endif #endif diff --git a/src/bin/e_widget_entry.c b/src/bin/e_widget_entry.c index 00ddd7e..bf7748d 100644 --- a/src/bin/e_widget_entry.c +++ b/src/bin/e_widget_entry.c @@ -35,7 +35,7 @@ static void _e_wid_movresz(void *data, Evas *e, Evas_Object *obj, void *event_in * The current value will be used to initialize the entry * @return Returns the new entry widget */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_entry_add(Evas_Object *parent, char **text_location, void (*func)(void *data, void *data2), void *data, void *data2) { Evas_Object *obj, *o; @@ -102,7 +102,7 @@ e_widget_entry_add(Evas_Object *parent, char **text_location, void (*func)(void * @param entry an entry widget * @param text the text to set */ -EAPI void +E_API void e_widget_entry_text_set(Evas_Object *entry, const char *text) { E_Widget_Data *wd; @@ -118,7 +118,7 @@ e_widget_entry_text_set(Evas_Object *entry, const char *text) * @param entry an entry widget * @return Returns the text of the entry widget */ -EAPI const char * +E_API const char * e_widget_entry_text_get(Evas_Object *entry) { E_Widget_Data *wd; @@ -133,7 +133,7 @@ e_widget_entry_text_get(Evas_Object *entry) * * @param entry an entry widget */ -EAPI void +E_API void e_widget_entry_clear(Evas_Object *entry) { E_Widget_Data *wd; @@ -150,7 +150,7 @@ e_widget_entry_clear(Evas_Object *entry) * @param entry an entry widget * @param password_mode 1 to turn on password mode, 0 to turn it off */ -EAPI void +E_API void e_widget_entry_password_set(Evas_Object *entry, int password_mode) { E_Widget_Data *wd; @@ -167,7 +167,7 @@ e_widget_entry_password_set(Evas_Object *entry, int password_mode) * @param entry an entry widget * @param readonly_mode 1 to enable read-only mode, 0 to turn it off */ -EAPI void +E_API void e_widget_entry_readonly_set(Evas_Object *entry, int readonly_mode) { E_Widget_Data *wd; @@ -183,7 +183,7 @@ e_widget_entry_readonly_set(Evas_Object *entry, int readonly_mode) * * @param entry an entry widget */ -EAPI void +E_API void e_widget_entry_select_all(Evas_Object *entry) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_entry.h b/src/bin/e_widget_entry.h index 644d9b5..7103393 100644 --- a/src/bin/e_widget_entry.h +++ b/src/bin/e_widget_entry.h @@ -3,13 +3,13 @@ #ifndef E_WIDGET_ENTRY_H #define E_WIDGET_ENTRY_H -EAPI Evas_Object *e_widget_entry_add (Evas_Object *parent, char **text_location, void (*func) (void *data, void *data2), void *data, void *data2); -EAPI void e_widget_entry_text_set (Evas_Object *entry, const char *text); -EAPI const char *e_widget_entry_text_get (Evas_Object *entry); -EAPI void e_widget_entry_clear (Evas_Object *entry); -EAPI void e_widget_entry_password_set (Evas_Object *entry, int password_mode); -EAPI void e_widget_entry_readonly_set (Evas_Object *entry, int readonly_mode); -EAPI void e_widget_entry_select_all (Evas_Object *entry); +E_API Evas_Object *e_widget_entry_add (Evas_Object *parent, char **text_location, void (*func) (void *data, void *data2), void *data, void *data2); +E_API void e_widget_entry_text_set (Evas_Object *entry, const char *text); +E_API const char *e_widget_entry_text_get (Evas_Object *entry); +E_API void e_widget_entry_clear (Evas_Object *entry); +E_API void e_widget_entry_password_set (Evas_Object *entry, int password_mode); +E_API void e_widget_entry_readonly_set (Evas_Object *entry, int readonly_mode); +E_API void e_widget_entry_select_all (Evas_Object *entry); #endif #endif diff --git a/src/bin/e_widget_filepreview.c b/src/bin/e_widget_filepreview.c index 7117583..f161651 100644 --- a/src/bin/e_widget_filepreview.c +++ b/src/bin/e_widget_filepreview.c @@ -1178,7 +1178,7 @@ _e_wid_fprev_cb_mod(E_Widget_Data *wd, int type EINA_UNUSED, Eio_Monitor_Event * return ECORE_CALLBACK_RENEW; } -EAPI Evas_Object * +E_API Evas_Object * e_widget_filepreview_add(Evas *evas, int w, int h, int horiz) { Evas_Object *obj, *o; @@ -1217,7 +1217,7 @@ e_widget_filepreview_add(Evas *evas, int w, int h, int horiz) return obj; } -EAPI void +E_API void e_widget_filepreview_path_set(Evas_Object *obj, const char *path, const char *mime) { E_Widget_Data *wd; @@ -1239,7 +1239,7 @@ e_widget_filepreview_path_set(Evas_Object *obj, const char *path, const char *mi _e_wid_fprev_preview_file(wd); } -EAPI void +E_API void e_widget_filepreview_filemode_force(Evas_Object *obj) { E_Widget_Data *wd; @@ -1250,7 +1250,7 @@ e_widget_filepreview_filemode_force(Evas_Object *obj) _e_wid_fprev_preview_file_widgets(wd, 0, 0, 0); } -EAPI void +E_API void e_widget_filepreview_clamp_video_set(Evas_Object *obj, Eina_Bool clamp) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_filepreview.h b/src/bin/e_widget_filepreview.h index e26e249..f8d6af2 100644 --- a/src/bin/e_widget_filepreview.h +++ b/src/bin/e_widget_filepreview.h @@ -3,10 +3,10 @@ #ifndef E_WIDGET_FILEPREVIEW_H #define E_WIDGET_FILEPREVIEW_H -EAPI Evas_Object *e_widget_filepreview_add(Evas *evas, int w, int h, int horiz); -EAPI void e_widget_filepreview_path_set(Evas_Object *obj, const char *path, const char *mime); -EAPI void e_widget_filepreview_filemode_force(Evas_Object *obj); -EAPI void e_widget_filepreview_clamp_video_set(Evas_Object *obj, Eina_Bool clamp); +E_API Evas_Object *e_widget_filepreview_add(Evas *evas, int w, int h, int horiz); +E_API void e_widget_filepreview_path_set(Evas_Object *obj, const char *path, const char *mime); +E_API void e_widget_filepreview_filemode_force(Evas_Object *obj); +E_API void e_widget_filepreview_clamp_video_set(Evas_Object *obj, Eina_Bool clamp); #endif #endif diff --git a/src/bin/e_widget_flist.c b/src/bin/e_widget_flist.c index d4e1226..fd2c6c7 100644 --- a/src/bin/e_widget_flist.c +++ b/src/bin/e_widget_flist.c @@ -16,7 +16,7 @@ static void _e_wid_cb_dir_changed(void *data, Evas_Object *obj, void *event); static void _e_wid_cb_changed(void *data, Evas_Object *obj, void *event); static void _e_wid_cb_file_deleted(void *data, Evas_Object *obj, void *event); -EAPI Evas_Object * +E_API Evas_Object * e_widget_flist_add(Evas *evas) { Evas_Object *obj, *o; @@ -84,7 +84,7 @@ e_widget_flist_add(Evas *evas) return obj; } -EAPI E_Fm2_Config * +E_API E_Fm2_Config * e_widget_flist_config_get(Evas_Object *obj) { E_Widget_Data *wd = NULL; @@ -93,7 +93,7 @@ e_widget_flist_config_get(Evas_Object *obj) return e_fm2_config_get(wd->o_fm); } -EAPI void +E_API void e_widget_flist_path_set(Evas_Object *obj, const char *dev, const char *path) { E_Widget_Data *wd = NULL; @@ -103,7 +103,7 @@ e_widget_flist_path_set(Evas_Object *obj, const char *dev, const char *path) e_scrollframe_child_pos_set(wd->o_scroll, 0, 0); } -EAPI Eina_List * +E_API Eina_List * e_widget_flist_all_list_get(Evas_Object *obj) { E_Widget_Data *wd = NULL; @@ -112,7 +112,7 @@ e_widget_flist_all_list_get(Evas_Object *obj) return e_fm2_all_list_get(wd->o_fm); } -EAPI Eina_List * +E_API Eina_List * e_widget_flist_selected_list_get(Evas_Object *obj) { E_Widget_Data *wd = NULL; @@ -121,7 +121,7 @@ e_widget_flist_selected_list_get(Evas_Object *obj) return e_fm2_selected_list_get(wd->o_fm); } -EAPI const char * +E_API const char * e_widget_flist_real_path_get(Evas_Object *obj) { E_Widget_Data *wd = NULL; @@ -130,7 +130,7 @@ e_widget_flist_real_path_get(Evas_Object *obj) return e_fm2_real_path_get(wd->o_fm); } -EAPI int +E_API int e_widget_flist_has_parent_get(Evas_Object *obj) { E_Widget_Data *wd = NULL; @@ -139,7 +139,7 @@ e_widget_flist_has_parent_get(Evas_Object *obj) return e_fm2_has_parent_get(wd->o_fm); } -EAPI void +E_API void e_widget_flist_select_set(Evas_Object *obj, const char *file, int s) { E_Widget_Data *wd = NULL; @@ -148,7 +148,7 @@ e_widget_flist_select_set(Evas_Object *obj, const char *file, int s) e_fm2_select_set(wd->o_fm, file, s); } -EAPI void +E_API void e_widget_flist_file_show(Evas_Object *obj, const char *file) { E_Widget_Data *wd = NULL; @@ -157,7 +157,7 @@ e_widget_flist_file_show(Evas_Object *obj, const char *file) e_fm2_file_show(wd->o_fm, file); } -EAPI void +E_API void e_widget_flist_parent_go(Evas_Object *obj) { E_Widget_Data *wd = NULL; @@ -167,7 +167,7 @@ e_widget_flist_parent_go(Evas_Object *obj) e_scrollframe_child_pos_set(wd->o_scroll, 0, 0); } -EAPI void +E_API void e_widget_flist_refresh(Evas_Object *obj) { E_Widget_Data *wd = NULL; diff --git a/src/bin/e_widget_flist.h b/src/bin/e_widget_flist.h index 2c1a9af..beea1c7 100644 --- a/src/bin/e_widget_flist.h +++ b/src/bin/e_widget_flist.h @@ -3,17 +3,17 @@ #ifndef E_WIDGET_FLIST_H #define E_WIDGET_FLIST_H -EAPI Evas_Object *e_widget_flist_add(Evas *evas); -EAPI void e_widget_flist_path_set(Evas_Object *obj, const char *dev, const char *path); -EAPI Eina_List *e_widget_flist_all_list_get(Evas_Object *obj); -EAPI Eina_List *e_widget_flist_selected_list_get(Evas_Object *obj); -EAPI const char *e_widget_flist_real_path_get(Evas_Object *obj); -EAPI int e_widget_flist_has_parent_get(Evas_Object *obj); -EAPI void e_widget_flist_select_set(Evas_Object *obj, const char *file, int select); -EAPI void e_widget_flist_file_show(Evas_Object *obj, const char *file); -EAPI void e_widget_flist_parent_go(Evas_Object *obj); -EAPI void e_widget_flist_refresh(Evas_Object *obj); -EAPI E_Fm2_Config *e_widget_flist_config_get(Evas_Object *obj); +E_API Evas_Object *e_widget_flist_add(Evas *evas); +E_API void e_widget_flist_path_set(Evas_Object *obj, const char *dev, const char *path); +E_API Eina_List *e_widget_flist_all_list_get(Evas_Object *obj); +E_API Eina_List *e_widget_flist_selected_list_get(Evas_Object *obj); +E_API const char *e_widget_flist_real_path_get(Evas_Object *obj); +E_API int e_widget_flist_has_parent_get(Evas_Object *obj); +E_API void e_widget_flist_select_set(Evas_Object *obj, const char *file, int select); +E_API void e_widget_flist_file_show(Evas_Object *obj, const char *file); +E_API void e_widget_flist_parent_go(Evas_Object *obj); +E_API void e_widget_flist_refresh(Evas_Object *obj); +E_API E_Fm2_Config *e_widget_flist_config_get(Evas_Object *obj); #endif #endif diff --git a/src/bin/e_widget_font_preview.c b/src/bin/e_widget_font_preview.c index e0759cb..dc3fef3 100644 --- a/src/bin/e_widget_font_preview.c +++ b/src/bin/e_widget_font_preview.c @@ -13,7 +13,7 @@ static void _e_wid_del_hook(Evas_Object *obj); /* local subsystem functions */ /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_font_preview_add(Evas *evas, const char *text) { Evas_Object *obj, *o; @@ -52,7 +52,7 @@ e_widget_font_preview_add(Evas *evas, const char *text) return obj; } -EAPI void +E_API void e_widget_font_preview_font_set(Evas_Object *obj, const char *font, Evas_Font_Size size) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_font_preview.h b/src/bin/e_widget_font_preview.h index 8683db7..2ea5138 100644 --- a/src/bin/e_widget_font_preview.h +++ b/src/bin/e_widget_font_preview.h @@ -3,8 +3,8 @@ #ifndef E_WIDGET_FONT_PREVIEW_H #define E_WIDGET_FONT_PREVIEW_H -EAPI Evas_Object *e_widget_font_preview_add(Evas *evas, const char *text); -EAPI void e_widget_font_preview_font_set(Evas_Object *obj, const char *font, Evas_Font_Size size); +E_API Evas_Object *e_widget_font_preview_add(Evas *evas, const char *text); +E_API void e_widget_font_preview_font_set(Evas_Object *obj, const char *font, Evas_Font_Size size); #endif #endif diff --git a/src/bin/e_widget_framelist.c b/src/bin/e_widget_framelist.c index ba80db2..8dd8d1b 100644 --- a/src/bin/e_widget_framelist.c +++ b/src/bin/e_widget_framelist.c @@ -12,7 +12,7 @@ static void _e_wid_disable_hook(Evas_Object *obj); /* local subsystem functions */ /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_framelist_add(Evas *evas, const char *label, int horiz) { Evas_Object *obj, *o, *win; @@ -44,7 +44,7 @@ e_widget_framelist_add(Evas *evas, const char *label, int horiz) return obj; } -EAPI void +E_API void e_widget_framelist_object_append_full(Evas_Object *obj, Evas_Object *sobj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h) { E_Widget_Data *wd; @@ -65,7 +65,7 @@ e_widget_framelist_object_append_full(Evas_Object *obj, Evas_Object *sobj, int f evas_object_show(sobj); } -EAPI void +E_API void e_widget_framelist_object_append(Evas_Object *obj, Evas_Object *sobj) { E_Widget_Data *wd; @@ -80,7 +80,7 @@ e_widget_framelist_object_append(Evas_Object *obj, Evas_Object *sobj) evas_object_show(sobj); } -EAPI void +E_API void e_widget_framelist_content_align_set(Evas_Object *obj, double halign, double valign) { E_Widget_Data *wd; @@ -89,7 +89,7 @@ e_widget_framelist_content_align_set(Evas_Object *obj, double halign, double val elm_box_align_set(wd->o_box, halign, valign); } -EAPI void +E_API void e_widget_framelist_label_set(Evas_Object *obj, const char *label) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_framelist.h b/src/bin/e_widget_framelist.h index 2f0b3c6..34ba9f4 100644 --- a/src/bin/e_widget_framelist.h +++ b/src/bin/e_widget_framelist.h @@ -3,12 +3,12 @@ #ifndef E_WIDGET_FRAMELIST_H #define E_WIDGET_FRAMELIST_H -EAPI Evas_Object *e_widget_framelist_add(Evas *evas, const char *label, int horiz); -EAPI void e_widget_framelist_object_append(Evas_Object *obj, Evas_Object *sobj); -EAPI void e_widget_framelist_object_append_full(Evas_Object *obj, Evas_Object *sobj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h); +E_API Evas_Object *e_widget_framelist_add(Evas *evas, const char *label, int horiz); +E_API void e_widget_framelist_object_append(Evas_Object *obj, Evas_Object *sobj); +E_API void e_widget_framelist_object_append_full(Evas_Object *obj, Evas_Object *sobj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h); -EAPI void e_widget_framelist_content_align_set(Evas_Object *obj, double halign, double valign); -EAPI void e_widget_framelist_label_set(Evas_Object *obj, const char *label); +E_API void e_widget_framelist_content_align_set(Evas_Object *obj, double halign, double valign); +E_API void e_widget_framelist_label_set(Evas_Object *obj, const char *label); #endif #endif diff --git a/src/bin/e_widget_frametable.c b/src/bin/e_widget_frametable.c index 1fd9a07..761230c 100644 --- a/src/bin/e_widget_frametable.c +++ b/src/bin/e_widget_frametable.c @@ -13,7 +13,7 @@ static void _e_wid_disable_hook(Evas_Object *obj); /* local subsystem functions */ /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_frametable_add(Evas *evas, const char *label, int homogenous) { Evas_Object *obj, *o; @@ -44,13 +44,13 @@ e_widget_frametable_add(Evas *evas, const char *label, int homogenous) return obj; } -EAPI void +E_API void e_widget_frametable_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h) { e_widget_frametable_object_append_full(obj, sobj, col, row, colspan, rowspan, fill_w, fill_h, expand_w, expand_h, 0.5, 0.5, -1, -1, -1, -1); } -EAPI void +E_API void e_widget_frametable_object_append_full(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h) { E_Widget_Data *wd = e_widget_data_get(obj); @@ -68,7 +68,7 @@ e_widget_frametable_object_append_full(Evas_Object *obj, Evas_Object *sobj, int evas_object_show(sobj); } -EAPI void +E_API void e_widget_frametable_object_repack(Evas_Object *obj EINA_UNUSED, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h) { if (fill_w || fill_h) @@ -77,7 +77,7 @@ e_widget_frametable_object_repack(Evas_Object *obj EINA_UNUSED, Evas_Object *sob elm_table_pack_set(sobj, col, row, colspan, rowspan); } -EAPI void +E_API void e_widget_frametable_content_align_set(Evas_Object *obj, double halign, double valign) { E_Widget_Data *wd; @@ -86,7 +86,7 @@ e_widget_frametable_content_align_set(Evas_Object *obj, double halign, double va elm_table_align_set(wd->o_table, halign, valign); } -EAPI void +E_API void e_widget_frametable_label_set(Evas_Object *obj, const char *label) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_frametable.h b/src/bin/e_widget_frametable.h index 939d470..3799116 100644 --- a/src/bin/e_widget_frametable.h +++ b/src/bin/e_widget_frametable.h @@ -3,12 +3,12 @@ #ifndef E_WIDGET_FRAMETABLE_H #define E_WIDGET_FRAMETABLE_H -EAPI Evas_Object *e_widget_frametable_add(Evas *evas, const char *label, int homogenous); -EAPI void e_widget_frametable_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h); -EAPI void e_widget_frametable_object_append_full(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h); -EAPI void e_widget_frametable_object_repack(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h); -EAPI void e_widget_frametable_content_align_set(Evas_Object *obj, double halign, double valign); -EAPI void e_widget_frametable_label_set(Evas_Object *obj, const char *label); +E_API Evas_Object *e_widget_frametable_add(Evas *evas, const char *label, int homogenous); +E_API void e_widget_frametable_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h); +E_API void e_widget_frametable_object_append_full(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h); +E_API void e_widget_frametable_object_repack(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h); +E_API void e_widget_frametable_content_align_set(Evas_Object *obj, double halign, double valign); +E_API void e_widget_frametable_label_set(Evas_Object *obj, const char *label); #endif #endif diff --git a/src/bin/e_widget_fsel.c b/src/bin/e_widget_fsel.c index 7e5417a..4e78f8a 100644 --- a/src/bin/e_widget_fsel.c +++ b/src/bin/e_widget_fsel.c @@ -299,7 +299,7 @@ _e_wid_fsel_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN } /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, char *filter EINA_UNUSED, void (*sel_func)(void *data, Evas_Object *obj), void *sel_data, void (*chg_func)(void *data, Evas_Object *obj), void *chg_data, @@ -493,7 +493,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, return obj; } -EAPI void +E_API void e_widget_fsel_path_get(Evas_Object *obj, const char **dev, const char **path) { E_Widget_Data *wd; @@ -503,7 +503,7 @@ e_widget_fsel_path_get(Evas_Object *obj, const char **dev, const char **path) e_fm2_path_get(wd->o_files_fm, dev, path); } -EAPI const char * +E_API const char * e_widget_fsel_selection_path_get(Evas_Object *obj) { E_Widget_Data *wd; @@ -531,7 +531,7 @@ e_widget_fsel_selection_path_get(Evas_Object *obj) return wd->path; } -EAPI void +E_API void e_widget_fsel_window_set(Evas_Object *obj, Evas_Object *win) { E_Widget_Data *wd; @@ -542,7 +542,7 @@ e_widget_fsel_window_set(Evas_Object *obj, Evas_Object *win) e_fm2_window_set(wd->o_files_fm, win); } -EAPI Eina_Bool +E_API Eina_Bool e_widget_fsel_typebuf_visible_get(Evas_Object *obj) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_fsel.h b/src/bin/e_widget_fsel.h index 1531e73..9375f1d 100644 --- a/src/bin/e_widget_fsel.h +++ b/src/bin/e_widget_fsel.h @@ -3,12 +3,12 @@ #ifndef E_WIDGET_FSEL_H #define E_WIDGET_FSEL_H -EAPI Evas_Object *e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, char *filter, +E_API Evas_Object *e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected, char *filter, void (*sel_func) (void *data, Evas_Object *obj), void *sel_data, void (*chg_func) (void *data, Evas_Object *obj), void *chg_data, int preview); -EAPI void e_widget_fsel_path_get(Evas_Object *obj, const char **dev, const char **path); -EAPI const char *e_widget_fsel_selection_path_get(Evas_Object *obj); -EAPI void e_widget_fsel_window_set(Evas_Object *obj, Evas_Object *win); -EAPI Eina_Bool e_widget_fsel_typebuf_visible_get(Evas_Object *obj); +E_API void e_widget_fsel_path_get(Evas_Object *obj, const char **dev, const char **path); +E_API const char *e_widget_fsel_selection_path_get(Evas_Object *obj); +E_API void e_widget_fsel_window_set(Evas_Object *obj, Evas_Object *win); +E_API Eina_Bool e_widget_fsel_typebuf_visible_get(Evas_Object *obj); #endif #endif diff --git a/src/bin/e_widget_ilist.c b/src/bin/e_widget_ilist.c index 824867b..7566756 100644 --- a/src/bin/e_widget_ilist.c +++ b/src/bin/e_widget_ilist.c @@ -303,7 +303,7 @@ _e_wid_disable_hook(Evas_Object *obj) } /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_ilist_add(Evas *evas, int icon_w, int icon_h, const char **value) { Evas_Object *obj, *o; @@ -344,7 +344,7 @@ e_widget_ilist_add(Evas *evas, int icon_w, int icon_h, const char **value) return obj; } -EAPI void +E_API void e_widget_ilist_freeze(Evas_Object *obj) { E_Widget_Data *wd; @@ -354,7 +354,7 @@ e_widget_ilist_freeze(Evas_Object *obj) e_ilist_freeze(wd->o_ilist); } -EAPI void +E_API void e_widget_ilist_thaw(Evas_Object *obj) { E_Widget_Data *wd; @@ -364,7 +364,7 @@ e_widget_ilist_thaw(Evas_Object *obj) e_ilist_thaw(wd->o_ilist); } -EAPI void +E_API void e_widget_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func)(void *data), void *data, const char *val) { _queue_append(obj, CMD_ADD, icon, NULL, label, 0, func, data, val, 0, CMD_APPEND, 0); @@ -385,25 +385,25 @@ e_widget_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, vo */ } -EAPI void +E_API void e_widget_ilist_append_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func)(void *data), void *data, const char *val) { _queue_append(obj, CMD_ADD, icon, end, label, 0, func, data, val, 0, CMD_APPEND, 0); } -EAPI void +E_API void e_widget_ilist_header_append_relative(Evas_Object *obj, Evas_Object *icon, const char *label, int relative) { _queue_append(obj, CMD_ADD, icon, NULL, label, 1, NULL, NULL, NULL, relative, CMD_APPEND_RELATIVE, 0); } -EAPI void +E_API void e_widget_ilist_header_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char *label, int relative) { _queue_append(obj, CMD_ADD, icon, NULL, label, 1, NULL, NULL, NULL, relative, CMD_PREPEND_RELATIVE, 0); } -EAPI void +E_API void e_widget_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func)(void *data), void *data, const char *val, int relative) { _queue_append(obj, CMD_ADD, icon, NULL, label, 0, func, data, val, relative, CMD_APPEND_RELATIVE, 0); @@ -435,13 +435,13 @@ e_widget_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, const char * */ } -EAPI void +E_API void e_widget_ilist_append_relative_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func)(void *data), void *data, const char *val, int relative) { _queue_append(obj, CMD_ADD, icon, end, label, 0, func, data, val, relative, CMD_APPEND_RELATIVE, 0); } -EAPI void +E_API void e_widget_ilist_prepend(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func)(void *data), void *data, const char *val) { _queue_append(obj, CMD_ADD, icon, NULL, label, 0, func, data, val, 0, CMD_PREPEND, 0); @@ -462,19 +462,19 @@ e_widget_ilist_prepend(Evas_Object *obj, Evas_Object *icon, const char *label, v */ } -EAPI void +E_API void e_widget_ilist_header_prepend(Evas_Object *obj, Evas_Object *icon, const char *label) { _queue_append(obj, CMD_ADD, icon, NULL, label, 1, NULL, NULL, NULL, 0, CMD_PREPEND, 0); } -EAPI void +E_API void e_widget_ilist_prepend_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func)(void *data), void *data, const char *val) { _queue_append(obj, CMD_ADD, icon, end, label, 0, func, data, val, 0, CMD_PREPEND, 0); } -EAPI void +E_API void e_widget_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func)(void *data), void *data, const char *val, int relative) { _queue_append(obj, CMD_ADD, icon, NULL, label, 0, func, data, val, relative, CMD_PREPEND_RELATIVE, 0); @@ -506,13 +506,13 @@ e_widget_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char */ } -EAPI void +E_API void e_widget_ilist_prepend_relative_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func)(void *data), void *data, const char *val, int relative) { _queue_append(obj, CMD_ADD, icon, end, label, 0, func, data, val, relative, CMD_PREPEND_RELATIVE, 0); } -EAPI void +E_API void e_widget_ilist_header_append(Evas_Object *obj, Evas_Object *icon, const char *label) { _queue_append(obj, CMD_ADD, icon, NULL, label, 1, NULL, NULL, NULL, 0, CMD_APPEND, 0); @@ -530,7 +530,7 @@ e_widget_ilist_header_append(Evas_Object *obj, Evas_Object *icon, const char *la */ } -EAPI void +E_API void e_widget_ilist_selector_set(Evas_Object *obj, int selector) { E_Widget_Data *wd; @@ -540,7 +540,7 @@ e_widget_ilist_selector_set(Evas_Object *obj, int selector) e_ilist_selector_set(wd->o_ilist, selector); } -EAPI void +E_API void e_widget_ilist_go(Evas_Object *obj) { E_Widget_Data *wd; @@ -564,7 +564,7 @@ e_widget_ilist_go(Evas_Object *obj) evas_object_resize(wd->o_ilist, vw, mh); } -EAPI void +E_API void e_widget_ilist_clear(Evas_Object *obj) { E_Widget_Data *wd; @@ -582,7 +582,7 @@ e_widget_ilist_clear(Evas_Object *obj) } } -EAPI int +E_API int e_widget_ilist_count(Evas_Object *obj) { E_Widget_Data *wd; @@ -605,7 +605,7 @@ e_widget_ilist_count(Evas_Object *obj) return e_ilist_count(wd->o_ilist); } -EAPI const Eina_List * +E_API const Eina_List * e_widget_ilist_items_get(Evas_Object *obj) { E_Widget_Data *wd; @@ -615,7 +615,7 @@ e_widget_ilist_items_get(Evas_Object *obj) return e_ilist_items_get(wd->o_ilist); } -EAPI Eina_Bool +E_API Eina_Bool e_widget_ilist_nth_is_header(Evas_Object *obj, int n) { E_Widget_Data *wd; @@ -625,7 +625,7 @@ e_widget_ilist_nth_is_header(Evas_Object *obj, int n) return e_ilist_nth_is_header(wd->o_ilist, n); } -EAPI void +E_API void e_widget_ilist_nth_label_set(Evas_Object *obj, int n, const char *label) { _queue_append(obj, CMD_LABEL_SET, NULL, NULL, label, 0, NULL, NULL, NULL, 0, 0, n); @@ -637,7 +637,7 @@ e_widget_ilist_nth_label_set(Evas_Object *obj, int n, const char *label) */ } -EAPI const char * +E_API const char * e_widget_ilist_nth_label_get(Evas_Object *obj, int n) { E_Widget_Data *wd; @@ -647,7 +647,7 @@ e_widget_ilist_nth_label_get(Evas_Object *obj, int n) return e_ilist_nth_label_get(wd->o_ilist, n); } -EAPI void +E_API void e_widget_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon) { _queue_append(obj, CMD_ICON_SET, icon, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n); @@ -659,7 +659,7 @@ e_widget_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon) */ } -EAPI Evas_Object * +E_API Evas_Object * e_widget_ilist_nth_icon_get(Evas_Object *obj, int n) { E_Widget_Data *wd; @@ -669,13 +669,13 @@ e_widget_ilist_nth_icon_get(Evas_Object *obj, int n) return e_ilist_nth_icon_get(wd->o_ilist, n); } -EAPI void +E_API void e_widget_ilist_nth_end_set(Evas_Object *obj, int n, Evas_Object *end) { _queue_append(obj, CMD_END_SET, NULL, end, NULL, 0, NULL, NULL, NULL, 0, 0, n); } -EAPI Evas_Object * +E_API Evas_Object * e_widget_ilist_nth_end_get(Evas_Object *obj, int n) { E_Widget_Data *wd; @@ -685,7 +685,7 @@ e_widget_ilist_nth_end_get(Evas_Object *obj, int n) return e_ilist_nth_end_get(wd->o_ilist, n); } -EAPI void * +E_API void * e_widget_ilist_nth_data_get(Evas_Object *obj, int n) { E_Widget_Data *wd; @@ -701,7 +701,7 @@ e_widget_ilist_nth_data_get(Evas_Object *obj, int n) return wcb->data; } -EAPI const char * +E_API const char * e_widget_ilist_nth_value_get(Evas_Object *obj, int n) { E_Widget_Data *wd; @@ -725,7 +725,7 @@ e_widget_ilist_nth_value_get(Evas_Object *obj, int n) * able to check any validity on the given pointer and may crash. Be * sure to use only with valid return of e_widget_ilist_items_get(). */ -EAPI Eina_Bool +E_API Eina_Bool e_widget_ilist_item_is_header(const E_Ilist_Item *it) { return it->header; @@ -738,7 +738,7 @@ e_widget_ilist_item_is_header(const E_Ilist_Item *it) * able to check any validity on the given pointer and may crash. Be * sure to use only with valid return of e_widget_ilist_items_get(). */ -EAPI const char * +E_API const char * e_widget_ilist_item_label_get(const E_Ilist_Item *it) { return it->label; @@ -753,7 +753,7 @@ e_widget_ilist_item_label_get(const E_Ilist_Item *it) * * Do not delete this object! */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_ilist_item_icon_get(const E_Ilist_Item *it) { return it->o_icon; @@ -768,7 +768,7 @@ e_widget_ilist_item_icon_get(const E_Ilist_Item *it) * * Do not delete this object! */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_ilist_item_end_get(const E_Ilist_Item *it) { return it->o_end; @@ -783,7 +783,7 @@ e_widget_ilist_item_end_get(const E_Ilist_Item *it) * * Do not delete this object! */ -EAPI void * +E_API void * e_widget_ilist_item_data_get(const E_Ilist_Item *it) { E_Widget_Callback *wcb = it->data2; @@ -794,7 +794,7 @@ e_widget_ilist_item_data_get(const E_Ilist_Item *it) return wcb->data; } -EAPI const char * +E_API const char * e_widget_ilist_item_value_get(const E_Ilist_Item *it) { E_Widget_Callback *wcb = it->data2; @@ -812,7 +812,7 @@ e_widget_ilist_item_value_get(const E_Ilist_Item *it) * @param top if true, place this item at the top, otherwise scroll just * enough to show the element (from the current position). */ -EAPI void +E_API void e_widget_ilist_nth_show(Evas_Object *obj, int n, int top) { _queue_append(obj, CMD_SHOW, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, top, n); @@ -829,7 +829,7 @@ e_widget_ilist_nth_show(Evas_Object *obj, int n, int top) */ } -EAPI void +E_API void e_widget_ilist_selected_set(Evas_Object *obj, int n) { _queue_append(obj, CMD_SELECT, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n); @@ -841,7 +841,7 @@ e_widget_ilist_selected_set(Evas_Object *obj, int n) */ } -EAPI const Eina_List * +E_API const Eina_List * e_widget_ilist_selected_items_get(Evas_Object *obj) { E_Widget_Data *wd; @@ -851,7 +851,7 @@ e_widget_ilist_selected_items_get(Evas_Object *obj) return e_ilist_selected_items_get(wd->o_ilist); } -EAPI int +E_API int e_widget_ilist_selected_get(Evas_Object *obj) { E_Widget_Data *wd; @@ -861,7 +861,7 @@ e_widget_ilist_selected_get(Evas_Object *obj) return e_ilist_selected_get(wd->o_ilist); } -EAPI const char * +E_API const char * e_widget_ilist_selected_label_get(Evas_Object *obj) { E_Widget_Data *wd; @@ -871,7 +871,7 @@ e_widget_ilist_selected_label_get(Evas_Object *obj) return e_ilist_selected_label_get(wd->o_ilist); } -EAPI Evas_Object * +E_API Evas_Object * e_widget_ilist_selected_icon_get(Evas_Object *obj) { E_Widget_Data *wd; @@ -881,7 +881,7 @@ e_widget_ilist_selected_icon_get(Evas_Object *obj) return e_ilist_selected_icon_get(wd->o_ilist); } -EAPI void * +E_API void * e_widget_ilist_selected_data_get(Evas_Object *obj) { E_Widget_Data *wd; @@ -894,7 +894,7 @@ e_widget_ilist_selected_data_get(Evas_Object *obj) return wcb ? wcb->data : NULL; } -EAPI Evas_Object * +E_API Evas_Object * e_widget_ilist_selected_end_get(Evas_Object *obj) { E_Widget_Data *wd; @@ -904,7 +904,7 @@ e_widget_ilist_selected_end_get(Evas_Object *obj) return e_ilist_selected_end_get(wd->o_ilist); } -EAPI int +E_API int e_widget_ilist_selected_count_get(Evas_Object *obj) { E_Widget_Data *wd; @@ -914,7 +914,7 @@ e_widget_ilist_selected_count_get(Evas_Object *obj) return e_ilist_selected_count_get(wd->o_ilist); } -EAPI const char * +E_API const char * e_widget_ilist_selected_value_get(Evas_Object *obj) { E_Widget_Data *wd; @@ -930,7 +930,7 @@ e_widget_ilist_selected_value_get(Evas_Object *obj) return wcb->value; } -EAPI void +E_API void e_widget_ilist_unselect(Evas_Object *obj) { _queue_append(obj, CMD_UNSELECT, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, 0); @@ -947,7 +947,7 @@ e_widget_ilist_unselect(Evas_Object *obj) */ } -EAPI void +E_API void e_widget_ilist_remove_num(Evas_Object *obj, int n) { /* _queue_append(obj, CMD_REMOVE, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n); */ @@ -969,7 +969,7 @@ e_widget_ilist_remove_num(Evas_Object *obj, int n) } } -EAPI void +E_API void e_widget_ilist_multi_select_set(Evas_Object *obj, Eina_Bool multi) { E_Widget_Data *wd; @@ -979,7 +979,7 @@ e_widget_ilist_multi_select_set(Evas_Object *obj, Eina_Bool multi) e_ilist_multi_select_set(wd->o_ilist, multi); } -EAPI Eina_Bool +E_API Eina_Bool e_widget_ilist_multi_select_get(Evas_Object *obj) { E_Widget_Data *wd; @@ -989,7 +989,7 @@ e_widget_ilist_multi_select_get(Evas_Object *obj) return e_ilist_multi_select_get(wd->o_ilist); } -EAPI void +E_API void e_widget_ilist_multi_select(Evas_Object *obj, int n) { _queue_append(obj, CMD_MULTI_SELECT, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n); @@ -1001,7 +1001,7 @@ e_widget_ilist_multi_select(Evas_Object *obj, int n) */ } -EAPI void +E_API void e_widget_ilist_range_select(Evas_Object *obj, int n) { _queue_append(obj, CMD_RANGE_SELECT, NULL, NULL, NULL, 0, NULL, NULL, NULL, 0, 0, n); @@ -1013,7 +1013,7 @@ e_widget_ilist_range_select(Evas_Object *obj, int n) */ } -EAPI Eina_Bool +E_API Eina_Bool e_widget_ilist_custom_edje_file_set(Evas_Object *obj, const char *file, const char *group) { E_Widget_Data *wd; @@ -1030,7 +1030,7 @@ e_widget_ilist_custom_edje_file_set(Evas_Object *obj, const char *file, const ch return e_ilist_custom_edje_file_set(wd->o_ilist, file, group); } -EAPI void +E_API void e_widget_ilist_preferred_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) { Evas_Coord ww, hh, mw, mh, vw, vh; diff --git a/src/bin/e_widget_ilist.h b/src/bin/e_widget_ilist.h index ce56bf5..e978022 100644 --- a/src/bin/e_widget_ilist.h +++ b/src/bin/e_widget_ilist.h @@ -3,64 +3,64 @@ #ifndef E_WIDGET_ILIST_H #define E_WIDGET_ILIST_H -EAPI Evas_Object *e_widget_ilist_add(Evas *evas, int icon_w, int icon_h, const char **value); -EAPI void e_widget_ilist_freeze(Evas_Object *obj); -EAPI void e_widget_ilist_thaw(Evas_Object *obj); -EAPI void e_widget_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val); -EAPI void e_widget_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val, int relative); -EAPI void e_widget_ilist_prepend(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val); -EAPI void e_widget_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val, int relative); +E_API Evas_Object *e_widget_ilist_add(Evas *evas, int icon_w, int icon_h, const char **value); +E_API void e_widget_ilist_freeze(Evas_Object *obj); +E_API void e_widget_ilist_thaw(Evas_Object *obj); +E_API void e_widget_ilist_append(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val); +E_API void e_widget_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val, int relative); +E_API void e_widget_ilist_prepend(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val); +E_API void e_widget_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data), void *data, const char *val, int relative); -EAPI void e_widget_ilist_append_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func) (void *data), void *data, const char *val); -EAPI void e_widget_ilist_append_relative_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func) (void *data), void *data, const char *val, int relative); -EAPI void e_widget_ilist_prepend_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func) (void *data), void *data, const char *val); -EAPI void e_widget_ilist_prepend_relative_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func) (void *data), void *data, const char *val, int relative); +E_API void e_widget_ilist_append_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func) (void *data), void *data, const char *val); +E_API void e_widget_ilist_append_relative_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func) (void *data), void *data, const char *val, int relative); +E_API void e_widget_ilist_prepend_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func) (void *data), void *data, const char *val); +E_API void e_widget_ilist_prepend_relative_full(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, void (*func) (void *data), void *data, const char *val, int relative); -EAPI void e_widget_ilist_header_append_relative(Evas_Object *obj, Evas_Object *icon, const char *label, int relative); -EAPI void e_widget_ilist_header_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char *label, int relative); -EAPI void e_widget_ilist_header_prepend(Evas_Object *obj, Evas_Object *icon, const char *label); -EAPI void e_widget_ilist_header_append(Evas_Object *obj, Evas_Object *icon, const char *label); -EAPI void e_widget_ilist_selector_set(Evas_Object *obj, int selector); -EAPI void e_widget_ilist_go(Evas_Object *obj); -EAPI void e_widget_ilist_clear(Evas_Object *obj); -EAPI int e_widget_ilist_count(Evas_Object *obj); -EAPI Eina_List const *e_widget_ilist_items_get(Evas_Object *obj); +E_API void e_widget_ilist_header_append_relative(Evas_Object *obj, Evas_Object *icon, const char *label, int relative); +E_API void e_widget_ilist_header_prepend_relative(Evas_Object *obj, Evas_Object *icon, const char *label, int relative); +E_API void e_widget_ilist_header_prepend(Evas_Object *obj, Evas_Object *icon, const char *label); +E_API void e_widget_ilist_header_append(Evas_Object *obj, Evas_Object *icon, const char *label); +E_API void e_widget_ilist_selector_set(Evas_Object *obj, int selector); +E_API void e_widget_ilist_go(Evas_Object *obj); +E_API void e_widget_ilist_clear(Evas_Object *obj); +E_API int e_widget_ilist_count(Evas_Object *obj); +E_API Eina_List const *e_widget_ilist_items_get(Evas_Object *obj); -EAPI Eina_Bool e_widget_ilist_nth_is_header(Evas_Object *obj, int n); -EAPI void e_widget_ilist_nth_label_set(Evas_Object *obj, int n, const char *label); -EAPI const char *e_widget_ilist_nth_label_get(Evas_Object *obj, int n); -EAPI void e_widget_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon); -EAPI Evas_Object *e_widget_ilist_nth_icon_get(Evas_Object *obj, int n); -EAPI void e_widget_ilist_nth_end_set(Evas_Object *obj, int n, Evas_Object *end); -EAPI Evas_Object *e_widget_ilist_nth_end_get(Evas_Object *obj, int n); -EAPI void *e_widget_ilist_nth_data_get(Evas_Object *obj, int n); -EAPI const char *e_widget_ilist_nth_value_get(Evas_Object *obj, int n); +E_API Eina_Bool e_widget_ilist_nth_is_header(Evas_Object *obj, int n); +E_API void e_widget_ilist_nth_label_set(Evas_Object *obj, int n, const char *label); +E_API const char *e_widget_ilist_nth_label_get(Evas_Object *obj, int n); +E_API void e_widget_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon); +E_API Evas_Object *e_widget_ilist_nth_icon_get(Evas_Object *obj, int n); +E_API void e_widget_ilist_nth_end_set(Evas_Object *obj, int n, Evas_Object *end); +E_API Evas_Object *e_widget_ilist_nth_end_get(Evas_Object *obj, int n); +E_API void *e_widget_ilist_nth_data_get(Evas_Object *obj, int n); +E_API const char *e_widget_ilist_nth_value_get(Evas_Object *obj, int n); -EAPI Eina_Bool e_widget_ilist_item_is_header(const E_Ilist_Item *it); -EAPI const char *e_widget_ilist_item_label_get(const E_Ilist_Item *it); -EAPI Evas_Object *e_widget_ilist_item_icon_get(const E_Ilist_Item *it); -EAPI Evas_Object *e_widget_ilist_item_end_get(const E_Ilist_Item *it); -EAPI void *e_widget_ilist_item_data_get(const E_Ilist_Item *it); -EAPI const char *e_widget_ilist_item_value_get(const E_Ilist_Item *it); +E_API Eina_Bool e_widget_ilist_item_is_header(const E_Ilist_Item *it); +E_API const char *e_widget_ilist_item_label_get(const E_Ilist_Item *it); +E_API Evas_Object *e_widget_ilist_item_icon_get(const E_Ilist_Item *it); +E_API Evas_Object *e_widget_ilist_item_end_get(const E_Ilist_Item *it); +E_API void *e_widget_ilist_item_data_get(const E_Ilist_Item *it); +E_API const char *e_widget_ilist_item_value_get(const E_Ilist_Item *it); -EAPI void e_widget_ilist_nth_show(Evas_Object *obj, int n, int top); -EAPI void e_widget_ilist_selected_set(Evas_Object *obj, int n); -EAPI const Eina_List *e_widget_ilist_selected_items_get(Evas_Object *obj); -EAPI int e_widget_ilist_selected_get(Evas_Object *obj); -EAPI const char *e_widget_ilist_selected_label_get(Evas_Object *obj); -EAPI Evas_Object *e_widget_ilist_selected_icon_get(Evas_Object *obj); -EAPI Evas_Object *e_widget_ilist_selected_end_get(Evas_Object *obj); -EAPI void *e_widget_ilist_selected_data_get(Evas_Object *obj); -EAPI int e_widget_ilist_selected_count_get(Evas_Object *obj); -EAPI const char *e_widget_ilist_selected_value_get(Evas_Object *obj); +E_API void e_widget_ilist_nth_show(Evas_Object *obj, int n, int top); +E_API void e_widget_ilist_selected_set(Evas_Object *obj, int n); +E_API const Eina_List *e_widget_ilist_selected_items_get(Evas_Object *obj); +E_API int e_widget_ilist_selected_get(Evas_Object *obj); +E_API const char *e_widget_ilist_selected_label_get(Evas_Object *obj); +E_API Evas_Object *e_widget_ilist_selected_icon_get(Evas_Object *obj); +E_API Evas_Object *e_widget_ilist_selected_end_get(Evas_Object *obj); +E_API void *e_widget_ilist_selected_data_get(Evas_Object *obj); +E_API int e_widget_ilist_selected_count_get(Evas_Object *obj); +E_API const char *e_widget_ilist_selected_value_get(Evas_Object *obj); -EAPI void e_widget_ilist_unselect(Evas_Object *obj); -EAPI void e_widget_ilist_remove_num(Evas_Object *obj, int n); -EAPI void e_widget_ilist_multi_select_set(Evas_Object *obj, Eina_Bool multi); -EAPI Eina_Bool e_widget_ilist_multi_select_get(Evas_Object *obj); -EAPI void e_widget_ilist_multi_select(Evas_Object *obj, int n); -EAPI void e_widget_ilist_range_select(Evas_Object *obj, int n); -EAPI void e_widget_ilist_preferred_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); -EAPI Eina_Bool e_widget_ilist_custom_edje_file_set(Evas_Object *obj, const char *file, const char *group); +E_API void e_widget_ilist_unselect(Evas_Object *obj); +E_API void e_widget_ilist_remove_num(Evas_Object *obj, int n); +E_API void e_widget_ilist_multi_select_set(Evas_Object *obj, Eina_Bool multi); +E_API Eina_Bool e_widget_ilist_multi_select_get(Evas_Object *obj); +E_API void e_widget_ilist_multi_select(Evas_Object *obj, int n); +E_API void e_widget_ilist_range_select(Evas_Object *obj, int n); +E_API void e_widget_ilist_preferred_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h); +E_API Eina_Bool e_widget_ilist_custom_edje_file_set(Evas_Object *obj, const char *file, const char *group); #endif #endif diff --git a/src/bin/e_widget_image.c b/src/bin/e_widget_image.c index 26ce53d..d792edf 100644 --- a/src/bin/e_widget_image.c +++ b/src/bin/e_widget_image.c @@ -12,7 +12,7 @@ static void _e_wid_del_hook(Evas_Object *obj); /* local subsystem functions */ /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_image_add_from_object(Evas *evas, Evas_Object *object, int minw, int minh) { Evas_Object *obj, *o; @@ -43,7 +43,7 @@ e_widget_image_add_from_object(Evas *evas, Evas_Object *object, int minw, int mi return obj; } -EAPI Evas_Object * +E_API Evas_Object * e_widget_image_add_from_file(Evas *evas, const char *file, int minw, int minh) { Evas_Object *obj, *o; @@ -74,7 +74,7 @@ e_widget_image_add_from_file(Evas *evas, const char *file, int minw, int minh) return obj; } -EAPI void +E_API void e_widget_image_edje_set(Evas_Object *obj, const char *file, const char *part) { E_Widget_Data *wd; @@ -84,7 +84,7 @@ e_widget_image_edje_set(Evas_Object *obj, const char *file, const char *part) evas_object_show(wd->img); } -EAPI void +E_API void e_widget_image_file_set(Evas_Object *obj, const char *file) { E_Widget_Data *wd; @@ -94,7 +94,7 @@ e_widget_image_file_set(Evas_Object *obj, const char *file) evas_object_show(wd->img); } -EAPI void +E_API void e_widget_image_file_key_set(Evas_Object *obj, const char *file, const char *key) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_image.h b/src/bin/e_widget_image.h index 04b1c53..1607f65 100644 --- a/src/bin/e_widget_image.h +++ b/src/bin/e_widget_image.h @@ -3,11 +3,11 @@ #ifndef E_WIDGET_IMAGE_H #define E_WIDGET_IMAGE_H -EAPI Evas_Object *e_widget_image_add_from_object(Evas *evas, Evas_Object *object, int minw, int minh); -EAPI Evas_Object *e_widget_image_add_from_file(Evas *evas, const char *file, int minw, int minh); -EAPI void e_widget_image_edje_set(Evas_Object *obj, const char *file, const char *part); -EAPI void e_widget_image_file_set(Evas_Object *obj, const char *file); -EAPI void e_widget_image_file_key_set(Evas_Object *obj, const char *file, const char *key); +E_API Evas_Object *e_widget_image_add_from_object(Evas *evas, Evas_Object *object, int minw, int minh); +E_API Evas_Object *e_widget_image_add_from_file(Evas *evas, const char *file, int minw, int minh); +E_API void e_widget_image_edje_set(Evas_Object *obj, const char *file, const char *part); +E_API void e_widget_image_file_set(Evas_Object *obj, const char *file); +E_API void e_widget_image_file_key_set(Evas_Object *obj, const char *file, const char *key); #endif #endif diff --git a/src/bin/e_widget_label.c b/src/bin/e_widget_label.c index 3dc4ace..7cb353c 100644 --- a/src/bin/e_widget_label.c +++ b/src/bin/e_widget_label.c @@ -18,7 +18,7 @@ static void _e_wid_disable_hook(Evas_Object *obj); * @param text to assign to the widget * @return the label widget */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_label_add(Evas *evas, const char *label) { Evas_Object *obj, *o; @@ -47,7 +47,7 @@ e_widget_label_add(Evas *evas, const char *label) * @param the label widget * @param text to assign to the widget */ -EAPI void +E_API void e_widget_label_text_set(Evas_Object *obj, const char *text) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_label.h b/src/bin/e_widget_label.h index 281e396..74fa021 100644 --- a/src/bin/e_widget_label.h +++ b/src/bin/e_widget_label.h @@ -3,8 +3,8 @@ #ifndef E_WIDGET_LABEL_H #define E_WIDGET_LABEL_H -EAPI Evas_Object *e_widget_label_add(Evas *evas, const char *label); -EAPI void e_widget_label_text_set(Evas_Object *obj, const char *text); +E_API Evas_Object *e_widget_label_add(Evas *evas, const char *label); +E_API void e_widget_label_text_set(Evas_Object *obj, const char *text); #endif #endif diff --git a/src/bin/e_widget_list.c b/src/bin/e_widget_list.c index e154601..f319469 100644 --- a/src/bin/e_widget_list.c +++ b/src/bin/e_widget_list.c @@ -19,7 +19,7 @@ static void _e_wid_del_hook(Evas_Object *obj); * @param horiz the direction the list should be displayed * @return the new list wdiget */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_list_add(Evas *evas, int homogenous, int horiz) { Evas_Object *obj, *o; @@ -52,7 +52,7 @@ e_widget_list_add(Evas *evas, int homogenous, int horiz) * @param align who the sub widget to be aligned, to wards the center or sides * @return the new list wdiget */ -EAPI void +E_API void e_widget_list_object_prepend(Evas_Object *obj, Evas_Object *sobj, int fill, int expand, double align) { E_Widget_Data *wd; @@ -90,7 +90,7 @@ e_widget_list_object_prepend(Evas_Object *obj, Evas_Object *sobj, int fill, int * @param align who the sub widget to be aligned, to wards the center or sides * @return the new list wdiget */ -EAPI void +E_API void e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int expand, double align) { E_Widget_Data *wd; @@ -118,7 +118,7 @@ e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int e evas_object_show(sobj); } -EAPI void +E_API void e_widget_list_object_repack(Evas_Object *obj, Evas_Object *sobj, int fill, int expand, double align) { E_Widget_Data *wd; @@ -143,7 +143,7 @@ e_widget_list_object_repack(Evas_Object *obj, Evas_Object *sobj, int fill, int e e_widget_size_min_set(obj, mw, mh); } -EAPI void +E_API void e_widget_list_homogeneous_set(Evas_Object *obj, int homogenous) { E_Widget_Data *wd = e_widget_data_get(obj); diff --git a/src/bin/e_widget_list.h b/src/bin/e_widget_list.h index d3014bc..680e7db 100644 --- a/src/bin/e_widget_list.h +++ b/src/bin/e_widget_list.h @@ -3,11 +3,11 @@ #ifndef E_WIDGET_LIST_H #define E_WIDGET_LIST_H -EAPI Evas_Object *e_widget_list_add(Evas *evas, int homogenous, int horiz); -EAPI void e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int expand, double align); -EAPI void e_widget_list_object_prepend(Evas_Object *obj, Evas_Object *sobj, int fill, int expand, double align); -EAPI void e_widget_list_object_repack(Evas_Object *obj, Evas_Object *sobj, int fill, int expand, double align); -EAPI void e_widget_list_homogeneous_set(Evas_Object *obj, int homogenous); +E_API Evas_Object *e_widget_list_add(Evas *evas, int homogenous, int horiz); +E_API void e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int expand, double align); +E_API void e_widget_list_object_prepend(Evas_Object *obj, Evas_Object *sobj, int fill, int expand, double align); +E_API void e_widget_list_object_repack(Evas_Object *obj, Evas_Object *sobj, int fill, int expand, double align); +E_API void e_widget_list_homogeneous_set(Evas_Object *obj, int homogenous); #endif #endif diff --git a/src/bin/e_widget_preview.c b/src/bin/e_widget_preview.c index 37b17d6..c0de820 100644 --- a/src/bin/e_widget_preview.c +++ b/src/bin/e_widget_preview.c @@ -11,7 +11,7 @@ static void _e_wid_del_hook(Evas_Object *obj); static void _e_wid_preview_thumb_gen(void *data, Evas_Object *obj, void *event_info); /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_preview_add(Evas *evas, int minw, int minh) { Evas_Object *obj; @@ -50,7 +50,7 @@ e_widget_preview_add(Evas *evas, int minw, int minh) return obj; } -EAPI void +E_API void e_widget_preview_size_set(Evas_Object *obj, int minw, int minh) { E_Widget_Data *wd; @@ -63,7 +63,7 @@ e_widget_preview_size_set(Evas_Object *obj, int minw, int minh) e_widget_size_min_set(obj, mw, mh); } -EAPI Evas * +E_API Evas * e_widget_preview_evas_get(Evas_Object *obj) { E_Widget_Data *wd; @@ -72,7 +72,7 @@ e_widget_preview_evas_get(Evas_Object *obj) return e_livethumb_evas_get(wd->img); } -EAPI void +E_API void e_widget_preview_extern_object_set(Evas_Object *obj, Evas_Object *eobj) { E_Widget_Data *wd; @@ -84,7 +84,7 @@ e_widget_preview_extern_object_set(Evas_Object *obj, Evas_Object *eobj) e_widget_change(obj); } -EAPI int +E_API int e_widget_preview_file_set(Evas_Object *obj, const char *file, const char *key) { E_Widget_Data *wd; @@ -102,7 +102,7 @@ e_widget_preview_file_set(Evas_Object *obj, const char *file, const char *key) return 1; } -EAPI int +E_API int e_widget_preview_thumb_set(Evas_Object *obj, const char *file, const char *key, int w, int h) { E_Widget_Data *wd; @@ -136,7 +136,7 @@ e_widget_preview_thumb_set(Evas_Object *obj, const char *file, const char *key, return 1; } -EAPI void +E_API void e_widget_preview_vsize_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { E_Widget_Data *wd; @@ -159,7 +159,7 @@ _e_wid_preview_thumb_gen(void *data, Evas_Object *obj EINA_UNUSED, void *event_i e_widget_change(wd->obj); } -EAPI void +E_API void e_widget_preview_file_get(Evas_Object *obj, const char **file, const char **group) { E_Widget_Data *wd; @@ -168,7 +168,7 @@ e_widget_preview_file_get(Evas_Object *obj, const char **file, const char **grou edje_object_file_get(wd->o_thumb, file, group); } -EAPI int +E_API int e_widget_preview_edje_set(Evas_Object *obj, const char *file, const char *group) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_preview.h b/src/bin/e_widget_preview.h index 48502d5..081d57d 100644 --- a/src/bin/e_widget_preview.h +++ b/src/bin/e_widget_preview.h @@ -3,14 +3,14 @@ #ifndef E_WIDGET_PREVIEW_H #define E_WIDGET_PREVIEW_H -EAPI Evas_Object *e_widget_preview_add(Evas *evas, int minw, int minh); -EAPI Evas *e_widget_preview_evas_get(Evas_Object *obj); -EAPI void e_widget_preview_extern_object_set(Evas_Object *obj, Evas_Object *eobj); -EAPI void e_widget_preview_file_get(Evas_Object *obj, const char **file, const char **group); -EAPI int e_widget_preview_file_set(Evas_Object *obj, const char *file, const char *key); -EAPI int e_widget_preview_thumb_set(Evas_Object *obj, const char *file, const char *key, int w, int h); -EAPI int e_widget_preview_edje_set(Evas_Object *obj, const char *file, const char *group); -EAPI void e_widget_preview_vsize_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h); -EAPI void e_widget_preview_size_set(Evas_Object *obj, int minw, int minh); +E_API Evas_Object *e_widget_preview_add(Evas *evas, int minw, int minh); +E_API Evas *e_widget_preview_evas_get(Evas_Object *obj); +E_API void e_widget_preview_extern_object_set(Evas_Object *obj, Evas_Object *eobj); +E_API void e_widget_preview_file_get(Evas_Object *obj, const char **file, const char **group); +E_API int e_widget_preview_file_set(Evas_Object *obj, const char *file, const char *key); +E_API int e_widget_preview_thumb_set(Evas_Object *obj, const char *file, const char *key, int w, int h); +E_API int e_widget_preview_edje_set(Evas_Object *obj, const char *file, const char *group); +E_API void e_widget_preview_vsize_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h); +E_API void e_widget_preview_size_set(Evas_Object *obj, int minw, int minh); #endif #endif diff --git a/src/bin/e_widget_radio.c b/src/bin/e_widget_radio.c index 83a2ec6..c86bcc1 100644 --- a/src/bin/e_widget_radio.c +++ b/src/bin/e_widget_radio.c @@ -25,7 +25,7 @@ static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *even /* local subsystem functions */ /* externally accessible functions */ -EAPI E_Radio_Group * +E_API E_Radio_Group * e_widget_radio_group_new(int *val) { E_Radio_Group *group; @@ -35,7 +35,7 @@ e_widget_radio_group_new(int *val) return group; } -EAPI Evas_Object * +E_API Evas_Object * e_widget_radio_add(Evas *evas, const char *label, int valnum, E_Radio_Group *group) { Evas_Object *obj, *o; @@ -82,7 +82,7 @@ e_widget_radio_add(Evas *evas, const char *label, int valnum, E_Radio_Group *gro return obj; } -EAPI Evas_Object * +E_API Evas_Object * e_widget_radio_icon_add(Evas *evas, const char *label, const char *icon, int icon_w, int icon_h, int valnum, E_Radio_Group *group) { Evas_Object *obj, *o, *o2; @@ -145,7 +145,7 @@ e_widget_radio_icon_add(Evas *evas, const char *label, const char *icon, int ico return obj; } -EAPI void +E_API void e_widget_radio_toggle_set(Evas_Object *obj, int toggle) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_radio.h b/src/bin/e_widget_radio.h index 7ed3b91..989bd2e 100644 --- a/src/bin/e_widget_radio.h +++ b/src/bin/e_widget_radio.h @@ -5,10 +5,10 @@ typedef struct _E_Radio_Group E_Radio_Group; -EAPI E_Radio_Group *e_widget_radio_group_new(int *val); -EAPI Evas_Object *e_widget_radio_add(Evas *evas, const char *label, int valnum, E_Radio_Group *group); -EAPI Evas_Object *e_widget_radio_icon_add(Evas *evas, const char *label, const char *icon, int icon_w, int icon_h, int valnum, E_Radio_Group *group); -EAPI void e_widget_radio_toggle_set(Evas_Object *obj, int toggle); +E_API E_Radio_Group *e_widget_radio_group_new(int *val); +E_API Evas_Object *e_widget_radio_add(Evas *evas, const char *label, int valnum, E_Radio_Group *group); +E_API Evas_Object *e_widget_radio_icon_add(Evas *evas, const char *label, const char *icon, int icon_w, int icon_h, int valnum, E_Radio_Group *group); +E_API void e_widget_radio_toggle_set(Evas_Object *obj, int toggle); #endif #endif diff --git a/src/bin/e_widget_scrollframe.c b/src/bin/e_widget_scrollframe.c index aeaa937..f5e1de3 100644 --- a/src/bin/e_widget_scrollframe.c +++ b/src/bin/e_widget_scrollframe.c @@ -13,7 +13,7 @@ static void _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_info); /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_scrollframe_simple_add(Evas *evas, Evas_Object *child) { E_Widget_Data *wd; @@ -46,7 +46,7 @@ e_widget_scrollframe_simple_add(Evas *evas, Evas_Object *child) return obj; } -EAPI Evas_Object * +E_API Evas_Object * e_widget_scrollframe_pan_add(Evas *evas, Evas_Object *pan, void (*pan_set)(Evas_Object *obj, Evas_Coord x, Evas_Coord y), void (*pan_get)(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y), void (*pan_max_get)(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y), void (*pan_child_size_get)(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)) { Evas_Object *obj, *o; @@ -75,7 +75,7 @@ e_widget_scrollframe_pan_add(Evas *evas, Evas_Object *pan, void (*pan_set)(Evas_ return obj; } -EAPI void +E_API void e_widget_scrollframe_child_pos_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { E_Widget_Data *wd; @@ -84,7 +84,7 @@ e_widget_scrollframe_child_pos_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) e_scrollframe_child_pos_set(wd->o_scrollframe, x, y); } -EAPI void +E_API void e_widget_scrollframe_child_pos_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y) { E_Widget_Data *wd; @@ -93,7 +93,7 @@ e_widget_scrollframe_child_pos_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord * e_scrollframe_child_pos_get(wd->o_scrollframe, x, y); } -EAPI void +E_API void e_widget_scrollframe_child_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) { E_Widget_Data *wd; @@ -102,7 +102,7 @@ e_widget_scrollframe_child_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coor e_scrollframe_child_region_show(wd->o_scrollframe, x, y, w, h); } -EAPI void +E_API void e_widget_scrollframe_focus_object_set(Evas_Object *obj, Evas_Object *fobj) { E_Widget_Data *wd; @@ -111,7 +111,7 @@ e_widget_scrollframe_focus_object_set(Evas_Object *obj, Evas_Object *fobj) wd->o_fobj = fobj; } -EAPI Evas_Object * +E_API Evas_Object * e_widget_scrollframe_object_get(Evas_Object *obj) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_scrollframe.h b/src/bin/e_widget_scrollframe.h index 5334ea9..1d96a13 100644 --- a/src/bin/e_widget_scrollframe.h +++ b/src/bin/e_widget_scrollframe.h @@ -3,13 +3,13 @@ #ifndef E_WIDGET_SCROLLFRAME_H #define E_WIDGET_SCROLLFRAME_H -EAPI Evas_Object *e_widget_scrollframe_pan_add(Evas *evas, Evas_Object *pan, void (*pan_set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y), void (*pan_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y), void (*pan_max_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y), void (*pan_child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)); -EAPI Evas_Object *e_widget_scrollframe_simple_add(Evas *evas, Evas_Object *child); -EAPI void e_widget_scrollframe_child_pos_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y); -EAPI void e_widget_scrollframe_child_pos_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); -EAPI void e_widget_scrollframe_child_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); -EAPI void e_widget_scrollframe_focus_object_set(Evas_Object *obj, Evas_Object *fobj); -EAPI Evas_Object *e_widget_scrollframe_object_get(Evas_Object *obj); +E_API Evas_Object *e_widget_scrollframe_pan_add(Evas *evas, Evas_Object *pan, void (*pan_set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y), void (*pan_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y), void (*pan_max_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y), void (*pan_child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)); +E_API Evas_Object *e_widget_scrollframe_simple_add(Evas *evas, Evas_Object *child); +E_API void e_widget_scrollframe_child_pos_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y); +E_API void e_widget_scrollframe_child_pos_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y); +E_API void e_widget_scrollframe_child_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h); +E_API void e_widget_scrollframe_focus_object_set(Evas_Object *obj, Evas_Object *fobj); +E_API Evas_Object *e_widget_scrollframe_object_get(Evas_Object *obj); #endif #endif diff --git a/src/bin/e_widget_slider.c b/src/bin/e_widget_slider.c index a73cb51..9e3002c 100644 --- a/src/bin/e_widget_slider.c +++ b/src/bin/e_widget_slider.c @@ -15,7 +15,7 @@ static void _e_wid_cb_changed(void *data, Evas_Object *obj, void *event_info); static void _e_wid_disable_hook(Evas_Object *obj); /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_slider_add(Evas *evas, int horiz, int rev, const char *fmt, double min, double max, double step, int count, double *dval, int *ival, Evas_Coord size) { Evas_Object *obj, *o; @@ -70,7 +70,7 @@ e_widget_slider_add(Evas *evas, int horiz, int rev, const char *fmt, double min, * @param dval the double value to set the slider to * @return 1 if value set, return 0 if value not set */ -EAPI int +E_API int e_widget_slider_value_double_set(Evas_Object *slider, double dval) { E_Widget_Data *wd; @@ -91,7 +91,7 @@ e_widget_slider_value_double_set(Evas_Object *slider, double dval) * @param ival the integer value to set the slider to * @return 1 if value set, return 0 if value not set */ -EAPI int +E_API int e_widget_slider_value_int_set(Evas_Object *slider, int ival) { E_Widget_Data *wd; @@ -111,7 +111,7 @@ e_widget_slider_value_int_set(Evas_Object *slider, int ival) * @param dval the pointer to the double value to be set with the value of the slider * @return 1 if value returned, return 0 if value not returned */ -EAPI int +E_API int e_widget_slider_value_double_get(Evas_Object *slider, double *dval) { E_Widget_Data *wd; @@ -132,7 +132,7 @@ e_widget_slider_value_double_get(Evas_Object *slider, double *dval) * @param ival the pointer to the integer value to be set with the value of the slider * @return 1 if value returned, return 0 if value not returned */ -EAPI int +E_API int e_widget_slider_value_int_get(Evas_Object *slider, int *ival) { E_Widget_Data *wd; @@ -145,7 +145,7 @@ e_widget_slider_value_int_get(Evas_Object *slider, int *ival) return 1; } -EAPI void +E_API void e_widget_slider_value_format_display_set(Evas_Object *slider, const char *format) { E_Widget_Data *wd; @@ -154,7 +154,7 @@ e_widget_slider_value_format_display_set(Evas_Object *slider, const char *format e_slider_value_format_display_set(wd->o_slider, format); } -EAPI void +E_API void e_widget_slider_value_range_set(Evas_Object *slider, double min, double max) { E_Widget_Data *wd; @@ -163,7 +163,7 @@ e_widget_slider_value_range_set(Evas_Object *slider, double min, double max) e_slider_value_range_set(wd->o_slider, min, max); } -EAPI void +E_API void e_widget_slider_value_step_size_set(Evas_Object *slider, double step_size) { E_Widget_Data *wd; @@ -172,7 +172,7 @@ e_widget_slider_value_step_size_set(Evas_Object *slider, double step_size) e_slider_value_step_size_set(wd->o_slider, step_size); } -EAPI void +E_API void e_widget_slider_special_value_add(Evas_Object *obj, double value, double error, const char *label) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_slider.h b/src/bin/e_widget_slider.h index 011dccc..79e72a4 100644 --- a/src/bin/e_widget_slider.h +++ b/src/bin/e_widget_slider.h @@ -3,16 +3,16 @@ #ifndef E_WIDGET_SLIDER_H #define E_WIDGET_SLIDER_H -EAPI Evas_Object *e_widget_slider_add(Evas *evas, int horiz, int rev, const char *fmt, double min, double max, double step, int count, double *dval, int *ival, Evas_Coord size); -EAPI int e_widget_slider_value_double_set(Evas_Object *slider, double dval); -EAPI int e_widget_slider_value_int_set(Evas_Object *slider, int ival); -EAPI int e_widget_slider_value_double_get(Evas_Object *slider, double *dval); -EAPI int e_widget_slider_value_int_get(Evas_Object *slider, int *ival); -EAPI void e_widget_slider_value_format_display_set(Evas_Object *slider, const char *format); -EAPI void e_widget_slider_value_range_set(Evas_Object *slider, double min, double max); -EAPI void e_widget_slider_value_step_size_set(Evas_Object *slider, double step_size); +E_API Evas_Object *e_widget_slider_add(Evas *evas, int horiz, int rev, const char *fmt, double min, double max, double step, int count, double *dval, int *ival, Evas_Coord size); +E_API int e_widget_slider_value_double_set(Evas_Object *slider, double dval); +E_API int e_widget_slider_value_int_set(Evas_Object *slider, int ival); +E_API int e_widget_slider_value_double_get(Evas_Object *slider, double *dval); +E_API int e_widget_slider_value_int_get(Evas_Object *slider, int *ival); +E_API void e_widget_slider_value_format_display_set(Evas_Object *slider, const char *format); +E_API void e_widget_slider_value_range_set(Evas_Object *slider, double min, double max); +E_API void e_widget_slider_value_step_size_set(Evas_Object *slider, double step_size); -EAPI void e_widget_slider_special_value_add(Evas_Object *obj, double value, double error, const char *label); +E_API void e_widget_slider_special_value_add(Evas_Object *obj, double value, double error, const char *label); #endif #endif diff --git a/src/bin/e_widget_table.c b/src/bin/e_widget_table.c index 95849ec..0fd4733 100644 --- a/src/bin/e_widget_table.c +++ b/src/bin/e_widget_table.c @@ -11,7 +11,7 @@ static void _e_wid_del_hook(Evas_Object *obj); /* local subsystem functions */ /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_table_add(Evas_Object *parent, int homogenous) { Evas_Object *obj, *o; @@ -33,7 +33,7 @@ e_widget_table_add(Evas_Object *parent, int homogenous) return obj; } -EAPI void +E_API void e_widget_table_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h) { e_widget_table_object_align_append(obj, sobj, @@ -42,7 +42,7 @@ e_widget_table_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int r 0.5, 0.5); } -EAPI void +E_API void e_widget_table_object_align_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h, double ax, double ay) { E_Widget_Data *wd; @@ -58,7 +58,7 @@ e_widget_table_object_align_append(Evas_Object *obj, Evas_Object *sobj, int col, evas_object_show(sobj); } -EAPI void +E_API void e_widget_table_object_repack(Evas_Object *obj EINA_UNUSED, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h) { if (fill_w || fill_h) @@ -67,7 +67,7 @@ e_widget_table_object_repack(Evas_Object *obj EINA_UNUSED, Evas_Object *sobj, in elm_table_pack_set(sobj, col, row, colspan, rowspan); } -EAPI void +E_API void e_widget_table_unpack(Evas_Object *obj, Evas_Object *sobj) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_table.h b/src/bin/e_widget_table.h index f4c2a71..7e295f3 100644 --- a/src/bin/e_widget_table.h +++ b/src/bin/e_widget_table.h @@ -3,11 +3,11 @@ #ifndef E_WIDGET_TABLE_H #define E_WIDGET_TABLE_H -EAPI Evas_Object *e_widget_table_add(Evas_Object *parent, int homogenous); -EAPI void e_widget_table_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h); -EAPI void e_widget_table_object_align_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h, double ax, double ay); -EAPI void e_widget_table_object_repack(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h); -EAPI void e_widget_table_unpack(Evas_Object *obj, Evas_Object *sobj); +E_API Evas_Object *e_widget_table_add(Evas_Object *parent, int homogenous); +E_API void e_widget_table_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h); +E_API void e_widget_table_object_align_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h, double ax, double ay); +E_API void e_widget_table_object_repack(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h); +E_API void e_widget_table_unpack(Evas_Object *obj, Evas_Object *sobj); #endif #endif diff --git a/src/bin/e_widget_textblock.c b/src/bin/e_widget_textblock.c index d3ba61a..1973b11 100644 --- a/src/bin/e_widget_textblock.c +++ b/src/bin/e_widget_textblock.c @@ -11,7 +11,7 @@ static void _e_wid_focus_hook(Evas_Object *obj); static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info); /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_textblock_add(Evas *evas) { Evas_Object *obj, *o; @@ -37,7 +37,7 @@ e_widget_textblock_add(Evas *evas) return obj; } -EAPI void +E_API void e_widget_textblock_markup_set(Evas_Object *obj, const char *text) { E_Widget_Data *wd; @@ -46,7 +46,7 @@ e_widget_textblock_markup_set(Evas_Object *obj, const char *text) elm_entry_entry_set(wd->o_entry, text); } -EAPI void +E_API void e_widget_textblock_plain_set(Evas_Object *obj, const char *text) { char *markup; diff --git a/src/bin/e_widget_textblock.h b/src/bin/e_widget_textblock.h index 5aac28c..6879a74 100644 --- a/src/bin/e_widget_textblock.h +++ b/src/bin/e_widget_textblock.h @@ -3,9 +3,9 @@ #ifndef E_WIDGET_TEXTBLOCK_H #define E_WIDGET_TEXTBLOCK_H -EAPI Evas_Object *e_widget_textblock_add(Evas *evas); -EAPI void e_widget_textblock_markup_set(Evas_Object *obj, const char *text); -EAPI void e_widget_textblock_plain_set(Evas_Object *obj, const char *text); +E_API Evas_Object *e_widget_textblock_add(Evas *evas); +E_API void e_widget_textblock_markup_set(Evas_Object *obj, const char *text); +E_API void e_widget_textblock_plain_set(Evas_Object *obj, const char *text); #endif #endif diff --git a/src/bin/e_widget_toolbar.c b/src/bin/e_widget_toolbar.c index a27202b..11d55d7 100644 --- a/src/bin/e_widget_toolbar.c +++ b/src/bin/e_widget_toolbar.c @@ -35,7 +35,7 @@ static void _item_unselect(Item *it); /* local subsystem functions */ /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_toolbar_add(Evas *evas, int icon_w, int icon_h) { Evas_Object *obj, *o; @@ -95,7 +95,7 @@ e_widget_toolbar_add(Evas *evas, int icon_w, int icon_h) return obj; } -EAPI const Eina_List * +E_API const Eina_List * e_widget_toolbar_items_get(Evas_Object *obj) { E_Widget_Data *wd; @@ -104,7 +104,7 @@ e_widget_toolbar_items_get(Evas_Object *obj) return wd->items; } -EAPI unsigned int +E_API unsigned int e_widget_toolbar_items_count(Evas_Object *obj) { E_Widget_Data *wd; @@ -113,7 +113,7 @@ e_widget_toolbar_items_count(Evas_Object *obj) return eina_list_count(wd->items); } -EAPI const char * +E_API const char * e_widget_toolbar_item_label_get(void *item) { Item *it = item; @@ -121,7 +121,7 @@ e_widget_toolbar_item_label_get(void *item) return edje_object_part_text_get(it->o_base, "e.text.label"); } -EAPI void +E_API void e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func)(void *data1, void *data2), const void *data1, const void *data2) { E_Widget_Data *wd; @@ -174,7 +174,7 @@ e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *la evas_object_resize(wd->o_box, mw, mh); } -EAPI void +E_API void e_widget_toolbar_item_remove(Evas_Object *obj, int num) { E_Widget_Data *wd; @@ -192,7 +192,7 @@ e_widget_toolbar_item_remove(Evas_Object *obj, int num) } } -EAPI void +E_API void e_widget_toolbar_item_select(Evas_Object *obj, int num) { E_Widget_Data *wd = NULL; @@ -216,7 +216,7 @@ e_widget_toolbar_item_select(Evas_Object *obj, int num) } } -EAPI void +E_API void e_widget_toolbar_item_label_set(Evas_Object *obj, int num, const char *label) { E_Widget_Data *wd = NULL; @@ -235,7 +235,7 @@ e_widget_toolbar_item_label_set(Evas_Object *obj, int num, const char *label) } } -EAPI void +E_API void e_widget_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable) { E_Widget_Data *wd; @@ -256,7 +256,7 @@ e_widget_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable) evas_object_resize(wd->o_box, mw, mh); } -EAPI void +E_API void e_widget_toolbar_focus_steal_set(Evas_Object *obj, Eina_Bool steal) { E_Widget_Data *wd; @@ -280,7 +280,7 @@ e_widget_toolbar_focus_steal_set(Evas_Object *obj, Eina_Bool steal) } } -EAPI void +E_API void e_widget_toolbar_clear(Evas_Object *obj) { E_Widget_Data *wd = NULL; @@ -296,7 +296,7 @@ e_widget_toolbar_clear(Evas_Object *obj) } } -EAPI int +E_API int e_widget_toolbar_item_selected_get(Evas_Object *obj) { E_Widget_Data *wd = NULL; diff --git a/src/bin/e_widget_toolbar.h b/src/bin/e_widget_toolbar.h index a3bb65d..75fd760 100644 --- a/src/bin/e_widget_toolbar.h +++ b/src/bin/e_widget_toolbar.h @@ -3,17 +3,17 @@ #ifndef E_WIDGET_TOOLBAR_H #define E_WIDGET_TOOLBAR_H -EAPI Evas_Object *e_widget_toolbar_add(Evas *evas, int icon_w, int icon_h); -EAPI void e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data1, void *data2), const void *data1, const void *data2); -EAPI void e_widget_toolbar_item_remove(Evas_Object *obj, int num); -EAPI void e_widget_toolbar_item_select(Evas_Object *obj, int num); -EAPI void e_widget_toolbar_item_label_set(Evas_Object *obj, int num, const char *label); -EAPI void e_widget_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable); -EAPI void e_widget_toolbar_focus_steal_set(Evas_Object *obj, Eina_Bool steal); -EAPI void e_widget_toolbar_clear(Evas_Object *obj); -EAPI int e_widget_toolbar_item_selected_get(Evas_Object *obj); -EAPI const Eina_List *e_widget_toolbar_items_get(Evas_Object *obj); -EAPI const char *e_widget_toolbar_item_label_get(void *item); -EAPI unsigned int e_widget_toolbar_items_count(Evas_Object *obj); +E_API Evas_Object *e_widget_toolbar_add(Evas *evas, int icon_w, int icon_h); +E_API void e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *label, void (*func) (void *data1, void *data2), const void *data1, const void *data2); +E_API void e_widget_toolbar_item_remove(Evas_Object *obj, int num); +E_API void e_widget_toolbar_item_select(Evas_Object *obj, int num); +E_API void e_widget_toolbar_item_label_set(Evas_Object *obj, int num, const char *label); +E_API void e_widget_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable); +E_API void e_widget_toolbar_focus_steal_set(Evas_Object *obj, Eina_Bool steal); +E_API void e_widget_toolbar_clear(Evas_Object *obj); +E_API int e_widget_toolbar_item_selected_get(Evas_Object *obj); +E_API const Eina_List *e_widget_toolbar_items_get(Evas_Object *obj); +E_API const char *e_widget_toolbar_item_label_get(void *item); +E_API unsigned int e_widget_toolbar_items_count(Evas_Object *obj); #endif #endif diff --git a/src/bin/e_widget_toolbook.c b/src/bin/e_widget_toolbook.c index 725266d..00917c2 100644 --- a/src/bin/e_widget_toolbook.c +++ b/src/bin/e_widget_toolbook.c @@ -11,7 +11,7 @@ static void _e_wid_del_hook(Evas_Object *obj); static void _item_sel(void *data1, void *data2); /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_widget_toolbook_add(Evas *evas, int icon_w, int icon_h) { Evas_Object *obj, *o; @@ -38,7 +38,7 @@ e_widget_toolbook_add(Evas *evas, int icon_w, int icon_h) return obj; } -EAPI void +E_API void e_widget_toolbook_page_append(Evas_Object *toolbook, Evas_Object *icon, const char *label, Evas_Object *content, int expand_w, int expand_h, int fill_w, int fill_h, double ax, double ay) { E_Widget_Data *wd; @@ -57,7 +57,7 @@ e_widget_toolbook_page_append(Evas_Object *toolbook, Evas_Object *icon, const ch e_widget_size_min_set(toolbook, minw, minh); } -EAPI void +E_API void e_widget_toolbook_page_show(Evas_Object *toolbook, int n) { E_Widget_Data *wd; diff --git a/src/bin/e_widget_toolbook.h b/src/bin/e_widget_toolbook.h index 3403659..a9632db 100644 --- a/src/bin/e_widget_toolbook.h +++ b/src/bin/e_widget_toolbook.h @@ -3,9 +3,9 @@ #ifndef E_WIDGET_TOOLBOOK_H #define E_WIDGET_TOOLBOOK_H -EAPI Evas_Object *e_widget_toolbook_add(Evas *evas, int icon_w, int icon_h); -EAPI void e_widget_toolbook_page_append(Evas_Object *toolbook, Evas_Object *icon, const char *label, Evas_Object *content, int expand_w, int expand_h, int fill_w, int fill_h, double ax, double ay); -EAPI void e_widget_toolbook_page_show(Evas_Object *toolbook, int n); +E_API Evas_Object *e_widget_toolbook_add(Evas *evas, int icon_w, int icon_h); +E_API void e_widget_toolbook_page_append(Evas_Object *toolbook, Evas_Object *icon, const char *label, Evas_Object *content, int expand_w, int expand_h, int fill_w, int fill_h, double ax, double ay); +E_API void e_widget_toolbook_page_show(Evas_Object *toolbook, int n); #endif #endif diff --git a/src/bin/e_win.c b/src/bin/e_win.c index 9ec5194..aaaa10a 100644 --- a/src/bin/e_win.c +++ b/src/bin/e_win.c @@ -370,7 +370,7 @@ e_win_shutdown(void) return 1; } -EAPI E_Client * +E_API E_Client * e_win_client_get(Evas_Object *obj) { Elm_Win_Trap_Ctx *ctx; @@ -381,13 +381,13 @@ e_win_client_get(Evas_Object *obj) return ctx ? ctx->client : NULL; } -EAPI Ecore_Evas * +E_API Ecore_Evas * e_win_ee_get(Evas_Object *obj) { return ecore_evas_ecore_evas_get(evas_object_evas_get(obj)); } -EAPI E_Pointer * +E_API E_Pointer * e_win_pointer_get(Evas_Object *obj) { Elm_Win_Trap_Ctx *ctx = elm_win_trap_data_get(obj); @@ -395,7 +395,7 @@ e_win_pointer_get(Evas_Object *obj) return ctx ? ctx->pointer : NULL; } -EAPI Eina_Bool +E_API Eina_Bool e_win_centered_get(Evas_Object *obj) { Elm_Win_Trap_Ctx *ctx = elm_win_trap_data_get(obj); @@ -403,7 +403,7 @@ e_win_centered_get(Evas_Object *obj) return ctx ? ctx->centered : EINA_FALSE; } -EAPI void +E_API void e_win_client_icon_set(Evas_Object *obj, const char *icon) { Elm_Win_Trap_Ctx *ctx = elm_win_trap_data_get(obj); @@ -412,7 +412,7 @@ e_win_client_icon_set(Evas_Object *obj, const char *icon) eina_stringshare_replace(&ctx->client->internal_icon, icon); } -EAPI void +E_API void e_win_client_icon_key_set(Evas_Object *obj, const char *key) { Elm_Win_Trap_Ctx *ctx = elm_win_trap_data_get(obj); @@ -421,7 +421,7 @@ e_win_client_icon_key_set(Evas_Object *obj, const char *key) eina_stringshare_replace(&ctx->client->internal_icon_key, key); } -EAPI void +E_API void e_win_placed_set(Evas_Object *obj, Eina_Bool placed) { Elm_Win_Trap_Ctx *ctx = elm_win_trap_data_get(obj); @@ -435,7 +435,7 @@ e_win_placed_set(Evas_Object *obj, Eina_Bool placed) } } -EAPI void +E_API void e_win_no_remember_set(Evas_Object *obj, Eina_Bool no_rem) { Elm_Win_Trap_Ctx *ctx = elm_win_trap_data_get(obj); @@ -446,7 +446,7 @@ e_win_no_remember_set(Evas_Object *obj, Eina_Bool no_rem) ctx->client->internal_no_remember = !!no_rem; } -EAPI void +E_API void e_win_no_reopen_set(Evas_Object *obj, Eina_Bool no_reopen) { Elm_Win_Trap_Ctx *ctx = elm_win_trap_data_get(obj); @@ -457,7 +457,7 @@ e_win_no_reopen_set(Evas_Object *obj, Eina_Bool no_reopen) ctx->client->internal_no_reopen = !!no_reopen; } -EAPI Evas_Object * +E_API Evas_Object * e_elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) { char *eng; diff --git a/src/bin/e_win.h b/src/bin/e_win.h index 96eaa2d..a18e2d9 100644 --- a/src/bin/e_win.h +++ b/src/bin/e_win.h @@ -6,17 +6,17 @@ EINTERN int e_win_init (void); EINTERN int e_win_shutdown (void); -EAPI E_Client *e_win_client_get(Evas_Object *obj); -EAPI Ecore_Evas *e_win_ee_get(Evas_Object *obj); -EAPI E_Pointer *e_win_pointer_get(Evas_Object *obj); -EAPI Eina_Bool e_win_centered_get(Evas_Object *obj); +E_API E_Client *e_win_client_get(Evas_Object *obj); +E_API Ecore_Evas *e_win_ee_get(Evas_Object *obj); +E_API E_Pointer *e_win_pointer_get(Evas_Object *obj); +E_API Eina_Bool e_win_centered_get(Evas_Object *obj); -EAPI void e_win_client_icon_set(Evas_Object *win, const char *icon); -EAPI void e_win_client_icon_key_set(Evas_Object *win, const char *key); +E_API void e_win_client_icon_set(Evas_Object *win, const char *icon); +E_API void e_win_client_icon_key_set(Evas_Object *win, const char *key); -EAPI void e_win_placed_set(Evas_Object *win, Eina_Bool placed); -EAPI void e_win_no_remember_set(Evas_Object *win, Eina_Bool no_rem); -EAPI void e_win_no_reopen_set(Evas_Object *win, Eina_Bool no_reopen); +E_API void e_win_placed_set(Evas_Object *win, Eina_Bool placed); +E_API void e_win_no_remember_set(Evas_Object *win, Eina_Bool no_rem); +E_API void e_win_no_reopen_set(Evas_Object *win, Eina_Bool no_reopen); static inline Evas_Object * e_win_evas_object_win_get(Evas_Object *obj) @@ -37,7 +37,7 @@ e_obj_is_win(const void *obj) return type && !strcmp(type, "elm_win"); } -EAPI Evas_Object *e_elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type); +E_API Evas_Object *e_elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type); #define elm_win_add(X, Y, Z) \ e_elm_win_add((X), (Y), (Z)) diff --git a/src/bin/e_xinerama.c b/src/bin/e_xinerama.c index 10ee4ad..2a8c76a 100644 --- a/src/bin/e_xinerama.c +++ b/src/bin/e_xinerama.c @@ -21,28 +21,28 @@ e_xinerama_shutdown(void) return 1; } -EAPI void +E_API void e_xinerama_update(void) { _e_xinerama_clean(); _e_xinerama_update(); } -EAPI const Eina_List * +E_API const Eina_List * e_xinerama_screens_get(void) { if (fake_screens) return fake_screens; return chosen_screens; } -EAPI const Eina_List * +E_API const Eina_List * e_xinerama_screens_all_get(void) { if (fake_screens) return fake_screens; return all_screens; } -EAPI void +E_API void e_xinerama_screens_set(Eina_List *screens) { E_FREE_LIST(all_screens, free); @@ -51,7 +51,7 @@ e_xinerama_screens_set(Eina_List *screens) _e_xinerama_update(); } -EAPI void +E_API void e_xinerama_fake_screen_add(int x, int y, int w, int h) { E_Screen *scr; @@ -66,7 +66,7 @@ e_xinerama_fake_screen_add(int x, int y, int w, int h) fake_screens = eina_list_append(fake_screens, scr); } -EAPI Eina_Bool +E_API Eina_Bool e_xinerama_fake_screens_exist(void) { return !!fake_screens; diff --git a/src/bin/e_xinerama.h b/src/bin/e_xinerama.h index f802bc3..53067cb 100644 --- a/src/bin/e_xinerama.h +++ b/src/bin/e_xinerama.h @@ -14,12 +14,12 @@ struct _E_Screen EINTERN int e_xinerama_init(void); EINTERN int e_xinerama_shutdown(void); -EAPI void e_xinerama_update(void); -EAPI const Eina_List *e_xinerama_screens_get(void); -EAPI const Eina_List *e_xinerama_screens_all_get(void); -EAPI void e_xinerama_screens_set(Eina_List *screens); -EAPI void e_xinerama_fake_screen_add(int x, int y, int w, int h); -EAPI Eina_Bool e_xinerama_fake_screens_exist(void); +E_API void e_xinerama_update(void); +E_API const Eina_List *e_xinerama_screens_get(void); +E_API const Eina_List *e_xinerama_screens_all_get(void); +E_API void e_xinerama_screens_set(Eina_List *screens); +E_API void e_xinerama_fake_screen_add(int x, int y, int w, int h); +E_API Eina_Bool e_xinerama_fake_screens_exist(void); #endif #endif diff --git a/src/bin/e_xkb.c b/src/bin/e_xkb.c index e48dd58..9847419 100644 --- a/src/bin/e_xkb.c +++ b/src/bin/e_xkb.c @@ -4,7 +4,7 @@ static void _e_xkb_update_event(int); static int _e_xkb_cur_group = -1; -EAPI int E_EVENT_XKB_CHANGED = 0; +E_API int E_EVENT_XKB_CHANGED = 0; static Eina_Bool _e_xkb_init_timer(void *data) @@ -28,7 +28,7 @@ _e_xkb_init_timer(void *data) } /* externally accessible functions */ -EAPI int +E_API int e_xkb_init(void) { E_EVENT_XKB_CHANGED = ecore_event_type_new(); @@ -43,13 +43,13 @@ e_xkb_init(void) return 1; } -EAPI int +E_API int e_xkb_shutdown(void) { return 1; } -EAPI void +E_API void e_xkb_update(int cur_group) { E_Config_XKB_Layout *cl; @@ -152,7 +152,7 @@ e_xkb_update(int cur_group) eina_strbuf_free(buf); } -EAPI void +E_API void e_xkb_layout_next(void) { Eina_List *l; @@ -174,7 +174,7 @@ e_xkb_layout_next(void) e_config_save_queue(); } -EAPI void +E_API void e_xkb_layout_prev(void) { Eina_List *l; @@ -200,7 +200,7 @@ e_xkb_layout_prev(void) /* always use this function to get the current layout's name * to ensure the most accurate results!!! */ -EAPI E_Config_XKB_Layout * +E_API E_Config_XKB_Layout * e_xkb_layout_get(void) { unsigned int n = 0; @@ -212,7 +212,7 @@ e_xkb_layout_get(void) return eina_list_nth(e_config->xkb.used_layouts, n); } -EAPI void +E_API void e_xkb_layout_set(const E_Config_XKB_Layout *cl) { Eina_List *l; @@ -238,7 +238,7 @@ e_xkb_layout_set(const E_Config_XKB_Layout *cl) e_config_save_queue(); } -EAPI const char * +E_API const char * e_xkb_layout_name_reduce(const char *name) { const char *s; @@ -250,7 +250,7 @@ e_xkb_layout_name_reduce(const char *name) return s; } -EAPI void +E_API void e_xkb_e_icon_flag_setup(Evas_Object *eicon, const char *name) { int w, h; @@ -262,7 +262,7 @@ e_xkb_e_icon_flag_setup(Evas_Object *eicon, const char *name) edje_extern_object_aspect_set(eicon, EDJE_ASPECT_CONTROL_BOTH, w, h); } -EAPI void +E_API void e_xkb_flag_file_get(char *buf, size_t bufsize, const char *name) { name = e_xkb_layout_name_reduce(name); @@ -273,7 +273,7 @@ e_xkb_flag_file_get(char *buf, size_t bufsize, const char *name) e_prefix_data_get()); } -EAPI Eina_Bool +E_API Eina_Bool e_config_xkb_layout_eq(const E_Config_XKB_Layout *a, const E_Config_XKB_Layout *b) { if (a == b) return EINA_TRUE; @@ -281,7 +281,7 @@ e_config_xkb_layout_eq(const E_Config_XKB_Layout *a, const E_Config_XKB_Layout * return ((a->name == b->name) && (a->model == b->model) && (a->variant == b->variant)); } -EAPI void +E_API void e_config_xkb_layout_free(E_Config_XKB_Layout *cl) { if (!cl) return; @@ -292,7 +292,7 @@ e_config_xkb_layout_free(E_Config_XKB_Layout *cl) free(cl); } -EAPI E_Config_XKB_Layout * +E_API E_Config_XKB_Layout * e_config_xkb_layout_dup(const E_Config_XKB_Layout *cl) { E_Config_XKB_Layout *cl2; diff --git a/src/bin/e_xkb.h b/src/bin/e_xkb.h index 9ad656c..02b0d40 100644 --- a/src/bin/e_xkb.h +++ b/src/bin/e_xkb.h @@ -3,22 +3,22 @@ #ifndef E_XKB_H #define E_XKB_H -EAPI int e_xkb_init(void); -EAPI int e_xkb_shutdown(void); -EAPI void e_xkb_update(int); -EAPI void e_xkb_layout_next(void); -EAPI void e_xkb_layout_prev(void); -EAPI E_Config_XKB_Layout *e_xkb_layout_get(void); -EAPI void e_xkb_layout_set(const E_Config_XKB_Layout *cl); -EAPI const char *e_xkb_layout_name_reduce(const char *name); -EAPI void e_xkb_e_icon_flag_setup(Evas_Object *eicon, const char *name); -EAPI void e_xkb_flag_file_get(char *buf, size_t bufsize, const char *name); +E_API int e_xkb_init(void); +E_API int e_xkb_shutdown(void); +E_API void e_xkb_update(int); +E_API void e_xkb_layout_next(void); +E_API void e_xkb_layout_prev(void); +E_API E_Config_XKB_Layout *e_xkb_layout_get(void); +E_API void e_xkb_layout_set(const E_Config_XKB_Layout *cl); +E_API const char *e_xkb_layout_name_reduce(const char *name); +E_API void e_xkb_e_icon_flag_setup(Evas_Object *eicon, const char *name); +E_API void e_xkb_flag_file_get(char *buf, size_t bufsize, const char *name); -EAPI Eina_Bool e_config_xkb_layout_eq(const E_Config_XKB_Layout *a, const E_Config_XKB_Layout *b); -EAPI void e_config_xkb_layout_free(E_Config_XKB_Layout *cl); -EAPI E_Config_XKB_Layout *e_config_xkb_layout_dup(const E_Config_XKB_Layout *cl); +E_API Eina_Bool e_config_xkb_layout_eq(const E_Config_XKB_Layout *a, const E_Config_XKB_Layout *b); +E_API void e_config_xkb_layout_free(E_Config_XKB_Layout *cl); +E_API E_Config_XKB_Layout *e_config_xkb_layout_dup(const E_Config_XKB_Layout *cl); -extern EAPI int E_EVENT_XKB_CHANGED; +extern E_API int E_EVENT_XKB_CHANGED; #endif #endif diff --git a/src/bin/e_xsettings.c b/src/bin/e_xsettings.c index 1354535..4d276a6 100644 --- a/src/bin/e_xsettings.c +++ b/src/bin/e_xsettings.c @@ -649,7 +649,7 @@ e_xsettings_shutdown(void) return 1; } -EAPI void +E_API void e_xsettings_config_update(void) { setting = EINA_FALSE; diff --git a/src/bin/e_xsettings.h b/src/bin/e_xsettings.h index a5198ed..185f7b5 100644 --- a/src/bin/e_xsettings.h +++ b/src/bin/e_xsettings.h @@ -7,7 +7,7 @@ EINTERN int e_xsettings_init(void); EINTERN int e_xsettings_shutdown(void); -EAPI void e_xsettings_config_update(void); +E_API void e_xsettings_config_update(void); # endif #endif diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c index 34367ce..721fde3 100644 --- a/src/bin/e_zone.c +++ b/src/bin/e_zone.c @@ -19,16 +19,16 @@ static void _e_zone_object_del_attach(void *o); static E_Zone_Edge _e_zone_detect_edge(E_Zone *zone, Evas_Object *obj); static void _e_zone_edge_move_resize(E_Zone *zone); -EAPI int E_EVENT_ZONE_DESK_COUNT_SET = 0; -EAPI int E_EVENT_POINTER_WARP = 0; -EAPI int E_EVENT_ZONE_MOVE_RESIZE = 0; -EAPI int E_EVENT_ZONE_ADD = 0; -EAPI int E_EVENT_ZONE_DEL = 0; -EAPI int E_EVENT_ZONE_EDGE_IN = 0; -EAPI int E_EVENT_ZONE_EDGE_OUT = 0; -EAPI int E_EVENT_ZONE_EDGE_MOVE = 0; -EAPI int E_EVENT_ZONE_STOW = 0; -EAPI int E_EVENT_ZONE_UNSTOW = 0; +E_API int E_EVENT_ZONE_DESK_COUNT_SET = 0; +E_API int E_EVENT_POINTER_WARP = 0; +E_API int E_EVENT_ZONE_MOVE_RESIZE = 0; +E_API int E_EVENT_ZONE_ADD = 0; +E_API int E_EVENT_ZONE_DEL = 0; +E_API int E_EVENT_ZONE_EDGE_IN = 0; +E_API int E_EVENT_ZONE_EDGE_OUT = 0; +E_API int E_EVENT_ZONE_EDGE_MOVE = 0; +E_API int E_EVENT_ZONE_STOW = 0; +E_API int E_EVENT_ZONE_UNSTOW = 0; #define E_ZONE_FLIP_LEFT(zone) (((e_config->desk_flip_wrap && ((zone)->desk_x_count > 1)) || ((zone)->desk_x_current > 0)) && (zone)->edge.left) #define E_ZONE_FLIP_RIGHT(zone) (((e_config->desk_flip_wrap && ((zone)->desk_x_count > 1)) || (((zone)->desk_x_current + 1) < (zone)->desk_x_count)) && (zone)->edge.right) @@ -59,7 +59,7 @@ e_zone_shutdown(void) return 1; } -EAPI void +E_API void e_zone_all_edge_flip_eval(void) { const Eina_List *l; @@ -179,7 +179,7 @@ _e_zone_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *e ecore_event_add(E_EVENT_ZONE_EDGE_MOVE, zev, NULL, NULL); } -EAPI E_Zone * +E_API E_Zone * e_zone_new(int num, int id, int x, int y, int w, int h) { E_Zone *zone; @@ -257,7 +257,7 @@ e_zone_new(int num, int id, int x, int y, int w, int h) return zone; } -EAPI void +E_API void e_zone_name_set(E_Zone *zone, const char *name) { @@ -288,7 +288,7 @@ e_zone_reconfigure_clients(E_Zone *zone, int dx, int dy, int dw, int dh) } } -EAPI void +E_API void e_zone_move(E_Zone *zone, int x, int y) @@ -318,7 +318,7 @@ e_zone_move(E_Zone *zone, e_zone_reconfigure_clients(zone, dx, dy, 0, 0); } -EAPI void +E_API void e_zone_resize(E_Zone *zone, int w, int h) @@ -350,7 +350,7 @@ e_zone_resize(E_Zone *zone, e_zone_reconfigure_clients(zone, 0, 0, dw, dh); } -EAPI Eina_Bool +E_API Eina_Bool e_zone_move_resize(E_Zone *zone, int x, int y, @@ -394,7 +394,7 @@ e_zone_move_resize(E_Zone *zone, return EINA_TRUE; } -EAPI E_Zone * +E_API E_Zone * e_zone_current_get(void) { Eina_List *l = NULL; @@ -415,7 +415,7 @@ e_zone_current_get(void) return eina_list_data_get(e_comp->zones); } -EAPI void +E_API void e_zone_bg_reconfigure(E_Zone *zone) { E_OBJECT_CHECK(zone); @@ -424,7 +424,7 @@ e_zone_bg_reconfigure(E_Zone *zone) e_bg_zone_update(zone, E_BG_TRANSITION_CHANGE); } -EAPI void +E_API void e_zone_flip_coords_handle(E_Zone *zone, int x, int y) @@ -630,7 +630,7 @@ noflip: } } -EAPI void +E_API void e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count) @@ -742,7 +742,7 @@ e_zone_desk_count_set(E_Zone *zone, _e_zone_event_generic_free, NULL); } -EAPI void +E_API void e_zone_desk_count_get(E_Zone *zone, int *x_count, int *y_count) @@ -754,7 +754,7 @@ e_zone_desk_count_get(E_Zone *zone, if (y_count) *y_count = zone->desk_y_count; } -EAPI void +E_API void e_zone_desk_flip_by(E_Zone *zone, int dx, int dy) @@ -768,7 +768,7 @@ e_zone_desk_flip_by(E_Zone *zone, e_zone_edge_flip_eval(zone); } -EAPI void +E_API void e_zone_desk_flip_to(E_Zone *zone, int x, int y) @@ -800,7 +800,7 @@ e_zone_desk_flip_to(E_Zone *zone, e_zone_edge_flip_eval(zone); } -EAPI void +E_API void e_zone_desk_linear_flip_by(E_Zone *zone, int dx) { @@ -817,7 +817,7 @@ e_zone_desk_linear_flip_by(E_Zone *zone, e_zone_desk_linear_flip_to(zone, dx); } -EAPI void +E_API void e_zone_desk_linear_flip_to(E_Zone *zone, int x) { @@ -831,7 +831,7 @@ e_zone_desk_linear_flip_to(E_Zone *zone, e_zone_desk_flip_to(zone, x, y); } -EAPI void +E_API void e_zone_edge_enable(void) { const Eina_List *l; @@ -855,7 +855,7 @@ e_zone_edge_enable(void) } } -EAPI void +E_API void e_zone_edge_disable(void) { const Eina_List *l; @@ -879,7 +879,7 @@ e_zone_edge_disable(void) } } -EAPI void +E_API void e_zone_edges_desk_flip_capable(E_Zone *zone, Eina_Bool l, Eina_Bool r, Eina_Bool t, Eina_Bool b) { #define NEED_FLIP_EDGE(x) \ @@ -933,7 +933,7 @@ e_zone_edges_desk_flip_capable(E_Zone *zone, Eina_Bool l, Eina_Bool r, Eina_Bool CHECK_CORNER(r, b, E_ZONE_EDGE_BOTTOM_RIGHT, right_bottom, bottom_right); } -EAPI Eina_Bool +E_API Eina_Bool e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge) { Eina_List *l; @@ -1009,7 +1009,7 @@ e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge) return EINA_FALSE; } -EAPI void +E_API void e_zone_edge_flip_eval(E_Zone *zone) { Eina_Bool lf, rf, tf, bf; @@ -1030,7 +1030,7 @@ e_zone_edge_flip_eval(E_Zone *zone) e_zone_edges_desk_flip_capable(zone, lf, rf, tf, bf); } -EAPI void +E_API void e_zone_edge_new(E_Zone_Edge edge) { const Eina_List *l; @@ -1102,7 +1102,7 @@ e_zone_edge_new(E_Zone_Edge edge) } } -EAPI void +E_API void e_zone_edge_free(E_Zone_Edge edge) { const Eina_List *l; @@ -1158,7 +1158,7 @@ e_zone_edge_free(E_Zone_Edge edge) } } -EAPI void +E_API void e_zone_edge_win_layer_set(E_Zone *zone, E_Layer layer) { #define EDGE_STACK(EDGE) do { \ @@ -1184,7 +1184,7 @@ e_zone_edge_win_layer_set(E_Zone *zone, E_Layer layer) EDGE_STACK(edge.bottom); } -EAPI void +E_API void e_zone_fade_handle(E_Zone *zone, int out, double tim) { EINA_SAFETY_ON_NULL_RETURN(zone); @@ -1312,7 +1312,7 @@ _e_zone_useful_geometry_calc(const E_Zone *zone, int dx, int dy, int *x, int *y, /** * Get (or calculate) the useful (or free, without any shelves) area. */ -EAPI void +E_API void e_zone_useful_geometry_get(E_Zone *zone, int *x, int *y, @@ -1359,7 +1359,7 @@ e_zone_useful_geometry_get(E_Zone *zone, if (h) *h = zone->useful_geometry.h; } -EAPI void +E_API void e_zone_desk_useful_geometry_get(const E_Zone *zone, const E_Desk *desk, int *x, int *y, int *w, int *h) { E_OBJECT_CHECK(zone); @@ -1375,7 +1375,7 @@ e_zone_desk_useful_geometry_get(const E_Zone *zone, const E_Desk *desk, int *x, * * Call this function when shelves are added or important properties changed. */ -EAPI void +E_API void e_zone_useful_geometry_dirty(E_Zone *zone) { E_Event_Zone_Move_Resize *ev; @@ -1395,7 +1395,7 @@ e_zone_useful_geometry_dirty(E_Zone *zone) zone->useful_geometry.h = -1; } -EAPI void +E_API void e_zone_stow(E_Zone *zone) { E_Event_Zone_Stow *ev; @@ -1411,7 +1411,7 @@ e_zone_stow(E_Zone *zone) zone->stowed = EINA_TRUE; } -EAPI void +E_API void e_zone_unstow(E_Zone *zone) { E_Event_Zone_Unstow *ev; diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h index 537cc02..dec74c1 100644 --- a/src/bin/e_zone.h +++ b/src/bin/e_zone.h @@ -120,47 +120,47 @@ struct _E_Event_Zone_Edge EINTERN int e_zone_init(void); EINTERN int e_zone_shutdown(void); -EAPI E_Zone *e_zone_new(int num, int id, int x, int y, int w, int h); -EAPI void e_zone_name_set(E_Zone *zone, const char *name); -EAPI void e_zone_move(E_Zone *zone, int x, int y); -EAPI void e_zone_resize(E_Zone *zone, int w, int h); -EAPI Eina_Bool e_zone_move_resize(E_Zone *zone, int x, int y, int w, int h); -EAPI E_Zone *e_zone_current_get(void); -EAPI void e_zone_bg_reconfigure(E_Zone *zone); -EAPI void e_zone_flip_coords_handle(E_Zone *zone, int x, int y); -EAPI void e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count); -EAPI void e_zone_desk_count_get(E_Zone *zone, int *x_count, int *y_count); -EAPI void e_zone_desk_flip_by(E_Zone *zone, int dx, int dy); -EAPI void e_zone_desk_flip_to(E_Zone *zone, int x, int y); -EAPI void e_zone_desk_linear_flip_by(E_Zone *zone, int dx); -EAPI void e_zone_desk_linear_flip_to(E_Zone *zone, int x); -EAPI void e_zone_edge_flip_eval(E_Zone *zone); -EAPI void e_zone_edge_new(E_Zone_Edge edge); -EAPI void e_zone_edge_free(E_Zone_Edge edge); -EAPI void e_zone_edge_enable(void); -EAPI void e_zone_edge_disable(void); -EAPI void e_zone_edges_desk_flip_capable(E_Zone *zone, Eina_Bool l, Eina_Bool r, Eina_Bool t, Eina_Bool b); -EAPI Eina_Bool e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge); -EAPI void e_zone_edge_win_layer_set(E_Zone *zone, E_Layer layer); - -EAPI void e_zone_useful_geometry_dirty(E_Zone *zone); -EAPI void e_zone_useful_geometry_get(E_Zone *zone, int *x, int *y, int *w, int *h); -EAPI void e_zone_desk_useful_geometry_get(const E_Zone *zone, const E_Desk *desk, int *x, int *y, int *w, int *h); -EAPI void e_zone_stow(E_Zone *zone); -EAPI void e_zone_unstow(E_Zone *zone); - -EAPI void e_zone_fade_handle(E_Zone *zone, int out, double tim); - -extern EAPI int E_EVENT_ZONE_DESK_COUNT_SET; -extern EAPI int E_EVENT_ZONE_MOVE_RESIZE; -extern EAPI int E_EVENT_ZONE_ADD; -extern EAPI int E_EVENT_ZONE_DEL; -extern EAPI int E_EVENT_POINTER_WARP; -extern EAPI int E_EVENT_ZONE_EDGE_IN; -extern EAPI int E_EVENT_ZONE_EDGE_OUT; -extern EAPI int E_EVENT_ZONE_EDGE_MOVE; -extern EAPI int E_EVENT_ZONE_STOW; -extern EAPI int E_EVENT_ZONE_UNSTOW; +E_API E_Zone *e_zone_new(int num, int id, int x, int y, int w, int h); +E_API void e_zone_name_set(E_Zone *zone, const char *name); +E_API void e_zone_move(E_Zone *zone, int x, int y); +E_API void e_zone_resize(E_Zone *zone, int w, int h); +E_API Eina_Bool e_zone_move_resize(E_Zone *zone, int x, int y, int w, int h); +E_API E_Zone *e_zone_current_get(void); +E_API void e_zone_bg_reconfigure(E_Zone *zone); +E_API void e_zone_flip_coords_handle(E_Zone *zone, int x, int y); +E_API void e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count); +E_API void e_zone_desk_count_get(E_Zone *zone, int *x_count, int *y_count); +E_API void e_zone_desk_flip_by(E_Zone *zone, int dx, int dy); +E_API void e_zone_desk_flip_to(E_Zone *zone, int x, int y); +E_API void e_zone_desk_linear_flip_by(E_Zone *zone, int dx); +E_API void e_zone_desk_linear_flip_to(E_Zone *zone, int x); +E_API void e_zone_edge_flip_eval(E_Zone *zone); +E_API void e_zone_edge_new(E_Zone_Edge edge); +E_API void e_zone_edge_free(E_Zone_Edge edge); +E_API void e_zone_edge_enable(void); +E_API void e_zone_edge_disable(void); +E_API void e_zone_edges_desk_flip_capable(E_Zone *zone, Eina_Bool l, Eina_Bool r, Eina_Bool t, Eina_Bool b); +E_API Eina_Bool e_zone_exists_direction(E_Zone *zone, E_Zone_Edge edge); +E_API void e_zone_edge_win_layer_set(E_Zone *zone, E_Layer layer); + +E_API void e_zone_useful_geometry_dirty(E_Zone *zone); +E_API void e_zone_useful_geometry_get(E_Zone *zone, int *x, int *y, int *w, int *h); +E_API void e_zone_desk_useful_geometry_get(const E_Zone *zone, const E_Desk *desk, int *x, int *y, int *w, int *h); +E_API void e_zone_stow(E_Zone *zone); +E_API void e_zone_unstow(E_Zone *zone); + +E_API void e_zone_fade_handle(E_Zone *zone, int out, double tim); + +extern E_API int E_EVENT_ZONE_DESK_COUNT_SET; +extern E_API int E_EVENT_ZONE_MOVE_RESIZE; +extern E_API int E_EVENT_ZONE_ADD; +extern E_API int E_EVENT_ZONE_DEL; +extern E_API int E_EVENT_POINTER_WARP; +extern E_API int E_EVENT_ZONE_EDGE_IN; +extern E_API int E_EVENT_ZONE_EDGE_OUT; +extern E_API int E_EVENT_ZONE_EDGE_MOVE; +extern E_API int E_EVENT_ZONE_STOW; +extern E_API int E_EVENT_ZONE_UNSTOW; #endif #endif diff --git a/src/bin/e_zoomap.c b/src/bin/e_zoomap.c index 7b49ab9..41783dc 100644 --- a/src/bin/e_zoomap.c +++ b/src/bin/e_zoomap.c @@ -35,14 +35,14 @@ static void _e_zoomap_smart_init(void); static Evas_Smart *_e_smart = NULL; /* externally accessible functions */ -EAPI Evas_Object * +E_API Evas_Object * e_zoomap_add(Evas *evas) { _e_zoomap_smart_init(); return evas_object_smart_add(evas, _e_smart); } -EAPI void +E_API void e_zoomap_child_set(Evas_Object *obj, Evas_Object *child) { API_ENTRY return; @@ -78,21 +78,21 @@ e_zoomap_child_set(Evas_Object *obj, Evas_Object *child) } } -EAPI void +E_API void e_zoomap_child_resize(Evas_Object *obj, int w, int h) { API_ENTRY return; evas_object_resize(sd->child_obj, w, h); } -EAPI Evas_Object * +E_API Evas_Object * e_zoomap_child_get(Evas_Object *obj) { API_ENTRY return NULL; return sd->child_obj; } -EAPI void +E_API void e_zoomap_smooth_set(Evas_Object *obj, Eina_Bool smooth) { API_ENTRY return; @@ -102,14 +102,14 @@ e_zoomap_smooth_set(Evas_Object *obj, Eina_Bool smooth) _e_zoomap_smart_reconfigure(sd); } -EAPI Eina_Bool +E_API Eina_Bool e_zoomap_smooth_get(Evas_Object *obj) { API_ENTRY return EINA_FALSE; return sd->smooth; } -EAPI void +E_API void e_zoomap_solid_set(Evas_Object *obj, Eina_Bool solid) { API_ENTRY return; @@ -119,14 +119,14 @@ e_zoomap_solid_set(Evas_Object *obj, Eina_Bool solid) _e_zoomap_smart_reconfigure(sd); } -EAPI Eina_Bool +E_API Eina_Bool e_zoomap_solid_get(Evas_Object *obj) { API_ENTRY return EINA_FALSE; return sd->solid; } -EAPI void +E_API void e_zoomap_always_set(Evas_Object *obj, Eina_Bool always) { API_ENTRY return; @@ -136,14 +136,14 @@ e_zoomap_always_set(Evas_Object *obj, Eina_Bool always) _e_zoomap_smart_reconfigure(sd); } -EAPI Eina_Bool +E_API Eina_Bool e_zoomap_always_get(Evas_Object *obj) { API_ENTRY return EINA_FALSE; return sd->always; } -EAPI void +E_API void e_zoomap_child_edje_solid_setup(Evas_Object *obj) { const char *s; diff --git a/src/bin/e_zoomap.h b/src/bin/e_zoomap.h index 355ceb1..37d56bc 100644 --- a/src/bin/e_zoomap.h +++ b/src/bin/e_zoomap.h @@ -3,16 +3,16 @@ #ifndef E_ZOOMAP_H #define E_ZOOMAP_H -EAPI Evas_Object *e_zoomap_add (Evas *evas); -EAPI void e_zoomap_child_set (Evas_Object *obj, Evas_Object *child); -EAPI Evas_Object *e_zoomap_child_get (Evas_Object *obj); -EAPI void e_zoomap_smooth_set (Evas_Object *obj, Eina_Bool smooth); -EAPI Eina_Bool e_zoomap_smooth_get (Evas_Object *obj); -EAPI void e_zoomap_solid_set (Evas_Object *obj, Eina_Bool solid); -EAPI Eina_Bool e_zoomap_solid_get (Evas_Object *obj); -EAPI void e_zoomap_always_set (Evas_Object *obj, Eina_Bool always); -EAPI Eina_Bool e_zoomap_always_get (Evas_Object *obj); -EAPI void e_zoomap_child_resize(Evas_Object *zoomap, int w, int h); -EAPI void e_zoomap_child_edje_solid_setup(Evas_Object *obj); +E_API Evas_Object *e_zoomap_add (Evas *evas); +E_API void e_zoomap_child_set (Evas_Object *obj, Evas_Object *child); +E_API Evas_Object *e_zoomap_child_get (Evas_Object *obj); +E_API void e_zoomap_smooth_set (Evas_Object *obj, Eina_Bool smooth); +E_API Eina_Bool e_zoomap_smooth_get (Evas_Object *obj); +E_API void e_zoomap_solid_set (Evas_Object *obj, Eina_Bool solid); +E_API Eina_Bool e_zoomap_solid_get (Evas_Object *obj); +E_API void e_zoomap_always_set (Evas_Object *obj, Eina_Bool always); +E_API Eina_Bool e_zoomap_always_get (Evas_Object *obj); +E_API void e_zoomap_child_resize(Evas_Object *zoomap, int w, int h); +E_API void e_zoomap_child_edje_solid_setup(Evas_Object *obj); #endif #endif diff --git a/src/modules/access/e_mod_main.c b/src/modules/access/e_mod_main.c index 31d5aad..d0cd055 100644 --- a/src/modules/access/e_mod_main.c +++ b/src/modules/access/e_mod_main.c @@ -958,12 +958,12 @@ _cb_client_message(void *data EINA_UNUSED, /***************************************************************************/ /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Access" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { if (!_atom_access) @@ -1006,7 +1006,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { EINA_LOG_INFO("[access module] module shutdown"); @@ -1019,7 +1019,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.access", conf_edd, access_config); diff --git a/src/modules/appmenu/e_mod_main.c b/src/modules/appmenu/e_mod_main.c index 6b9528f..bac9de0 100644 --- a/src/modules/appmenu/e_mod_main.c +++ b/src/modules/appmenu/e_mod_main.c @@ -113,7 +113,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) return tmpbuf; } -EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "AppMenu" }; +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "AppMenu" }; static Eina_Bool cb_focus_in(void *data, int type EINA_UNUSED, void *event) @@ -154,7 +154,7 @@ static const E_Gadcon_Client_Class _gc_class = E_GADCON_CLIENT_STYLE_PLAIN }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { E_AppMenu_Context *ctxt; @@ -178,13 +178,13 @@ e_modapi_init(E_Module *m) return ctxt; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m) { E_AppMenu_Context *ctxt = m->data; diff --git a/src/modules/backlight/e_mod_main.c b/src/modules/backlight/e_mod_main.c index 0f81669..70d73df 100644 --- a/src/modules/backlight/e_mod_main.c +++ b/src/modules/backlight/e_mod_main.c @@ -463,13 +463,13 @@ _backlight_cb_changed(void *d EINA_UNUSED, int type EINA_UNUSED, void *ev EINA_U } /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Backlight" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { backlight_module = m; @@ -486,7 +486,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { if (act) @@ -500,7 +500,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c index 32f4c26..4158e7d 100644 --- a/src/modules/battery/e_mod_main.c +++ b/src/modules/battery/e_mod_main.c @@ -721,12 +721,12 @@ _battery_cb_exe_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) } /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Battery" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { char buf[4096]; @@ -803,7 +803,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_configure_registry_item_del("advanced/battery"); @@ -848,7 +848,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.battery", conf_edd, battery_config); diff --git a/src/modules/battery/e_mod_main.h b/src/modules/battery/e_mod_main.h index 7c64223..32e5c65 100644 --- a/src/modules/battery/e_mod_main.h +++ b/src/modules/battery/e_mod_main.h @@ -133,11 +133,11 @@ void _battery_openbsd_stop(void); /* end e_mod_openbsd.c */ #endif -EAPI extern E_Module_Api e_modapi; +E_API extern E_Module_Api e_modapi; -EAPI void *e_modapi_init (E_Module *m); -EAPI int e_modapi_shutdown (E_Module *m); -EAPI int e_modapi_save (E_Module *m); +E_API void *e_modapi_init (E_Module *m); +E_API int e_modapi_shutdown (E_Module *m); +E_API int e_modapi_save (E_Module *m); E_Config_Dialog *e_int_config_battery_module(Evas_Object *parent, const char *params EINA_UNUSED); diff --git a/src/modules/bluez4/e_mod_main.c b/src/modules/bluez4/e_mod_main.c index 61cbbb5..2871505 100644 --- a/src/modules/bluez4/e_mod_main.c +++ b/src/modules/bluez4/e_mod_main.c @@ -20,7 +20,7 @@ static char tmpbuf[1024]; static E_Config_DD *conf_edd = NULL; Config *ebluez4_config = NULL; -EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, "Bluez4"}; +E_API E_Module_Api e_modapi = {E_MODULE_API_VERSION, "Bluez4"}; /* Local Functions */ static Eina_Bool @@ -664,7 +664,7 @@ _ebluez_desklock(void *data EINA_UNUSED, int ev_type EINA_UNUSED, } /* Module Functions */ -EAPI void * +E_API void * e_modapi_init(E_Module *m) { Eina_Strbuf *buf; @@ -700,7 +700,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_CONFIG_DD_FREE(conf_edd); @@ -723,7 +723,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.ebluez4", diff --git a/src/modules/bluez4/e_mod_main.h b/src/modules/bluez4/e_mod_main.h index dc48b3d..af7a9bf 100644 --- a/src/modules/bluez4/e_mod_main.h +++ b/src/modules/bluez4/e_mod_main.h @@ -22,11 +22,11 @@ struct _Config extern Config *ebluez4_config; -EAPI extern E_Module_Api e_modapi; +E_API extern E_Module_Api e_modapi; -EAPI void *e_modapi_init(E_Module *m); -EAPI int e_modapi_shutdown(E_Module *m); -EAPI int e_modapi_save(E_Module *m); +E_API void *e_modapi_init(E_Module *m); +E_API int e_modapi_shutdown(E_Module *m); +E_API int e_modapi_save(E_Module *m); void ebluez4_update_inst(Evas_Object *dest, Eina_List *src, Instance *inst); void ebluez4_update_instances(Eina_List *src); diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c index 9e982ec..e8812db 100644 --- a/src/modules/clock/e_mod_main.c +++ b/src/modules/clock/e_mod_main.c @@ -837,13 +837,13 @@ _clock_time_update(void *d EINA_UNUSED, int type EINA_UNUSED, void *event EINA_U } /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Clock" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { conf_item_edd = E_CONFIG_DD_NEW("Config_Item", Config_Item); @@ -904,7 +904,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { if (act) @@ -951,7 +951,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.clock", conf_edd, clock_config); diff --git a/src/modules/clock/e_mod_main.h b/src/modules/clock/e_mod_main.h index 60389c8..bde714f 100644 --- a/src/modules/clock/e_mod_main.h +++ b/src/modules/clock/e_mod_main.h @@ -1,11 +1,11 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -EAPI extern E_Module_Api e_modapi; +E_API extern E_Module_Api e_modapi; -EAPI void *e_modapi_init (E_Module *m); -EAPI int e_modapi_shutdown (E_Module *m); -EAPI int e_modapi_save (E_Module *m); +E_API void *e_modapi_init (E_Module *m); +E_API int e_modapi_shutdown (E_Module *m); +E_API int e_modapi_save (E_Module *m); typedef struct _Config Config; typedef struct _Config_Item Config_Item; diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c index ead941c..88fad12 100644 --- a/src/modules/conf/e_mod_main.c +++ b/src/modules/conf/e_mod_main.c @@ -256,9 +256,9 @@ e_mod_config_menu_add(void *data EINA_UNUSED, E_Menu *m) } /* module setup */ -EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Conf" }; +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Conf" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { char buf[PATH_MAX]; @@ -315,7 +315,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_configure_del(); @@ -355,7 +355,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.conf", conf_edd, conf); diff --git a/src/modules/conf_applications/e_mod_main.c b/src/modules/conf_applications/e_mod_main.c index 4d665e3..41ddea2 100644 --- a/src/modules/conf_applications/e_mod_main.c +++ b/src/modules/conf_applications/e_mod_main.c @@ -6,13 +6,13 @@ static E_Module *conf_module = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Applications" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("applications", 20, _("Apps"), NULL, @@ -68,7 +68,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -91,7 +91,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/conf_bindings/e_mod_main.c b/src/modules/conf_bindings/e_mod_main.c index 287d71b..25b611a 100644 --- a/src/modules/conf_bindings/e_mod_main.c +++ b/src/modules/conf_bindings/e_mod_main.c @@ -5,13 +5,13 @@ static E_Module *conf_module = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Input Controls" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), @@ -45,7 +45,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -73,7 +73,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/conf_dialogs/e_mod_main.c b/src/modules/conf_dialogs/e_mod_main.c index f949f4e..09cec4c 100644 --- a/src/modules/conf_dialogs/e_mod_main.c +++ b/src/modules/conf_dialogs/e_mod_main.c @@ -5,13 +5,13 @@ static E_Module *conf_module = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Dialogs" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("settings", 80, _("Settings"), NULL, "preferences-system"); @@ -23,7 +23,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -36,7 +36,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/conf_display/e_mod_main.c b/src/modules/conf_display/e_mod_main.c index ab8c3e3..f548a44 100644 --- a/src/modules/conf_display/e_mod_main.c +++ b/src/modules/conf_display/e_mod_main.c @@ -5,13 +5,13 @@ static E_Module *conf_module = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Screen" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("screen", 30, _("Screen"), NULL, @@ -50,7 +50,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -84,7 +84,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/conf_interaction/e_mod_main.c b/src/modules/conf_interaction/e_mod_main.c index 25101de..77639e4 100644 --- a/src/modules/conf_interaction/e_mod_main.c +++ b/src/modules/conf_interaction/e_mod_main.c @@ -5,13 +5,13 @@ static E_Module *conf_module = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Interaction" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("keyboard_and_mouse", 80, _("Input"), @@ -29,7 +29,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -48,7 +48,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/conf_intl/e_mod_main.c b/src/modules/conf_intl/e_mod_main.c index c960a48..c948397 100644 --- a/src/modules/conf_intl/e_mod_main.c +++ b/src/modules/conf_intl/e_mod_main.c @@ -5,13 +5,13 @@ static E_Module *conf_module = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Language" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("language", 70, _("Language"), NULL, @@ -33,7 +33,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -53,7 +53,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/conf_menus/e_mod_main.c b/src/modules/conf_menus/e_mod_main.c index 74890de..179cdc4 100644 --- a/src/modules/conf_menus/e_mod_main.c +++ b/src/modules/conf_menus/e_mod_main.c @@ -5,13 +5,13 @@ static E_Module *conf_module = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Menu Settings" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("menus", 60, _("Menus"), NULL, "preferences-menus"); @@ -21,7 +21,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -32,7 +32,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/conf_paths/e_mod_main.c b/src/modules/conf_paths/e_mod_main.c index 16166f9..f2d41e6 100644 --- a/src/modules/conf_paths/e_mod_main.c +++ b/src/modules/conf_paths/e_mod_main.c @@ -5,13 +5,13 @@ static E_Module *conf_module = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Search Directories" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, @@ -30,7 +30,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -47,7 +47,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/conf_performance/e_mod_main.c b/src/modules/conf_performance/e_mod_main.c index 882c416..e04007a 100644 --- a/src/modules/conf_performance/e_mod_main.c +++ b/src/modules/conf_performance/e_mod_main.c @@ -5,13 +5,13 @@ static E_Module *conf_module = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Performance" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced"); @@ -22,7 +22,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -34,7 +34,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/conf_randr/e_mod_main.c b/src/modules/conf_randr/e_mod_main.c index 30bf5fc..9cb09b3 100644 --- a/src/modules/conf_randr/e_mod_main.c +++ b/src/modules/conf_randr/e_mod_main.c @@ -2,12 +2,12 @@ #include "e_mod_main.h" #include "e_int_config_randr2.h" -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Screen Setup" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { /* create Screen configuration category @@ -24,7 +24,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -37,7 +37,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/conf_randr/e_mod_main.h b/src/modules/conf_randr/e_mod_main.h index 9ff8663..7400733 100644 --- a/src/modules/conf_randr/e_mod_main.h +++ b/src/modules/conf_randr/e_mod_main.h @@ -11,11 +11,11 @@ # define LOGFN(fl, ln, fn) # endif -EAPI extern E_Module_Api e_modapi; +E_API extern E_Module_Api e_modapi; -EAPI void *e_modapi_init(E_Module *m); -EAPI int e_modapi_shutdown(E_Module *m); -EAPI int e_modapi_save(E_Module *m); +E_API void *e_modapi_init(E_Module *m); +E_API int e_modapi_shutdown(E_Module *m); +E_API int e_modapi_save(E_Module *m); /** * @addtogroup Optional_Conf diff --git a/src/modules/conf_shelves/e_mod_main.c b/src/modules/conf_shelves/e_mod_main.c index 92875b6..20db2a3 100644 --- a/src/modules/conf_shelves/e_mod_main.c +++ b/src/modules/conf_shelves/e_mod_main.c @@ -9,13 +9,13 @@ static E_Module *conf_module = NULL; static E_Int_Menu_Augmentation *maug = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Shelves" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, @@ -33,7 +33,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -53,7 +53,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/conf_theme/e_mod_main.c b/src/modules/conf_theme/e_mod_main.c index c638115..6ae0970 100644 --- a/src/modules/conf_theme/e_mod_main.c +++ b/src/modules/conf_theme/e_mod_main.c @@ -6,7 +6,7 @@ static E_Module *conf_module = NULL; static E_Int_Menu_Augmentation *maug[8] = {0}; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Theme" @@ -47,7 +47,7 @@ _e_mod_menu_theme_add(void *data EINA_UNUSED, E_Menu *m) e_menu_item_callback_set(mi, _e_mod_run_theme_cb, NULL); } -EAPI void * +E_API void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("internal", -1, _("Internal"), @@ -97,7 +97,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; diff --git a/src/modules/conf_window_manipulation/e_mod_main.c b/src/modules/conf_window_manipulation/e_mod_main.c index 7376a91..b3f15bf 100644 --- a/src/modules/conf_window_manipulation/e_mod_main.c +++ b/src/modules/conf_window_manipulation/e_mod_main.c @@ -5,13 +5,13 @@ static E_Module *conf_module = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Window Manipulation" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows"); @@ -25,7 +25,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -44,7 +44,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/conf_window_remembers/e_mod_main.c b/src/modules/conf_window_remembers/e_mod_main.c index fb2d4e8..f504fdb 100644 --- a/src/modules/conf_window_remembers/e_mod_main.c +++ b/src/modules/conf_window_remembers/e_mod_main.c @@ -3,12 +3,12 @@ static E_Module *conf_module = NULL; -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Window Remembers" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { e_configure_registry_category_add("windows", 50, _("Windows"), NULL, @@ -23,7 +23,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -37,7 +37,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/connman/e_connman.c b/src/modules/connman/e_connman.c index 62f5fa3..3adc5da 100644 --- a/src/modules/connman/e_connman.c +++ b/src/modules/connman/e_connman.c @@ -13,8 +13,8 @@ static Eldbus_Connection *conn; static struct Connman_Manager *connman_manager; static E_Connman_Agent *agent; -EAPI int E_CONNMAN_EVENT_MANAGER_IN; -EAPI int E_CONNMAN_EVENT_MANAGER_OUT; +E_API int E_CONNMAN_EVENT_MANAGER_IN; +E_API int E_CONNMAN_EVENT_MANAGER_OUT; /* utility functions */ diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c index 09c6e6d..2f420ea 100644 --- a/src/modules/connman/e_mod_main.c +++ b/src/modules/connman/e_mod_main.c @@ -575,7 +575,7 @@ static const E_Gadcon_Client_Class _gc_class = E_GADCON_CLIENT_STYLE_PLAIN }; -EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, _e_connman_Name }; +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, _e_connman_Name }; static E_Config_Dialog * _econnman_config(Evas_Object *parent, const char *params EINA_UNUSED) @@ -615,7 +615,7 @@ _econnman_configure_registry_unregister(void) e_configure_registry_category_del(_reg_cat); } -EAPI void * +E_API void * e_modapi_init(E_Module *m) { E_Connman_Module_Context *ctxt; @@ -673,7 +673,7 @@ _econnman_instances_free(E_Connman_Module_Context *ctxt) } } -EAPI int +E_API int e_modapi_shutdown(E_Module *m) { E_Connman_Module_Context *ctxt; @@ -698,7 +698,7 @@ e_modapi_shutdown(E_Module *m) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m) { E_Connman_Module_Context *ctxt; diff --git a/src/modules/connman/e_mod_main.h b/src/modules/connman/e_mod_main.h index 7a59908..7ce2752 100644 --- a/src/modules/connman/e_mod_main.h +++ b/src/modules/connman/e_mod_main.h @@ -50,10 +50,10 @@ struct E_Connman_Module_Context int powered; }; -EAPI extern E_Module_Api e_modapi; -EAPI void *e_modapi_init(E_Module *m); -EAPI int e_modapi_shutdown(E_Module *m); -EAPI int e_modapi_save(E_Module *m); +E_API extern E_Module_Api e_modapi; +E_API void *e_modapi_init(E_Module *m); +E_API int e_modapi_shutdown(E_Module *m); +E_API int e_modapi_save(E_Module *m); void econnman_popup_del(E_Connman_Instance *inst); const char *e_connman_theme_path(void); diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c index 2e7fe5c..04a394d 100644 --- a/src/modules/cpufreq/e_mod_main.c +++ b/src/modules/cpufreq/e_mod_main.c @@ -1305,12 +1305,12 @@ _cpufreq_poll_interval_update(void) } /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Cpufreq" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { struct stat st; @@ -1414,7 +1414,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_configure_registry_item_del("advanced/cpufreq"); @@ -1468,7 +1468,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.cpufreq", conf_edd, cpufreq_config); diff --git a/src/modules/cpufreq/e_mod_main.h b/src/modules/cpufreq/e_mod_main.h index d1e8845..695e478 100644 --- a/src/modules/cpufreq/e_mod_main.h +++ b/src/modules/cpufreq/e_mod_main.h @@ -54,11 +54,11 @@ struct _Config E_Config_Dialog *config_dialog; }; -EAPI extern E_Module_Api e_modapi; +E_API extern E_Module_Api e_modapi; -EAPI void *e_modapi_init (E_Module *m); -EAPI int e_modapi_shutdown (E_Module *m); -EAPI int e_modapi_save (E_Module *m); +E_API void *e_modapi_init (E_Module *m); +E_API int e_modapi_shutdown (E_Module *m); +E_API int e_modapi_save (E_Module *m); E_Config_Dialog *e_int_config_cpufreq_module(Evas_Object *parent, const char *params); void _cpufreq_poll_interval_update(void); diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c index 77ee737..581a3df 100644 --- a/src/modules/everything/e_mod_main.c +++ b/src/modules/everything/e_mod_main.c @@ -24,13 +24,13 @@ int _evry_events[NUM_EVRY_EVENTS]; E_Module *_mod_evry = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Everything" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { Eina_List *l; @@ -147,7 +147,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -228,7 +228,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.everything", conf_edd, evry_conf); diff --git a/src/modules/everything/e_mod_main.h b/src/modules/everything/e_mod_main.h index ba923a1..e36099a 100644 --- a/src/modules/everything/e_mod_main.h +++ b/src/modules/everything/e_mod_main.h @@ -352,12 +352,12 @@ extern int _evry_events[NUM_EVRY_EVENTS]; extern E_Module *_mod_evry; /*** E Module ***/ -EAPI void *e_modapi_init (E_Module *m); -EAPI int e_modapi_shutdown (E_Module *m); -EAPI int e_modapi_save (E_Module *m); -EAPI E_Config_Dialog *evry_config_dialog(Evas_Object *parent, const char *params); -EAPI E_Config_Dialog *evry_collection_conf_dialog(Evas_Object *parent, const char *params); -EAPI extern E_Module_Api e_modapi; +E_API void *e_modapi_init (E_Module *m); +E_API int e_modapi_shutdown (E_Module *m); +E_API int e_modapi_save (E_Module *m); +E_API E_Config_Dialog *evry_config_dialog(Evas_Object *parent, const char *params); +E_API E_Config_Dialog *evry_collection_conf_dialog(Evas_Object *parent, const char *params); +E_API extern E_Module_Api e_modapi; /* #define CHECK_REFS 1 * #define PRINT_REFS 1 diff --git a/src/modules/everything/evry_config.c b/src/modules/everything/evry_config.c index fb02a40..270bf39 100644 --- a/src/modules/everything/evry_config.c +++ b/src/modules/everything/evry_config.c @@ -59,7 +59,7 @@ struct _E_Config_Dialog_Data Plugin_Page page[3]; }; -EAPI E_Config_Dialog * +E_API E_Config_Dialog * evry_config_dialog(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) { E_Config_Dialog *cfd; @@ -604,7 +604,7 @@ static Evas_Object *_cat_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static int _cat_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -EAPI E_Config_Dialog * +E_API E_Config_Dialog * evry_collection_conf_dialog(Evas_Object *parent EINA_UNUSED, const char *params) { E_Config_Dialog *cfd = NULL; diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c index c64dc3c..b7eb6b9 100644 --- a/src/modules/fileman/e_mod_main.c +++ b/src/modules/fileman/e_mod_main.c @@ -21,13 +21,13 @@ static E_Config_DD *paths_edd = NULL, *conf_edd = NULL; Config *fileman_config = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Fileman" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { const Eina_List *l; @@ -82,7 +82,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { const Eina_List *l; @@ -142,7 +142,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.fileman", conf_edd, fileman_config); diff --git a/src/modules/fileman_opinfo/e_mod_main.c b/src/modules/fileman_opinfo/e_mod_main.c index ff073ca..62b5522 100644 --- a/src/modules/fileman_opinfo/e_mod_main.c +++ b/src/modules/fileman_opinfo/e_mod_main.c @@ -457,13 +457,13 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) /******************** E MODULE ****************************************/ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "EFM Info" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { opinfo_module = m; @@ -471,7 +471,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { opinfo_module = NULL; @@ -479,7 +479,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/gadman/e_mod_main.c b/src/modules/gadman/e_mod_main.c index 49cf55d..768a573 100644 --- a/src/modules/gadman/e_mod_main.c +++ b/src/modules/gadman/e_mod_main.c @@ -7,13 +7,13 @@ static void _gadman_action_cb(E_Object *obj, const char *params); static void _gadman_desktop_menu(void *d EINA_UNUSED, E_Menu *m, void *icon); /* public module routines. all modules must have these */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Gadman" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { char buf[4096]; @@ -89,7 +89,7 @@ e_modapi_init(E_Module *m) return Man; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { if (Man->maug) @@ -124,7 +124,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.gadman", Man->conf_edd, Man->conf); diff --git a/src/modules/geolocation/e_mod_main.c b/src/modules/geolocation/e_mod_main.c index 641ab14..aa5d2f1 100644 --- a/src/modules/geolocation/e_mod_main.c +++ b/src/modules/geolocation/e_mod_main.c @@ -479,13 +479,13 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class) } /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Geolocation" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { geolocation_module = m; @@ -493,14 +493,14 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_gadcon_provider_unregister(&_gadcon_class); return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index 2c9a266..4f69b81 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -2756,12 +2756,12 @@ _ibar_cb_exec_new(void *d EINA_UNUSED, int t EINA_UNUSED, E_Exec_Instance *exe) } /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "IBar" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { conf_item_edd = E_CONFIG_DD_NEW("IBar_Config_Item", Config_Item); @@ -2834,7 +2834,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { Ecore_Event_Handler *eh; @@ -2869,7 +2869,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.ibar", conf_edd, ibar_config); diff --git a/src/modules/ibar/e_mod_main.h b/src/modules/ibar/e_mod_main.h index 9203f16..5f587e7 100644 --- a/src/modules/ibar/e_mod_main.h +++ b/src/modules/ibar/e_mod_main.h @@ -27,11 +27,11 @@ struct _Config_Item unsigned char dont_icon_menu_mouseover; }; -EAPI extern E_Module_Api e_modapi; +E_API extern E_Module_Api e_modapi; -EAPI void *e_modapi_init (E_Module *m); -EAPI int e_modapi_shutdown (E_Module *m); -EAPI int e_modapi_save (E_Module *m); +E_API void *e_modapi_init (E_Module *m); +E_API int e_modapi_shutdown (E_Module *m); +E_API int e_modapi_save (E_Module *m); void _ibar_config_update(Config_Item *ci); void _config_ibar_module(Config_Item *ci); diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c index 23c7849..5314d5c 100644 --- a/src/modules/ibox/e_mod_main.c +++ b/src/modules/ibox/e_mod_main.c @@ -1278,13 +1278,13 @@ _ibox_cb_menu_configuration(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi E /***************************************************************************/ /**/ /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "IBox" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { conf_item_edd = E_CONFIG_DD_NEW("IBox_Config_Item", Config_Item); @@ -1353,7 +1353,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { Config_Item *ci; @@ -1379,7 +1379,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.ibox", conf_edd, ibox_config); diff --git a/src/modules/ibox/e_mod_main.h b/src/modules/ibox/e_mod_main.h index edca9f3..8c1054e 100644 --- a/src/modules/ibox/e_mod_main.h +++ b/src/modules/ibox/e_mod_main.h @@ -25,11 +25,11 @@ struct _Config_Item E_Gadcon_Client *gcc; }; -EAPI extern E_Module_Api e_modapi; +E_API extern E_Module_Api e_modapi; -EAPI void *e_modapi_init (E_Module *m); -EAPI int e_modapi_shutdown (E_Module *m); -EAPI int e_modapi_save (E_Module *m); +E_API void *e_modapi_init (E_Module *m); +E_API int e_modapi_shutdown (E_Module *m); +E_API int e_modapi_save (E_Module *m); void _ibox_config_update(Config_Item *ci); void _config_ibox_module(Config_Item *ci); diff --git a/src/modules/layout/e_mod_main.c b/src/modules/layout/e_mod_main.c index 7dfe002..01b86c2 100644 --- a/src/modules/layout/e_mod_main.c +++ b/src/modules/layout/e_mod_main.c @@ -67,13 +67,13 @@ _e_module_layout_cb_hook(void *data, E_Client *ec) /***************************************************************************/ /**/ /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Layout" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { layout_module = m; @@ -83,7 +83,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m) { if (hook) @@ -95,7 +95,7 @@ e_modapi_shutdown(E_Module *m) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m) { return 1; diff --git a/src/modules/lokker/e_mod_main.c b/src/modules/lokker/e_mod_main.c index a9d07f9..25064d7 100644 --- a/src/modules/lokker/e_mod_main.c +++ b/src/modules/lokker/e_mod_main.c @@ -2,7 +2,7 @@ EINTERN int _e_lokker_log_dom = -1; -EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, "Lokker"}; +E_API E_Module_Api e_modapi = {E_MODULE_API_VERSION, "Lokker"}; static E_Desklock_Interface lokker_desklock_iface = { .name = "lokker", @@ -10,7 +10,7 @@ static E_Desklock_Interface lokker_desklock_iface = .hide = lokker_unlock }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { _e_lokker_log_dom = eina_log_domain_register("lokker", EINA_COLOR_ORANGE); @@ -21,7 +21,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_desklock_interface_remove(&lokker_desklock_iface); diff --git a/src/modules/lokker/e_mod_main.h b/src/modules/lokker/e_mod_main.h index 027e3a0..09c8e2b 100644 --- a/src/modules/lokker/e_mod_main.h +++ b/src/modules/lokker/e_mod_main.h @@ -26,5 +26,5 @@ typedef enum EINTERN Eina_Bool lokker_lock(void); EINTERN void lokker_unlock(void); -EAPI E_Config_Dialog *e_int_config_lokker(Evas_Object *parent, const char *params EINA_UNUSED); +E_API E_Config_Dialog *e_int_config_lokker(Evas_Object *parent, const char *params EINA_UNUSED); #endif diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c index c3f4884..0e72f25 100644 --- a/src/modules/mixer/e_mod_main.c +++ b/src/modules/mixer/e_mod_main.c @@ -1101,7 +1101,7 @@ static const E_Gadcon_Client_Class _gc_class = E_GADCON_CLIENT_STYLE_PLAIN }; -EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, _e_mixer_Name}; +E_API E_Module_Api e_modapi = {E_MODULE_API_VERSION, _e_mixer_Name}; static void _mixer_cb_volume_modify(Eina_Bool up) @@ -1381,7 +1381,7 @@ _mixer_actions_unregister(E_Mixer_Module_Context *ctxt) } } -EAPI void * +E_API void * e_modapi_init(E_Module *m) { E_Mixer_Module_Context *ctxt; @@ -1421,7 +1421,7 @@ _mixer_instances_free(E_Mixer_Module_Context *ctxt) } } -EAPI int +E_API int e_modapi_shutdown(E_Module *m) { E_Mixer_Module_Context *ctxt; @@ -1456,7 +1456,7 @@ e_modapi_shutdown(E_Module *m) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m) { E_Mixer_Module_Context *ctxt; diff --git a/src/modules/mixer/e_mod_main.h b/src/modules/mixer/e_mod_main.h index 261abca..f786fbc 100644 --- a/src/modules/mixer/e_mod_main.h +++ b/src/modules/mixer/e_mod_main.h @@ -84,10 +84,10 @@ typedef struct E_Mixer_Module_Context char *external_mixer_command; } E_Mixer_Module_Context; -EAPI extern E_Module_Api e_modapi; -EAPI void *e_modapi_init(E_Module *m); -EAPI int e_modapi_shutdown(E_Module *m); -EAPI int e_modapi_save(E_Module *m); +E_API extern E_Module_Api e_modapi; +E_API void *e_modapi_init(E_Module *m); +E_API int e_modapi_shutdown(E_Module *m); +E_API int e_modapi_save(E_Module *m); E_Config_Dialog *e_mixer_config_module_dialog_new(Evas_Object *parent, E_Mixer_Module_Context *ctxt); E_Config_Dialog *e_mixer_config_dialog_new(Evas_Object *parent, E_Mixer_Gadget_Config *conf); diff --git a/src/modules/msgbus/e_mod_main.c b/src/modules/msgbus/e_mod_main.c index ece2257..a872d1f 100644 --- a/src/modules/msgbus/e_mod_main.c +++ b/src/modules/msgbus/e_mod_main.c @@ -4,13 +4,13 @@ static Eina_Array* ifaces = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "IPC Extension" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { ifaces = eina_array_new(5); @@ -22,7 +22,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { Eldbus_Service_Interface* iface; @@ -35,7 +35,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/music-control/e_mod_main.c b/src/modules/music-control/e_mod_main.c index 04df8d4..acd7ca9 100644 --- a/src/modules/music-control/e_mod_main.c +++ b/src/modules/music-control/e_mod_main.c @@ -213,7 +213,7 @@ static const E_Gadcon_Client_Class _gc_class = E_GADCON_CLIENT_STYLE_PLAIN }; -EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, _e_music_control_Name }; +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, _e_music_control_Name }; static void parse_metadata(E_Music_Control_Module_Context *ctxt, Eina_Value *array) @@ -371,7 +371,7 @@ music_control_dbus_init(E_Music_Control_Module_Context *ctxt, const char *bus) return EINA_TRUE; } -EAPI void * +E_API void * e_modapi_init(E_Module *m) { E_Music_Control_Module_Context *ctxt; @@ -407,7 +407,7 @@ error_dbus_bus_get: return NULL; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Music_Control_Module_Context *ctxt; @@ -440,7 +440,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m) { E_Music_Control_Module_Context *ctxt = m->data; diff --git a/src/modules/music-control/e_mod_main.h b/src/modules/music-control/e_mod_main.h index 07c1fd7..50217f9 100644 --- a/src/modules/music-control/e_mod_main.h +++ b/src/modules/music-control/e_mod_main.h @@ -4,9 +4,9 @@ #include "config.h" #include -EAPI extern E_Module_Api e_modapi; -EAPI void *e_modapi_init(E_Module *m); -EAPI int e_modapi_shutdown(E_Module *m); -EAPI int e_modapi_save(E_Module *m); +E_API extern E_Module_Api e_modapi; +E_API void *e_modapi_init(E_Module *m); +E_API int e_modapi_shutdown(E_Module *m); +E_API int e_modapi_save(E_Module *m); #endif diff --git a/src/modules/notification/e_mod_main.c b/src/modules/notification/e_mod_main.c index 5d15a6a..0cf6a39 100644 --- a/src/modules/notification/e_mod_main.c +++ b/src/modules/notification/e_mod_main.c @@ -118,7 +118,7 @@ _notification_cb_initial_mode_timer(Config *m_cfg) } /* Module Api Functions */ -EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, "Notification"}; +E_API E_Module_Api e_modapi = {E_MODULE_API_VERSION, "Notification"}; static const E_Notification_Server_Info server_info = { .name = "e17", @@ -141,7 +141,7 @@ _notification_cb_close(void *data EINA_UNUSED, unsigned int id) notification_popup_close(id); } -EAPI void * +E_API void * e_modapi_init(E_Module *m) { char buf[PATH_MAX]; @@ -213,7 +213,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { if (notification_cfg->initial_mode_timer) @@ -237,7 +237,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return e_config_domain_save("module.notification", conf_edd, notification_cfg); diff --git a/src/modules/notification/e_mod_main.h b/src/modules/notification/e_mod_main.h index 0bb79d8..2669bfa 100644 --- a/src/modules/notification/e_mod_main.h +++ b/src/modules/notification/e_mod_main.h @@ -75,10 +75,10 @@ void notification_popup_notify(E_Notification_Notify *n, unsigned int id); void notification_popup_shutdown(void); void notification_popup_close(unsigned int id); -EAPI extern E_Module_Api e_modapi; -EAPI void *e_modapi_init(E_Module *m); -EAPI int e_modapi_shutdown(E_Module *m); -EAPI int e_modapi_save(E_Module *m); +E_API extern E_Module_Api e_modapi; +E_API void *e_modapi_init(E_Module *m); +E_API int e_modapi_shutdown(E_Module *m); +E_API int e_modapi_save(E_Module *m); void _gc_orient (E_Gadcon_Client *gcc, E_Gadcon_Orient orient); diff --git a/src/modules/packagekit/e_mod_main.c b/src/modules/packagekit/e_mod_main.c index db890d7..83a771b 100644 --- a/src/modules/packagekit/e_mod_main.c +++ b/src/modules/packagekit/e_mod_main.c @@ -159,9 +159,9 @@ static const E_Gadcon_Client_Class _gc_class = /* E Module Api Functions */ -EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "PackageKit" }; +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "PackageKit" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { E_PackageKit_Module_Context *ctxt; @@ -191,7 +191,7 @@ e_modapi_init(E_Module *m) return ctxt; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m) { E_PackageKit_Module_Context *ctxt = m->data; @@ -221,7 +221,7 @@ e_modapi_shutdown(E_Module *m) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m) { E_PackageKit_Module_Context *ctxt = m->data; diff --git a/src/modules/packagekit/e_mod_main.h b/src/modules/packagekit/e_mod_main.h index 2eaf18d..1d602a1 100644 --- a/src/modules/packagekit/e_mod_main.h +++ b/src/modules/packagekit/e_mod_main.h @@ -3,9 +3,9 @@ #include "config.h" -EAPI extern E_Module_Api e_modapi; -EAPI void *e_modapi_init(E_Module *m); -EAPI int e_modapi_shutdown(E_Module *m); -EAPI int e_modapi_save(E_Module *m); +E_API extern E_Module_Api e_modapi; +E_API void *e_modapi_init(E_Module *m); +E_API int e_modapi_shutdown(E_Module *m); +E_API int e_modapi_save(E_Module *m); #endif diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index b9e3779..8689c6f 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -1967,12 +1967,12 @@ _pager_popup_cb_key_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event /***************************************************************************/ /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Pager" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { E_Module *p; @@ -2076,7 +2076,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_gadcon_provider_unregister(&_gadcon_class); @@ -2102,7 +2102,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.pager", conf_edd, pager_config); diff --git a/src/modules/pager/e_mod_main.h b/src/modules/pager/e_mod_main.h index b324b9d..746e733 100644 --- a/src/modules/pager/e_mod_main.h +++ b/src/modules/pager/e_mod_main.h @@ -38,11 +38,11 @@ struct _Config Eina_List *instances, *handlers; }; -EAPI extern E_Module_Api e_modapi; +E_API extern E_Module_Api e_modapi; -EAPI void *e_modapi_init(E_Module *m); -EAPI int e_modapi_shutdown(E_Module *m); -EAPI int e_modapi_save(E_Module *m); +E_API void *e_modapi_init(E_Module *m); +E_API int e_modapi_shutdown(E_Module *m); +E_API int e_modapi_save(E_Module *m); EINTERN void _pager_cb_config_updated(void); EINTERN void _config_pager_module(Config_Item *ci); diff --git a/src/modules/pager_plain/e_mod_main.c b/src/modules/pager_plain/e_mod_main.c index 4805afa..01cac16 100644 --- a/src/modules/pager_plain/e_mod_main.c +++ b/src/modules/pager_plain/e_mod_main.c @@ -2796,12 +2796,12 @@ _pager_popup_cb_key_up(void *data EINA_UNUSED, int type EINA_UNUSED, void *event /***************************************************************************/ /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Pager" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { E_Module *p; @@ -2923,7 +2923,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_gadcon_provider_unregister(&_gadcon_class); @@ -2949,7 +2949,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.pager_plain", conf_edd, pager_config); diff --git a/src/modules/pager_plain/e_mod_main.h b/src/modules/pager_plain/e_mod_main.h index ce631a0..49eb5c0 100644 --- a/src/modules/pager_plain/e_mod_main.h +++ b/src/modules/pager_plain/e_mod_main.h @@ -39,11 +39,11 @@ struct _Config Eina_List *instances, *handlers; }; -EAPI extern E_Module_Api e_modapi; +E_API extern E_Module_Api e_modapi; -EAPI void *e_modapi_init(E_Module *m); -EAPI int e_modapi_shutdown(E_Module *m); -EAPI int e_modapi_save(E_Module *m); +E_API void *e_modapi_init(E_Module *m); +E_API int e_modapi_shutdown(E_Module *m); +E_API int e_modapi_save(E_Module *m); EINTERN void _pager_cb_config_updated(void); EINTERN void _config_pager_module(Config_Item *ci); diff --git a/src/modules/policy_mobile/e_mod_main.c b/src/modules/policy_mobile/e_mod_main.c index 43ca0c9..86973f1 100644 --- a/src/modules/policy_mobile/e_mod_main.c +++ b/src/modules/policy_mobile/e_mod_main.c @@ -1,6 +1,6 @@ #include "e_mod_main.h" -EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Policy-Mobile" }; +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Policy-Mobile" }; Mod *_pol_mod = NULL; Eina_Hash *hash_pol_desks = NULL; @@ -526,7 +526,7 @@ e_mod_pol_client_launcher_get(E_Zone *zone) } \ while (0) -EAPI void * +E_API void * e_modapi_init(E_Module *m) { Mod *mod; @@ -595,7 +595,7 @@ e_modapi_init(E_Module *m) return mod; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m) { Mod *mod = m->data; @@ -628,7 +628,7 @@ e_modapi_shutdown(E_Module *m) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m) { Mod *mod = m->data; diff --git a/src/modules/quickaccess/e_mod_main.c b/src/modules/quickaccess/e_mod_main.c index 485d7b9..792252d 100644 --- a/src/modules/quickaccess/e_mod_main.c +++ b/src/modules/quickaccess/e_mod_main.c @@ -22,7 +22,7 @@ Config *qa_config = NULL; * it here) */ -EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, "Quickaccess"}; +E_API E_Module_Api e_modapi = {E_MODULE_API_VERSION, "Quickaccess"}; ////////////////////////////// static void @@ -42,7 +42,7 @@ _e_modapi_shutdown(void) qa_config = NULL; } -EAPI void * +E_API void * e_modapi_init(E_Module *m) { char buf[PATH_MAX]; @@ -83,14 +83,14 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { _e_modapi_shutdown(); return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.quickaccess", conf_edd, qa_config); diff --git a/src/modules/quickaccess/e_mod_main.h b/src/modules/quickaccess/e_mod_main.h index 5b3013d..a35a499 100644 --- a/src/modules/quickaccess/e_mod_main.h +++ b/src/modules/quickaccess/e_mod_main.h @@ -100,5 +100,5 @@ char *e_qa_db_class_lookup(const char *class); void e_qa_entry_bindings_cleanup(E_Quick_Access_Entry *entry); void e_qa_entry_bindings_rename(E_Quick_Access_Entry *entry, const char *name); -EAPI int e_modapi_shutdown(E_Module *m EINA_UNUSED); +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED); #endif diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c index 4f97ed9..28da026 100644 --- a/src/modules/shot/e_mod_main.c +++ b/src/modules/shot/e_mod_main.c @@ -988,13 +988,13 @@ _e_mod_menu_add(void *data EINA_UNUSED, E_Menu *m) } /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Shot" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { if (!ecore_con_url_init()) @@ -1029,7 +1029,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { _share_done(); @@ -1057,7 +1057,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/start/e_mod_main.c b/src/modules/start/e_mod_main.c index d73cce0..ba4f8e3 100644 --- a/src/modules/start/e_mod_main.c +++ b/src/modules/start/e_mod_main.c @@ -311,13 +311,13 @@ _menu_cb_post(void *data, E_Menu *m) } /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Start" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { start_module = m; @@ -325,7 +325,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { start_module = NULL; @@ -333,7 +333,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/syscon/e_mod_main.c b/src/modules/syscon/e_mod_main.c index 88469fb..4bca63b 100644 --- a/src/modules/syscon/e_mod_main.c +++ b/src/modules/syscon/e_mod_main.c @@ -12,13 +12,13 @@ static E_Action *act = NULL; static E_Int_Menu_Augmentation *maug = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Syscon" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { conf_module = m; @@ -40,7 +40,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; diff --git a/src/modules/syscon/e_syscon_gadget.c b/src/modules/syscon/e_syscon_gadget.c index 9e1baa7..6e9a06c 100644 --- a/src/modules/syscon/e_syscon_gadget.c +++ b/src/modules/syscon/e_syscon_gadget.c @@ -393,7 +393,7 @@ e_syscon_menu_fill(E_Menu *m) } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.syscon", conf_edd, syscon_config); diff --git a/src/modules/systray/e_mod_main.c b/src/modules/systray/e_mod_main.c index d5e3d71..3fceb47 100644 --- a/src/modules/systray/e_mod_main.c +++ b/src/modules/systray/e_mod_main.c @@ -382,9 +382,9 @@ static const E_Gadcon_Client_Class _gc_class = E_GADCON_CLIENT_STYLE_PLAIN }; -EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, _Name}; +E_API E_Module_Api e_modapi = {E_MODULE_API_VERSION, _Name}; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { systray_mod = m; @@ -406,7 +406,7 @@ e_modapi_init(E_Module *m) return ctx; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_gadcon_provider_unregister(&_gc_class); @@ -420,7 +420,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save(_name, ctx->conf_edd, ctx->config); diff --git a/src/modules/systray/e_mod_main.h b/src/modules/systray/e_mod_main.h index 8d54687..4d83d24 100644 --- a/src/modules/systray/e_mod_main.h +++ b/src/modules/systray/e_mod_main.h @@ -3,11 +3,11 @@ #include "e.h" -EAPI extern E_Module_Api e_modapi; +E_API extern E_Module_Api e_modapi; -EAPI void *e_modapi_init(E_Module *m); -EAPI int e_modapi_shutdown(E_Module *m); -EAPI int e_modapi_save(E_Module *m); +E_API void *e_modapi_init(E_Module *m); +E_API int e_modapi_shutdown(E_Module *m); +E_API int e_modapi_save(E_Module *m); typedef struct _Instance Instance; typedef struct _Context_Notifier_Host Context_Notifier_Host; diff --git a/src/modules/tasks/e_mod_main.c b/src/modules/tasks/e_mod_main.c index 132424a..59c4ba7 100644 --- a/src/modules/tasks/e_mod_main.c +++ b/src/modules/tasks/e_mod_main.c @@ -94,13 +94,13 @@ static E_Config_DD *conf_item_edd = NULL; Config *tasks_config = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Tasks" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { conf_item_edd = E_CONFIG_DD_NEW("Tasks_Config_Item", Config_Item); @@ -158,7 +158,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { Ecore_Event_Handler *eh; @@ -193,7 +193,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.tasks", conf_edd, tasks_config); diff --git a/src/modules/tasks/e_mod_main.h b/src/modules/tasks/e_mod_main.h index caead1b..d6258ed 100644 --- a/src/modules/tasks/e_mod_main.h +++ b/src/modules/tasks/e_mod_main.h @@ -24,11 +24,11 @@ struct _Config_Item Eina_Bool text_only; }; -EAPI extern E_Module_Api e_modapi; +E_API extern E_Module_Api e_modapi; -EAPI void *e_modapi_init(E_Module *m); -EAPI int e_modapi_shutdown(E_Module *m); -EAPI int e_modapi_save(E_Module *m); +E_API void *e_modapi_init(E_Module *m); +E_API int e_modapi_shutdown(E_Module *m); +E_API int e_modapi_save(E_Module *m); void _config_tasks_module(Config_Item *ci); void _tasks_config_updated(Config_Item *ci); diff --git a/src/modules/teamwork/e_mod_main.c b/src/modules/teamwork/e_mod_main.c index 6da7d73..ce24ef8 100644 --- a/src/modules/teamwork/e_mod_main.c +++ b/src/modules/teamwork/e_mod_main.c @@ -5,7 +5,7 @@ EINTERN int _e_teamwork_log_dom = -1; EINTERN Mod *tw_mod = NULL; EINTERN Teamwork_Config *tw_config = NULL; -EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, "Teamwork"}; +E_API E_Module_Api e_modapi = {E_MODULE_API_VERSION, "Teamwork"}; static E_Config_DD *conf_edd = NULL; @@ -129,7 +129,7 @@ _e_modapi_shutdown(void) E_FREE(tw_mod); } -EAPI void * +E_API void * e_modapi_init(E_Module *m) { char buf[PATH_MAX]; @@ -178,14 +178,14 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { _e_modapi_shutdown(); return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.teamwork", conf_edd, tw_config); diff --git a/src/modules/teamwork/e_mod_main.h b/src/modules/teamwork/e_mod_main.h index f27e0c1..edae71a 100644 --- a/src/modules/teamwork/e_mod_main.h +++ b/src/modules/teamwork/e_mod_main.h @@ -59,7 +59,7 @@ EINTERN void tw_uri_show(const char *uri); EINTERN E_Config_Dialog *e_int_config_teamwork_module(Evas_Object *parent, const char *params EINA_UNUSED); -EAPI int e_modapi_shutdown(E_Module *m EINA_UNUSED); +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED); #undef DBG #undef INF #undef WRN diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c index 9e165a8..d60c489 100644 --- a/src/modules/temperature/e_mod_main.c +++ b/src/modules/temperature/e_mod_main.c @@ -406,13 +406,13 @@ temperature_get_bus_files(const char *bus) } /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Temperature" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { conf_face_edd = E_CONFIG_DD_NEW("Temperature_Config_Face", Config_Face); @@ -449,7 +449,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_gadcon_provider_unregister(&_gadcon_class); @@ -463,7 +463,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.temperature", conf_edd, temperature_config); diff --git a/src/modules/temperature/e_mod_main.h b/src/modules/temperature/e_mod_main.h index 59808b7..3d0157e 100644 --- a/src/modules/temperature/e_mod_main.h +++ b/src/modules/temperature/e_mod_main.h @@ -84,11 +84,11 @@ Eina_Bool temperature_udev_update_poll(void *data); void temperature_udev_update(void *data); #endif -EAPI extern E_Module_Api e_modapi; +E_API extern E_Module_Api e_modapi; -EAPI void *e_modapi_init(E_Module *m); -EAPI int e_modapi_shutdown(E_Module *m); -EAPI int e_modapi_save(E_Module *m); +E_API void *e_modapi_init(E_Module *m); +E_API int e_modapi_shutdown(E_Module *m); +E_API int e_modapi_save(E_Module *m); Eina_Bool _temperature_cb_exe_data(void *data, int type, void *event); Eina_Bool _temperature_cb_exe_del(void *data, int type, void *event); diff --git a/src/modules/tiling/e_mod_tiling.c b/src/modules/tiling/e_mod_tiling.c index 92335d0..1565f0e 100644 --- a/src/modules/tiling/e_mod_tiling.c +++ b/src/modules/tiling/e_mod_tiling.c @@ -1369,12 +1369,12 @@ _clear_border_extras(void *data) E_FREE(extra); } -EAPI E_Module_Api e_modapi = { +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Tiling" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { E_Desk *desk; @@ -1554,7 +1554,7 @@ _foreach_desk(void (*func)(E_Desk *desk)) } } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_gadcon_provider_unregister(&_gc_class); @@ -1628,7 +1628,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { e_config_domain_save("module.tiling", _G.config_edd, tiling_g.config); diff --git a/src/modules/tiling/e_mod_tiling.h b/src/modules/tiling/e_mod_tiling.h index e5f4cf3..48deb88 100644 --- a/src/modules/tiling/e_mod_tiling.h +++ b/src/modules/tiling/e_mod_tiling.h @@ -69,11 +69,11 @@ struct _E_Config_Dialog_Data E_Config_Dialog *e_int_config_tiling_module(Evas_Object *parent, const char *params); -EAPI extern E_Module_Api e_modapi; +E_API extern E_Module_Api e_modapi; -EAPI void *e_modapi_init(E_Module *m); -EAPI int e_modapi_shutdown(E_Module *m); -EAPI int e_modapi_save(E_Module *m); +E_API void *e_modapi_init(E_Module *m); +E_API int e_modapi_shutdown(E_Module *m); +E_API int e_modapi_save(E_Module *m); void change_desk_conf(struct _Config_vdesk *newconf); diff --git a/src/modules/winlist/e_mod_main.c b/src/modules/winlist/e_mod_main.c index 318b750..890eb7b 100644 --- a/src/modules/winlist/e_mod_main.c +++ b/src/modules/winlist/e_mod_main.c @@ -14,13 +14,13 @@ const char *_winlist_act = NULL; E_Action *_act_winlist = NULL; /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Winlist" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { conf_module = m; @@ -67,7 +67,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; @@ -99,7 +99,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/e_mod_main.c b/src/modules/wizard/e_mod_main.c index d2fffb0..ded9af1 100644 --- a/src/modules/wizard/e_mod_main.c +++ b/src/modules/wizard/e_mod_main.c @@ -30,7 +30,7 @@ E_Module *wiz_module = NULL; */ /* module setup */ -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wizard" @@ -42,7 +42,7 @@ _cb_sort_files(char *f1, char *f2) return strcmp(f1, f2); } -EAPI void * +E_API void * e_modapi_init(E_Module *m) { Eina_List *files; @@ -90,7 +90,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_wizard_shutdown(); @@ -101,7 +101,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c index 24df045..b817da3 100644 --- a/src/modules/wizard/e_wizard.c +++ b/src/modules/wizard/e_wizard.c @@ -31,7 +31,7 @@ static Eina_Bool need_xdg_icons = EINA_FALSE; static Ecore_Timer *next_timer = NULL; -EAPI int +E_API int e_wizard_init(void) { E_Zone *zone; @@ -54,7 +54,7 @@ e_wizard_init(void) return 1; } -EAPI int +E_API int e_wizard_shutdown(void) { E_FREE_FUNC(pop, evas_object_del); @@ -69,7 +69,7 @@ e_wizard_shutdown(void) return 1; } -EAPI void +E_API void e_wizard_go(void) { if (!curpage) @@ -92,7 +92,7 @@ e_wizard_go(void) } } -EAPI void +E_API void e_wizard_apply(void) { E_Wizard_Page *pg; @@ -101,7 +101,7 @@ e_wizard_apply(void) if (pg->apply) pg->apply(pg); } -EAPI void +E_API void e_wizard_next(void) { if (!curpage) @@ -135,7 +135,7 @@ e_wizard_next(void) e_wizard_next(); } -EAPI void +E_API void e_wizard_page_show(Evas_Object *obj) { if (o_content) evas_object_del(o_content); @@ -153,7 +153,7 @@ e_wizard_page_show(Evas_Object *obj) } } -EAPI E_Wizard_Page * +E_API E_Wizard_Page * e_wizard_page_add(void *handle, int (*init_cb)(E_Wizard_Page *pg, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons), int (*shutdown_cb)(E_Wizard_Page *pg), @@ -181,7 +181,7 @@ e_wizard_page_add(void *handle, return pg; } -EAPI void +E_API void e_wizard_page_del(E_Wizard_Page *pg) { // rare thing.. if we do e_wizard_next() from a page and we end up finishing @@ -193,32 +193,32 @@ e_wizard_page_del(E_Wizard_Page *pg) free(pg); } -EAPI void +E_API void e_wizard_button_next_enable_set(int enable) { next_ok = enable; _e_wizard_next_eval(); } -EAPI void +E_API void e_wizard_title_set(const char *title) { edje_object_part_text_set(o_bg, "e.text.title", title); } -EAPI void +E_API void e_wizard_labels_update(void) { edje_object_part_text_set(o_bg, "e.text.label", _("Next")); } -EAPI const char * +E_API const char * e_wizard_dir_get(void) { return e_module_dir_get(wiz_module); } -EAPI void +E_API void e_wizard_xdg_desktops_reset(void) { if (xdg_error) return; diff --git a/src/modules/wizard/e_wizard.h b/src/modules/wizard/e_wizard.h index 007ab34..dca4694 100644 --- a/src/modules/wizard/e_wizard.h +++ b/src/modules/wizard/e_wizard.h @@ -27,25 +27,25 @@ struct _E_Wizard_Page E_Wizard_Page_State state; }; -EAPI int e_wizard_init(void); -EAPI int e_wizard_shutdown(void); -EAPI void e_wizard_go(void); -EAPI void e_wizard_apply(void); -EAPI void e_wizard_next(void); -EAPI void e_wizard_page_show(Evas_Object *obj); -EAPI E_Wizard_Page *e_wizard_page_add(void *handle, +E_API int e_wizard_init(void); +E_API int e_wizard_shutdown(void); +E_API void e_wizard_go(void); +E_API void e_wizard_apply(void); +E_API void e_wizard_next(void); +E_API void e_wizard_page_show(Evas_Object *obj); +E_API E_Wizard_Page *e_wizard_page_add(void *handle, int (*init) (E_Wizard_Page *pg, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons), int (*shutdown) (E_Wizard_Page *pg), int (*show) (E_Wizard_Page *pg), int (*hide) (E_Wizard_Page *pg), int (*apply) (E_Wizard_Page *pg) ); -EAPI void e_wizard_page_del(E_Wizard_Page *pg); -EAPI void e_wizard_button_next_enable_set(int enable); -EAPI void e_wizard_title_set(const char *title); -EAPI void e_wizard_labels_update(void); -EAPI const char *e_wizard_dir_get(void); -EAPI void e_wizard_xdg_desktops_reset(void); +E_API void e_wizard_page_del(E_Wizard_Page *pg); +E_API void e_wizard_button_next_enable_set(int enable); +E_API void e_wizard_title_set(const char *title); +E_API void e_wizard_labels_update(void); +E_API const char *e_wizard_dir_get(void); +E_API void e_wizard_xdg_desktops_reset(void); /** * @addtogroup Optional_Conf diff --git a/src/modules/wizard/page_000.c b/src/modules/wizard/page_000.c index a739d58..90db20b 100644 --- a/src/modules/wizard/page_000.c +++ b/src/modules/wizard/page_000.c @@ -5,13 +5,13 @@ static Ecore_Timer *_next_timer = NULL; /* -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; @@ -26,7 +26,7 @@ _next_page(void *data EINA_UNUSED) return ECORE_CALLBACK_CANCEL; } -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { Evas_Object *o; @@ -43,7 +43,7 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) return 1; } -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { if (_next_timer) ecore_timer_del(_next_timer); @@ -51,7 +51,7 @@ wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) return 1; } /* -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c index 755dae0..c4f7c3a 100644 --- a/src/modules/wizard/page_010.c +++ b/src/modules/wizard/page_010.c @@ -81,7 +81,7 @@ _basic_lang_list_sort(const void *data1, const void *data2) return strcmp(trans1, trans2); } -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { FILE *output; @@ -142,14 +142,14 @@ wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EIN return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { eina_list_free(blang_list); return 1; } -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg) { Evas_Object *o, *of, *ob, *ic; @@ -222,7 +222,7 @@ wizard_page_show(E_Wizard_Page *pg) return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { // evas_object_del(pg->data); @@ -238,7 +238,7 @@ wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) return 1; } -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { // do this again as we want it to apply to the new profile diff --git a/src/modules/wizard/page_011.c b/src/modules/wizard/page_011.c index 41bf68a..0cb91ce 100644 --- a/src/modules/wizard/page_011.c +++ b/src/modules/wizard/page_011.c @@ -120,7 +120,7 @@ implement_layout(void) e_xkb_layout_set(nl); } -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { // parse kbd rules here @@ -129,13 +129,13 @@ wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EIN return 1; } /* -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg) { Evas_Object *o, *of, *ob, *ic; @@ -185,7 +185,7 @@ wizard_page_show(E_Wizard_Page *pg) return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { /* special - key layout inits its stuff the moment it goes away */ @@ -193,7 +193,7 @@ wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) return 1; } -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { // do this again as we want it to apply to the new profile diff --git a/src/modules/wizard/page_020.c b/src/modules/wizard/page_020.c index b08764c..c3a1d94 100644 --- a/src/modules/wizard/page_020.c +++ b/src/modules/wizard/page_020.c @@ -27,19 +27,19 @@ _profile_change(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED) e_wizard_button_next_enable_set(1); } /* -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg) { Evas_Object *o, *of, *ob; @@ -133,7 +133,7 @@ wizard_page_show(E_Wizard_Page *pg) return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { // evas_object_del(pg->data); @@ -146,7 +146,7 @@ wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) return 1; } /* -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_030.c b/src/modules/wizard/page_030.c index 2b93cd5..0df5e40 100644 --- a/src/modules/wizard/page_030.c +++ b/src/modules/wizard/page_030.c @@ -1,19 +1,19 @@ /* Menu setup */ #include "e_wizard.h" /* -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { char buf[PATH_MAX]; @@ -24,13 +24,13 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) return 0; /* 1 == show ui, and wait for user, 0 == just continue */ } /* -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_040.c b/src/modules/wizard/page_040.c index fc255dd..83e14e1 100644 --- a/src/modules/wizard/page_040.c +++ b/src/modules/wizard/page_040.c @@ -3,14 +3,14 @@ static Ecore_Timer *_next_timer = NULL; -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons EINA_UNUSED) { *need_xdg_desktops = EINA_TRUE; return 1; } /* -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; @@ -25,7 +25,7 @@ _next_page(void *data EINA_UNUSED) return ECORE_CALLBACK_CANCEL; } -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { Eina_List *extra_desks, *desks; @@ -110,7 +110,7 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { if (_next_timer) ecore_timer_del(_next_timer); @@ -118,7 +118,7 @@ wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) return 1; } /* -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_050.c b/src/modules/wizard/page_050.c index 7732eb6..7fa6838 100644 --- a/src/modules/wizard/page_050.c +++ b/src/modules/wizard/page_050.c @@ -4,13 +4,13 @@ static double scale = 1.0; static Eina_List *obs = NULL; /* -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; @@ -118,7 +118,7 @@ _scale_preview_new(Evas *e, double sc, double *scp) return ob; } -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg) { Evas_Object *o, *of, *ob; @@ -172,7 +172,7 @@ wizard_page_show(E_Wizard_Page *pg) return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { obs = eina_list_free(obs); @@ -185,7 +185,7 @@ wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) return 1; } /* -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_060.c b/src/modules/wizard/page_060.c index 5f12a79..7a66858 100644 --- a/src/modules/wizard/page_060.c +++ b/src/modules/wizard/page_060.c @@ -3,19 +3,19 @@ static int focus_mode = 1; /* -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg) { Evas_Object *o, *of, *ob; @@ -45,7 +45,7 @@ wizard_page_show(E_Wizard_Page *pg) return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { if (!focus_mode) @@ -79,7 +79,7 @@ wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) return 1; } /* -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_070.c b/src/modules/wizard/page_070.c index 630101b..8f00368 100644 --- a/src/modules/wizard/page_070.c +++ b/src/modules/wizard/page_070.c @@ -1,20 +1,20 @@ /* Setup of default icon theme */ #include "e_wizard.h" -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons) { *need_xdg_icons = EINA_TRUE; return 1; } /* -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { Eina_List *l, *themes = efreet_icon_theme_list_get(); @@ -59,13 +59,13 @@ done: return 0; /* 1 == show ui, and wait for user, 0 == just continue */ } /* -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_080.c b/src/modules/wizard/page_080.c index fecd8d4..5886545 100644 --- a/src/modules/wizard/page_080.c +++ b/src/modules/wizard/page_080.c @@ -1,20 +1,20 @@ /* Ibar setup */ #include "e_wizard.h" -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops, Eina_Bool *need_xdg_icons EINA_UNUSED) { *need_xdg_desktops = EINA_TRUE; return 1; } /* -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { FILE *f, *fin; @@ -62,13 +62,13 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) return 0; /* 1 == show ui, and wait for user, 0 == just continue */ } /* -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_090.c b/src/modules/wizard/page_090.c index f581480..b0f2e12 100644 --- a/src/modules/wizard/page_090.c +++ b/src/modules/wizard/page_090.c @@ -31,19 +31,19 @@ read_file(const char *file) return strdup(buf); } /* -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { int hav_bat = 0; @@ -116,13 +116,13 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) return 0; /* 1 == show ui, and wait for user, 0 == just continue */ } /* -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_100.c b/src/modules/wizard/page_100.c index 0f46b18..7e89706 100644 --- a/src/modules/wizard/page_100.c +++ b/src/modules/wizard/page_100.c @@ -30,19 +30,19 @@ read_file(const char *file) } #endif /* -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { int hav_cpufreq = 0; @@ -92,13 +92,13 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) return 0; /* 1 == show ui, and wait for user, 0 == just continue */ } /* -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_110.c b/src/modules/wizard/page_110.c index c833c27..f6a386d 100644 --- a/src/modules/wizard/page_110.c +++ b/src/modules/wizard/page_110.c @@ -107,19 +107,19 @@ fail: } /* -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg) { Eina_Bool have_connman = EINA_FALSE; @@ -164,7 +164,7 @@ wizard_page_show(E_Wizard_Page *pg) return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { if (pending_connman) @@ -188,7 +188,7 @@ wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) return 1; } /* -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_120.c b/src/modules/wizard/page_120.c index ee7e983..67e72a2 100644 --- a/src/modules/wizard/page_120.c +++ b/src/modules/wizard/page_120.c @@ -77,19 +77,19 @@ _wizard_temperature_get_bus_files(const char *bus) } /* -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { Eina_List *tempdevs = NULL; @@ -189,13 +189,13 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) return 0; /* 1 == show ui, and wait for user, 0 == just continue */ } /* -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_130.c b/src/modules/wizard/page_130.c index 307d436..4e33dc6 100644 --- a/src/modules/wizard/page_130.c +++ b/src/modules/wizard/page_130.c @@ -1,19 +1,19 @@ /* Setup if we need backlight? */ #include "e_wizard.h" /* -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { int hav_backlight = 0; @@ -41,13 +41,13 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) return 0; /* 1 == show ui, and wait for user, 0 == just continue */ } /* -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_150.c b/src/modules/wizard/page_150.c index 8f37862..5e89dfc 100644 --- a/src/modules/wizard/page_150.c +++ b/src/modules/wizard/page_150.c @@ -43,7 +43,7 @@ match_xorg_log(const char *globbing) return 0; } -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg) { Evas_Object *o, *of, *ob; @@ -100,7 +100,7 @@ wizard_page_show(E_Wizard_Page *pg) return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { E_Comp_Config *conf = NULL; diff --git a/src/modules/wizard/page_160.c b/src/modules/wizard/page_160.c index 5e9033c..d4596a8 100644 --- a/src/modules/wizard/page_160.c +++ b/src/modules/wizard/page_160.c @@ -1,19 +1,19 @@ /* Setup favorites and desktop links */ #include "e_wizard.h" /* -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { Eina_List *files; @@ -37,13 +37,13 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) return 0; /* 1 == show ui, and wait for user, 0 == just continue */ } /* -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_170.c b/src/modules/wizard/page_170.c index 1cdd097..1e68bae 100644 --- a/src/modules/wizard/page_170.c +++ b/src/modules/wizard/page_170.c @@ -3,19 +3,19 @@ static int do_up = 1; /* -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg) { Evas_Object *o, *of, *ob; @@ -61,7 +61,7 @@ wizard_page_show(E_Wizard_Page *pg) return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { e_config->update.check = do_up; @@ -69,7 +69,7 @@ wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) return 1; } /* -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { return 1; diff --git a/src/modules/wizard/page_180.c b/src/modules/wizard/page_180.c index f9cdf00..a7ed7ef 100644 --- a/src/modules/wizard/page_180.c +++ b/src/modules/wizard/page_180.c @@ -3,19 +3,19 @@ static int do_tasks = 1; /* -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg) { Evas_Object *o, *of, *ob; @@ -46,13 +46,13 @@ wizard_page_show(E_Wizard_Page *pg) return 1; /* 1 == show ui, and wait for user, 0 == just continue */ } /* -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } */ -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { E_Config_Module *em; diff --git a/src/modules/wizard/page_200.c b/src/modules/wizard/page_200.c index bb2d1d3..b8de7a8 100644 --- a/src/modules/wizard/page_200.c +++ b/src/modules/wizard/page_200.c @@ -2,31 +2,31 @@ #include "e_wizard.h" #if 0 -EAPI int +E_API int wizard_page_init(E_Wizard_Page *pg EINA_UNUSED, Eina_Bool *need_xdg_desktops EINA_UNUSED, Eina_Bool *need_xdg_icons EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_shutdown(E_Wizard_Page *pg EINA_UNUSED) { return 1; } -EAPI int +E_API int wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) { return 0; /* 1 == show ui, and wait for user, 0 == just continue */ } -EAPI int +E_API int wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED) { return 1; } #endif -EAPI int +E_API int wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED) { // save the config now everyone has modified it diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c index ba57527..be91d67 100644 --- a/src/modules/wl_desktop_shell/e_mod_main.c +++ b/src/modules/wl_desktop_shell/e_mod_main.c @@ -1396,9 +1396,9 @@ _e_xdg_shell_cb_bind(struct wl_client *client, void *data, uint32_t version, uin wl_resource_set_dispatcher(res, _e_xdg_shell_cb_dispatch, NULL, cdata, NULL); } -EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_Desktop_Shell" }; +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_Desktop_Shell" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { E_Comp_Data *cdata; @@ -1431,7 +1431,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c index 0a6f03e..9779dd9 100644 --- a/src/modules/wl_drm/e_mod_main.c +++ b/src/modules/wl_drm/e_mod_main.c @@ -2,7 +2,7 @@ #include "e.h" #include -EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_Drm" }; +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_Drm" }; static Ecore_Event_Handler *activate_handler; static Ecore_Event_Handler *output_handler; @@ -284,7 +284,7 @@ static E_Comp_Screen_Iface drmiface = .apply = _drm_randr_apply }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { int w = 0, h = 0; @@ -368,7 +368,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { /* shutdown ecore_drm */ diff --git a/src/modules/wl_fb/e_mod_main.c b/src/modules/wl_fb/e_mod_main.c index c64db83..f7b5812 100644 --- a/src/modules/wl_fb/e_mod_main.c +++ b/src/modules/wl_fb/e_mod_main.c @@ -2,9 +2,9 @@ #include #include -EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_FB" }; +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_FB" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { Ecore_Evas *ee; @@ -44,7 +44,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { /* shutdown ecore_x */ diff --git a/src/modules/wl_screenshot/e_mod_main.c b/src/modules/wl_screenshot/e_mod_main.c index 6910301..c935b75 100644 --- a/src/modules/wl_screenshot/e_mod_main.c +++ b/src/modules/wl_screenshot/e_mod_main.c @@ -54,9 +54,9 @@ static struct wl_output *_output; static int ow = 0, oh = 0; static Ecore_Timer *_timer = NULL; -EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Screenshooter" }; +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Screenshooter" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { struct wl_display *disp; @@ -84,7 +84,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { _mod = NULL; @@ -93,7 +93,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) return 1; } -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; diff --git a/src/modules/wl_x11/e_mod_main.c b/src/modules/wl_x11/e_mod_main.c index 78da253..1dc2d32 100644 --- a/src/modules/wl_x11/e_mod_main.c +++ b/src/modules/wl_x11/e_mod_main.c @@ -1,7 +1,7 @@ #include "e.h" #include -EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_X11" }; +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_X11" }; static Ecore_Event_Handler *kbd_hdlr; @@ -62,7 +62,7 @@ _cb_keymap_changed(void *data, int type EINA_UNUSED, void *event EINA_UNUSED) return ECORE_CALLBACK_PASS_ON; } -EAPI void * +E_API void * e_modapi_init(E_Module *m) { int w = 0, h = 0; @@ -103,7 +103,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { /* delete handler for keymap change */ diff --git a/src/modules/xkbswitch/e_mod_main.c b/src/modules/xkbswitch/e_mod_main.c index cd86c5c..a3ce068 100644 --- a/src/modules/xkbswitch/e_mod_main.c +++ b/src/modules/xkbswitch/e_mod_main.c @@ -54,7 +54,7 @@ static const E_Gadcon_Client_Class _gc_class = E_GADCON_CLIENT_STYLE_PLAIN }; -EAPI E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "XKB Switcher" @@ -64,7 +64,7 @@ EAPI E_Module_Api e_modapi = * Initializes the configuration file, checks its versions, populates * menus, finds the rules file, initializes gadget icon. */ -EAPI void * +E_API void * e_modapi_init(E_Module *m) { /* Menus and dialogs */ @@ -87,7 +87,7 @@ e_modapi_init(E_Module *m) * Called when the module gets unloaded. Deregisters the menu state * and frees up the config. */ -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { e_configure_registry_item_del("keyboard_and_mouse/xkbswitch"); @@ -105,7 +105,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) /* Module state save * Used to save the configuration file. */ -EAPI int +E_API int e_modapi_save(E_Module *m EINA_UNUSED) { return 1; -- 2.7.4