enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

enlightenment: Make E build again with EFL from git 

sed -i 's/EAPI/E_API/g'

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-05-07 15:13:10 -04:00 committed by Mike Blumenkrantz
parent 00904480d5
commit 099861c55a
446 changed files with 4340 additions and 4285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/bin/e.h
View File

@ -130,14 +130,14 @@ void *alloca (size_t);
# include <uuid.h> # include <uuid.h>
# endif # endif
# ifdef EAPI # ifdef E_API
# undef EAPI # undef E_API
# endif # endif
# ifdef WIN32 # ifdef WIN32
# ifdef BUILDING_DLL # ifdef BUILDING_DLL
# define EAPI __declspec(dllexport) # define E_API __declspec(dllexport)
# else # else
# define EAPI __declspec(dllimport) # define E_API __declspec(dllimport)
# endif # endif
# else # else
# ifdef __GNUC__ # ifdef __GNUC__
@ -146,12 +146,12 @@ void *alloca (size_t);
# if 0 # if 0
# pragma GCC visibility push(hidden) # pragma GCC visibility push(hidden)
# endif # endif
# define EAPI __attribute__ ((visibility("default"))) # define E_API __attribute__ ((visibility("default")))
# else # else
# define EAPI # define E_API
# endif # endif
# else # else
# define EAPI # define E_API
# endif # endif
# endif # endif
@ -280,30 +280,30 @@ typedef struct _E_Rect E_Rect;
# undef E_TYPEDEFS # undef E_TYPEDEFS
# include "e_includes.h" # include "e_includes.h"
EAPI double e_main_ts(const char *str); E_API double e_main_ts(const char *str);
struct _E_Rect struct _E_Rect
{ {
int x, y, w, h; int x, y, w, h;
}; };
extern EAPI E_Path *path_data; extern E_API E_Path *path_data;
extern EAPI E_Path *path_images; extern E_API E_Path *path_images;
extern EAPI E_Path *path_fonts; extern E_API E_Path *path_fonts;
extern EAPI E_Path *path_themes; extern E_API E_Path *path_themes;
extern EAPI E_Path *path_icons; extern E_API E_Path *path_icons;
extern EAPI E_Path *path_modules; extern E_API E_Path *path_modules;
extern EAPI E_Path *path_backgrounds; extern E_API E_Path *path_backgrounds;
extern EAPI E_Path *path_messages; extern E_API E_Path *path_messages;
extern EAPI Eina_Bool good; extern E_API Eina_Bool good;
extern EAPI Eina_Bool evil; extern E_API Eina_Bool evil;
extern EAPI Eina_Bool starting; extern E_API Eina_Bool starting;
extern EAPI Eina_Bool stopping; extern E_API Eina_Bool stopping;
extern EAPI Eina_Bool restart; extern E_API Eina_Bool restart;
extern EAPI Eina_Bool e_nopause; extern E_API Eina_Bool e_nopause;
extern EAPI Eina_Bool e_precache_end; extern E_API Eina_Bool e_precache_end;
extern EAPI Eina_Bool x_fatal; extern E_API Eina_Bool x_fatal;
extern EINTERN const char *e_first_frame; extern EINTERN const char *e_first_frame;
extern EINTERN double e_first_frame_start_time; extern EINTERN double e_first_frame_start_time;

4
src/bin/e_about.c
View File

@ -6,7 +6,7 @@
/* externally accessible functions */ /* externally accessible functions */
EAPI E_About * E_API E_About *
e_about_new(E_Comp *c) e_about_new(E_Comp *c)
{ {
E_Obj_Dialog *od; E_Obj_Dialog *od;
@ -110,7 +110,7 @@ e_about_new(E_Comp *c)
return (E_About *)od; return (E_About *)od;
} }
EAPI void E_API void
e_about_show(E_About *about) e_about_show(E_About *about)
{ {
e_obj_dialog_show((E_Obj_Dialog *)about); e_obj_dialog_show((E_Obj_Dialog *)about);

4
src/bin/e_about.h
View File

@ -6,8 +6,8 @@ typedef struct _E_Obj_Dialog E_About;
#ifndef E_ABOUT_H #ifndef E_ABOUT_H
#define E_ABOUT_H #define E_ABOUT_H
EAPI E_About *e_about_new (E_Comp *c); E_API E_About *e_about_new (E_Comp *c);
EAPI void e_about_show (E_About *about); E_API void e_about_show (E_About *about);
#endif #endif
#endif #endif

6
src/bin/e_acpi.c
View File

@ -122,7 +122,7 @@ static E_ACPI_Device_Multiplexed _devices_multiplexed[] =
}; };
/* public variables */ /* public variables */
EAPI int E_EVENT_ACPI = 0; E_API int E_EVENT_ACPI = 0;
/* public functions */ /* public functions */
EINTERN int EINTERN int
@ -191,13 +191,13 @@ e_acpi_lid_status_get(void)
return E_ACPI_LID_UNKNOWN; return E_ACPI_LID_UNKNOWN;
} }
EAPI void E_API void
e_acpi_events_freeze(void) e_acpi_events_freeze(void)
{ {
_e_acpi_events_frozen++; _e_acpi_events_frozen++;
} }
EAPI void E_API void
e_acpi_events_thaw(void) e_acpi_events_thaw(void)
{ {
_e_acpi_events_frozen--; _e_acpi_events_frozen--;

6
src/bin/e_acpi.h
View File

@ -73,10 +73,10 @@ EINTERN int e_acpi_shutdown(void);
EINTERN E_Acpi_Lid_Status e_acpi_lid_status_get(void); EINTERN E_Acpi_Lid_Status e_acpi_lid_status_get(void);
EAPI void e_acpi_events_freeze(void); E_API void e_acpi_events_freeze(void);
EAPI void e_acpi_events_thaw(void); E_API void e_acpi_events_thaw(void);
extern EAPI int E_EVENT_ACPI; extern E_API int E_EVENT_ACPI;
# endif # endif
#endif #endif

18
src/bin/e_actions.c
View File

@ -3450,13 +3450,13 @@ e_actions_shutdown(void)
return 1; return 1;
} }
EAPI Eina_List * E_API Eina_List *
e_action_name_list(void) e_action_name_list(void)
{ {
return action_names; return action_names;
} }
EAPI E_Action * E_API E_Action *
e_action_add(const char *name) e_action_add(const char *name)
{ {
E_Action *act; E_Action *act;
@ -3474,7 +3474,7 @@ e_action_add(const char *name)
return act; return act;
} }
EAPI void E_API void
e_action_del(const char *name) e_action_del(const char *name)
{ {
E_Action *act; E_Action *act;
@ -3483,7 +3483,7 @@ e_action_del(const char *name)
if (act) _e_action_free(act); if (act) _e_action_free(act);
} }
EAPI E_Action * E_API E_Action *
e_action_find(const char *name) e_action_find(const char *name)
{ {
E_Action *act; E_Action *act;
@ -3492,7 +3492,7 @@ e_action_find(const char *name)
return act; return act;
} }
EAPI const char * E_API const char *
e_action_predef_label_get(const char *action, const char *params) e_action_predef_label_get(const char *action, const char *params)
{ {
E_Action_Group *actg = NULL; E_Action_Group *actg = NULL;
@ -3518,7 +3518,7 @@ e_action_predef_label_get(const char *action, const char *params)
return NULL; 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_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; E_Action_Group *actg = NULL;
@ -3564,7 +3564,7 @@ e_action_predef_name_set(const char *act_grp, const char *act_name, const char *
actg->acts = eina_list_append(actg->acts, actd); 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_predef_name_del(const char *act_grp, const char *act_name)
{ {
E_Action_Group *actg = NULL; E_Action_Group *actg = NULL;
@ -3603,7 +3603,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_predef_name_all_del(void)
{ {
E_Action_Group *actg = NULL; E_Action_Group *actg = NULL;
@ -3626,7 +3626,7 @@ e_action_predef_name_all_del(void)
action_groups = NULL; action_groups = NULL;
} }
EAPI Eina_List * E_API Eina_List *
e_action_groups_get(void) e_action_groups_get(void)
{ {
return action_groups; return action_groups;

18
src/bin/e_actions.h
View File

@ -48,17 +48,17 @@ struct _E_Action_Group
EINTERN int e_actions_init(void); EINTERN int e_actions_init(void);
EINTERN int e_actions_shutdown(void); EINTERN int e_actions_shutdown(void);
EAPI Eina_List *e_action_name_list(void); E_API Eina_List *e_action_name_list(void);
EAPI E_Action *e_action_add(const char *name); E_API E_Action *e_action_add(const char *name);
/* e_action_del allows, for example, modules to define their own actions dynamically. */ /* e_action_del allows, for example, modules to define their own actions dynamically. */
EAPI void e_action_del(const char *name); E_API void e_action_del(const char *name);
EAPI E_Action *e_action_find(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); E_API 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); 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);
EAPI void e_action_predef_name_del(const char *act_grp, const char *act_name); E_API void e_action_predef_name_del(const char *act_grp, const char *act_name);
EAPI void e_action_predef_name_all_del(void); E_API void e_action_predef_name_all_del(void);
EAPI Eina_List *e_action_groups_get(void); E_API Eina_List *e_action_groups_get(void);
#endif #endif
#endif #endif

6
src/bin/e_alert.c
View File

@ -2,7 +2,7 @@
#include <sys/wait.h> #include <sys/wait.h>
/* public variables */ /* public variables */
EAPI unsigned long _e_alert_composite_win = 0; E_API unsigned long _e_alert_composite_win = 0;
EINTERN int EINTERN int
e_alert_init(void) e_alert_init(void)
@ -16,7 +16,7 @@ e_alert_shutdown(void)
return 1; return 1;
} }
EAPI void E_API void
e_alert_composite_win(Ecore_X_Window root, Ecore_X_Window comp) e_alert_composite_win(Ecore_X_Window root, Ecore_X_Window comp)
{ {
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY
@ -31,7 +31,7 @@ e_alert_composite_win(Ecore_X_Window root, Ecore_X_Window comp)
#endif #endif
} }
EAPI void E_API void
e_alert_show(void) e_alert_show(void)
{ {
if (!e_nopause) if (!e_nopause)

2
src/bin/e_alert.h
View File

@ -13,7 +13,7 @@ typedef enum _E_Alert_Op_Type
EINTERN int e_alert_init(void); EINTERN int e_alert_init(void);
EINTERN int e_alert_shutdown(void); EINTERN int e_alert_shutdown(void);
EAPI void e_alert_show(void); E_API void e_alert_show(void);
#endif #endif
#endif #endif

22
src/bin/e_atoms.c
View File

@ -2,17 +2,17 @@
/* Atoms */ /* Atoms */
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY
EAPI Ecore_X_Atom E_ATOM_MANAGED = 0; E_API Ecore_X_Atom E_ATOM_MANAGED = 0;
EAPI Ecore_X_Atom E_ATOM_ZONE = 0; E_API Ecore_X_Atom E_ATOM_ZONE = 0;
EAPI Ecore_X_Atom E_ATOM_DESK = 0; E_API Ecore_X_Atom E_ATOM_DESK = 0;
EAPI Ecore_X_Atom E_ATOM_MAPPED = 0; E_API Ecore_X_Atom E_ATOM_MAPPED = 0;
EAPI Ecore_X_Atom E_ATOM_SHADE_DIRECTION = 0; E_API Ecore_X_Atom E_ATOM_SHADE_DIRECTION = 0;
EAPI Ecore_X_Atom E_ATOM_HIDDEN = 0; E_API Ecore_X_Atom E_ATOM_HIDDEN = 0;
EAPI Ecore_X_Atom E_ATOM_BORDER_SIZE = 0; E_API Ecore_X_Atom E_ATOM_BORDER_SIZE = 0;
EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE = 0; E_API Ecore_X_Atom E_ATOM_WINDOW_STATE = 0;
EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED = 0; E_API Ecore_X_Atom E_ATOM_WINDOW_STATE_CENTERED = 0;
EAPI Ecore_X_Atom E_ATOM_DESKTOP_FILE = 0; E_API Ecore_X_Atom E_ATOM_DESKTOP_FILE = 0;
EAPI Ecore_X_Atom E_ATOM_ZONE_GEOMETRY = 0; E_API Ecore_X_Atom E_ATOM_ZONE_GEOMETRY = 0;
#endif #endif
/* externally accessible functions */ /* externally accessible functions */

22
src/bin/e_atoms.h
View File

@ -4,26 +4,26 @@
#define E_ATOMS_H #define E_ATOMS_H
/* an "overall" atom to see that we recognise the window */ /* 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 */ /* basic window properties */
extern EAPI Ecore_X_Atom E_ATOM_ZONE; extern E_API Ecore_X_Atom E_ATOM_ZONE;
extern EAPI Ecore_X_Atom E_ATOM_DESK; extern E_API Ecore_X_Atom E_ATOM_DESK;
extern EAPI Ecore_X_Atom E_ATOM_MAPPED; extern E_API Ecore_X_Atom E_ATOM_MAPPED;
extern EAPI Ecore_X_Atom E_ATOM_SHADE_DIRECTION; extern E_API Ecore_X_Atom E_ATOM_SHADE_DIRECTION;
extern EAPI Ecore_X_Atom E_ATOM_HIDDEN; extern E_API Ecore_X_Atom E_ATOM_HIDDEN;
extern EAPI Ecore_X_Atom E_ATOM_BORDER_SIZE; extern E_API Ecore_X_Atom E_ATOM_BORDER_SIZE;
extern EAPI Ecore_X_Atom E_ATOM_DESKTOP_FILE; extern E_API Ecore_X_Atom E_ATOM_DESKTOP_FILE;
/* extra e window states */ /* extra e window states */
/* if we add more states, we need to fix /* if we add more states, we need to fix
* * e_hints_window_e_state_get() * * e_hints_window_e_state_get()
* * e_hints_window_e_state_set() * * e_hints_window_e_state_set()
* * _e_win_state_update() + e_win * * _e_win_state_update() + e_win
*/ */
extern EAPI Ecore_X_Atom E_ATOM_WINDOW_STATE; extern E_API 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_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_init(void);
EINTERN int e_atoms_shutdown(void); EINTERN int e_atoms_shutdown(void);

4
src/bin/e_auth.c
View File

@ -131,7 +131,7 @@ _auth_pam_init(E_Auth *da)
#endif #endif
EAPI int E_API int
#ifdef HAVE_PAM #ifdef HAVE_PAM
e_auth_begin(char *passwd) e_auth_begin(char *passwd)
{ {
@ -194,7 +194,7 @@ e_auth_begin(char *passwd EINA_UNUSED)
} }
#endif #endif
EAPI char * E_API char *
e_auth_hostname_get(void) e_auth_hostname_get(void)
{ {
return strdup("localhost"); return strdup("localhost");

4
src/bin/e_auth.h
View File

@ -1,8 +1,8 @@
#ifndef E_AUTH_H #ifndef E_AUTH_H
#define E_AUTH_H #define E_AUTH_H
EAPI int e_auth_begin(char *passwd); E_API int e_auth_begin(char *passwd);
EAPI char *e_auth_hostname_get(void); E_API char *e_auth_hostname_get(void);
static inline int static inline int
e_auth_hash_djb2(const char *key, int len) e_auth_hash_djb2(const char *key, int len)

16
src/bin/e_backlight.c
View File

@ -39,7 +39,7 @@ static Eina_Bool _e_bl_cb_exit(void *data __UNUSED__, int type __UNUSED__, void
static void _bl_sys_level_set(double val); static void _bl_sys_level_set(double val);
#endif #endif
EAPI int E_EVENT_BACKLIGHT_CHANGE = -1; E_API int E_EVENT_BACKLIGHT_CHANGE = -1;
EINTERN int EINTERN int
e_backlight_init(void) e_backlight_init(void)
@ -90,14 +90,14 @@ e_backlight_shutdown(void)
return 1; return 1;
} }
EAPI Eina_Bool E_API Eina_Bool
e_backlight_exists(void) e_backlight_exists(void)
{ {
if (sysmode == MODE_NONE) return EINA_FALSE; if (sysmode == MODE_NONE) return EINA_FALSE;
return EINA_TRUE; return EINA_TRUE;
} }
EAPI void E_API void
e_backlight_update(void) e_backlight_update(void)
{ {
const Eina_List *l, *ll; const Eina_List *l, *ll;
@ -111,7 +111,7 @@ e_backlight_update(void)
_e_backlight_update(zone); _e_backlight_update(zone);
} }
EAPI void E_API void
e_backlight_level_set(E_Zone *zone, double val, double tim) e_backlight_level_set(E_Zone *zone, double val, double tim)
{ {
double bl_now; double bl_now;
@ -149,14 +149,14 @@ e_backlight_level_set(E_Zone *zone, double val, double tim)
bl_anim_toval = val; bl_anim_toval = val;
} }
EAPI double E_API double
e_backlight_level_get(E_Zone *zone __UNUSED__) e_backlight_level_get(E_Zone *zone __UNUSED__)
{ {
// zone == NULL == everything // zone == NULL == everything
return e_bl_val; return e_bl_val;
} }
EAPI void E_API void
e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode) e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode)
{ {
E_Backlight_Mode pmode; E_Backlight_Mode pmode;
@ -184,14 +184,14 @@ e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode)
e_backlight_level_set(zone, 1.0, -1.0); 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 __UNUSED__) e_backlight_mode_get(E_Zone *zone __UNUSED__)
{ {
// zone == NULL == everything // zone == NULL == everything
return e_config->backlight.mode; return e_config->backlight.mode;
} }
EAPI const Eina_List * E_API const Eina_List *
e_backlight_devices_get(void) e_backlight_devices_get(void)
{ {
return bl_devs; return bl_devs;

16
src/bin/e_backlight.h
View File

@ -18,7 +18,7 @@ typedef enum _E_Backlight_Mode
#ifndef E_BACKLIGHT_H #ifndef E_BACKLIGHT_H
#define 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 //struct _E_Screen
//{ //{
@ -28,13 +28,13 @@ extern EAPI int E_EVENT_BACKLIGHT_CHANGE;
EINTERN int e_backlight_init(void); EINTERN int e_backlight_init(void);
EINTERN int e_backlight_shutdown(void); EINTERN int e_backlight_shutdown(void);
EAPI Eina_Bool e_backlight_exists(void); E_API Eina_Bool e_backlight_exists(void);
EAPI void e_backlight_update(void); E_API void e_backlight_update(void);
EAPI void e_backlight_level_set(E_Zone *zone, double val, double tim); E_API void e_backlight_level_set(E_Zone *zone, double val, double tim);
EAPI double e_backlight_level_get(E_Zone *zone); E_API double e_backlight_level_get(E_Zone *zone);
EAPI void e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode); E_API void e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode);
EAPI E_Backlight_Mode e_backlight_mode_get(E_Zone *zone); E_API E_Backlight_Mode e_backlight_mode_get(E_Zone *zone);
EAPI const Eina_List *e_backlight_devices_get(void); E_API const Eina_List *e_backlight_devices_get(void);
#endif #endif
#endif #endif

16
src/bin/e_bg.c
View File

@ -8,7 +8,7 @@ static int e_bg_handler_test(void *data __UNUSED__, Evas_Object *obj __UNUSED__
static void _e_bg_handler_image_imported(const char *image_path, void *data); static void _e_bg_handler_image_imported(const char *image_path, void *data);
/* local subsystem globals */ /* 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; static E_Fm2_Mime_Handler *bg_hdl = NULL;
/* externally accessible functions */ /* externally accessible functions */
@ -75,7 +75,7 @@ e_bg_shutdown(void)
* Use -1 as a wild card for each parameter. * Use -1 as a wild card for each parameter.
* The most specific match will be returned * 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 manager_num, int zone_num, int desk_x, int desk_y) e_bg_config_get(int manager_num, int zone_num, int desk_x, int desk_y)
{ {
Eina_List *l, *entries; Eina_List *l, *entries;
@ -143,7 +143,7 @@ e_bg_config_get(int manager_num, int zone_num, int desk_x, int desk_y)
return bg; return bg;
} }
EAPI Eina_Stringshare * E_API Eina_Stringshare *
e_bg_file_get(int manager_num, int zone_num, int desk_x, int desk_y) e_bg_file_get(int manager_num, int zone_num, int desk_x, int desk_y)
{ {
const E_Config_Desktop_Background *cfbg; const E_Config_Desktop_Background *cfbg;
@ -191,7 +191,7 @@ e_bg_file_get(int manager_num, int zone_num, int desk_x, int desk_y)
return bgfile; return bgfile;
} }
EAPI void E_API void
e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition) e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
{ {
Evas_Object *o; Evas_Object *o;
@ -292,7 +292,7 @@ end:
eina_stringshare_del(bgfile); eina_stringshare_del(bgfile);
} }
EAPI void E_API void
e_bg_default_set(const char *file) e_bg_default_set(const char *file)
{ {
E_Event_Bg_Update *ev; E_Event_Bg_Update *ev;
@ -329,7 +329,7 @@ e_bg_default_set(const char *file)
ecore_event_add(E_EVENT_BG_UPDATE, ev, _e_bg_event_bg_update_free, NULL); ecore_event_add(E_EVENT_BG_UPDATE, ev, _e_bg_event_bg_update_free, NULL);
} }
EAPI void E_API void
e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file) e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file)
{ {
const Eina_List *l; const Eina_List *l;
@ -371,7 +371,7 @@ e_bg_add(int manager, 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); ecore_event_add(E_EVENT_BG_UPDATE, ev, _e_bg_event_bg_update_free, NULL);
} }
EAPI void E_API void
e_bg_del(int manager, int zone, int desk_x, int desk_y) e_bg_del(int manager, int zone, int desk_x, int desk_y)
{ {
Eina_List *l; Eina_List *l;
@ -400,7 +400,7 @@ e_bg_del(int manager, int zone, int desk_x, int desk_y)
ecore_event_add(E_EVENT_BG_UPDATE, ev, _e_bg_event_bg_update_free, NULL); ecore_event_add(E_EVENT_BG_UPDATE, ev, _e_bg_event_bg_update_free, NULL);
} }
EAPI void E_API void
e_bg_update(void) e_bg_update(void)
{ {
const Eina_List *l, *ll; const Eina_List *l, *ll;

20
src/bin/e_bg.h
View File

@ -15,7 +15,7 @@ typedef struct _E_Bg_Image_Import_Handle E_Bg_Image_Import_Handle;
#ifndef E_BG_H #ifndef E_BG_H
#define 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 struct _E_Event_Bg_Update
{ {
@ -28,16 +28,16 @@ struct _E_Event_Bg_Update
EINTERN int e_bg_init(void); EINTERN int e_bg_init(void);
EINTERN int e_bg_shutdown(void); EINTERN int e_bg_shutdown(void);
EAPI const E_Config_Desktop_Background *e_bg_config_get(int manager_num, int zone_num, int desk_x, int desk_y); E_API const E_Config_Desktop_Background *e_bg_config_get(int manager_num, int zone_num, int desk_x, int desk_y);
EAPI Eina_Stringshare *e_bg_file_get(int manager_num, int zone_num, int desk_x, int desk_y); E_API Eina_Stringshare *e_bg_file_get(int manager_num, int zone_num, int desk_x, int desk_y);
EAPI void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition); E_API void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition);
EAPI void e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file); E_API void e_bg_add(int manager, int zone, int desk_x, int desk_y, const char *file);
EAPI void e_bg_del(int manager, int zone, int desk_x, int desk_y); E_API void e_bg_del(int manager, int zone, int desk_x, int desk_y);
EAPI void e_bg_default_set(const char *file); E_API void e_bg_default_set(const char *file);
EAPI void e_bg_update(void); 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); 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);
EAPI void e_bg_image_import_cancel(E_Bg_Image_Import_Handle *handle); E_API void e_bg_image_import_cancel(E_Bg_Image_Import_Handle *handle);
#endif #endif
#endif #endif

120
src/bin/e_bindings.c
View File

@ -100,7 +100,7 @@ e_bindings_shutdown(void)
return 1; return 1;
} }
EAPI int E_API int
e_bindings_modifiers_to_ecore_convert(E_Binding_Modifier modifiers) e_bindings_modifiers_to_ecore_convert(E_Binding_Modifier modifiers)
{ {
int mod = 0; int mod = 0;
@ -116,7 +116,7 @@ e_bindings_modifiers_to_ecore_convert(E_Binding_Modifier modifiers)
return mod; 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) 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)); 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); 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) 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)); 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; 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) 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)); 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) e_bindings_evas_modifiers_convert(Evas_Modifier *modifiers)
{ {
int mod = 0; int mod = 0;
@ -191,7 +191,7 @@ e_bindings_evas_modifiers_convert(Evas_Modifier *modifiers)
return mod; 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) 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)); 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_bindings_signal_reset(void)
{ {
E_Config_Binding_Signal *ebs; 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_bindings_acpi_reset(void)
{ {
E_Config_Binding_Acpi *eba; E_Config_Binding_Acpi *eba;
@ -268,7 +268,7 @@ e_bindings_acpi_reset(void)
eba->action, eba->params); eba->action, eba->params);
} }
EAPI void E_API void
e_bindings_wheel_reset(void) e_bindings_wheel_reset(void)
{ {
E_Config_Binding_Wheel *ebw; E_Config_Binding_Wheel *ebw;
@ -281,7 +281,7 @@ e_bindings_wheel_reset(void)
ebw->any_mod, ebw->action, ebw->params); ebw->any_mod, ebw->action, ebw->params);
} }
EAPI void E_API void
e_bindings_edge_reset(void) e_bindings_edge_reset(void)
{ {
E_Config_Binding_Edge *ebe; E_Config_Binding_Edge *ebe;
@ -294,7 +294,7 @@ e_bindings_edge_reset(void)
ebe->any_mod, ebe->action, ebe->params, ebe->delay); ebe->any_mod, ebe->action, ebe->params, ebe->delay);
} }
EAPI void E_API void
e_bindings_mouse_reset(void) e_bindings_mouse_reset(void)
{ {
E_Config_Binding_Mouse *ebm; E_Config_Binding_Mouse *ebm;
@ -307,7 +307,7 @@ e_bindings_mouse_reset(void)
ebm->any_mod, ebm->action, ebm->params); ebm->any_mod, ebm->action, ebm->params);
} }
EAPI void E_API void
e_bindings_key_reset(void) e_bindings_key_reset(void)
{ {
E_Config_Binding_Key *ebk; E_Config_Binding_Key *ebk;
@ -322,7 +322,7 @@ e_bindings_key_reset(void)
e_managers_keys_grab(); e_managers_keys_grab();
} }
EAPI void E_API void
e_bindings_reset(void) e_bindings_reset(void)
{ {
e_bindings_signal_reset(); e_bindings_signal_reset();
@ -332,7 +332,7 @@ e_bindings_reset(void)
e_bindings_key_reset(); 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_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; 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); 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_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; 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_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win)
{ {
E_Binding_Mouse *binding; E_Binding_Mouse *binding;
@ -393,7 +393,7 @@ e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win)
} }
} }
EAPI void E_API void
e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win) e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
{ {
E_Binding_Mouse *binding; E_Binding_Mouse *binding;
@ -411,7 +411,7 @@ e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
} }
} }
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_bindings_mouse_button_find(E_Binding_Context ctxt, E_Binding_Event_Mouse_Button *ev, E_Binding_Mouse **bind_ret)
{ {
E_Binding_Mouse *binding; E_Binding_Mouse *binding;
@ -435,7 +435,7 @@ e_bindings_mouse_button_find(E_Binding_Context ctxt, E_Binding_Event_Mouse_Butto
return NULL; 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_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev)
{ {
E_Action *act; E_Action *act;
@ -453,7 +453,7 @@ e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Bind
return act; 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_bindings_mouse_down_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Down *ev)
{ {
E_Binding_Event_Mouse_Button event; E_Binding_Event_Mouse_Button event;
@ -463,7 +463,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); 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_bindings_mouse_down_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev)
{ {
E_Binding_Event_Mouse_Button event; E_Binding_Event_Mouse_Button event;
@ -473,7 +473,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); 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_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Mouse_Button *ev)
{ {
E_Action *act; E_Action *act;
@ -491,7 +491,7 @@ e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Bindin
return act; 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_bindings_mouse_up_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Up *ev)
{ {
E_Binding_Event_Mouse_Button event; E_Binding_Event_Mouse_Button event;
@ -501,7 +501,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); 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_bindings_mouse_up_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Button *ev)
{ {
E_Binding_Event_Mouse_Button event; E_Binding_Event_Mouse_Button event;
@ -511,7 +511,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); 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_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; E_Binding_Key *binding;
@ -526,7 +526,7 @@ e_bindings_key_add(E_Binding_Context ctxt, const char *key, E_Binding_Modifier m
key_bindings = eina_list_append(key_bindings, binding); 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_bindings_key_get(const char *action)
{ {
E_Binding_Key *binding; E_Binding_Key *binding;
@ -540,7 +540,7 @@ e_bindings_key_get(const char *action)
return NULL; 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_bindings_key_find(const char *key, E_Binding_Modifier mod, int any_mod)
{ {
E_Binding_Key *binding; E_Binding_Key *binding;
@ -558,7 +558,7 @@ e_bindings_key_find(const char *key, E_Binding_Modifier mod, int any_mod)
return NULL; 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_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; E_Binding_Key *binding;
@ -582,7 +582,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_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win)
{ {
E_Binding_Key *binding; E_Binding_Key *binding;
@ -603,7 +603,7 @@ e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win)
} }
} }
EAPI void E_API void
e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win) e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
{ {
E_Binding_Key *binding; E_Binding_Key *binding;
@ -624,7 +624,7 @@ e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
} }
} }
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_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev)
{ {
E_Binding_Modifier mod = 0; E_Binding_Modifier mod = 0;
@ -657,7 +657,7 @@ e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Ev
return NULL; 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_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Key *ev)
{ {
E_Binding_Modifier mod = 0; E_Binding_Modifier mod = 0;
@ -690,7 +690,7 @@ e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Even
return NULL; return NULL;
} }
EAPI E_Action * E_API E_Action *
e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev) e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
{ {
E_Binding_Modifier mod = 0; E_Binding_Modifier mod = 0;
@ -715,7 +715,7 @@ e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
return NULL; return NULL;
} }
EAPI E_Action * E_API E_Action *
e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev) e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
{ {
E_Binding_Modifier mod = 0; E_Binding_Modifier mod = 0;
@ -740,7 +740,7 @@ e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
return NULL; return NULL;
} }
EAPI Eina_Bool E_API Eina_Bool
e_bindings_key_allowed(const char *key) e_bindings_key_allowed(const char *key)
{ {
if (!key) return EINA_FALSE; if (!key) return EINA_FALSE;
@ -767,7 +767,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_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; E_Binding_Edge *binding;
@ -786,7 +786,7 @@ e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_onl
e_zone_edge_new(edge); e_zone_edge_new(edge);
} }
EAPI Eina_Bool E_API Eina_Bool
e_bindings_edge_flippable_get(E_Zone_Edge edge) e_bindings_edge_flippable_get(E_Zone_Edge edge)
{ {
E_Binding_Edge *binding; E_Binding_Edge *binding;
@ -804,7 +804,7 @@ e_bindings_edge_flippable_get(E_Zone_Edge edge)
return EINA_FALSE; return EINA_FALSE;
} }
EAPI Eina_Bool E_API Eina_Bool
e_bindings_edge_non_flippable_get(E_Zone_Edge edge) e_bindings_edge_non_flippable_get(E_Zone_Edge edge)
{ {
E_Binding_Edge *binding; E_Binding_Edge *binding;
@ -823,7 +823,7 @@ e_bindings_edge_non_flippable_get(E_Zone_Edge edge)
return EINA_FALSE; 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_bindings_edge_get(const char *action, E_Zone_Edge edge, int click)
{ {
E_Binding_Edge *binding; E_Binding_Edge *binding;
@ -841,7 +841,7 @@ e_bindings_edge_get(const char *action, E_Zone_Edge edge, int click)
return NULL; 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_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; E_Binding_Edge *binding;
@ -873,7 +873,7 @@ e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, Eina_Bool drag_onl
e_zone_edge_free(edge); 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_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev)
{ {
E_Binding_Modifier mod = 0; E_Binding_Modifier mod = 0;
@ -923,7 +923,7 @@ e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Z
return act; 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_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev)
{ {
E_Binding_Modifier mod = 0; E_Binding_Modifier mod = 0;
@ -965,7 +965,7 @@ e_bindings_edge_out_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_
return act; 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_bindings_edge_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev)
{ {
E_Binding_Modifier mod = 0; E_Binding_Modifier mod = 0;
@ -1002,7 +1002,7 @@ e_bindings_edge_down_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event
return act; 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_bindings_edge_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Zone_Edge *ev)
{ {
E_Binding_Modifier mod = 0; E_Binding_Modifier mod = 0;
@ -1030,7 +1030,7 @@ e_bindings_edge_up_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Z
return act; 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_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; E_Binding_Signal *binding;
@ -1046,7 +1046,7 @@ e_bindings_signal_add(E_Binding_Context ctxt, const char *sig, const char *src,
signal_bindings = eina_list_append(signal_bindings, binding); 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_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; E_Binding_Signal *binding;
@ -1073,7 +1073,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_bindings_signal_find(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Signal **bind_ret)
{ {
E_Binding_Modifier mod = 0; E_Binding_Modifier mod = 0;
@ -1103,7 +1103,7 @@ e_bindings_signal_find(E_Binding_Context ctxt, const char *sig, const char *src,
return NULL; 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_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, const char *sig, const char *src)
{ {
E_Action *act; E_Action *act;
@ -1124,7 +1124,7 @@ e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, const char *sig,
return act; 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_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; E_Binding_Wheel *binding;
@ -1140,7 +1140,7 @@ e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Mod
wheel_bindings = eina_list_append(wheel_bindings, binding); 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_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; E_Binding_Wheel *binding;
@ -1165,7 +1165,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_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win)
{ {
E_Binding_Wheel *binding; E_Binding_Wheel *binding;
@ -1199,7 +1199,7 @@ e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win)
} }
} }
EAPI void E_API void
e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win) e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
{ {
E_Binding_Wheel *binding; E_Binding_Wheel *binding;
@ -1232,7 +1232,7 @@ e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
} }
} }
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_bindings_wheel_find(E_Binding_Context ctxt, E_Binding_Event_Wheel *ev, E_Binding_Wheel **bind_ret)
{ {
E_Binding_Wheel *binding; E_Binding_Wheel *binding;
@ -1257,7 +1257,7 @@ e_bindings_wheel_find(E_Binding_Context ctxt, E_Binding_Event_Wheel *ev, E_Bindi
return NULL; 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_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_Event_Wheel *ev)
{ {
E_Action *act; E_Action *act;
@ -1275,7 +1275,7 @@ e_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Binding_E
return act; 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_bindings_wheel_evas_event_handle(E_Binding_Context ctxt, E_Object *obj, Evas_Event_Mouse_Wheel *ev)
{ {
E_Binding_Event_Wheel event; E_Binding_Event_Wheel event;
@ -1285,7 +1285,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); 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_bindings_wheel_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mouse_Wheel *ev)
{ {
E_Binding_Event_Wheel event; E_Binding_Event_Wheel event;
@ -1295,7 +1295,7 @@ e_bindings_wheel_ecore_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore
return e_bindings_wheel_event_handle(ctxt, obj, &event); 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_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *action, const char *params)
{ {
E_Binding_Acpi *binding; E_Binding_Acpi *binding;
@ -1309,7 +1309,7 @@ e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *ac
acpi_bindings = eina_list_append(acpi_bindings, binding); 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_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *action, const char *params)
{ {
E_Binding_Acpi *binding; E_Binding_Acpi *binding;
@ -1331,7 +1331,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_bindings_acpi_find(E_Binding_Context ctxt, E_Event_Acpi *ev, E_Binding_Acpi **bind_ret)
{ {
E_Binding_Acpi *binding; E_Binding_Acpi *binding;
@ -1360,7 +1360,7 @@ e_bindings_acpi_find(E_Binding_Context ctxt, E_Event_Acpi *ev, E_Binding_Acpi **
return NULL; 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_bindings_acpi_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Acpi *ev)
{ {
E_Action *act; E_Action *act;

118
src/bin/e_bindings.h
View File

@ -133,73 +133,73 @@ struct _E_Binding_Acpi
EINTERN int e_bindings_init(void); EINTERN int e_bindings_init(void);
EINTERN int e_bindings_shutdown(void); EINTERN int e_bindings_shutdown(void);
EAPI void e_bindings_mouse_reset(void); E_API void e_bindings_mouse_reset(void);
EAPI void e_bindings_key_reset(void); E_API void e_bindings_key_reset(void);
EAPI void e_bindings_wheel_reset(void); E_API void e_bindings_wheel_reset(void);
EAPI void e_bindings_edge_reset(void); E_API void e_bindings_edge_reset(void);
EAPI void e_bindings_signal_reset(void); E_API void e_bindings_signal_reset(void);
EAPI void e_bindings_reset(void); E_API 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); 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);
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); 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);
EAPI void e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); 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);
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); 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);
EAPI E_Binding_Key *e_bindings_key_get(const char *action); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); 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);
EAPI Eina_Bool e_bindings_edge_flippable_get(E_Zone_Edge edge); E_API Eina_Bool e_bindings_edge_flippable_get(E_Zone_Edge edge);
EAPI Eina_Bool e_bindings_edge_non_flippable_get(E_Zone_Edge edge); E_API 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); E_API 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); 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);
EAPI 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_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); E_API 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); E_API 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); E_API 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); 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);
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); 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);
EAPI 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_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); E_API 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); 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);
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); 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);
EAPI void e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API int e_bindings_evas_modifiers_convert(Evas_Modifier *modifiers);
EAPI int e_bindings_modifiers_to_ecore_convert(E_Binding_Modifier modifiers); E_API 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); E_API 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); E_API 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); E_API 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_ecore_event_mouse_wheel_convert(const Ecore_Event_Mouse_Wheel *ev, E_Binding_Event_Wheel *event);
#endif #endif
#endif #endif

46
src/bin/e_box.c
View File

@ -100,14 +100,14 @@ _e_box_item_nth_get(E_Smart_Data *sd, unsigned int n)
} }
/* externally accessible functions */ /* externally accessible functions */
EAPI Evas_Object * E_API Evas_Object *
e_box_add(Evas *evas) e_box_add(Evas *evas)
{ {
_e_box_smart_init(); _e_box_smart_init();
return evas_object_smart_add(evas, _e_smart); return evas_object_smart_add(evas, _e_smart);
} }
EAPI int E_API int
e_box_freeze(Evas_Object *obj) e_box_freeze(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -119,7 +119,7 @@ e_box_freeze(Evas_Object *obj)
return sd->frozen; return sd->frozen;
} }
EAPI int E_API int
e_box_thaw(Evas_Object *obj) e_box_thaw(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -132,7 +132,7 @@ e_box_thaw(Evas_Object *obj)
return sd->frozen; return sd->frozen;
} }
EAPI void E_API void
e_box_orientation_set(Evas_Object *obj, int horizontal) e_box_orientation_set(Evas_Object *obj, int horizontal)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -146,7 +146,7 @@ e_box_orientation_set(Evas_Object *obj, int horizontal)
if (sd->frozen <= 0) _e_box_smart_reconfigure(sd); if (sd->frozen <= 0) _e_box_smart_reconfigure(sd);
} }
EAPI int E_API int
e_box_orientation_get(Evas_Object *obj) e_box_orientation_get(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -157,7 +157,7 @@ e_box_orientation_get(Evas_Object *obj)
return sd->horizontal; return sd->horizontal;
} }
EAPI void E_API void
e_box_homogenous_set(Evas_Object *obj, int homogenous) e_box_homogenous_set(Evas_Object *obj, int homogenous)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -171,7 +171,7 @@ e_box_homogenous_set(Evas_Object *obj, int homogenous)
if (sd->frozen <= 0) _e_box_smart_reconfigure(sd); if (sd->frozen <= 0) _e_box_smart_reconfigure(sd);
} }
EAPI int E_API int
e_box_pack_start(Evas_Object *obj, Evas_Object *child) e_box_pack_start(Evas_Object *obj, Evas_Object *child)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -192,7 +192,7 @@ e_box_pack_start(Evas_Object *obj, Evas_Object *child)
return 0; return 0;
} }
EAPI int E_API int
e_box_pack_end(Evas_Object *obj, Evas_Object *child) e_box_pack_end(Evas_Object *obj, Evas_Object *child)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -213,7 +213,7 @@ e_box_pack_end(Evas_Object *obj, Evas_Object *child)
return sd->item_count - 1; return sd->item_count - 1;
} }
EAPI int E_API int
e_box_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *before) e_box_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *before)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -240,7 +240,7 @@ e_box_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *before)
return i; return i;
} }
EAPI int E_API int
e_box_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after) e_box_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -266,7 +266,7 @@ e_box_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after)
return i; return i;
} }
EAPI int E_API int
e_box_pack_count_get(Evas_Object *obj) e_box_pack_count_get(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -277,7 +277,7 @@ e_box_pack_count_get(Evas_Object *obj)
return sd->item_count; return sd->item_count;
} }
EAPI Evas_Object * E_API Evas_Object *
e_box_pack_object_nth(Evas_Object *obj, int n) e_box_pack_object_nth(Evas_Object *obj, int n)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -288,7 +288,7 @@ e_box_pack_object_nth(Evas_Object *obj, int n)
return _e_box_item_nth_get(sd, n); return _e_box_item_nth_get(sd, n);
} }
EAPI Evas_Object * E_API Evas_Object *
e_box_pack_object_first(Evas_Object *obj) e_box_pack_object_first(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -299,7 +299,7 @@ e_box_pack_object_first(Evas_Object *obj)
return sd->items ? sd->items->obj : NULL; return sd->items ? sd->items->obj : NULL;
} }
EAPI Evas_Object * E_API Evas_Object *
e_box_pack_object_last(Evas_Object *obj) e_box_pack_object_last(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -310,7 +310,7 @@ e_box_pack_object_last(Evas_Object *obj)
return EINA_INLIST_CONTAINER_GET(EINA_INLIST_GET(sd->items)->last, E_Box_Item)->obj; return EINA_INLIST_CONTAINER_GET(EINA_INLIST_GET(sd->items)->last, E_Box_Item)->obj;
} }
EAPI void E_API void
e_box_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_box_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_Box_Item *bi; E_Box_Item *bi;
@ -331,7 +331,7 @@ e_box_pack_options_set(Evas_Object *obj, int fill_w, int fill_h, int expand_w, i
if (bi->sd->frozen <= 0) _e_box_smart_reconfigure(bi->sd); if (bi->sd->frozen <= 0) _e_box_smart_reconfigure(bi->sd);
} }
EAPI void E_API void
e_box_unpack(Evas_Object *obj) e_box_unpack(Evas_Object *obj)
{ {
E_Box_Item *bi; E_Box_Item *bi;
@ -345,7 +345,7 @@ e_box_unpack(Evas_Object *obj)
_e_box_unpack_internal(sd, bi); _e_box_unpack_internal(sd, bi);
} }
EAPI void E_API void
e_box_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) e_box_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -358,7 +358,7 @@ e_box_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
if (minh) *minh = sd->min.h; if (minh) *minh = sd->min.h;
} }
EAPI void E_API void
e_box_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh) e_box_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -371,7 +371,7 @@ e_box_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
if (maxh) *maxh = sd->max.h; if (maxh) *maxh = sd->max.h;
} }
EAPI void E_API void
e_box_align_get(Evas_Object *obj, double *ax, double *ay) e_box_align_get(Evas_Object *obj, double *ax, double *ay)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -383,7 +383,7 @@ e_box_align_get(Evas_Object *obj, double *ax, double *ay)
if (ay) *ay = sd->align.y; if (ay) *ay = sd->align.y;
} }
EAPI void E_API void
e_box_align_set(Evas_Object *obj, double ax, double ay) e_box_align_set(Evas_Object *obj, double ax, double ay)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -401,7 +401,7 @@ e_box_align_set(Evas_Object *obj, double ax, double ay)
/* /*
* Returns the number of pixels that are hidden on the left/top side. * Returns the number of pixels that are hidden on the left/top side.
*/ */
EAPI void E_API void
e_box_align_pixel_offset_get(Evas_Object *obj, int *x, int *y) e_box_align_pixel_offset_get(Evas_Object *obj, int *x, int *y)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -413,7 +413,7 @@ e_box_align_pixel_offset_get(Evas_Object *obj, int *x, int *y)
if (y) *y = (sd->min.h - sd->h) * (1.0 - sd->align.y); if (y) *y = (sd->min.h - sd->h) * (1.0 - sd->align.y);
} }
EAPI Evas_Object * E_API Evas_Object *
e_box_item_at_xy_get(Evas_Object *obj, Evas_Coord x, Evas_Coord y) e_box_item_at_xy_get(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -454,7 +454,7 @@ e_box_item_at_xy_get(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
return NULL; return NULL;
} }
EAPI Eina_Bool E_API Eina_Bool
e_box_item_size_get(Evas_Object *obj, int *w, int *h) e_box_item_size_get(Evas_Object *obj, int *w, int *h)
{ {
E_Box_Item *bi; E_Box_Item *bi;

46
src/bin/e_box.h
View File

@ -3,28 +3,28 @@
#ifndef E_BOX_H #ifndef E_BOX_H
#define E_BOX_H #define E_BOX_H
EAPI Evas_Object *e_box_add (Evas *evas); E_API Evas_Object *e_box_add (Evas *evas);
EAPI int e_box_freeze (Evas_Object *obj); E_API int e_box_freeze (Evas_Object *obj);
EAPI int e_box_thaw (Evas_Object *obj); E_API int e_box_thaw (Evas_Object *obj);
EAPI void e_box_orientation_set (Evas_Object *obj, int horizontal); E_API void e_box_orientation_set (Evas_Object *obj, int horizontal);
EAPI int e_box_orientation_get (Evas_Object *obj); E_API int e_box_orientation_get (Evas_Object *obj);
EAPI void e_box_homogenous_set (Evas_Object *obj, int homogenous); E_API void e_box_homogenous_set (Evas_Object *obj, int homogenous);
EAPI int e_box_pack_start (Evas_Object *obj, Evas_Object *child); E_API int e_box_pack_start (Evas_Object *obj, Evas_Object *child);
EAPI int e_box_pack_end (Evas_Object *obj, Evas_Object *child); E_API int e_box_pack_end (Evas_Object *obj, Evas_Object *child);
EAPI int e_box_pack_before (Evas_Object *obj, Evas_Object *child, Evas_Object *before); E_API int e_box_pack_before (Evas_Object *obj, Evas_Object *child, Evas_Object *before);
EAPI int e_box_pack_after (Evas_Object *obj, Evas_Object *child, Evas_Object *after); E_API int e_box_pack_after (Evas_Object *obj, Evas_Object *child, Evas_Object *after);
EAPI int e_box_pack_count_get (Evas_Object *obj); E_API int e_box_pack_count_get (Evas_Object *obj);
EAPI Evas_Object *e_box_pack_object_nth (Evas_Object *obj, int n); E_API Evas_Object *e_box_pack_object_nth (Evas_Object *obj, int n);
EAPI Evas_Object *e_box_pack_object_first (Evas_Object *obj); E_API Evas_Object *e_box_pack_object_first (Evas_Object *obj);
EAPI Evas_Object *e_box_pack_object_last (Evas_Object *obj); E_API Evas_Object *e_box_pack_object_last (Evas_Object *obj);
EAPI void e_box_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_box_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_box_unpack (Evas_Object *obj); E_API void e_box_unpack (Evas_Object *obj);
EAPI void e_box_size_min_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh); E_API void e_box_size_min_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
EAPI void e_box_size_max_get (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh); E_API void e_box_size_max_get (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
EAPI void e_box_align_get (Evas_Object *obj, double *ax, double *ay); E_API void e_box_align_get (Evas_Object *obj, double *ax, double *ay);
EAPI void e_box_align_set (Evas_Object *obj, double ax, double ay); E_API void e_box_align_set (Evas_Object *obj, double ax, double ay);
EAPI void e_box_align_pixel_offset_get (Evas_Object *obj, int *x, int *y); E_API void e_box_align_pixel_offset_get (Evas_Object *obj, int *x, int *y);
EAPI Evas_Object *e_box_item_at_xy_get(Evas_Object *obj, Evas_Coord x, Evas_Coord y); E_API Evas_Object *e_box_item_at_xy_get(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
EAPI Eina_Bool e_box_item_size_get(Evas_Object *obj, int *w, int *h); E_API Eina_Bool e_box_item_size_get(Evas_Object *obj, int *w, int *h);
#endif #endif
#endif #endif

18
src/bin/e_canvas.c
View File

@ -8,7 +8,7 @@ static Eina_List *_e_canvases = NULL;
static Ecore_Poller *_e_canvas_cache_flush_poller = NULL; static Ecore_Poller *_e_canvas_cache_flush_poller = NULL;
/* externally accessible functions */ /* externally accessible functions */
EAPI void E_API void
e_canvas_add(Ecore_Evas *ee) e_canvas_add(Ecore_Evas *ee)
{ {
Evas *e; Evas *e;
@ -38,13 +38,13 @@ e_canvas_add(Ecore_Evas *ee)
evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE); evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE);
} }
EAPI void E_API void
e_canvas_del(Ecore_Evas *ee) e_canvas_del(Ecore_Evas *ee)
{ {
_e_canvases = eina_list_remove(_e_canvases, ee); _e_canvases = eina_list_remove(_e_canvases, ee);
} }
EAPI void E_API void
e_canvas_recache(void) e_canvas_recache(void)
{ {
Eina_List *l; Eina_List *l;
@ -74,7 +74,7 @@ e_canvas_recache(void)
} }
} }
EAPI void E_API void
e_canvas_cache_flush(void) e_canvas_cache_flush(void)
{ {
Eina_List *l; Eina_List *l;
@ -92,7 +92,7 @@ e_canvas_cache_flush(void)
edje_collection_cache_flush(); edje_collection_cache_flush();
} }
EAPI void E_API void
e_canvas_cache_reload(void) e_canvas_cache_reload(void)
{ {
Eina_List *l; Eina_List *l;
@ -107,7 +107,7 @@ e_canvas_cache_reload(void)
} }
} }
EAPI void E_API void
e_canvas_idle_flush(void) e_canvas_idle_flush(void)
{ {
Eina_List *l; Eina_List *l;
@ -122,7 +122,7 @@ e_canvas_idle_flush(void)
} }
} }
EAPI void E_API void
e_canvas_rehint(void) e_canvas_rehint(void)
{ {
Eina_List *l; Eina_List *l;
@ -142,7 +142,7 @@ e_canvas_rehint(void)
} }
} }
EAPI Ecore_Evas * E_API Ecore_Evas *
e_canvas_new(Ecore_Window win, int x, int y, int w, int h, e_canvas_new(Ecore_Window win, int x, int y, int w, int h,
int direct_resize, int override, Ecore_Window *win_ret) int direct_resize, int override, Ecore_Window *win_ret)
{ {
@ -181,7 +181,7 @@ e_canvas_new(Ecore_Window win, int x, int y, int w, int h,
return ee; return ee;
} }
EAPI const Eina_List * E_API const Eina_List *
e_canvas_list(void) e_canvas_list(void)
{ {
return _e_canvases; return _e_canvases;

18
src/bin/e_canvas.h
View File

@ -3,15 +3,15 @@
#ifndef E_CANVAS_H #ifndef E_CANVAS_H
#define E_CANVAS_H #define E_CANVAS_H
EAPI void e_canvas_add(Ecore_Evas *ee); E_API void e_canvas_add(Ecore_Evas *ee);
EAPI void e_canvas_del(Ecore_Evas *ee); E_API void e_canvas_del(Ecore_Evas *ee);
EAPI void e_canvas_recache(void); E_API void e_canvas_recache(void);
EAPI void e_canvas_cache_flush(void); E_API void e_canvas_cache_flush(void);
EAPI void e_canvas_cache_reload(void); E_API void e_canvas_cache_reload(void);
EAPI void e_canvas_idle_flush(void); E_API void e_canvas_idle_flush(void);
EAPI void e_canvas_rehint(void); E_API void e_canvas_rehint(void);
EAPI Ecore_Evas *e_canvas_new(Ecore_Window win, int x, int y, int w, int h, int direct_resize, int override, Ecore_Window *win_ret); E_API Ecore_Evas *e_canvas_new(Ecore_Window win, int x, int y, int w, int h, int direct_resize, int override, Ecore_Window *win_ret);
EAPI const Eina_List *e_canvas_list(void); E_API const Eina_List *e_canvas_list(void);
#endif #endif
#endif #endif

188
src/bin/e_client.c
View File

@ -3,22 +3,22 @@
static int _e_client_hooks_delete = 0; static int _e_client_hooks_delete = 0;
static int _e_client_hooks_walking = 0; static int _e_client_hooks_walking = 0;
EAPI int E_EVENT_CLIENT_ADD = -1; E_API int E_EVENT_CLIENT_ADD = -1;
EAPI int E_EVENT_CLIENT_REMOVE = -1; E_API int E_EVENT_CLIENT_REMOVE = -1;
EAPI int E_EVENT_CLIENT_ZONE_SET = -1; E_API int E_EVENT_CLIENT_ZONE_SET = -1;
EAPI int E_EVENT_CLIENT_DESK_SET = -1; E_API int E_EVENT_CLIENT_DESK_SET = -1;
EAPI int E_EVENT_CLIENT_RESIZE = -1; E_API int E_EVENT_CLIENT_RESIZE = -1;
EAPI int E_EVENT_CLIENT_MOVE = -1; E_API int E_EVENT_CLIENT_MOVE = -1;
EAPI int E_EVENT_CLIENT_SHOW = -1; E_API int E_EVENT_CLIENT_SHOW = -1;
EAPI int E_EVENT_CLIENT_HIDE = -1; E_API int E_EVENT_CLIENT_HIDE = -1;
EAPI int E_EVENT_CLIENT_ICONIFY = -1; E_API int E_EVENT_CLIENT_ICONIFY = -1;
EAPI int E_EVENT_CLIENT_UNICONIFY = -1; E_API int E_EVENT_CLIENT_UNICONIFY = -1;
EAPI int E_EVENT_CLIENT_STACK = -1; E_API int E_EVENT_CLIENT_STACK = -1;
EAPI int E_EVENT_CLIENT_FOCUS_IN = -1; E_API int E_EVENT_CLIENT_FOCUS_IN = -1;
EAPI int E_EVENT_CLIENT_FOCUS_OUT = -1; E_API int E_EVENT_CLIENT_FOCUS_OUT = -1;
EAPI int E_EVENT_CLIENT_PROPERTY = -1; E_API int E_EVENT_CLIENT_PROPERTY = -1;
EAPI int E_EVENT_CLIENT_FULLSCREEN = -1; E_API int E_EVENT_CLIENT_FULLSCREEN = -1;
EAPI int E_EVENT_CLIENT_UNFULLSCREEN = -1; E_API int E_EVENT_CLIENT_UNFULLSCREEN = -1;
static Eina_Hash *clients_hash = NULL; // pixmap->client static Eina_Hash *clients_hash = NULL; // pixmap->client
@ -2450,7 +2450,7 @@ e_client_shutdown(void)
warp_client = NULL; warp_client = NULL;
} }
EAPI E_Client * E_API E_Client *
e_client_new(E_Comp *c, E_Pixmap *cp, int first_map, int internal) e_client_new(E_Comp *c, E_Pixmap *cp, int first_map, int internal)
{ {
E_Client *ec; E_Client *ec;
@ -2580,7 +2580,7 @@ e_client_new(E_Comp *c, E_Pixmap *cp, int first_map, int internal)
return ec; return ec;
} }
EAPI Eina_Bool E_API Eina_Bool
e_client_desk_window_profile_available_check(E_Client *ec, const char *profile) e_client_desk_window_profile_available_check(E_Client *ec, const char *profile)
{ {
int i; int i;
@ -2601,7 +2601,7 @@ e_client_desk_window_profile_available_check(E_Client *ec, const char *profile)
return EINA_FALSE; return EINA_FALSE;
} }
EAPI void E_API void
e_client_desk_window_profile_wait_desk_set(E_Client *ec, E_Desk *desk) e_client_desk_window_profile_wait_desk_set(E_Client *ec, E_Desk *desk)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -2636,7 +2636,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)); 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_client_desk_set(E_Client *ec, E_Desk *desk)
{ {
E_Event_Client_Desk_Set *ev; E_Event_Client_Desk_Set *ev;
@ -2718,26 +2718,26 @@ e_client_desk_set(E_Client *ec, E_Desk *desk)
evas_object_smart_callback_call(ec->frame, "desk_change", ec); evas_object_smart_callback_call(ec->frame, "desk_change", ec);
} }
EAPI Eina_Bool E_API Eina_Bool
e_client_comp_grabbed_get(void) e_client_comp_grabbed_get(void)
{ {
return comp_grabbed; return comp_grabbed;
} }
EAPI E_Client * E_API E_Client *
e_client_action_get(void) e_client_action_get(void)
{ {
return action_client; return action_client;
} }
EAPI E_Client * E_API E_Client *
e_client_warping_get(void) e_client_warping_get(void)
{ {
return warp_client; return warp_client;
} }
EAPI Eina_List * E_API Eina_List *
e_clients_immortal_list(const E_Comp *c) e_clients_immortal_list(const E_Comp *c)
{ {
const Eina_List *l, *ll; const Eina_List *l, *ll;
@ -2766,7 +2766,7 @@ e_clients_immortal_list(const E_Comp *c)
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
EAPI void E_API void
e_client_mouse_in(E_Client *ec, int x, int y) e_client_mouse_in(E_Client *ec, int x, int y)
{ {
if (comp_grabbed) return; if (comp_grabbed) return;
@ -2780,7 +2780,7 @@ e_client_mouse_in(E_Client *ec, int x, int y)
e_focus_event_mouse_in(ec); e_focus_event_mouse_in(ec);
} }
EAPI void E_API void
e_client_mouse_out(E_Client *ec, int x, int y) e_client_mouse_out(E_Client *ec, int x, int y)
{ {
if (comp_grabbed) return; if (comp_grabbed) return;
@ -2796,7 +2796,7 @@ e_client_mouse_out(E_Client *ec, int x, int y)
e_focus_event_mouse_out(ec); 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) e_client_mouse_wheel(E_Client *ec, Evas_Point *output, E_Binding_Event_Wheel *ev)
{ {
EINA_SAFETY_ON_NULL_RETURN(ec); EINA_SAFETY_ON_NULL_RETURN(ec);
@ -2807,7 +2807,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); 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) e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button *ev)
{ {
Eina_Bool did_act = EINA_FALSE; Eina_Bool did_act = EINA_FALSE;
@ -2873,7 +2873,7 @@ e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Even
ec->mouse.current.my = output->y; 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) e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_Mouse_Button* ev)
{ {
EINA_SAFETY_ON_NULL_RETURN(ec); EINA_SAFETY_ON_NULL_RETURN(ec);
@ -2914,7 +2914,7 @@ e_client_mouse_up(E_Client *ec, int button, Evas_Point *output, E_Binding_Event_
ec->drag.start = 0; ec->drag.start = 0;
} }
EAPI void E_API void
e_client_mouse_move(E_Client *ec, Evas_Point *output) e_client_mouse_move(E_Client *ec, Evas_Point *output)
{ {
EINA_SAFETY_ON_NULL_RETURN(ec); EINA_SAFETY_ON_NULL_RETURN(ec);
@ -3019,7 +3019,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_client_res_change_geometry_save(E_Client *ec)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -3037,7 +3037,7 @@ e_client_res_change_geometry_save(E_Client *ec)
ec->pre_res_change.saved.h = ec->saved.h; ec->pre_res_change.saved.h = ec->saved.h;
} }
EAPI void E_API void
e_client_res_change_geometry_restore(E_Client *ec) e_client_res_change_geometry_restore(E_Client *ec)
{ {
struct struct
@ -3109,7 +3109,7 @@ e_client_res_change_geometry_restore(E_Client *ec)
memcpy(&ec->pre_res_change, &pre_res_change, sizeof(pre_res_change)); 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_client_zone_set(E_Client *ec, E_Zone *zone)
{ {
E_Event_Client_Zone_Set *ev; E_Event_Client_Zone_Set *ev;
@ -3172,7 +3172,7 @@ e_client_zone_set(E_Client *ec, E_Zone *zone)
ec->pre_res_change.valid = 0; 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_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -3189,7 +3189,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) e_client_above_get(const E_Client *ec)
{ {
unsigned int x; unsigned int x;
@ -3216,7 +3216,7 @@ e_client_above_get(const E_Client *ec)
return NULL; return NULL;
} }
EAPI E_Client * E_API E_Client *
e_client_below_get(const E_Client *ec) e_client_below_get(const E_Client *ec)
{ {
unsigned int x; unsigned int x;
@ -3250,7 +3250,7 @@ e_client_below_get(const E_Client *ec)
return NULL; return NULL;
} }
EAPI E_Client * E_API E_Client *
e_client_bottom_get(const E_Comp *c) e_client_bottom_get(const E_Comp *c)
{ {
unsigned int x; unsigned int x;
@ -3269,7 +3269,7 @@ e_client_bottom_get(const E_Comp *c)
return NULL; return NULL;
} }
EAPI E_Client * E_API E_Client *
e_client_top_get(const E_Comp *c) e_client_top_get(const E_Comp *c)
{ {
unsigned int x; unsigned int x;
@ -3288,7 +3288,7 @@ e_client_top_get(const E_Comp *c)
return NULL; return NULL;
} }
EAPI unsigned int E_API unsigned int
e_clients_count(E_Comp *c) e_clients_count(E_Comp *c)
{ {
if (!c) return eina_hash_population(clients_hash); if (!c) return eina_hash_population(clients_hash);
@ -3300,7 +3300,7 @@ e_clients_count(E_Comp *c)
* Set a callback which will be called just prior to updating the * Set a callback which will be called just prior to updating the
* move coordinates for a border * 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) e_client_move_intercept_cb_set(E_Client *ec, E_Client_Move_Intercept_Cb cb)
{ {
ec->move_intercept_cb = cb; ec->move_intercept_cb = cb;
@ -3308,7 +3308,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_add(E_Client_Hook_Point hookpoint, E_Client_Hook_Cb func, const void *data)
{ {
E_Client_Hook *ch; E_Client_Hook *ch;
@ -3323,7 +3323,7 @@ e_client_hook_add(E_Client_Hook_Point hookpoint, E_Client_Hook_Cb func, const vo
return ch; return ch;
} }
EAPI void E_API void
e_client_hook_del(E_Client_Hook *ch) e_client_hook_del(E_Client_Hook *ch)
{ {
ch->delete_me = 1; ch->delete_me = 1;
@ -3338,39 +3338,39 @@ e_client_hook_del(E_Client_Hook *ch)
/////////////////////////////////////// ///////////////////////////////////////
EAPI void E_API void
e_client_focus_latest_set(E_Client *ec) e_client_focus_latest_set(E_Client *ec)
{ {
focus_stack = eina_list_remove(focus_stack, ec); focus_stack = eina_list_remove(focus_stack, ec);
focus_stack = eina_list_prepend(focus_stack, ec); focus_stack = eina_list_prepend(focus_stack, ec);
} }
EAPI void E_API void
e_client_raise_latest_set(E_Client *ec) e_client_raise_latest_set(E_Client *ec)
{ {
raise_stack = eina_list_remove(raise_stack, ec); raise_stack = eina_list_remove(raise_stack, ec);
raise_stack = eina_list_prepend(raise_stack, ec); raise_stack = eina_list_prepend(raise_stack, ec);
} }
EAPI Eina_Bool E_API Eina_Bool
e_client_focus_track_enabled(void) e_client_focus_track_enabled(void)
{ {
return !focus_track_frozen; return !focus_track_frozen;
} }
EAPI void E_API void
e_client_focus_track_freeze(void) e_client_focus_track_freeze(void)
{ {
focus_track_frozen++; focus_track_frozen++;
} }
EAPI void E_API void
e_client_focus_track_thaw(void) e_client_focus_track_thaw(void)
{ {
focus_track_frozen--; focus_track_frozen--;
} }
EAPI void E_API void
e_client_refocus(void) e_client_refocus(void)
{ {
E_Client *ec; E_Client *ec;
@ -3411,7 +3411,7 @@ e_client_refocus(void)
* the last focused window should get focus). * the last focused window should get focus).
* *
*/ */
EAPI void E_API void
e_client_focus_set_with_pointer(E_Client *ec) e_client_focus_set_with_pointer(E_Client *ec)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -3541,7 +3541,7 @@ e_client_focused_set(E_Client *ec)
_e_client_event_simple(ec, E_EVENT_CLIENT_FOCUS_IN); _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_client_activate(E_Client *ec, Eina_Bool just_do_it)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -3580,25 +3580,25 @@ e_client_activate(E_Client *ec, Eina_Bool just_do_it)
} }
} }
EAPI E_Client * E_API E_Client *
e_client_focused_get(void) e_client_focused_get(void)
{ {
return focused; return focused;
} }
EAPI Eina_List * E_API Eina_List *
e_client_focus_stack_get(void) e_client_focus_stack_get(void)
{ {
return focus_stack; return focus_stack;
} }
EAPI Eina_List * E_API Eina_List *
e_client_raise_stack_get(void) e_client_raise_stack_get(void)
{ {
return raise_stack; return raise_stack;
} }
EAPI Eina_List * E_API Eina_List *
e_client_lost_windows_get(E_Zone *zone) e_client_lost_windows_get(E_Zone *zone)
{ {
Eina_List *list = NULL; Eina_List *list = NULL;
@ -3631,7 +3631,7 @@ e_client_lost_windows_get(E_Zone *zone)
/////////////////////////////////////// ///////////////////////////////////////
EAPI void E_API void
e_client_shade(E_Client *ec, E_Direction dir) e_client_shade(E_Client *ec, E_Direction dir)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -3659,7 +3659,7 @@ e_client_shade(E_Client *ec, E_Direction dir)
e_remember_update(ec); e_remember_update(ec);
} }
EAPI void E_API void
e_client_unshade(E_Client *ec, E_Direction dir) e_client_unshade(E_Client *ec, E_Direction dir)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -3687,7 +3687,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_client_maximize(E_Client *ec, E_Maximize max)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -3749,7 +3749,7 @@ e_client_maximize(E_Client *ec, E_Maximize max)
evas_object_smart_callback_call(ec->frame, "maximize_done", NULL); 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_client_unmaximize(E_Client *ec, E_Maximize max)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -3859,7 +3859,7 @@ e_client_unmaximize(E_Client *ec, E_Maximize max)
evas_object_smart_callback_call(ec->frame, "unmaximize_done", NULL); evas_object_smart_callback_call(ec->frame, "unmaximize_done", NULL);
} }
EAPI void E_API void
e_client_fullscreen(E_Client *ec, E_Fullscreen policy) e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
{ {
int x, y, w, h; int x, y, w, h;
@ -3942,7 +3942,7 @@ e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
e_remember_update(ec); e_remember_update(ec);
} }
EAPI void E_API void
e_client_unfullscreen(E_Client *ec) e_client_unfullscreen(E_Client *ec)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -3983,7 +3983,7 @@ e_client_unfullscreen(E_Client *ec)
/////////////////////////////////////// ///////////////////////////////////////
EAPI void E_API void
e_client_iconify(E_Client *ec) e_client_iconify(E_Client *ec)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -4017,7 +4017,7 @@ e_client_iconify(E_Client *ec)
e_remember_update(ec); e_remember_update(ec);
} }
EAPI void E_API void
e_client_uniconify(E_Client *ec) e_client_uniconify(E_Client *ec)
{ {
E_Desk *desk; E_Desk *desk;
@ -4049,7 +4049,7 @@ e_client_uniconify(E_Client *ec)
/////////////////////////////////////// ///////////////////////////////////////
EAPI void E_API void
e_client_urgent_set(E_Client *ec, Eina_Bool urgent) e_client_urgent_set(E_Client *ec, Eina_Bool urgent)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -4079,7 +4079,7 @@ e_client_urgent_set(E_Client *ec, Eina_Bool urgent)
/////////////////////////////////////// ///////////////////////////////////////
EAPI void E_API void
e_client_stick(E_Client *ec) e_client_stick(E_Client *ec)
{ {
E_Desk *desk; E_Desk *desk;
@ -4113,7 +4113,7 @@ e_client_stick(E_Client *ec)
e_remember_update(ec); e_remember_update(ec);
} }
EAPI void E_API void
e_client_unstick(E_Client *ec) e_client_unstick(E_Client *ec)
{ {
E_Desk *desk; E_Desk *desk;
@ -4148,7 +4148,7 @@ e_client_unstick(E_Client *ec)
e_remember_update(ec); e_remember_update(ec);
} }
EAPI void E_API void
e_client_pinned_set(E_Client *ec, Eina_Bool set) e_client_pinned_set(E_Client *ec, Eina_Bool set)
{ {
E_Layer layer; E_Layer layer;
@ -4169,7 +4169,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) e_client_border_set(E_Client *ec, const char *name)
{ {
Eina_Stringshare *pborder; Eina_Stringshare *pborder;
@ -4199,7 +4199,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_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -4214,7 +4214,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) e_client_act_move_keyboard(E_Client *ec)
{ {
EINA_SAFETY_ON_NULL_RETURN(ec); EINA_SAFETY_ON_NULL_RETURN(ec);
@ -4235,7 +4235,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); 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) e_client_act_resize_keyboard(E_Client *ec)
{ {
EINA_SAFETY_ON_NULL_RETURN(ec); EINA_SAFETY_ON_NULL_RETURN(ec);
@ -4256,7 +4256,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); 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_client_act_move_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -4278,7 +4278,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_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -4291,7 +4291,7 @@ e_client_act_move_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED
_e_client_action_finish(); _e_client_action_finish();
} }
EAPI void E_API void
e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev) e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -4356,7 +4356,7 @@ e_client_act_resize_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev)
e_pointer_mode_push(ec, ec->resize_mode); 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_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUSED)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -4372,7 +4372,7 @@ e_client_act_resize_end(E_Client *ec, E_Binding_Event_Mouse_Button *ev EINA_UNUS
_e_client_action_finish(); _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_client_act_menu_begin(E_Client *ec, E_Binding_Event_Mouse_Button *ev, int key)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -4390,7 +4390,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_client_act_close_begin(E_Client *ec)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -4408,7 +4408,7 @@ e_client_act_close_begin(E_Client *ec)
} }
} }
EAPI void E_API void
e_client_act_kill_begin(E_Client *ec) e_client_act_kill_begin(E_Client *ec)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -4429,7 +4429,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) e_client_icon_add(E_Client *ec, Evas *evas)
{ {
Evas_Object *o; Evas_Object *o;
@ -4520,7 +4520,7 @@ e_client_icon_add(E_Client *ec, Evas *evas)
//////////////////////////////////////////// ////////////////////////////////////////////
EAPI void E_API void
e_client_ping(E_Client *ec) e_client_ping(E_Client *ec)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -4537,7 +4537,7 @@ e_client_ping(E_Client *ec)
//////////////////////////////////////////// ////////////////////////////////////////////
EAPI void E_API void
e_client_move_cancel(void) e_client_move_cancel(void)
{ {
if (!ecmove) return; if (!ecmove) return;
@ -4559,7 +4559,7 @@ e_client_move_cancel(void)
_e_client_move_end(ecmove); _e_client_move_end(ecmove);
} }
EAPI void E_API void
e_client_resize_cancel(void) e_client_resize_cancel(void)
{ {
if (!ecresize) return; if (!ecresize) return;
@ -4581,7 +4581,7 @@ e_client_resize_cancel(void)
_e_client_resize_end(ecresize); _e_client_resize_end(ecresize);
} }
EAPI Eina_Bool E_API Eina_Bool
e_client_resize_begin(E_Client *ec) e_client_resize_begin(E_Client *ec)
{ {
if ((ec->shaded) || (ec->shading) || if ((ec->shaded) || (ec->shading) ||
@ -4610,7 +4610,7 @@ error:
//////////////////////////////////////////// ////////////////////////////////////////////
EAPI void E_API void
e_client_frame_recalc(E_Client *ec) e_client_frame_recalc(E_Client *ec)
{ {
EINA_SAFETY_ON_NULL_RETURN(ec); EINA_SAFETY_ON_NULL_RETURN(ec);
@ -4620,7 +4620,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_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_UNUSED)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -4634,7 +4634,7 @@ e_client_signal_move_begin(E_Client *ec, const char *sig, const char *src EINA_U
_e_client_moveinfo_gather(ec, sig); _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_client_signal_move_end(E_Client *ec, const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
{ {
E_OBJECT_CHECK(ec); E_OBJECT_CHECK(ec);
@ -4646,7 +4646,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); 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) 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; int resize_mode = E_POINTER_RESIZE_BR;
@ -4694,7 +4694,7 @@ e_client_signal_resize_begin(E_Client *ec, const char *dir, const char *sig, con
e_pointer_mode_push(ec, ec->resize_mode); 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_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); E_OBJECT_CHECK(ec);
@ -4708,7 +4708,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) e_client_resize_limit(E_Client *ec, int *w, int *h)
{ {
double a; double a;
@ -4805,7 +4805,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) e_client_under_pointer_get(E_Desk *desk, E_Client *exclude)
{ {
int x, y; int x, y;
@ -4837,7 +4837,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) e_client_pointer_warp_to_center_now(E_Client *ec)
{ {
if (e_config->disable_all_pointer_warps) return 0; if (e_config->disable_all_pointer_warps) return 0;
@ -4855,7 +4855,7 @@ e_client_pointer_warp_to_center_now(E_Client *ec)
return 1; return 1;
} }
EAPI int E_API int
e_client_pointer_warp_to_center(E_Client *ec) e_client_pointer_warp_to_center(E_Client *ec)
{ {
int x, y; int x, y;
@ -4904,7 +4904,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) e_client_redirected_set(E_Client *ec, Eina_Bool set)
{ {
EINA_SAFETY_ON_NULL_RETURN(ec); EINA_SAFETY_ON_NULL_RETURN(ec);
@ -4926,7 +4926,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) e_client_is_stacking(const E_Client *ec)
{ {
return ec->comp->layers[e_comp_canvas_layer_map(ec->layer)].obj == ec->frame; return ec->comp->layers[e_comp_canvas_layer_map(ec->layer)].obj == ec->frame;
@ -4934,7 +4934,7 @@ e_client_is_stacking(const E_Client *ec)
//////////////////////////////////////////// ////////////////////////////////////////////
EAPI void E_API void
e_client_layout_cb_set(E_Client_Layout_Cb cb) e_client_layout_cb_set(E_Client_Layout_Cb cb)
{ {
if (_e_client_layout_cb && cb) if (_e_client_layout_cb && cb)

188
src/bin/e_client.h
View File

@ -724,105 +724,105 @@ struct E_Client
for (EC = e_client_top_get(COMP); EC; EC = e_client_below_get(EC)) for (EC = e_client_top_get(COMP); EC; EC = e_client_below_get(EC))
EAPI extern int E_EVENT_CLIENT_ADD; E_API extern int E_EVENT_CLIENT_ADD;
EAPI extern int E_EVENT_CLIENT_REMOVE; E_API extern int E_EVENT_CLIENT_REMOVE;
EAPI extern int E_EVENT_CLIENT_ZONE_SET; E_API extern int E_EVENT_CLIENT_ZONE_SET;
EAPI extern int E_EVENT_CLIENT_DESK_SET; E_API extern int E_EVENT_CLIENT_DESK_SET;
EAPI extern int E_EVENT_CLIENT_RESIZE; E_API extern int E_EVENT_CLIENT_RESIZE;
EAPI extern int E_EVENT_CLIENT_MOVE; E_API extern int E_EVENT_CLIENT_MOVE;
EAPI extern int E_EVENT_CLIENT_SHOW; E_API extern int E_EVENT_CLIENT_SHOW;
EAPI extern int E_EVENT_CLIENT_HIDE; E_API extern int E_EVENT_CLIENT_HIDE;
EAPI extern int E_EVENT_CLIENT_ICONIFY; E_API extern int E_EVENT_CLIENT_ICONIFY;
EAPI extern int E_EVENT_CLIENT_UNICONIFY; E_API extern int E_EVENT_CLIENT_UNICONIFY;
EAPI extern int E_EVENT_CLIENT_STACK; E_API extern int E_EVENT_CLIENT_STACK;
EAPI extern int E_EVENT_CLIENT_FOCUS_IN; E_API extern int E_EVENT_CLIENT_FOCUS_IN;
EAPI extern int E_EVENT_CLIENT_FOCUS_OUT; E_API extern int E_EVENT_CLIENT_FOCUS_OUT;
EAPI extern int E_EVENT_CLIENT_PROPERTY; E_API extern int E_EVENT_CLIENT_PROPERTY;
EAPI extern int E_EVENT_CLIENT_FULLSCREEN; E_API extern int E_EVENT_CLIENT_FULLSCREEN;
EAPI extern int E_EVENT_CLIENT_UNFULLSCREEN; E_API extern int E_EVENT_CLIENT_UNFULLSCREEN;
EINTERN void e_client_idler_before(void); EINTERN void e_client_idler_before(void);
EINTERN Eina_Bool e_client_init(void); EINTERN Eina_Bool e_client_init(void);
EINTERN void e_client_shutdown(void); EINTERN void e_client_shutdown(void);
EAPI E_Client *e_client_new(E_Comp *c, E_Pixmap *cp, int first_map, int internal); E_API E_Client *e_client_new(E_Comp *c, E_Pixmap *cp, int first_map, int internal);
EAPI void e_client_desk_set(E_Client *ec, E_Desk *desk); E_API void e_client_desk_set(E_Client *ec, E_Desk *desk);
EAPI Eina_Bool e_client_comp_grabbed_get(void); E_API Eina_Bool e_client_comp_grabbed_get(void);
EAPI E_Client *e_client_action_get(void); E_API E_Client *e_client_action_get(void);
EAPI E_Client *e_client_warping_get(void); E_API E_Client *e_client_warping_get(void);
EAPI Eina_List *e_clients_immortal_list(const E_Comp *c); E_API Eina_List *e_clients_immortal_list(const E_Comp *c);
EAPI void e_client_mouse_in(E_Client *ec, int x, int y); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API void e_client_mouse_move(E_Client *ec, Evas_Point *output);
EAPI void e_client_res_change_geometry_save(E_Client *bd); E_API void e_client_res_change_geometry_save(E_Client *bd);
EAPI void e_client_res_change_geometry_restore(E_Client *ec); E_API void e_client_res_change_geometry_restore(E_Client *ec);
EAPI void e_client_zone_set(E_Client *ec, E_Zone *zone); E_API 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); E_API 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); E_API E_Client *e_client_above_get(const E_Client *ec);
EAPI E_Client *e_client_below_get(const E_Client *ec); E_API E_Client *e_client_below_get(const E_Client *ec);
EAPI E_Client *e_client_bottom_get(const E_Comp *c); E_API E_Client *e_client_bottom_get(const E_Comp *c);
EAPI E_Client *e_client_top_get(const E_Comp *c); E_API E_Client *e_client_top_get(const E_Comp *c);
EAPI unsigned int e_clients_count(E_Comp *c); E_API unsigned int e_clients_count(E_Comp *c);
EAPI void e_client_move_intercept_cb_set(E_Client *ec, E_Client_Move_Intercept_Cb cb); E_API 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); E_API 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); E_API void e_client_hook_del(E_Client_Hook *ch);
EAPI void e_client_focus_latest_set(E_Client *ec); E_API void e_client_focus_latest_set(E_Client *ec);
EAPI void e_client_raise_latest_set(E_Client *ec); E_API void e_client_raise_latest_set(E_Client *ec);
EAPI Eina_Bool e_client_focus_track_enabled(void); E_API Eina_Bool e_client_focus_track_enabled(void);
EAPI void e_client_focus_track_freeze(void); E_API void e_client_focus_track_freeze(void);
EAPI void e_client_focus_track_thaw(void); E_API void e_client_focus_track_thaw(void);
EAPI void e_client_refocus(void); E_API void e_client_refocus(void);
EAPI void e_client_focus_set_with_pointer(E_Client *ec); E_API void e_client_focus_set_with_pointer(E_Client *ec);
EAPI void e_client_activate(E_Client *ec, Eina_Bool just_do_it); E_API void e_client_activate(E_Client *ec, Eina_Bool just_do_it);
EAPI E_Client *e_client_focused_get(void); E_API E_Client *e_client_focused_get(void);
EAPI Eina_List *e_client_focus_stack_get(void); E_API Eina_List *e_client_focus_stack_get(void);
EAPI Eina_List *e_client_raise_stack_get(void); E_API Eina_List *e_client_raise_stack_get(void);
EAPI Eina_List *e_client_lost_windows_get(E_Zone *zone); E_API Eina_List *e_client_lost_windows_get(E_Zone *zone);
EAPI void e_client_shade(E_Client *ec, E_Direction dir); E_API void e_client_shade(E_Client *ec, E_Direction dir);
EAPI void e_client_unshade(E_Client *ec, E_Direction dir); E_API void e_client_unshade(E_Client *ec, E_Direction dir);
EAPI void e_client_maximize(E_Client *ec, E_Maximize max); E_API void e_client_maximize(E_Client *ec, E_Maximize max);
EAPI void e_client_unmaximize(E_Client *ec, E_Maximize max); E_API void e_client_unmaximize(E_Client *ec, E_Maximize max);
EAPI void e_client_fullscreen(E_Client *ec, E_Fullscreen policy); E_API void e_client_fullscreen(E_Client *ec, E_Fullscreen policy);
EAPI void e_client_unfullscreen(E_Client *ec); E_API void e_client_unfullscreen(E_Client *ec);
EAPI void e_client_iconify(E_Client *ec); E_API void e_client_iconify(E_Client *ec);
EAPI void e_client_uniconify(E_Client *ec); E_API void e_client_uniconify(E_Client *ec);
EAPI void e_client_urgent_set(E_Client *ec, Eina_Bool urgent); E_API void e_client_urgent_set(E_Client *ec, Eina_Bool urgent);
EAPI void e_client_stick(E_Client *ec); E_API void e_client_stick(E_Client *ec);
EAPI void e_client_unstick(E_Client *ec); E_API void e_client_unstick(E_Client *ec);
EAPI void e_client_pinned_set(E_Client *ec, Eina_Bool set); E_API void e_client_pinned_set(E_Client *ec, Eina_Bool set);
EAPI void e_client_comp_hidden_set(E_Client *ec, Eina_Bool hidden); E_API 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); E_API Eina_Bool e_client_border_set(E_Client *ec, const char *name);
EAPI void e_client_act_move_keyboard(E_Client *ec); E_API void e_client_act_move_keyboard(E_Client *ec);
EAPI void e_client_act_resize_keyboard(E_Client *ec); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API void e_client_act_close_begin(E_Client *ec);
EAPI void e_client_act_kill_begin(E_Client *ec); E_API void e_client_act_kill_begin(E_Client *ec);
EAPI Evas_Object *e_client_icon_add(E_Client *ec, Evas *evas); E_API Evas_Object *e_client_icon_add(E_Client *ec, Evas *evas);
EAPI void e_client_ping(E_Client *cw); E_API void e_client_ping(E_Client *cw);
EAPI void e_client_move_cancel(void); E_API void e_client_move_cancel(void);
EAPI void e_client_resize_cancel(void); E_API void e_client_resize_cancel(void);
EAPI Eina_Bool e_client_resize_begin(E_Client *ec); E_API Eina_Bool e_client_resize_begin(E_Client *ec);
EAPI void e_client_frame_recalc(E_Client *ec); E_API 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); E_API 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); E_API 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); E_API 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); 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);
EAPI void e_client_resize_limit(E_Client *ec, int *w, int *h); E_API 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); E_API 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); E_API int e_client_pointer_warp_to_center_now(E_Client *ec);
EAPI int e_client_pointer_warp_to_center(E_Client *ec); E_API int e_client_pointer_warp_to_center(E_Client *ec);
EAPI void e_client_redirected_set(E_Client *ec, Eina_Bool set); E_API void e_client_redirected_set(E_Client *ec, Eina_Bool set);
EAPI Eina_Bool e_client_is_stacking(const E_Client *ec); E_API 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); E_API 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); E_API 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); E_API void e_client_layout_cb_set(E_Client_Layout_Cb cb);
#include "e_client.x" #include "e_client.x"
#endif #endif

6
src/bin/e_color.h
View File

@ -25,8 +25,8 @@ struct _E_Color
int a; int a;
}; };
EAPI void e_color_update_rgb (E_Color *ec); E_API void e_color_update_rgb (E_Color *ec);
EAPI void e_color_update_hsv (E_Color *ec); E_API 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_copy (const E_Color *from, E_Color *to);
#endif #endif
#endif #endif

18
src/bin/e_color_class.c
View File

@ -37,7 +37,7 @@ e_color_class_node_find_stringshared(const char *name)
return NULL; return NULL;
} }
EAPI E_Color_Class * E_API E_Color_Class *
e_color_class_find_stringshared(const char *name) e_color_class_find_stringshared(const char *name)
{ {
Eina_List *l = e_color_class_node_find_stringshared(name); Eina_List *l = e_color_class_node_find_stringshared(name);
@ -45,7 +45,7 @@ e_color_class_find_stringshared(const char *name)
return l->data; return l->data;
} }
EAPI E_Color_Class * E_API E_Color_Class *
e_color_class_find(const char *name) e_color_class_find(const char *name)
{ {
E_Color_Class *cc; E_Color_Class *cc;
@ -57,7 +57,7 @@ e_color_class_find(const char *name)
return cc; return cc;
} }
EAPI void E_API void
e_color_class_instance_set(E_Color_Class *cc, int r, int g, int b, int a, int r2, int b2, int g2, int a2, int r3, int g3, int b3, int a3) e_color_class_instance_set(E_Color_Class *cc, int r, int g, int b, int a, int r2, int b2, int g2, int a2, int r3, int g3, int b3, int a3)
{ {
if (!cc) return; if (!cc) return;
@ -82,7 +82,7 @@ e_color_class_instance_set(E_Color_Class *cc, int r, int g, int b, int a, int r2
e_config_save_queue(); e_config_save_queue();
} }
EAPI E_Color_Class * E_API E_Color_Class *
e_color_class_set_stringshared(const char *color_class, int r, int g, int b, int a, int r2, int b2, int g2, int a2, int r3, int g3, int b3, int a3) e_color_class_set_stringshared(const char *color_class, int r, int g, int b, int a, int r2, int b2, int g2, int a2, int r3, int g3, int b3, int a3)
{ {
E_Color_Class *cc = e_color_class_find_stringshared(color_class); E_Color_Class *cc = e_color_class_find_stringshared(color_class);
@ -104,7 +104,7 @@ e_color_class_set_stringshared(const char *color_class, int r, int g, int b, int
return cc; return cc;
} }
EAPI E_Color_Class * E_API E_Color_Class *
e_color_class_set(const char *color_class, int r, int g, int b, int a, int r2, int b2, int g2, int a2, int r3, int g3, int b3, int a3) e_color_class_set(const char *color_class, int r, int g, int b, int a, int r2, int b2, int g2, int a2, int r3, int g3, int b3, int a3)
{ {
E_Color_Class *cc; E_Color_Class *cc;
@ -131,7 +131,7 @@ e_color_class_node_del(Eina_List *n)
e_config_save_queue(); e_config_save_queue();
} }
EAPI void E_API void
e_color_class_instance_del(E_Color_Class *cc) e_color_class_instance_del(E_Color_Class *cc)
{ {
Eina_List *n = eina_list_data_find_list(e_config->color_classes, cc); Eina_List *n = eina_list_data_find_list(e_config->color_classes, cc);
@ -139,7 +139,7 @@ e_color_class_instance_del(E_Color_Class *cc)
e_color_class_node_del(n); e_color_class_node_del(n);
} }
EAPI void E_API void
e_color_class_del_stringshared(const char *name) e_color_class_del_stringshared(const char *name)
{ {
Eina_List *n = e_color_class_node_find_stringshared(name); Eina_List *n = e_color_class_node_find_stringshared(name);
@ -147,7 +147,7 @@ e_color_class_del_stringshared(const char *name)
e_color_class_node_del(n); e_color_class_node_del(n);
} }
EAPI void E_API void
e_color_class_del(const char *name) e_color_class_del(const char *name)
{ {
name = eina_stringshare_add(name); name = eina_stringshare_add(name);
@ -155,7 +155,7 @@ e_color_class_del(const char *name)
eina_stringshare_del(name); eina_stringshare_del(name);
} }
EAPI Eina_List * E_API Eina_List *
e_color_class_list(void) e_color_class_list(void)
{ {
return e_config->color_classes; return e_config->color_classes;

18
src/bin/e_color_class.h
View File

@ -17,27 +17,27 @@ struct _E_Color_Class
EINTERN int e_color_class_init(void); EINTERN int e_color_class_init(void);
EINTERN int e_color_class_shutdown(void); EINTERN int e_color_class_shutdown(void);
EAPI void e_color_class_instance_set(E_Color_Class *cc, E_API void e_color_class_instance_set(E_Color_Class *cc,
int r, int g, int b, int a, int r, int g, int b, int a,
int r2, int b2, int g2, int a2, int r2, int b2, int g2, int a2,
int r3, int g3, int b3, int a3); int r3, int g3, int b3, int a3);
EAPI E_Color_Class *e_color_class_set_stringshared(const char *color_class, E_API E_Color_Class *e_color_class_set_stringshared(const char *color_class,
int r, int g, int b, int a, int r, int g, int b, int a,
int r2, int b2, int g2, int a2, int r2, int b2, int g2, int a2,
int r3, int g3, int b3, int a3); int r3, int g3, int b3, int a3);
EAPI E_Color_Class *e_color_class_set(const char *color_class, E_API E_Color_Class *e_color_class_set(const char *color_class,
int r, int g, int b, int a, int r, int g, int b, int a,
int r2, int b2, int g2, int a2, int r2, int b2, int g2, int a2,
int r3, int g3, int b3, int a3); int r3, int g3, int b3, int a3);
EAPI E_Color_Class *e_color_class_find(const char *name); E_API E_Color_Class *e_color_class_find(const char *name);
EAPI E_Color_Class *e_color_class_find_stringshared(const char *name); E_API E_Color_Class *e_color_class_find_stringshared(const char *name);
EAPI void e_color_class_instance_del(E_Color_Class *cc); E_API void e_color_class_instance_del(E_Color_Class *cc);
EAPI void e_color_class_del_stringshared(const char *name); E_API void e_color_class_del_stringshared(const char *name);
EAPI void e_color_class_del(const char *name); E_API void e_color_class_del(const char *name);
EAPI Eina_List *e_color_class_list(void); E_API Eina_List *e_color_class_list(void);
#endif #endif
#endif #endif

2
src/bin/e_color_dialog.c
View File

@ -80,7 +80,7 @@ e_color_dialog_cancel_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dia
dia->cancel_data = data; 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) 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; dia->change_func = func;

12
src/bin/e_color_dialog.h
View File

@ -24,14 +24,14 @@ struct _E_Color_Dialog
void *change_data; void *change_data;
}; };
EAPI E_Color_Dialog *e_color_dialog_new (E_Comp *c, const E_Color *initial_color, Eina_Bool alpha_enabled); E_API E_Color_Dialog *e_color_dialog_new (E_Comp *c, const E_Color *initial_color, Eina_Bool alpha_enabled);
EAPI void e_color_dialog_show (E_Color_Dialog *dia); E_API 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 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 */ /* 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); 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);
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); 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);
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_change_callback_set(E_Color_Dialog *dia, void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data);
#endif #endif
#endif #endif

66
src/bin/e_comp.c
View File

@ -36,9 +36,9 @@ static double ecore_frametime = 0;
static int _e_comp_log_dom = -1; static int _e_comp_log_dom = -1;
EAPI int E_EVENT_COMPOSITOR_RESIZE = -1; E_API int E_EVENT_COMPOSITOR_RESIZE = -1;
EAPI int E_EVENT_COMPOSITOR_DISABLE = -1; E_API int E_EVENT_COMPOSITOR_DISABLE = -1;
EAPI int E_EVENT_COMPOSITOR_ENABLE = -1; E_API int E_EVENT_COMPOSITOR_ENABLE = -1;
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#undef DBG #undef DBG
@ -1274,7 +1274,7 @@ e_comp_style_selector_create(Evas *evas, const char **source)
return oi; return oi;
} }
EAPI E_Comp * E_API E_Comp *
e_comp_new(void) e_comp_new(void)
{ {
E_Comp *c; E_Comp *c;
@ -1292,7 +1292,7 @@ e_comp_new(void)
return c; return c;
} }
EAPI int E_API int
e_comp_internal_save(void) e_comp_internal_save(void)
{ {
return e_config_domain_save("e_comp", conf_edd, conf); return e_config_domain_save("e_comp", conf_edd, conf);
@ -1331,7 +1331,7 @@ e_comp_shutdown(void)
return 1; return 1;
} }
EAPI void E_API void
e_comp_render_queue(E_Comp *c) e_comp_render_queue(E_Comp *c)
{ {
E_OBJECT_CHECK(c); E_OBJECT_CHECK(c);
@ -1353,7 +1353,7 @@ e_comp_render_queue(E_Comp *c)
} }
} }
EAPI void E_API void
e_comp_shape_queue(E_Comp *c) e_comp_shape_queue(E_Comp *c)
{ {
EINA_SAFETY_ON_NULL_RETURN(c); EINA_SAFETY_ON_NULL_RETURN(c);
@ -1363,7 +1363,7 @@ e_comp_shape_queue(E_Comp *c)
c->shape_job = ecore_job_add((Ecore_Cb)_e_comp_shapes_update_job, c); c->shape_job = ecore_job_add((Ecore_Cb)_e_comp_shapes_update_job, c);
} }
EAPI void E_API void
e_comp_shape_queue_block(E_Comp *c, Eina_Bool block) e_comp_shape_queue_block(E_Comp *c, Eina_Bool block)
{ {
EINA_SAFETY_ON_NULL_RETURN(c); EINA_SAFETY_ON_NULL_RETURN(c);
@ -1375,19 +1375,19 @@ e_comp_shape_queue_block(E_Comp *c, Eina_Bool block)
e_comp_shape_queue(c); e_comp_shape_queue(c);
} }
EAPI E_Comp_Config * E_API E_Comp_Config *
e_comp_config_get(void) e_comp_config_get(void)
{ {
return conf; return conf;
} }
EAPI const Eina_List * E_API const Eina_List *
e_comp_list(void) e_comp_list(void)
{ {
return compositors; return compositors;
} }
EAPI void E_API void
e_comp_shadows_reset(void) e_comp_shadows_reset(void)
{ {
Eina_List *l; Eina_List *l;
@ -1404,7 +1404,7 @@ e_comp_shadows_reset(void)
} }
} }
EAPI E_Comp * E_API E_Comp *
e_comp_get(const void *o) e_comp_get(const void *o)
{ {
E_Client *ec; E_Client *ec;
@ -1491,7 +1491,7 @@ e_comp_get(const void *o)
} }
EAPI Ecore_Window E_API Ecore_Window
e_comp_top_window_at_xy_get(E_Comp *c, Evas_Coord x, Evas_Coord y) e_comp_top_window_at_xy_get(E_Comp *c, Evas_Coord x, Evas_Coord y)
{ {
E_Client *ec; E_Client *ec;
@ -1505,7 +1505,7 @@ e_comp_top_window_at_xy_get(E_Comp *c, Evas_Coord x, Evas_Coord y)
return c->ee_win; return c->ee_win;
} }
EAPI void E_API void
e_comp_util_wins_print(const E_Comp *c) e_comp_util_wins_print(const E_Comp *c)
{ {
Evas_Object *o; Evas_Object *o;
@ -1531,7 +1531,7 @@ e_comp_util_wins_print(const E_Comp *c)
fputc('\n', stderr); fputc('\n', stderr);
} }
EAPI void E_API void
e_comp_ignore_win_add(E_Pixmap_Type type, Ecore_Window win) e_comp_ignore_win_add(E_Pixmap_Type type, Ecore_Window win)
{ {
E_Client *ec; E_Client *ec;
@ -1543,7 +1543,7 @@ e_comp_ignore_win_add(E_Pixmap_Type type, Ecore_Window win)
if (ec->visible) evas_object_hide(ec->frame); 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_comp_ignore_win_del(E_Pixmap_Type type, Ecore_Window win)
{ {
E_Client *ec; E_Client *ec;
@ -1555,13 +1555,13 @@ e_comp_ignore_win_del(E_Pixmap_Type type, Ecore_Window win)
if (ec->visible) evas_object_show(ec->frame); if (ec->visible) evas_object_show(ec->frame);
} }
EAPI Eina_Bool E_API Eina_Bool
e_comp_ignore_win_find(Ecore_Window win) e_comp_ignore_win_find(Ecore_Window win)
{ {
return !!eina_hash_find(ignores, &win); return !!eina_hash_find(ignores, &win);
} }
EAPI void E_API void
e_comp_override_del(E_Comp *c) e_comp_override_del(E_Comp *c)
{ {
c->nocomp_override--; c->nocomp_override--;
@ -1572,7 +1572,7 @@ e_comp_override_del(E_Comp *c)
} }
} }
EAPI void E_API void
e_comp_override_add(E_Comp *c) e_comp_override_add(E_Comp *c)
{ {
c->nocomp_override++; c->nocomp_override++;
@ -1581,7 +1581,7 @@ e_comp_override_add(E_Comp *c)
#if 0 #if 0
FIXME FIXME
EAPI void E_API void
e_comp_block_window_add(void) e_comp_block_window_add(void)
{ {
E_Comp *c; E_Comp *c;
@ -1602,7 +1602,7 @@ e_comp_block_window_add(void)
} }
} }
EAPI void E_API void
e_comp_block_window_del(void) e_comp_block_window_del(void)
{ {
E_Comp *c; E_Comp *c;
@ -1619,7 +1619,7 @@ e_comp_block_window_del(void)
} }
#endif #endif
EAPI E_Comp * E_API E_Comp *
e_comp_find_by_window(Ecore_Window win) e_comp_find_by_window(Ecore_Window win)
{ {
Eina_List *l; Eina_List *l;
@ -1632,7 +1632,7 @@ e_comp_find_by_window(Ecore_Window win)
return NULL; return NULL;
} }
EAPI void E_API void
e_comp_override_timed_pop(E_Comp *c) e_comp_override_timed_pop(E_Comp *c)
{ {
EINA_SAFETY_ON_NULL_RETURN(c); EINA_SAFETY_ON_NULL_RETURN(c);
@ -1643,7 +1643,7 @@ e_comp_override_timed_pop(E_Comp *c)
c->nocomp_override_timer = ecore_timer_add(1.0, _e_comp_override_expire, c); c->nocomp_override_timer = ecore_timer_add(1.0, _e_comp_override_expire, c);
} }
EAPI unsigned int E_API unsigned int
e_comp_e_object_layer_get(const E_Object *obj) e_comp_e_object_layer_get(const E_Object *obj)
{ {
E_Gadcon *gc = NULL; E_Gadcon *gc = NULL;
@ -1677,7 +1677,7 @@ e_comp_e_object_layer_get(const E_Object *obj)
return 0; return 0;
} }
EAPI Eina_Bool E_API Eina_Bool
e_comp_grab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd) e_comp_grab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd)
{ {
Eina_Bool ret = EINA_FALSE; Eina_Bool ret = EINA_FALSE;
@ -1700,7 +1700,7 @@ e_comp_grab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd)
return ret; return ret;
} }
EAPI void E_API void
e_comp_ungrab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd) e_comp_ungrab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd)
{ {
Ecore_Window mwin = 0, kwin = 0; Ecore_Window mwin = 0, kwin = 0;
@ -1725,19 +1725,19 @@ e_comp_ungrab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd)
e_client_refocus(); e_client_refocus();
} }
EAPI void E_API void
e_comp_gl_set(Eina_Bool set) e_comp_gl_set(Eina_Bool set)
{ {
gl_avail = !!set; gl_avail = !!set;
} }
EAPI Eina_Bool E_API Eina_Bool
e_comp_gl_get(void) e_comp_gl_get(void)
{ {
return gl_avail; return gl_avail;
} }
EAPI E_Comp * E_API E_Comp *
e_comp_evas_find(const Evas *e) e_comp_evas_find(const Evas *e)
{ {
Eina_List *l; Eina_List *l;
@ -1748,7 +1748,7 @@ e_comp_evas_find(const Evas *e)
return NULL; return NULL;
} }
EAPI void E_API void
e_comp_button_bindings_ungrab_all(void) e_comp_button_bindings_ungrab_all(void)
{ {
Eina_List *l; Eina_List *l;
@ -1759,7 +1759,7 @@ e_comp_button_bindings_ungrab_all(void)
c->bindings_ungrab_cb(c); c->bindings_ungrab_cb(c);
} }
EAPI void E_API void
e_comp_button_bindings_grab_all(void) e_comp_button_bindings_grab_all(void)
{ {
Eina_List *l; Eina_List *l;
@ -1770,7 +1770,7 @@ e_comp_button_bindings_grab_all(void)
c->bindings_grab_cb(c); c->bindings_grab_cb(c);
} }
EAPI void E_API void
e_comp_client_redirect_toggle(E_Client *ec) e_comp_client_redirect_toggle(E_Client *ec)
{ {
EINA_SAFETY_ON_NULL_RETURN(ec); EINA_SAFETY_ON_NULL_RETURN(ec);
@ -1782,7 +1782,7 @@ e_comp_client_redirect_toggle(E_Client *ec)
e_comp_shape_queue(ec->comp); e_comp_shape_queue(ec->comp);
} }
EAPI Eina_Bool E_API Eina_Bool
e_comp_util_object_is_above_nocomp(Evas_Object *obj) e_comp_util_object_is_above_nocomp(Evas_Object *obj)
{ {
E_Comp *comp; E_Comp *comp;

68
src/bin/e_comp.h
View File

@ -52,8 +52,8 @@ typedef enum _E_Layer
# include "e_comp_cfdata.h" # include "e_comp_cfdata.h"
extern EAPI int E_EVENT_COMPOSITOR_DISABLE; extern E_API int E_EVENT_COMPOSITOR_DISABLE;
extern EAPI int E_EVENT_COMPOSITOR_ENABLE; extern E_API int E_EVENT_COMPOSITOR_ENABLE;
struct _E_Comp struct _E_Comp
{ {
@ -154,42 +154,42 @@ typedef enum
} E_Comp_Engine; } E_Comp_Engine;
EINTERN Eina_Bool e_comp_init(void); EINTERN Eina_Bool e_comp_init(void);
EAPI E_Comp *e_comp_new(void); E_API E_Comp *e_comp_new(void);
EAPI int e_comp_internal_save(void); E_API int e_comp_internal_save(void);
EINTERN int e_comp_shutdown(void); EINTERN int e_comp_shutdown(void);
EAPI void e_comp_render_queue(E_Comp *c); E_API void e_comp_render_queue(E_Comp *c);
EAPI void e_comp_shape_queue(E_Comp *c); E_API void e_comp_shape_queue(E_Comp *c);
EAPI void e_comp_shape_queue_block(E_Comp *c, Eina_Bool block); E_API void e_comp_shape_queue_block(E_Comp *c, Eina_Bool block);
EAPI E_Comp_Config *e_comp_config_get(void); E_API E_Comp_Config *e_comp_config_get(void);
EAPI const Eina_List *e_comp_list(void); E_API const Eina_List *e_comp_list(void);
EAPI void e_comp_shadows_reset(void); E_API void e_comp_shadows_reset(void);
EAPI E_Comp *e_comp_get(const void *o); E_API E_Comp *e_comp_get(const void *o);
EAPI Ecore_Window e_comp_top_window_at_xy_get(E_Comp *c, Evas_Coord x, Evas_Coord y); E_API Ecore_Window e_comp_top_window_at_xy_get(E_Comp *c, Evas_Coord x, Evas_Coord y);
EAPI void e_comp_util_wins_print(const E_Comp *c); E_API void e_comp_util_wins_print(const E_Comp *c);
EAPI void e_comp_ignore_win_add(E_Pixmap_Type type, Ecore_Window win); E_API 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); E_API void e_comp_ignore_win_del(E_Pixmap_Type type, Ecore_Window win);
EAPI Eina_Bool e_comp_ignore_win_find(Ecore_Window win); E_API Eina_Bool e_comp_ignore_win_find(Ecore_Window win);
EAPI void e_comp_override_del(E_Comp *c); E_API void e_comp_override_del(E_Comp *c);
EAPI void e_comp_override_add(E_Comp *c); E_API void e_comp_override_add(E_Comp *c);
EAPI void e_comp_block_window_add(void); E_API void e_comp_block_window_add(void);
EAPI void e_comp_block_window_del(void); E_API void e_comp_block_window_del(void);
EAPI E_Comp *e_comp_find_by_window(Ecore_Window win); E_API E_Comp *e_comp_find_by_window(Ecore_Window win);
EAPI void e_comp_override_timed_pop(E_Comp *c); E_API void e_comp_override_timed_pop(E_Comp *c);
EAPI unsigned int e_comp_e_object_layer_get(const E_Object *obj); E_API unsigned int e_comp_e_object_layer_get(const E_Object *obj);
EAPI Eina_Bool e_comp_grab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd); E_API Eina_Bool e_comp_grab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd);
EAPI void e_comp_ungrab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd); E_API void e_comp_ungrab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd);
EAPI void e_comp_gl_set(Eina_Bool set); E_API void e_comp_gl_set(Eina_Bool set);
EAPI Eina_Bool e_comp_gl_get(void); E_API Eina_Bool e_comp_gl_get(void);
EAPI E_Comp *e_comp_evas_find(const Evas *e); E_API E_Comp *e_comp_evas_find(const Evas *e);
EAPI void e_comp_button_bindings_grab_all(void); E_API void e_comp_button_bindings_grab_all(void);
EAPI void e_comp_button_bindings_ungrab_all(void); E_API void e_comp_button_bindings_ungrab_all(void);
EAPI void e_comp_client_redirect_toggle(E_Client *ec); E_API void e_comp_client_redirect_toggle(E_Client *ec);
EAPI Eina_Bool e_comp_util_object_is_above_nocomp(Evas_Object *obj); 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); EINTERN Evas_Object *e_comp_style_selector_create(Evas *evas, const char **source);
EAPI E_Config_Dialog *e_int_config_comp(E_Comp *comp, const char *params); E_API E_Config_Dialog *e_int_config_comp(E_Comp *comp, const char *params);
EAPI E_Config_Dialog *e_int_config_comp_match(E_Comp *comp, const char *params); E_API E_Config_Dialog *e_int_config_comp_match(E_Comp *comp, const char *params);
static inline E_Comp * static inline E_Comp *
e_comp_util_evas_object_comp_get(Evas_Object *obj) e_comp_util_evas_object_comp_get(Evas_Object *obj)

32
src/bin/e_comp_canvas.c
View File

@ -109,7 +109,7 @@ _e_comp_canvas_cb_zone_sort(const void *data1, const void *data2)
} }
EAPI Eina_Bool E_API Eina_Bool
e_comp_canvas_init(E_Comp *c) e_comp_canvas_init(E_Comp *c)
{ {
Evas_Object *o; Evas_Object *o;
@ -174,7 +174,7 @@ e_comp_canvas_clear(E_Comp *c)
////////////////////////////////////////////// //////////////////////////////////////////////
EAPI void E_API void
e_comp_all_freeze(void) e_comp_all_freeze(void)
{ {
Eina_List *l; Eina_List *l;
@ -184,7 +184,7 @@ e_comp_all_freeze(void)
evas_event_freeze(man->comp->evas); evas_event_freeze(man->comp->evas);
} }
EAPI void E_API void
e_comp_all_thaw(void) e_comp_all_thaw(void)
{ {
Eina_List *l; Eina_List *l;
@ -194,7 +194,7 @@ e_comp_all_thaw(void)
evas_event_thaw(man->comp->evas); evas_event_thaw(man->comp->evas);
} }
EAPI E_Zone * E_API E_Zone *
e_comp_zone_xy_get(const E_Comp *c, Evas_Coord x, Evas_Coord y) e_comp_zone_xy_get(const E_Comp *c, Evas_Coord x, Evas_Coord y)
{ {
const Eina_List *l; const Eina_List *l;
@ -206,7 +206,7 @@ e_comp_zone_xy_get(const E_Comp *c, Evas_Coord x, Evas_Coord y)
return NULL; return NULL;
} }
EAPI E_Zone * E_API E_Zone *
e_comp_zone_number_get(E_Comp *c, int num) e_comp_zone_number_get(E_Comp *c, int num)
{ {
Eina_List *l = NULL; Eina_List *l = NULL;
@ -221,7 +221,7 @@ e_comp_zone_number_get(E_Comp *c, int num)
return NULL; return NULL;
} }
EAPI E_Zone * E_API E_Zone *
e_comp_zone_id_get(E_Comp *c, int id) e_comp_zone_id_get(E_Comp *c, int id)
{ {
Eina_List *l = NULL; Eina_List *l = NULL;
@ -236,7 +236,7 @@ e_comp_zone_id_get(E_Comp *c, int id)
return NULL; return NULL;
} }
EAPI E_Comp * E_API E_Comp *
e_comp_number_get(unsigned int num) e_comp_number_get(unsigned int num)
{ {
const Eina_List *l; const Eina_List *l;
@ -247,7 +247,7 @@ e_comp_number_get(unsigned int num)
return NULL; return NULL;
} }
EAPI E_Desk * E_API E_Desk *
e_comp_desk_window_profile_get(E_Comp *c, const char *profile) e_comp_desk_window_profile_get(E_Comp *c, const char *profile)
{ {
Eina_List *l = NULL; Eina_List *l = NULL;
@ -278,7 +278,7 @@ e_comp_desk_window_profile_get(E_Comp *c, const char *profile)
return NULL; return NULL;
} }
EAPI void E_API void
e_comp_canvas_zone_update(E_Zone *zone) e_comp_canvas_zone_update(E_Zone *zone)
{ {
Evas_Object *o; Evas_Object *o;
@ -329,7 +329,7 @@ e_comp_canvas_zone_update(E_Zone *zone)
evas_object_show(o); evas_object_show(o);
} }
EAPI void E_API void
e_comp_canvas_update(E_Comp *c) e_comp_canvas_update(E_Comp *c)
{ {
E_Event_Compositor_Resize *ev; E_Event_Compositor_Resize *ev;
@ -462,7 +462,7 @@ e_comp_canvas_update(E_Comp *c)
} }
} }
EAPI void E_API void
e_comp_canvas_fake_layers_init(E_Comp *comp) e_comp_canvas_fake_layers_init(E_Comp *comp)
{ {
unsigned int layer; unsigned int layer;
@ -478,7 +478,7 @@ e_comp_canvas_fake_layers_init(E_Comp *comp)
} }
} }
EAPI void E_API void
e_comp_canvas_fps_toggle(void) e_comp_canvas_fps_toggle(void)
{ {
E_Comp_Config *conf = e_comp_config_get(); E_Comp_Config *conf = e_comp_config_get();
@ -488,7 +488,7 @@ e_comp_canvas_fps_toggle(void)
E_LIST_FOREACH(e_comp_list(), e_comp_render_queue); E_LIST_FOREACH(e_comp_list(), e_comp_render_queue);
} }
EAPI E_Layer E_API E_Layer
e_comp_canvas_layer_map_to(unsigned int layer) e_comp_canvas_layer_map_to(unsigned int layer)
{ {
switch (layer) switch (layer)
@ -517,7 +517,7 @@ e_comp_canvas_layer_map_to(unsigned int layer)
return -INT_MAX; return -INT_MAX;
} }
EAPI unsigned int E_API unsigned int
e_comp_canvas_layer_map(E_Layer layer) e_comp_canvas_layer_map(E_Layer layer)
{ {
switch (layer) switch (layer)
@ -546,7 +546,7 @@ e_comp_canvas_layer_map(E_Layer layer)
return 9999; return 9999;
} }
EAPI unsigned int E_API unsigned int
e_comp_canvas_client_layer_map(E_Layer layer) e_comp_canvas_client_layer_map(E_Layer layer)
{ {
switch (layer) switch (layer)
@ -567,7 +567,7 @@ e_comp_canvas_client_layer_map(E_Layer layer)
return 9999; return 9999;
} }
EAPI E_Layer E_API E_Layer
e_comp_canvas_client_layer_map_nearest(int layer) e_comp_canvas_client_layer_map_nearest(int layer)
{ {
#define LAYER_MAP(X) \ #define LAYER_MAP(X) \

34
src/bin/e_comp_canvas.h
View File

@ -13,25 +13,25 @@ struct _E_Event_Compositor_Resize
E_Comp *comp; E_Comp *comp;
}; };
extern EAPI int E_EVENT_COMPOSITOR_RESIZE; extern E_API int E_EVENT_COMPOSITOR_RESIZE;
EAPI Eina_Bool e_comp_canvas_init(E_Comp *c); E_API Eina_Bool e_comp_canvas_init(E_Comp *c);
EINTERN void e_comp_canvas_clear(E_Comp *c); EINTERN void e_comp_canvas_clear(E_Comp *c);
EAPI void e_comp_all_freeze(void); E_API void e_comp_all_freeze(void);
EAPI void e_comp_all_thaw(void); E_API void e_comp_all_thaw(void);
EAPI E_Zone * e_comp_zone_xy_get(const E_Comp *c, Evas_Coord x, Evas_Coord y); E_API E_Zone * e_comp_zone_xy_get(const E_Comp *c, Evas_Coord x, Evas_Coord y);
EAPI E_Zone * e_comp_zone_number_get(E_Comp *c, int num); E_API E_Zone * e_comp_zone_number_get(E_Comp *c, int num);
EAPI E_Zone * e_comp_zone_id_get(E_Comp *c, int id); E_API E_Zone * e_comp_zone_id_get(E_Comp *c, int id);
EAPI E_Comp * e_comp_number_get(unsigned int num); E_API E_Comp * e_comp_number_get(unsigned int num);
EAPI E_Desk * e_comp_desk_window_profile_get(E_Comp *c, const char *profile); E_API E_Desk * e_comp_desk_window_profile_get(E_Comp *c, const char *profile);
EAPI void e_comp_canvas_zone_update(E_Zone *zone); E_API void e_comp_canvas_zone_update(E_Zone *zone);
EAPI void e_comp_canvas_update(E_Comp *c); E_API void e_comp_canvas_update(E_Comp *c);
EAPI void e_comp_canvas_fake_layers_init(E_Comp *comp); E_API void e_comp_canvas_fake_layers_init(E_Comp *comp);
EAPI void e_comp_canvas_fps_toggle(void); E_API void e_comp_canvas_fps_toggle(void);
EAPI E_Layer e_comp_canvas_layer_map_to(unsigned int layer); E_API E_Layer e_comp_canvas_layer_map_to(unsigned int layer);
EAPI unsigned int e_comp_canvas_layer_map(E_Layer layer); E_API unsigned int e_comp_canvas_layer_map(E_Layer layer);
EAPI unsigned int e_comp_canvas_client_layer_map(E_Layer layer); E_API unsigned int e_comp_canvas_client_layer_map(E_Layer layer);
EAPI E_Layer e_comp_canvas_client_layer_map_nearest(int layer); E_API E_Layer e_comp_canvas_client_layer_map_nearest(int layer);
/* the following functions are used for adjusting root window coordinates /* the following functions are used for adjusting root window coordinates

8
src/bin/e_comp_cfdata.c
View File

@ -1,7 +1,7 @@
#include "e.h" #include "e.h"
#include "e_comp_cfdata.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) 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); *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); 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_cfdata_config_new(void)
{ {
E_Comp_Config *cfg; E_Comp_Config *cfg;
@ -195,7 +195,7 @@ e_comp_cfdata_config_new(void)
return cfg; return cfg;
} }
EAPI void E_API void
e_comp_cfdata_match_free(E_Comp_Match *m) e_comp_cfdata_match_free(E_Comp_Match *m)
{ {
if (!m) return; if (!m) return;
@ -207,7 +207,7 @@ e_comp_cfdata_match_free(E_Comp_Match *m)
free(m); free(m);
} }
EAPI void E_API void
e_comp_cfdata_config_free(E_Comp_Config *cfg) e_comp_cfdata_config_free(E_Comp_Config *cfg)
{ {
if (!cfg) return; if (!cfg) return;

8
src/bin/e_comp_cfdata.h
View File

@ -76,10 +76,10 @@ struct _E_Comp_Match
char no_shadow; // set whether shadow is disabled 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); E_API 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); E_API E_Comp_Config *e_comp_cfdata_config_new(void);
EAPI void e_comp_cfdata_config_free(E_Comp_Config *cfg); E_API 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_match_free(E_Comp_Match *m);
#endif #endif
#endif #endif

94
src/bin/e_comp_object.c
View File

@ -138,7 +138,7 @@ static Evas_Smart *_e_comp_smart = NULL;
EINTERN void e_client_focused_set(E_Client *ec); EINTERN void e_client_focused_set(E_Client *ec);
/* emitted every time a new noteworthy comp object is added */ /* 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 static void
_e_comp_object_event_free(void *d EINA_UNUSED, void *event) _e_comp_object_event_free(void *d EINA_UNUSED, void *event)
@ -2131,7 +2131,7 @@ _e_comp_smart_init(void)
} }
} }
EAPI void E_API void
e_comp_object_zoomap_set(Evas_Object *obj, Eina_Bool enabled) e_comp_object_zoomap_set(Evas_Object *obj, Eina_Bool enabled)
{ {
API_ENTRY; API_ENTRY;
@ -2278,7 +2278,7 @@ _e_comp_object_util_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
e_comp_shape_queue(e_comp_util_evas_object_comp_get(obj)); e_comp_shape_queue(e_comp_util_evas_object_comp_get(obj));
} }
EAPI Evas_Object * E_API Evas_Object *
e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type) e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type)
{ {
Evas_Object *o, *z = NULL; Evas_Object *o, *z = NULL;
@ -2414,7 +2414,7 @@ e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type)
} }
/* utility functions for deleting objects when their "owner" is deleted */ /* 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) e_comp_object_util_del_list_append(Evas_Object *obj, Evas_Object *to_del)
{ {
Eina_List *l; Eina_List *l;
@ -2427,7 +2427,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); 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) e_comp_object_util_del_list_remove(Evas_Object *obj, Evas_Object *to_del)
{ {
Eina_List *l; Eina_List *l;
@ -2441,7 +2441,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) e_comp_object_client_add(E_Client *ec)
{ {
Evas_Object *o; Evas_Object *o;
@ -2465,7 +2465,7 @@ e_comp_object_client_add(E_Client *ec)
} }
/* utility functions for getting client inset */ /* 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) e_comp_object_frame_xy_adjust(Evas_Object *obj, int x, int y, int *ax, int *ay)
{ {
API_ENTRY; API_ENTRY;
@ -2479,7 +2479,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; 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) e_comp_object_frame_xy_unadjust(Evas_Object *obj, int x, int y, int *ax, int *ay)
{ {
API_ENTRY; API_ENTRY;
@ -2493,7 +2493,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; 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) e_comp_object_frame_wh_adjust(Evas_Object *obj, int w, int h, int *aw, int *ah)
{ {
API_ENTRY; API_ENTRY;
@ -2507,7 +2507,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; 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) e_comp_object_frame_wh_unadjust(Evas_Object *obj, int w, int h, int *aw, int *ah)
{ {
API_ENTRY; API_ENTRY;
@ -2521,7 +2521,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; 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) e_comp_object_client_get(Evas_Object *obj)
{ {
Evas_Object *o; Evas_Object *o;
@ -2534,7 +2534,7 @@ e_comp_object_client_get(Evas_Object *obj)
return cw ? cw->ec : NULL; 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) e_comp_object_frame_extends_get(Evas_Object *obj, int *x, int *y, int *w, int *h)
{ {
API_ENTRY; API_ENTRY;
@ -2549,7 +2549,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_comp_object_util_zone_get(Evas_Object *obj)
{ {
E_Zone *zone = NULL; E_Zone *zone = NULL;
@ -2601,7 +2601,7 @@ e_comp_object_util_zone_get(Evas_Object *obj)
return zone; return zone;
} }
EAPI void E_API void
e_comp_object_util_center(Evas_Object *obj) e_comp_object_util_center(Evas_Object *obj)
{ {
int x, y, w, h, ow, oh; int x, y, w, h, ow, oh;
@ -2621,7 +2621,7 @@ e_comp_object_util_center(Evas_Object *obj)
evas_object_move(obj, x, y); evas_object_move(obj, x, y);
} }
EAPI void E_API void
e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on) e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on)
{ {
int x, y, w, h, ow, oh; int x, y, w, h, ow, oh;
@ -2636,7 +2636,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)); 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) e_comp_object_util_fullscreen(Evas_Object *obj)
{ {
SOFT_ENTRY(); SOFT_ENTRY();
@ -2653,7 +2653,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_comp_object_util_center_pos_get(Evas_Object *obj, int *x, int *y)
{ {
E_Zone *zone; E_Zone *zone;
@ -2671,7 +2671,7 @@ e_comp_object_util_center_pos_get(Evas_Object *obj, int *x, int *y)
if (y) *y = zy + (zh - oh) / 2; 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) e_comp_object_input_area_set(Evas_Object *obj, int x, int y, int w, int h)
{ {
API_ENTRY; API_ENTRY;
@ -2705,7 +2705,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) e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int *b)
{ {
API_ENTRY; API_ENTRY;
@ -2715,7 +2715,7 @@ e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int *
if (b) *b = cw->client_inset.b; 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) e_comp_object_frame_icon_geometry_get(Evas_Object *obj, int *x, int *y, int *w, int *h)
{ {
API_ENTRY; API_ENTRY;
@ -2728,7 +2728,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); 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) e_comp_object_frame_title_set(Evas_Object *obj, const char *name)
{ {
API_ENTRY EINA_FALSE; API_ENTRY EINA_FALSE;
@ -2739,14 +2739,14 @@ e_comp_object_frame_title_set(Evas_Object *obj, const char *name)
return EINA_TRUE; return EINA_TRUE;
} }
EAPI Eina_Bool E_API Eina_Bool
e_comp_object_frame_exists(Evas_Object *obj) e_comp_object_frame_exists(Evas_Object *obj)
{ {
API_ENTRY EINA_FALSE; API_ENTRY EINA_FALSE;
return !!cw->frame_object; return !!cw->frame_object;
} }
EAPI void E_API void
e_comp_object_frame_icon_update(Evas_Object *obj) e_comp_object_frame_icon_update(Evas_Object *obj)
{ {
API_ENTRY; API_ENTRY;
@ -2760,7 +2760,7 @@ e_comp_object_frame_icon_update(Evas_Object *obj)
E_FREE_FUNC(cw->frame_icon, evas_object_del); 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) e_comp_object_frame_theme_set(Evas_Object *obj, const char *name)
{ {
Evas_Object *o, *pbg; Evas_Object *o, *pbg;
@ -2904,7 +2904,7 @@ reshadow:
return EINA_TRUE; 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_signal_emit(Evas_Object *obj, const char *sig, const char *src)
{ {
E_Comp_Object_Mover *prov; E_Comp_Object_Mover *prov;
@ -2926,7 +2926,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) 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 /* FIXME: at some point I guess this should use eo to inherit
@ -2937,21 +2937,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); 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) e_comp_object_signal_callback_del(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb)
{ {
API_ENTRY; API_ENTRY;
edje_object_signal_callback_del(cw->shobj, sig, src, cb); 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) 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; API_ENTRY;
edje_object_signal_callback_del_full(cw->shobj, sig, src, cb, (void*)data); 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) e_comp_object_damage(Evas_Object *obj, int x, int y, int w, int h)
{ {
int tw, th; int tw, th;
@ -3011,14 +3011,14 @@ e_comp_object_damage(Evas_Object *obj, int x, int y, int w, int h)
e_comp_object_render_update_add(obj); e_comp_object_render_update_add(obj);
} }
EAPI Eina_Bool E_API Eina_Bool
e_comp_object_damage_exists(Evas_Object *obj) e_comp_object_damage_exists(Evas_Object *obj)
{ {
API_ENTRY EINA_FALSE; API_ENTRY EINA_FALSE;
return cw->updates_exist; return cw->updates_exist;
} }
EAPI void E_API void
e_comp_object_render_update_add(Evas_Object *obj) e_comp_object_render_update_add(Evas_Object *obj)
{ {
API_ENTRY; API_ENTRY;
@ -3037,7 +3037,7 @@ e_comp_object_render_update_add(Evas_Object *obj)
e_comp_render_queue(cw->comp); e_comp_render_queue(cw->comp);
} }
EAPI void E_API void
e_comp_object_render_update_del(Evas_Object *obj) e_comp_object_render_update_del(Evas_Object *obj)
{ {
API_ENTRY; API_ENTRY;
@ -3056,7 +3056,7 @@ e_comp_object_render_update_del(Evas_Object *obj)
} }
} }
EAPI void E_API void
e_comp_object_shape_apply(Evas_Object *obj) e_comp_object_shape_apply(Evas_Object *obj)
{ {
Eina_List *l; Eina_List *l;
@ -3160,7 +3160,7 @@ e_comp_object_shape_apply(Evas_Object *obj)
} }
/* helper function to simplify toggling of redirection for display servers which support it */ /* 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) e_comp_object_redirected_set(Evas_Object *obj, Eina_Bool set)
{ {
API_ENTRY; API_ENTRY;
@ -3198,7 +3198,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) e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set)
{ {
Evas_Native_Surface ns; Evas_Native_Surface ns;
@ -3225,7 +3225,7 @@ e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set)
} }
/* mark an object as dirty and setup damages */ /* mark an object as dirty and setup damages */
EAPI void E_API void
e_comp_object_dirty(Evas_Object *obj) e_comp_object_dirty(Evas_Object *obj)
{ {
Eina_Iterator *it; Eina_Iterator *it;
@ -3288,7 +3288,7 @@ e_comp_object_dirty(Evas_Object *obj)
e_comp_object_render(obj); e_comp_object_render(obj);
} }
EAPI Eina_Bool E_API Eina_Bool
e_comp_object_render(Evas_Object *obj) e_comp_object_render(Evas_Object *obj)
{ {
Eina_Iterator *it; Eina_Iterator *it;
@ -3390,7 +3390,7 @@ e_comp_object_render(Evas_Object *obj)
} }
/* create a duplicate of an evas object */ /* create a duplicate of an evas object */
EAPI Evas_Object * E_API Evas_Object *
e_comp_object_util_mirror_add(Evas_Object *obj) e_comp_object_util_mirror_add(Evas_Object *obj)
{ {
Evas_Object *o; Evas_Object *o;
@ -3461,7 +3461,7 @@ e_comp_object_util_mirror_add(Evas_Object *obj)
////////////////////////////////////////////////////// //////////////////////////////////////////////////////
/* setup an api effect for a client */ /* setup an api effect for a client */
EAPI void E_API void
e_comp_object_effect_set(Evas_Object *obj, const char *effect) e_comp_object_effect_set(Evas_Object *obj, const char *effect)
{ {
char buf[4096]; char buf[4096];
@ -3490,7 +3490,7 @@ e_comp_object_effect_set(Evas_Object *obj, const char *effect)
} }
/* set params for embryo scripts in 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) e_comp_object_effect_params_set(Evas_Object *obj, int id, int *params, unsigned int count)
{ {
Edje_Message_Int_Set *msg; Edje_Message_Int_Set *msg;
@ -3532,7 +3532,7 @@ _e_comp_object_effect_end_cb(void *data, Evas_Object *obj, const char *emission,
} }
/* clip effect to client's zone */ /* clip effect to client's zone */
EAPI void E_API void
e_comp_object_effect_clip(Evas_Object *obj) e_comp_object_effect_clip(Evas_Object *obj)
{ {
API_ENTRY; API_ENTRY;
@ -3544,7 +3544,7 @@ e_comp_object_effect_clip(Evas_Object *obj)
} }
/* unclip effect from client's zone */ /* unclip effect from client's zone */
EAPI void E_API void
e_comp_object_effect_unclip(Evas_Object *obj) e_comp_object_effect_unclip(Evas_Object *obj)
{ {
API_ENTRY; API_ENTRY;
@ -3554,7 +3554,7 @@ e_comp_object_effect_unclip(Evas_Object *obj)
} }
/* start effect, running end_cb after */ /* 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) e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *end_data)
{ {
API_ENTRY; API_ENTRY;
@ -3574,7 +3574,7 @@ e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *
} }
/* stop a currently-running effect immediately */ /* stop a currently-running effect immediately */
EAPI void E_API void
e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb) e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb)
{ {
API_ENTRY; API_ENTRY;
@ -3602,7 +3602,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 */ /* 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_effect_mover_add(int pri, const char *sig, E_Comp_Object_Mover_Cb provider, const void *data)
{ {
E_Comp_Object_Mover *prov; E_Comp_Object_Mover *prov;
@ -3618,7 +3618,7 @@ e_comp_object_effect_mover_add(int pri, const char *sig, E_Comp_Object_Mover_Cb
return prov; return prov;
} }
EAPI void E_API void
e_comp_object_effect_mover_del(E_Comp_Object_Mover *prov) e_comp_object_effect_mover_del(E_Comp_Object_Mover *prov)
{ {
EINA_SAFETY_ON_NULL_RETURN(prov); EINA_SAFETY_ON_NULL_RETURN(prov);
@ -3710,7 +3710,7 @@ _e_comp_object_autoclose_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
e_client_refocus(); 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) 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_Comp *c; E_Comp *c;

94
src/bin/e_comp_object.h
View File

@ -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); E_API void e_comp_object_zoomap_set(Evas_Object *obj, Eina_Bool enabled);
EAPI Evas_Object *e_comp_object_client_add(E_Client *ec); E_API Evas_Object *e_comp_object_client_add(E_Client *ec);
EAPI Evas_Object *e_comp_object_util_mirror_add(Evas_Object *obj); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API E_Client *e_comp_object_client_get(Evas_Object *obj);
EAPI E_Zone *e_comp_object_util_zone_get(Evas_Object *obj); E_API 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); E_API 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); E_API 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); 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);
EAPI void e_comp_object_util_center(Evas_Object *obj); E_API void e_comp_object_util_center(Evas_Object *obj);
EAPI void e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API Eina_Bool e_comp_object_frame_exists(Evas_Object *obj);
EAPI void e_comp_object_frame_icon_update(Evas_Object *obj); E_API 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); E_API 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); E_API 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); 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);
EAPI 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(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); 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);
EAPI void e_comp_object_input_area_set(Evas_Object *obj, int x, int y, int w, int h); E_API 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); E_API 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); E_API Eina_Bool e_comp_object_damage_exists(Evas_Object *obj);
EAPI void e_comp_object_render_update_add(Evas_Object *obj); E_API void e_comp_object_render_update_add(Evas_Object *obj);
EAPI void e_comp_object_render_update_del(Evas_Object *obj); E_API void e_comp_object_render_update_del(Evas_Object *obj);
EAPI void e_comp_object_shape_apply(Evas_Object *obj); E_API void e_comp_object_shape_apply(Evas_Object *obj);
EAPI void e_comp_object_redirected_set(Evas_Object *obj, Eina_Bool set); E_API 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); E_API void e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set);
EAPI void e_comp_object_dirty(Evas_Object *obj); E_API void e_comp_object_dirty(Evas_Object *obj);
EAPI Eina_Bool e_comp_object_render(Evas_Object *obj); E_API Eina_Bool e_comp_object_render(Evas_Object *obj);
EAPI void e_comp_object_effect_set(Evas_Object *obj, const char *effect); E_API 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); E_API 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); E_API void e_comp_object_effect_clip(Evas_Object *obj);
EAPI void e_comp_object_effect_unclip(Evas_Object *obj); E_API 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); E_API 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); E_API 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); 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);
EAPI void e_comp_object_effect_mover_del(E_Comp_Object_Mover *prov); E_API void e_comp_object_effect_mover_del(E_Comp_Object_Mover *prov);
#endif #endif
#endif #endif

2
src/bin/e_comp_wl.c
View File

@ -3142,7 +3142,7 @@ _e_comp_wl_cb_hook_client_focus_unset(void *data EINA_UNUSED, E_Client *ec)
ec->comp->wl_comp_data->kbd.focus = NULL; ec->comp->wl_comp_data->kbd.focus = NULL;
} }
EAPI Eina_Bool E_API Eina_Bool
e_comp_wl_init(void) e_comp_wl_init(void)
{ {
/* set gl available */ /* set gl available */

2
src/bin/e_comp_wl.h
View File

@ -262,7 +262,7 @@ struct _E_Comp_Wl_Client_Data
Eina_Bool frame_update : 1; Eina_Bool frame_update : 1;
}; };
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 void e_comp_wl_shutdown(void);
EINTERN struct wl_resource *e_comp_wl_surface_create(struct wl_client *client, int version, uint32_t id); EINTERN struct wl_resource *e_comp_wl_surface_create(struct wl_client *client, int version, uint32_t id);

6
src/bin/e_comp_wl_input.c
View File

@ -420,7 +420,7 @@ e_comp_wl_input_keyboard_state_update(E_Comp_Data *cdata, uint32_t keycode, Eina
e_comp_wl_input_keyboard_modifiers_update(cdata); e_comp_wl_input_keyboard_modifiers_update(cdata);
} }
EAPI void E_API void
e_comp_wl_input_pointer_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled) e_comp_wl_input_pointer_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled)
{ {
/* check for valid compositor data */ /* check for valid compositor data */
@ -434,7 +434,7 @@ e_comp_wl_input_pointer_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled)
_e_comp_wl_input_update_seat_caps(cdata); _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) e_comp_wl_input_keyboard_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled)
{ {
/* check for valid compositor data */ /* check for valid compositor data */
@ -448,7 +448,7 @@ e_comp_wl_input_keyboard_enabled_set(E_Comp_Data *cdata, Eina_Bool enabled)
_e_comp_wl_input_update_seat_caps(cdata); _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) e_comp_wl_input_keymap_set(E_Comp_Data *cdata, const char *rules, const char *model, const char *layout)
{ {
struct xkb_keymap *keymap; struct xkb_keymap *keymap;

6
src/bin/e_comp_wl_input.h
View File

@ -11,10 +11,10 @@ EINTERN Eina_Bool e_comp_wl_input_keyboard_check(struct wl_resource *res);
EINTERN void e_comp_wl_input_keyboard_modifiers_update(E_Comp_Data *cdata); 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_state_update(E_Comp_Data *cdata, uint32_t keycode, Eina_Bool pressed);
EAPI void e_comp_wl_input_pointer_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);
EAPI void e_comp_wl_input_keyboard_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
#endif #endif

2
src/bin/e_comp_x.h
View File

@ -110,7 +110,7 @@ struct _E_Comp_X_Client_Data
EINTERN Eina_Bool e_comp_x_init(void); EINTERN Eina_Bool e_comp_x_init(void);
EINTERN void e_comp_x_shutdown(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(E_Comp *comp); EINTERN void e_comp_x_nocomp_end(E_Comp *comp);
# endif # endif
#endif #endif

70
src/bin/e_config.c
View File

@ -6,8 +6,8 @@
#define DEF_MENUCLICK 0.25 #define DEF_MENUCLICK 0.25
#endif #endif
EAPI E_Config *e_config = NULL; E_API E_Config *e_config = NULL;
EAPI E_Config_Bindings *e_bindings = NULL; E_API E_Config_Bindings *e_bindings = NULL;
static int _e_config_revisions = 9; 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_layout_edd = NULL;
static E_Config_DD *_e_config_xkb_option_edd = NULL; static E_Config_DD *_e_config_xkb_option_edd = NULL;
EAPI int E_EVENT_CONFIG_ICON_THEME = 0; E_API int E_EVENT_CONFIG_ICON_THEME = 0;
EAPI int E_EVENT_CONFIG_MODE_CHANGED = 0; E_API int E_EVENT_CONFIG_MODE_CHANGED = 0;
EAPI int E_EVENT_CONFIG_LOADED = 0; E_API int E_EVENT_CONFIG_LOADED = 0;
static E_Dialog *_e_config_error_dialog = NULL; static E_Dialog *_e_config_error_dialog = NULL;
@ -951,7 +951,7 @@ e_config_shutdown(void)
return 1; return 1;
} }
EAPI void E_API void
e_config_load(void) e_config_load(void)
{ {
int reload = 0; int reload = 0;
@ -1510,7 +1510,7 @@ e_config_load(void)
ecore_event_add(E_EVENT_CONFIG_LOADED, NULL, NULL, NULL); ecore_event_add(E_EVENT_CONFIG_LOADED, NULL, NULL, NULL);
} }
EAPI int E_API int
e_config_save(void) e_config_save(void)
{ {
E_FREE_FUNC(_e_config_save_defer, e_powersave_deferred_action_del); E_FREE_FUNC(_e_config_save_defer, e_powersave_deferred_action_del);
@ -1518,7 +1518,7 @@ e_config_save(void)
return e_config_domain_save("e", _e_config_edd, e_config); return e_config_domain_save("e", _e_config_edd, e_config);
} }
EAPI void E_API void
e_config_save_flush(void) e_config_save_flush(void)
{ {
if (_e_config_save_defer) if (_e_config_save_defer)
@ -1529,7 +1529,7 @@ e_config_save_flush(void)
} }
} }
EAPI void E_API void
e_config_save_queue(void) e_config_save_queue(void)
{ {
if (_e_config_save_defer) if (_e_config_save_defer)
@ -1538,20 +1538,20 @@ e_config_save_queue(void)
NULL); NULL);
} }
EAPI const char * E_API const char *
e_config_profile_get(void) e_config_profile_get(void)
{ {
return _e_config_profile; return _e_config_profile;
} }
EAPI void E_API void
e_config_profile_set(const char *prof) e_config_profile_set(const char *prof)
{ {
eina_stringshare_replace(&_e_config_profile, prof); eina_stringshare_replace(&_e_config_profile, prof);
e_util_env_set("E_CONF_PROFILE", _e_config_profile); e_util_env_set("E_CONF_PROFILE", _e_config_profile);
} }
EAPI char * E_API char *
e_config_profile_dir_get(const char *prof) e_config_profile_dir_get(const char *prof)
{ {
char buf[PATH_MAX]; char buf[PATH_MAX];
@ -1569,7 +1569,7 @@ _cb_sort_files(char *f1, char *f2)
return strcmp(f1, f2); return strcmp(f1, f2);
} }
EAPI Eina_List * E_API Eina_List *
e_config_profile_list(void) e_config_profile_list(void)
{ {
Eina_List *files; Eina_List *files;
@ -1645,7 +1645,7 @@ e_config_profile_list(void)
return flist; return flist;
} }
EAPI void E_API void
e_config_profile_add(const char *prof) e_config_profile_add(const char *prof)
{ {
char buf[4096]; char buf[4096];
@ -1654,7 +1654,7 @@ e_config_profile_add(const char *prof)
ecore_file_mkdir(buf); ecore_file_mkdir(buf);
} }
EAPI void E_API void
e_config_profile_del(const char *prof) e_config_profile_del(const char *prof)
{ {
char buf[4096]; char buf[4096];
@ -1663,13 +1663,13 @@ e_config_profile_del(const char *prof)
ecore_file_recursive_rm(buf); ecore_file_recursive_rm(buf);
} }
EAPI void E_API void
e_config_save_block_set(int block) e_config_save_block_set(int block)
{ {
_e_config_save_block = block; _e_config_save_block = block;
} }
EAPI int E_API int
e_config_save_block_get(void) e_config_save_block_get(void)
{ {
return _e_config_save_block; return _e_config_save_block;
@ -1684,7 +1684,7 @@ e_config_save_block_get(void)
* @param edd to struct definition * @param edd to struct definition
* @return returns allocated struct on success, if unable to find config returns null * @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) e_config_domain_load(const char *domain, E_Config_DD *edd)
{ {
Eet_File *ef; Eet_File *ef;
@ -1717,7 +1717,7 @@ e_config_domain_load(const char *domain, E_Config_DD *edd)
return e_config_domain_system_load(domain, 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) e_config_domain_system_load(const char *domain, E_Config_DD *edd)
{ {
Eet_File *ef; Eet_File *ef;
@ -1770,7 +1770,7 @@ _e_config_mv_error(const char *from, const char *to)
_e_config_error_dialog = dia; _e_config_error_dialog = dia;
} }
EAPI int E_API int
e_config_profile_save(void) e_config_profile_save(void)
{ {
Eet_File *ef; Eet_File *ef;
@ -1837,7 +1837,7 @@ e_config_profile_save(void)
* @param data struct to save as configuration file * @param data struct to save as configuration file
* @return 1 if save success, 0 on failure * @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) e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data)
{ {
Eet_File *ef; Eet_File *ef;
@ -1901,7 +1901,7 @@ e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data)
return ok; return ok;
} }
EAPI E_Config_Binding_Mouse * E_API E_Config_Binding_Mouse *
e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in) e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in)
{ {
Eina_List *l; Eina_List *l;
@ -1922,7 +1922,7 @@ e_config_binding_mouse_match(E_Config_Binding_Mouse *eb_in)
return NULL; return NULL;
} }
EAPI E_Config_Binding_Key * E_API E_Config_Binding_Key *
e_config_binding_key_match(E_Config_Binding_Key *eb_in) e_config_binding_key_match(E_Config_Binding_Key *eb_in)
{ {
Eina_List *l; Eina_List *l;
@ -1944,7 +1944,7 @@ e_config_binding_key_match(E_Config_Binding_Key *eb_in)
return NULL; return NULL;
} }
EAPI E_Config_Binding_Edge * E_API E_Config_Binding_Edge *
e_config_binding_edge_match(E_Config_Binding_Edge *eb_in) e_config_binding_edge_match(E_Config_Binding_Edge *eb_in)
{ {
Eina_List *l; Eina_List *l;
@ -1967,7 +1967,7 @@ e_config_binding_edge_match(E_Config_Binding_Edge *eb_in)
return NULL; return NULL;
} }
EAPI E_Config_Binding_Signal * E_API E_Config_Binding_Signal *
e_config_binding_signal_match(E_Config_Binding_Signal *eb_in) e_config_binding_signal_match(E_Config_Binding_Signal *eb_in)
{ {
Eina_List *l; Eina_List *l;
@ -1991,7 +1991,7 @@ e_config_binding_signal_match(E_Config_Binding_Signal *eb_in)
return NULL; return NULL;
} }
EAPI E_Config_Binding_Wheel * E_API E_Config_Binding_Wheel *
e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in) e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in)
{ {
Eina_List *l; Eina_List *l;
@ -2013,7 +2013,7 @@ e_config_binding_wheel_match(E_Config_Binding_Wheel *eb_in)
return NULL; return NULL;
} }
EAPI E_Config_Binding_Acpi * E_API E_Config_Binding_Acpi *
e_config_binding_acpi_match(E_Config_Binding_Acpi *eb_in) e_config_binding_acpi_match(E_Config_Binding_Acpi *eb_in)
{ {
Eina_List *l; Eina_List *l;
@ -2035,13 +2035,13 @@ e_config_binding_acpi_match(E_Config_Binding_Acpi *eb_in)
return NULL; return NULL;
} }
EAPI void E_API void
e_config_mode_changed(void) e_config_mode_changed(void)
{ {
ecore_event_add(E_EVENT_CONFIG_MODE_CHANGED, NULL, NULL, NULL); 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) e_config_binding_acpi_free(E_Config_Binding_Acpi *eba)
{ {
if (!eba) return; if (!eba) return;
@ -2050,7 +2050,7 @@ e_config_binding_acpi_free(E_Config_Binding_Acpi *eba)
free(eba); free(eba);
} }
EAPI void E_API void
e_config_binding_key_free(E_Config_Binding_Key *ebk) e_config_binding_key_free(E_Config_Binding_Key *ebk)
{ {
if (!ebk) return; if (!ebk) return;
@ -2060,7 +2060,7 @@ e_config_binding_key_free(E_Config_Binding_Key *ebk)
free(ebk); free(ebk);
} }
EAPI void E_API void
e_config_binding_edge_free(E_Config_Binding_Edge *ebe) e_config_binding_edge_free(E_Config_Binding_Edge *ebe)
{ {
if (!ebe) return; if (!ebe) return;
@ -2069,7 +2069,7 @@ e_config_binding_edge_free(E_Config_Binding_Edge *ebe)
free(ebe); free(ebe);
} }
EAPI void E_API void
e_config_binding_mouse_free(E_Config_Binding_Mouse *ebm) e_config_binding_mouse_free(E_Config_Binding_Mouse *ebm)
{ {
if (!ebm) return; if (!ebm) return;
@ -2078,7 +2078,7 @@ e_config_binding_mouse_free(E_Config_Binding_Mouse *ebm)
free(ebm); free(ebm);
} }
EAPI void E_API void
e_config_binding_wheel_free(E_Config_Binding_Wheel *ebw) e_config_binding_wheel_free(E_Config_Binding_Wheel *ebw)
{ {
if (!ebw) return; if (!ebw) return;
@ -2087,7 +2087,7 @@ e_config_binding_wheel_free(E_Config_Binding_Wheel *ebw)
free(ebw); free(ebw);
} }
EAPI void E_API void
e_config_binding_signal_free(E_Config_Binding_Signal *ebs) e_config_binding_signal_free(E_Config_Binding_Signal *ebs)
{ {
if (!ebs) return; if (!ebs) return;
@ -2098,7 +2098,7 @@ e_config_binding_signal_free(E_Config_Binding_Signal *ebs)
free(ebs); free(ebs);
} }
EAPI void E_API void
e_config_bindings_free(E_Config_Bindings *ecb) e_config_bindings_free(E_Config_Bindings *ecb)
{ {
if (!ecb) return; if (!ecb) return;

70
src/bin/e_config.h
View File

@ -646,50 +646,50 @@ struct _E_Config_XKB_Option
EINTERN int e_config_init(void); EINTERN int e_config_init(void);
EINTERN int e_config_shutdown(void); EINTERN int e_config_shutdown(void);
EAPI void e_config_load(void); E_API void e_config_load(void);
EAPI int e_config_save(void); E_API int e_config_save(void);
EAPI void e_config_save_flush(void); E_API void e_config_save_flush(void);
EAPI void e_config_save_queue(void); E_API void e_config_save_queue(void);
EAPI const char *e_config_profile_get(void); E_API const char *e_config_profile_get(void);
EAPI char *e_config_profile_dir_get(const char *prof); E_API char *e_config_profile_dir_get(const char *prof);
EAPI void e_config_profile_set(const char *prof); E_API void e_config_profile_set(const char *prof);
EAPI Eina_List *e_config_profile_list(void); E_API Eina_List *e_config_profile_list(void);
EAPI void e_config_profile_add(const char *prof); E_API void e_config_profile_add(const char *prof);
EAPI void e_config_profile_del(const char *prof); E_API void e_config_profile_del(const char *prof);
EAPI void e_config_save_block_set(int block); E_API void e_config_save_block_set(int block);
EAPI int e_config_save_block_get(void); E_API int e_config_save_block_get(void);
EAPI void *e_config_domain_load(const char *domain, E_Config_DD *edd); E_API 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); E_API void *e_config_domain_system_load(const char *domain, E_Config_DD *edd);
EAPI int e_config_profile_save(void); E_API int e_config_profile_save(void);
EAPI int e_config_domain_save(const char *domain, E_Config_DD *edd, const void *data); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API E_Config_Binding_Acpi *e_config_binding_acpi_match(E_Config_Binding_Acpi *eb_in);
EAPI void e_config_mode_changed(void); E_API void e_config_mode_changed(void);
EAPI void e_config_bindings_free(E_Config_Bindings *ecb); E_API void e_config_bindings_free(E_Config_Bindings *ecb);
EAPI void e_config_binding_signal_free(E_Config_Binding_Signal *ebs); E_API void e_config_binding_signal_free(E_Config_Binding_Signal *ebs);
EAPI void e_config_binding_wheel_free(E_Config_Binding_Wheel *ebw); E_API void e_config_binding_wheel_free(E_Config_Binding_Wheel *ebw);
EAPI void e_config_binding_mouse_free(E_Config_Binding_Mouse *ebm); E_API void e_config_binding_mouse_free(E_Config_Binding_Mouse *ebm);
EAPI void e_config_binding_edge_free(E_Config_Binding_Edge *ebe); E_API void e_config_binding_edge_free(E_Config_Binding_Edge *ebe);
EAPI void e_config_binding_key_free(E_Config_Binding_Key *ebk); E_API void e_config_binding_key_free(E_Config_Binding_Key *ebk);
EAPI void e_config_binding_acpi_free(E_Config_Binding_Acpi *eba); E_API void e_config_binding_acpi_free(E_Config_Binding_Acpi *eba);
extern EAPI E_Config *e_config; extern E_API E_Config *e_config;
extern EAPI E_Config_Bindings *e_bindings; extern E_API E_Config_Bindings *e_bindings;
extern EAPI int E_EVENT_CONFIG_ICON_THEME; extern E_API int E_EVENT_CONFIG_ICON_THEME;
extern EAPI int E_EVENT_CONFIG_MODE_CHANGED; extern E_API int E_EVENT_CONFIG_MODE_CHANGED;
extern EAPI int E_EVENT_CONFIG_LOADED; extern E_API int E_EVENT_CONFIG_LOADED;
#endif #endif
#endif #endif

6
src/bin/e_config_data.c
View File

@ -2,14 +2,14 @@
static Eina_Hash *config_hash = NULL; static Eina_Hash *config_hash = NULL;
EAPI void E_API void
e_config_descriptor_free(E_Config_DD *edd) e_config_descriptor_free(E_Config_DD *edd)
{ {
eina_hash_del_by_key(config_hash, eet_data_descriptor_name_get((Eet_Data_Descriptor*)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); 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) e_config_descriptor_new(const char *name, int size)
{ {
Eet_Data_Descriptor_Class eddc; Eet_Data_Descriptor_Class eddc;
@ -29,7 +29,7 @@ e_config_descriptor_new(const char *name, int size)
return edd; return edd;
} }
EAPI E_Config_DD * E_API E_Config_DD *
e_config_descriptor_find(const char *name) e_config_descriptor_find(const char *name)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL);

6
src/bin/e_config_data.h
View File

@ -55,9 +55,9 @@ typedef Eet_Data_Descriptor E_Config_DD;
#ifndef E_CONFIG_DATA_H #ifndef E_CONFIG_DATA_H
#define E_CONFIG_DATA_H #define E_CONFIG_DATA_H
EAPI E_Config_DD *e_config_descriptor_new(const char *name, int size); E_API E_Config_DD *e_config_descriptor_new(const char *name, int size);
EAPI void e_config_descriptor_free(E_Config_DD *edd); E_API 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_find(const char *name);
#endif #endif
#endif #endif

10
src/bin/e_config_dialog.c
View File

@ -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 * @param data additional data to attach to the dialog, will be passed to the callbacks
* @return returns the created dialog. Null on failure * @return returns the created dialog. Null on failure
*/ */
EAPI E_Config_Dialog * E_API E_Config_Dialog *
e_config_dialog_new(E_Comp *c, 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_new(E_Comp *c, 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; E_Config_Dialog *cfd;
@ -92,7 +92,7 @@ e_config_dialog_new(E_Comp *c, const char *title, const char *name, const char *
return cfd; return cfd;
} }
EAPI int E_API int
e_config_dialog_find(const char *name, const char *class) e_config_dialog_find(const char *name, const char *class)
{ {
Eina_List *l; Eina_List *l;
@ -127,7 +127,7 @@ e_config_dialog_find(const char *name, const char *class)
return 0; return 0;
} }
EAPI E_Config_Dialog * E_API E_Config_Dialog *
e_config_dialog_get(const char *name, const char *class) e_config_dialog_get(const char *name, const char *class)
{ {
Eina_List *l; Eina_List *l;
@ -488,14 +488,14 @@ _e_config_dialog_cb_close(void *data __UNUSED__, E_Dialog *dia)
if (ok) e_util_defer_object_del(E_OBJECT(cfd)); 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) e_config_dialog_changed_auto_set(E_Config_Dialog *cfd, unsigned char value)
{ {
if (!cfd) return; if (!cfd) return;
cfd->cfg_changed_auto = !!value; cfd->cfg_changed_auto = !!value;
} }
EAPI void E_API void
e_config_dialog_changed_set(E_Config_Dialog *cfd, unsigned char value) e_config_dialog_changed_set(E_Config_Dialog *cfd, unsigned char value)
{ {
if (!cfd) return; if (!cfd) return;

10
src/bin/e_config_dialog.h
View File

@ -55,12 +55,12 @@ struct _E_Config_Dialog
unsigned char cfg_changed_auto : 1; unsigned char cfg_changed_auto : 1;
}; };
EAPI E_Config_Dialog *e_config_dialog_new(E_Comp *c, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data); E_API E_Config_Dialog *e_config_dialog_new(E_Comp *c, 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); E_API 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_get(const char *name, const char *class);
EAPI void e_config_dialog_changed_auto_set(E_Config_Dialog *cfd, unsigned char value); E_API 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_set(E_Config_Dialog *cfd, unsigned char value);
#endif #endif
#endif #endif

20
src/bin/e_configure.c
View File

@ -11,7 +11,7 @@ static void _e_configure_registry_item_free(E_Configure_It *eci);
static void _configure_job(void *data); static void _configure_job(void *data);
static Eina_Bool _configure_init_timer(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 Eina_List *handlers = NULL;
static E_Int_Menu_Augmentation *maug = 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); ecore_timer_add(0.0, _configure_init_timer, NULL);
} }
EAPI void E_API void
e_configure_registry_call(const char *path, E_Comp *c, const char *params) e_configure_registry_call(const char *path, E_Comp *c, const char *params)
{ {
E_Configure_Cat *ecat; E_Configure_Cat *ecat;
@ -89,19 +89,19 @@ e_configure_registry_call(const char *path, E_Comp *c, const char *params)
free(cat); 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)(E_Comp *c, const char *params)) e_configure_registry_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func)(E_Comp *c, const char *params))
{ {
_e_configure_registry_item_full_add(path, pri, label, icon_file, icon, func, NULL, NULL, NULL); _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)(E_Comp *c, const char *params)) e_configure_registry_generic_item_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, void (*generic_func)(E_Comp *c, const char *params))
{ {
_e_configure_registry_item_full_add(path, pri, label, icon_file, icon, NULL, generic_func, NULL, NULL); _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)(E_Comp *c, const char *params), const char *params) 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)(E_Comp *c, const char *params), const char *params)
{ {
_e_configure_registry_item_full_add(path, pri, label, icon_file, icon, func, NULL, NULL, params); _e_configure_registry_item_full_add(path, pri, label, icon_file, icon, func, NULL, NULL, params);
@ -112,7 +112,7 @@ e_configure_registry_item_params_add(const char *path, int pri, const char *labe
* *
*@param path location the item to delete *@param path location the item to delete
*/ */
EAPI void E_API void
e_configure_registry_item_del(const char *path) e_configure_registry_item_del(const char *path)
{ {
E_Configure_Cat *ecat; E_Configure_Cat *ecat;
@ -162,7 +162,7 @@ _E_configure_category_pri_cb(E_Configure_Cat *ecat, E_Configure_Cat *ecat2)
return ecat->pri - ecat2->pri; 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_registry_category_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon)
{ {
E_Configure_Cat *ecat2; E_Configure_Cat *ecat2;
@ -191,7 +191,7 @@ e_configure_registry_category_add(const char *path, int pri, const char *label,
* *
*@param path location the category to delete *@param path location the category to delete
*/ */
EAPI void E_API void
e_configure_registry_category_del(const char *path) e_configure_registry_category_del(const char *path)
{ {
E_Configure_Cat *ecat; E_Configure_Cat *ecat;
@ -227,14 +227,14 @@ e_configure_registry_category_del(const char *path)
*@param func the callback to use when the configuration item is clicked *@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, E_Comp *c, const char *params, Efreet_Desktop *desktop), const void *data) e_configure_registry_custom_desktop_exec_callback_set(void (*func)(const void *data, E_Comp *c, const char *params, Efreet_Desktop *desktop), const void *data)
{ {
custom_desktop_exec.func = func; custom_desktop_exec.func = func;
custom_desktop_exec.data = data; custom_desktop_exec.data = data;
} }
EAPI int E_API int
e_configure_registry_exists(const char *path) e_configure_registry_exists(const char *path)
{ {
E_Configure_Cat *ecat; E_Configure_Cat *ecat;

20
src/bin/e_configure.h
View File

@ -30,18 +30,18 @@ struct _E_Configure_It
Efreet_Desktop *desktop; 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) (E_Comp *c, const char *params)); 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) (E_Comp *c, 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) (E_Comp *c, const char *params), 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) (E_Comp *c, 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) (E_Comp *c, 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) (E_Comp *c, const char *params));
EAPI void e_configure_registry_item_del(const char *path); E_API 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); E_API 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); E_API void e_configure_registry_category_del(const char *path);
EAPI void e_configure_registry_call(const char *path, E_Comp *c, const char *params); E_API void e_configure_registry_call(const char *path, E_Comp *c, const char *params);
EAPI int e_configure_registry_exists(const char *path); E_API int e_configure_registry_exists(const char *path);
EAPI void e_configure_registry_custom_desktop_exec_callback_set(void (*func) (const void *data, E_Comp *c, const char *params, Efreet_Desktop *desktop), const void *data); E_API void e_configure_registry_custom_desktop_exec_callback_set(void (*func) (const void *data, E_Comp *c, const char *params, Efreet_Desktop *desktop), const void *data);
EINTERN void e_configure_init(void); EINTERN void e_configure_init(void);
extern EAPI Eina_List *e_configure_registry; extern E_API Eina_List *e_configure_registry;
#endif #endif
#endif #endif

2
src/bin/e_confirm_dialog.c
View File

@ -15,7 +15,7 @@ _dia_del(void *data)
} }
/********** externally accesible functions ****************/ /********** 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, e_confirm_dialog_show(const char *title, const char *icon, const char *text,
const char *button_text, const char *button2_text, const char *button_text, const char *button2_text,
void (*func)(void *data), void (*func2)(void *data), void (*func)(void *data), void (*func2)(void *data),

2
src/bin/e_confirm_dialog.h
View File

@ -45,7 +45,7 @@ struct _E_Confirm_Dialog
* del_func - the function to call before dialog is deleted * del_func - the function to call before dialog is deleted
* del_data - the pointer passer to del_func * 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
#endif #endif

6
src/bin/e_datastore.c
View File

@ -6,7 +6,7 @@
static Eina_Hash *store = NULL; static Eina_Hash *store = NULL;
/* externally accessible functions */ /* externally accessible functions */
EAPI void E_API void
e_datastore_set(char *key, void *data) e_datastore_set(char *key, void *data)
{ {
if (!store) store = eina_hash_string_superfast_new(NULL); 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); eina_hash_add(store, key, data);
} }
EAPI void * E_API void *
e_datastore_get(char *key) e_datastore_get(char *key)
{ {
return eina_hash_find(store, key); return eina_hash_find(store, key);
} }
EAPI void E_API void
e_datastore_del(char *key) e_datastore_del(char *key)
{ {
eina_hash_del(store, key, NULL); eina_hash_del(store, key, NULL);

6
src/bin/e_datastore.h
View File

@ -4,9 +4,9 @@
#ifndef E_DATASTORE_H #ifndef E_DATASTORE_H
#define E_DATASTORE_H #define E_DATASTORE_H
EAPI void e_datastore_set(char *key, void *data); E_API void e_datastore_set(char *key, void *data);
EAPI void *e_datastore_get(char *key); E_API void *e_datastore_get(char *key);
EAPI void e_datastore_del(char *key); E_API void e_datastore_del(char *key);
#endif #endif
#endif #endif

10
src/bin/e_dbusmenu.c
View File

@ -337,7 +337,7 @@ layout_updated_cb(void *data, const Eldbus_Message *msg EINA_UNUSED)
layout_update(ctx); 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) e_dbusmenu_load(Eldbus_Connection *conn, const char *bus, const char *path, const void *data)
{ {
Eldbus_Object *obj; Eldbus_Object *obj;
@ -371,7 +371,7 @@ e_dbusmenu_load(Eldbus_Connection *conn, const char *bus, const char *path, cons
return ctx; return ctx;
} }
EAPI void E_API void
e_dbusmenu_event_send(E_DBusMenu_Item *m, E_DBusMenu_Item_Event event) e_dbusmenu_event_send(E_DBusMenu_Item *m, E_DBusMenu_Item_Event event)
{ {
Eldbus_Message *msg; 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); eldbus_proxy_send(m->ctx->proxy, msg, NULL, NULL, -1);
} }
EAPI void E_API void
e_dbusmenu_unload(E_DBusMenu_Ctx *ctx) e_dbusmenu_unload(E_DBusMenu_Ctx *ctx)
{ {
Eldbus_Connection *conn; Eldbus_Connection *conn;
@ -414,13 +414,13 @@ e_dbusmenu_unload(E_DBusMenu_Ctx *ctx)
free(ctx); free(ctx);
} }
EAPI void E_API void
e_dbusmenu_pop_request_cb_set(E_DBusMenu_Ctx *ctx, E_DBusMenu_Pop_Request_Cb cb) e_dbusmenu_pop_request_cb_set(E_DBusMenu_Ctx *ctx, E_DBusMenu_Pop_Request_Cb cb)
{ {
ctx->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) e_dbusmenu_update_cb_set(E_DBusMenu_Ctx *ctx, E_DBusMenu_Update_Cb cb)
{ {
ctx->update_cb = cb; ctx->update_cb = cb;

10
src/bin/e_dbusmenu.h
View File

@ -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_Pop_Request_Cb)(void *data, const E_DBusMenu_Item *item);
typedef void (*E_DBusMenu_Update_Cb)(void *data, E_DBusMenu_Item *new_root_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); E_API 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); E_API 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); E_API 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 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 #endif

62
src/bin/e_desk.c
View File

@ -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 E_Desk_Flip_Cb _e_desk_flip_cb = NULL;
static void *_e_desk_flip_data = NULL; static void *_e_desk_flip_data = NULL;
EAPI int E_EVENT_DESK_SHOW = 0; E_API int E_EVENT_DESK_SHOW = 0;
EAPI int E_EVENT_DESK_BEFORE_SHOW = 0; E_API int E_EVENT_DESK_BEFORE_SHOW = 0;
EAPI int E_EVENT_DESK_AFTER_SHOW = 0; E_API int E_EVENT_DESK_AFTER_SHOW = 0;
EAPI int E_EVENT_DESK_DESKSHOW = 0; E_API int E_EVENT_DESK_DESKSHOW = 0;
EAPI int E_EVENT_DESK_NAME_CHANGE = 0; E_API int E_EVENT_DESK_NAME_CHANGE = 0;
EAPI int E_EVENT_DESK_WINDOW_PROFILE_CHANGE = 0; E_API int E_EVENT_DESK_WINDOW_PROFILE_CHANGE = 0;
EINTERN int EINTERN int
e_desk_init(void) e_desk_init(void)
@ -44,7 +44,7 @@ e_desk_shutdown(void)
return 1; return 1;
} }
EAPI E_Desk * E_API E_Desk *
e_desk_new(E_Zone *zone, int x, int y) e_desk_new(E_Zone *zone, int x, int y)
{ {
E_Desk *desk; E_Desk *desk;
@ -103,7 +103,7 @@ e_desk_new(E_Zone *zone, int x, int y)
return desk; return desk;
} }
EAPI E_Client * E_API E_Client *
e_desk_client_top_visible_get(const E_Desk *desk) e_desk_client_top_visible_get(const E_Desk *desk)
{ {
E_Client *ec; E_Client *ec;
@ -116,7 +116,7 @@ e_desk_client_top_visible_get(const E_Desk *desk)
return NULL; return NULL;
} }
EAPI void E_API void
e_desk_name_set(E_Desk *desk, const char *name) e_desk_name_set(E_Desk *desk, const char *name)
{ {
E_Event_Desk_Name_Change *ev; E_Event_Desk_Name_Change *ev;
@ -133,7 +133,7 @@ e_desk_name_set(E_Desk *desk, const char *name)
_e_desk_event_desk_name_change_free, NULL); _e_desk_event_desk_name_change_free, NULL);
} }
EAPI void E_API void
e_desk_name_add(int manager, int zone, int desk_x, int desk_y, const char *name) e_desk_name_add(int manager, int zone, int desk_x, int desk_y, const char *name)
{ {
E_Config_Desktop_Name *cfname; E_Config_Desktop_Name *cfname;
@ -150,7 +150,7 @@ e_desk_name_add(int manager, int zone, int desk_x, int desk_y, const char *name)
e_config->desktop_names = eina_list_append(e_config->desktop_names, cfname); e_config->desktop_names = eina_list_append(e_config->desktop_names, cfname);
} }
EAPI void E_API void
e_desk_name_del(int manager, int zone, int desk_x, int desk_y) e_desk_name_del(int manager, int zone, int desk_x, int desk_y)
{ {
Eina_List *l = NULL; Eina_List *l = NULL;
@ -170,7 +170,7 @@ e_desk_name_del(int manager, int zone, int desk_x, int desk_y)
} }
} }
EAPI void E_API void
e_desk_name_update(void) e_desk_name_update(void)
{ {
const Eina_List *z, *l, *ll; const Eina_List *z, *l, *ll;
@ -218,7 +218,7 @@ e_desk_name_update(void)
} }
} }
EAPI void E_API void
e_desk_show(E_Desk *desk) e_desk_show(E_Desk *desk)
{ {
E_Event_Desk_Show *ev; E_Event_Desk_Show *ev;
@ -330,7 +330,7 @@ e_desk_show(E_Desk *desk)
e_zone_edge_flip_eval(desk->zone); e_zone_edge_flip_eval(desk->zone);
} }
EAPI void E_API void
e_desk_deskshow(E_Zone *zone) e_desk_deskshow(E_Zone *zone)
{ {
E_Client *ec; E_Client *ec;
@ -381,7 +381,7 @@ e_desk_deskshow(E_Zone *zone)
_e_desk_event_desk_deskshow_free, NULL); _e_desk_event_desk_deskshow_free, NULL);
} }
EAPI E_Client * E_API E_Client *
e_desk_last_focused_focus(E_Desk *desk) e_desk_last_focused_focus(E_Desk *desk)
{ {
Eina_List *l = NULL; Eina_List *l = NULL;
@ -425,31 +425,31 @@ e_desk_last_focused_focus(E_Desk *desk)
return NULL; return NULL;
} }
EAPI void E_API void
e_desk_row_add(E_Zone *zone) e_desk_row_add(E_Zone *zone)
{ {
e_zone_desk_count_set(zone, zone->desk_x_count, zone->desk_y_count + 1); 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_desk_row_remove(E_Zone *zone)
{ {
e_zone_desk_count_set(zone, zone->desk_x_count, zone->desk_y_count - 1); 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_desk_col_add(E_Zone *zone)
{ {
e_zone_desk_count_set(zone, zone->desk_x_count + 1, zone->desk_y_count); 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_desk_col_remove(E_Zone *zone)
{ {
e_zone_desk_count_set(zone, zone->desk_x_count - 1, zone->desk_y_count); 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_desk_current_get(E_Zone *zone)
{ {
E_OBJECT_CHECK_RETURN(zone, NULL); E_OBJECT_CHECK_RETURN(zone, NULL);
@ -458,7 +458,7 @@ e_desk_current_get(E_Zone *zone)
return e_desk_at_xy_get(zone, zone->desk_x_current, zone->desk_y_current); 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_desk_at_xy_get(E_Zone *zone, int x, int y)
{ {
E_OBJECT_CHECK_RETURN(zone, NULL); E_OBJECT_CHECK_RETURN(zone, NULL);
@ -473,7 +473,7 @@ e_desk_at_xy_get(E_Zone *zone, int x, int y)
return zone->desks[x + (y * zone->desk_x_count)]; 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) e_desk_at_pos_get(E_Zone *zone, int pos)
{ {
int x, y; int x, y;
@ -490,7 +490,7 @@ e_desk_at_pos_get(E_Zone *zone, int pos)
return zone->desks[x + (y * zone->desk_x_count)]; 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_desk_xy_get(E_Desk *desk, int *x, int *y)
{ {
E_OBJECT_CHECK(desk); E_OBJECT_CHECK(desk);
@ -500,7 +500,7 @@ e_desk_xy_get(E_Desk *desk, int *x, int *y)
if (y) *y = desk->y; if (y) *y = desk->y;
} }
EAPI void E_API void
e_desk_next(E_Zone *zone) e_desk_next(E_Zone *zone)
{ {
int x, y; int x, y;
@ -525,7 +525,7 @@ e_desk_next(E_Zone *zone)
e_desk_show(e_desk_at_xy_get(zone, x, y)); e_desk_show(e_desk_at_xy_get(zone, x, y));
} }
EAPI void E_API void
e_desk_prev(E_Zone *zone) e_desk_prev(E_Zone *zone)
{ {
int x, y; int x, y;
@ -549,7 +549,7 @@ e_desk_prev(E_Zone *zone)
e_desk_show(e_desk_at_xy_get(zone, x, y)); e_desk_show(e_desk_at_xy_get(zone, x, y));
} }
EAPI void E_API void
e_desk_window_profile_set(E_Desk *desk, e_desk_window_profile_set(E_Desk *desk,
const char *profile) const char *profile)
{ {
@ -567,7 +567,7 @@ e_desk_window_profile_set(E_Desk *desk,
_e_desk_event_desk_window_profile_change_free, NULL); _e_desk_event_desk_window_profile_change_free, NULL);
} }
EAPI void E_API void
e_desk_window_profile_add(int manager, e_desk_window_profile_add(int manager,
int zone, int zone,
int desk_x, int desk_x,
@ -587,7 +587,7 @@ e_desk_window_profile_add(int manager,
e_config->desktop_window_profiles = eina_list_append(e_config->desktop_window_profiles, cfprof); 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 manager, e_desk_window_profile_del(int manager,
int zone, int zone,
int desk_x, int desk_x,
@ -612,7 +612,7 @@ e_desk_window_profile_del(int manager,
} }
} }
EAPI void E_API void
e_desk_window_profile_update(void) e_desk_window_profile_update(void)
{ {
const Eina_List *z, *l, *ll; const Eina_List *z, *l, *ll;
@ -662,14 +662,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_set(E_Desk_Flip_Cb cb, const void *data)
{ {
_e_desk_flip_cb = cb; _e_desk_flip_cb = cb;
_e_desk_flip_data = (void*)data; _e_desk_flip_data = (void*)data;
} }
EAPI void E_API void
e_desk_flip_end(E_Desk *desk) e_desk_flip_end(E_Desk *desk)
{ {
E_Event_Desk_After_Show *ev; E_Event_Desk_After_Show *ev;

62
src/bin/e_desk.h
View File

@ -66,39 +66,39 @@ struct _E_Event_Desk_Window_Profile_Change
EINTERN int e_desk_init(void); EINTERN int e_desk_init(void);
EINTERN int e_desk_shutdown(void); EINTERN int e_desk_shutdown(void);
EAPI E_Desk *e_desk_new(E_Zone *zone, int x, int y); E_API E_Desk *e_desk_new(E_Zone *zone, int x, int y);
EAPI void e_desk_name_set(E_Desk *desk, const char *name); E_API void e_desk_name_set(E_Desk *desk, const char *name);
EAPI void e_desk_name_add(int manager, int zone, int desk_x, int desk_y, const char *name); E_API void e_desk_name_add(int manager, int zone, int desk_x, int desk_y, const char *name);
EAPI void e_desk_name_del(int manager, int zone, int desk_x, int desk_y); E_API void e_desk_name_del(int manager, int zone, int desk_x, int desk_y);
EAPI void e_desk_name_update(void); E_API void e_desk_name_update(void);
EAPI void e_desk_show(E_Desk *desk); E_API void e_desk_show(E_Desk *desk);
EAPI void e_desk_deskshow(E_Zone *zone); E_API void e_desk_deskshow(E_Zone *zone);
EAPI E_Client *e_desk_last_focused_focus(E_Desk *desk); E_API E_Client *e_desk_last_focused_focus(E_Desk *desk);
EAPI E_Client *e_desk_client_top_visible_get(const E_Desk *desk); E_API E_Client *e_desk_client_top_visible_get(const E_Desk *desk);
EAPI E_Desk *e_desk_current_get(E_Zone *zone); E_API E_Desk *e_desk_current_get(E_Zone *zone);
EAPI E_Desk *e_desk_at_xy_get(E_Zone *zone, int x, int y); E_API 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); E_API 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); E_API void e_desk_xy_get(E_Desk *desk, int *x, int *y);
EAPI void e_desk_next(E_Zone *zone); E_API void e_desk_next(E_Zone *zone);
EAPI void e_desk_prev(E_Zone *zone); E_API void e_desk_prev(E_Zone *zone);
EAPI void e_desk_row_add(E_Zone *zone); E_API void e_desk_row_add(E_Zone *zone);
EAPI void e_desk_row_remove(E_Zone *zone); E_API void e_desk_row_remove(E_Zone *zone);
EAPI void e_desk_col_add(E_Zone *zone); E_API void e_desk_col_add(E_Zone *zone);
EAPI void e_desk_col_remove(E_Zone *zone); E_API void e_desk_col_remove(E_Zone *zone);
EAPI void e_desk_window_profile_set(E_Desk *desk, const char *profile); E_API void e_desk_window_profile_set(E_Desk *desk, const char *profile);
EAPI void e_desk_window_profile_add(int manager, int zone, int desk_x, int desk_y, const char *profile); E_API void e_desk_window_profile_add(int manager, int zone, int desk_x, int desk_y, const char *profile);
EAPI void e_desk_window_profile_del(int manager, int zone, int desk_x, int desk_y); E_API void e_desk_window_profile_del(int manager, int zone, int desk_x, int desk_y);
EAPI void e_desk_window_profile_update(void); E_API void e_desk_window_profile_update(void);
EAPI void e_desk_flip_cb_set(E_Desk_Flip_Cb cb, const void *data); E_API void e_desk_flip_cb_set(E_Desk_Flip_Cb cb, const void *data);
EAPI void e_desk_flip_end(E_Desk *desk); E_API void e_desk_flip_end(E_Desk *desk);
extern EAPI int E_EVENT_DESK_SHOW; extern E_API int E_EVENT_DESK_SHOW;
extern EAPI int E_EVENT_DESK_BEFORE_SHOW; extern E_API int E_EVENT_DESK_BEFORE_SHOW;
extern EAPI int E_EVENT_DESK_AFTER_SHOW; extern E_API int E_EVENT_DESK_AFTER_SHOW;
extern EAPI int E_EVENT_DESK_DESKSHOW; extern E_API int E_EVENT_DESK_DESKSHOW;
extern EAPI int E_EVENT_DESK_NAME_CHANGE; extern E_API int E_EVENT_DESK_NAME_CHANGE;
extern EAPI int E_EVENT_DESK_WINDOW_PROFILE_CHANGE; extern E_API int E_EVENT_DESK_WINDOW_PROFILE_CHANGE;
#endif #endif
#endif #endif

2
src/bin/e_deskenv.c
View File

@ -48,7 +48,7 @@ e_deskenv_shutdown(void)
return 1; return 1;
} }
EAPI void E_API void
e_deskenv_xmodmap_run(void) e_deskenv_xmodmap_run(void)
{ {
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY

2
src/bin/e_deskenv.h
View File

@ -5,6 +5,6 @@
EINTERN int e_deskenv_init(void); EINTERN int e_deskenv_init(void);
EINTERN int e_deskenv_shutdown(void); EINTERN int e_deskenv_shutdown(void);
EAPI void e_deskenv_xmodmap_run(void); E_API void e_deskenv_xmodmap_run(void);
#endif #endif
#endif #endif

24
src/bin/e_desklock.c
View File

@ -41,7 +41,7 @@ static Eina_Bool _e_desklock_state = EINA_FALSE;
static void _e_desklock_ask_presentation_mode(void); static void _e_desklock_ask_presentation_mode(void);
EAPI int E_EVENT_DESKLOCK = 0; E_API int E_EVENT_DESKLOCK = 0;
EINTERN int EINTERN int
e_desklock_init(void) e_desklock_init(void)
@ -95,7 +95,7 @@ e_desklock_shutdown(void)
return 1; return 1;
} }
EAPI Eina_Stringshare * E_API Eina_Stringshare *
e_desklock_user_wallpaper_get(E_Zone *zone) e_desklock_user_wallpaper_get(E_Zone *zone)
{ {
const E_Config_Desktop_Background *cdbg; const E_Config_Desktop_Background *cdbg;
@ -118,7 +118,7 @@ e_desklock_user_wallpaper_get(E_Zone *zone)
return e_theme_edje_file_get("base/theme/desklock", "e/desklock/background"); 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) e_desklock_interface_append(E_Desklock_Interface *iface)
{ {
EINA_SAFETY_ON_NULL_RETURN(iface); EINA_SAFETY_ON_NULL_RETURN(iface);
@ -140,7 +140,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_remove(E_Desklock_Interface *iface)
{ {
E_Desklock_Interface *diface; E_Desklock_Interface *diface;
@ -169,35 +169,35 @@ e_desklock_interface_remove(E_Desklock_Interface *iface)
*/ */
} }
EAPI void E_API void
e_desklock_show_hook_add(E_Desklock_Show_Cb cb) e_desklock_show_hook_add(E_Desklock_Show_Cb cb)
{ {
EINA_SAFETY_ON_NULL_RETURN(cb); EINA_SAFETY_ON_NULL_RETURN(cb);
show_hooks = eina_list_append(show_hooks, cb); show_hooks = eina_list_append(show_hooks, cb);
} }
EAPI void E_API void
e_desklock_show_hook_del(E_Desklock_Show_Cb cb) e_desklock_show_hook_del(E_Desklock_Show_Cb cb)
{ {
EINA_SAFETY_ON_NULL_RETURN(cb); EINA_SAFETY_ON_NULL_RETURN(cb);
show_hooks = eina_list_remove(show_hooks, cb); show_hooks = eina_list_remove(show_hooks, cb);
} }
EAPI void E_API void
e_desklock_hide_hook_add(E_Desklock_Hide_Cb cb) e_desklock_hide_hook_add(E_Desklock_Hide_Cb cb)
{ {
EINA_SAFETY_ON_NULL_RETURN(cb); EINA_SAFETY_ON_NULL_RETURN(cb);
hide_hooks = eina_list_append(hide_hooks, cb); hide_hooks = eina_list_append(hide_hooks, cb);
} }
EAPI void E_API void
e_desklock_hide_hook_del(E_Desklock_Hide_Cb cb) e_desklock_hide_hook_del(E_Desklock_Hide_Cb cb)
{ {
EINA_SAFETY_ON_NULL_RETURN(cb); EINA_SAFETY_ON_NULL_RETURN(cb);
hide_hooks = eina_list_remove(hide_hooks, cb); hide_hooks = eina_list_remove(hide_hooks, cb);
} }
EAPI int E_API int
e_desklock_show_autolocked(void) e_desklock_show_autolocked(void)
{ {
if (_e_desklock_autolock_time < 1.0) if (_e_desklock_autolock_time < 1.0)
@ -205,7 +205,7 @@ e_desklock_show_autolocked(void)
return e_desklock_show(EINA_FALSE); return e_desklock_show(EINA_FALSE);
} }
EAPI int E_API int
e_desklock_show(Eina_Bool suspend) e_desklock_show(Eina_Bool suspend)
{ {
const Eina_List *l; const Eina_List *l;
@ -326,7 +326,7 @@ fail:
return 0; return 0;
} }
EAPI void E_API void
e_desklock_hide(void) e_desklock_hide(void)
{ {
Eina_List *l; Eina_List *l;
@ -392,7 +392,7 @@ e_desklock_hide(void)
e_util_env_set("E_DESKLOCK_UNLOCKED", "happened"); e_util_env_set("E_DESKLOCK_UNLOCKED", "happened");
} }
EAPI Eina_Bool E_API Eina_Bool
e_desklock_state_get(void) e_desklock_state_get(void)
{ {
return _e_desklock_state; return _e_desklock_state;

24
src/bin/e_desklock.h
View File

@ -42,20 +42,20 @@ struct _E_Event_Desklock
EINTERN int e_desklock_init(void); EINTERN int e_desklock_init(void);
EINTERN int e_desklock_shutdown(void); EINTERN int e_desklock_shutdown(void);
EAPI int e_desklock_show(Eina_Bool suspend); E_API int e_desklock_show(Eina_Bool suspend);
EAPI int e_desklock_show_autolocked(void); E_API int e_desklock_show_autolocked(void);
EAPI void e_desklock_hide(void); E_API void e_desklock_hide(void);
EAPI Eina_Bool e_desklock_state_get(void); E_API Eina_Bool e_desklock_state_get(void);
EAPI void e_desklock_interface_append(E_Desklock_Interface *iface); E_API void e_desklock_interface_append(E_Desklock_Interface *iface);
EAPI void e_desklock_interface_remove(E_Desklock_Interface *iface); E_API void e_desklock_interface_remove(E_Desklock_Interface *iface);
EAPI Eina_Stringshare *e_desklock_user_wallpaper_get(E_Zone *zone); E_API Eina_Stringshare *e_desklock_user_wallpaper_get(E_Zone *zone);
EAPI void e_desklock_show_hook_add(E_Desklock_Show_Cb cb); E_API void e_desklock_show_hook_add(E_Desklock_Show_Cb cb);
EAPI void e_desklock_show_hook_del(E_Desklock_Show_Cb cb); E_API void e_desklock_show_hook_del(E_Desklock_Show_Cb cb);
EAPI void e_desklock_hide_hook_add(E_Desklock_Hide_Cb cb); E_API 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_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 static inline Eina_Bool
e_desklock_is_external(void) e_desklock_is_external(void)

16
src/bin/e_deskmirror.c
View File

@ -676,7 +676,7 @@ _client_property(E_Smart_Data *sd, int type EINA_UNUSED, E_Event_Client_Property
} }
/* externally accessible functions */ /* externally accessible functions */
EAPI Evas_Object * E_API Evas_Object *
e_deskmirror_add(E_Desk *desk, Eina_Bool pager, Eina_Bool taskbar) e_deskmirror_add(E_Desk *desk, Eina_Bool pager, Eina_Bool taskbar)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -724,7 +724,7 @@ e_deskmirror_add(E_Desk *desk, Eina_Bool pager, Eina_Bool taskbar)
return o; return o;
} }
EAPI Evas_Object * E_API Evas_Object *
e_deskmirror_mirror_find(Evas_Object *deskmirror, Evas_Object *comp_object) e_deskmirror_mirror_find(Evas_Object *deskmirror, Evas_Object *comp_object)
{ {
Mirror *m; Mirror *m;
@ -736,7 +736,7 @@ e_deskmirror_mirror_find(Evas_Object *deskmirror, Evas_Object *comp_object)
return m ? m->mirror : NULL; return m ? m->mirror : NULL;
} }
EAPI Eina_List * E_API Eina_List *
e_deskmirror_mirror_list(Evas_Object *deskmirror) e_deskmirror_mirror_list(Evas_Object *deskmirror)
{ {
Eina_List *l = NULL; Eina_List *l = NULL;
@ -760,7 +760,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); 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) e_deskmirror_mirror_copy(Evas_Object *obj)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
@ -796,7 +796,7 @@ e_deskmirror_mirror_copy(Evas_Object *obj)
return NULL; 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) e_deskmirror_coord_canvas_to_virtual(Evas_Object *obj, Evas_Coord cx, Evas_Coord cy, Evas_Coord *vx, Evas_Coord *vy)
{ {
API_ENTRY(obj); API_ENTRY(obj);
@ -804,7 +804,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); 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) e_deskmirror_coord_virtual_to_canvas(Evas_Object *obj, Evas_Coord vx, Evas_Coord vy, Evas_Coord *cx, Evas_Coord *cy)
{ {
API_ENTRY(obj); API_ENTRY(obj);
@ -812,14 +812,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); 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) e_deskmirror_desk_get(Evas_Object *obj)
{ {
API_ENTRY(obj) NULL; API_ENTRY(obj) NULL;
return sd->desk; return sd->desk;
} }
EAPI void E_API void
e_deskmirror_util_wins_print(Evas_Object *obj) e_deskmirror_util_wins_print(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;

16
src/bin/e_deskmirror.h
View File

@ -1,14 +1,14 @@
#ifndef E_WIDGET_DESKMIRROR_H #ifndef E_WIDGET_DESKMIRROR_H
#define E_WIDGET_DESKMIRROR_H #define E_WIDGET_DESKMIRROR_H
EAPI Evas_Object *e_deskmirror_add(E_Desk *desk, Eina_Bool pager, Eina_Bool taskbar); E_API 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); E_API Evas_Object *e_deskmirror_mirror_find(Evas_Object *deskmirror, Evas_Object *comp_object);
EAPI Eina_List *e_deskmirror_mirror_list(Evas_Object *deskmirror); E_API Eina_List *e_deskmirror_mirror_list(Evas_Object *deskmirror);
EAPI Evas_Object *e_deskmirror_mirror_copy(Evas_Object *obj); E_API 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); E_API 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); E_API 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); E_API E_Desk *e_deskmirror_desk_get(Evas_Object *obj);
EAPI void e_deskmirror_util_wins_print(Evas_Object *obj); E_API void e_deskmirror_util_wins_print(Evas_Object *obj);
//#define DESKMIRROR_TEST //#define DESKMIRROR_TEST
#endif #endif

6
src/bin/e_desktop_editor.c
View File

@ -95,7 +95,7 @@ _e_util_icon_save(Ecore_X_Icon *icon, const char *filename)
} }
/* externally accessible functions */ /* externally accessible functions */
EAPI Efreet_Desktop * E_API Efreet_Desktop *
e_desktop_client_create(E_Client *ec) e_desktop_client_create(E_Client *ec)
{ {
Efreet_Desktop *desktop = NULL; Efreet_Desktop *desktop = NULL;
@ -183,7 +183,7 @@ e_desktop_client_create(E_Client *ec)
return desktop; return desktop;
} }
EAPI E_Desktop_Edit * E_API E_Desktop_Edit *
e_desktop_border_edit(E_Comp *c, E_Client *ec) e_desktop_border_edit(E_Comp *c, E_Client *ec)
{ {
E_Desktop_Edit *editor; E_Desktop_Edit *editor;
@ -228,7 +228,7 @@ e_desktop_border_edit(E_Comp *c, E_Client *ec)
return editor; return editor;
} }
EAPI E_Desktop_Edit * E_API E_Desktop_Edit *
e_desktop_edit(E_Comp *c, Efreet_Desktop *desktop) e_desktop_edit(E_Comp *c, Efreet_Desktop *desktop)
{ {
E_Desktop_Edit *editor; E_Desktop_Edit *editor;

6
src/bin/e_desktop_editor.h
View File

@ -32,9 +32,9 @@ struct _E_Desktop_Edit
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
}; };
EAPI Efreet_Desktop *e_desktop_client_create(E_Client *ec); E_API Efreet_Desktop *e_desktop_client_create(E_Client *ec);
EAPI E_Desktop_Edit *e_desktop_border_edit(E_Comp *c, E_Client *ec); E_API E_Desktop_Edit *e_desktop_border_edit(E_Comp *c, E_Client *ec);
EAPI E_Desktop_Edit *e_desktop_edit(E_Comp *c, Efreet_Desktop *desktop); E_API E_Desktop_Edit *e_desktop_edit(E_Comp *c, Efreet_Desktop *desktop);
#endif #endif
#endif #endif

28
src/bin/e_dialog.c
View File

@ -75,19 +75,19 @@ _e_dialog_internal_new(E_Comp *c, const char *name, const char *class, int dialo
return dia; return dia;
} }
EAPI E_Dialog * E_API E_Dialog *
e_dialog_new(E_Comp *c, const char *name, const char *class) e_dialog_new(E_Comp *c, const char *name, const char *class)
{ {
return _e_dialog_internal_new(c, name, class, 1); return _e_dialog_internal_new(c, name, class, 1);
} }
EAPI E_Dialog * E_API E_Dialog *
e_dialog_normal_win_new(E_Comp *c, const char *name, const char *class) e_dialog_normal_win_new(E_Comp *c, const char *name, const char *class)
{ {
return _e_dialog_internal_new(c, name, class, 0); return _e_dialog_internal_new(c, 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) e_dialog_button_add(E_Dialog *dia, const char *label, const char *icon, E_Dialog_Cb func, void *data)
{ {
Evas_Object *o; Evas_Object *o;
@ -98,7 +98,7 @@ e_dialog_button_add(E_Dialog *dia, const char *label, const char *icon, E_Dialog
dia->buttons = eina_list_append(dia->buttons, o); dia->buttons = eina_list_append(dia->buttons, o);
} }
EAPI int E_API int
e_dialog_button_focus_num(E_Dialog *dia, int button) e_dialog_button_focus_num(E_Dialog *dia, int button)
{ {
Evas_Object *o; Evas_Object *o;
@ -108,7 +108,7 @@ e_dialog_button_focus_num(E_Dialog *dia, int button)
return 1; return 1;
} }
EAPI int E_API int
e_dialog_button_disable_num_set(E_Dialog *dia, int button, int disabled) e_dialog_button_disable_num_set(E_Dialog *dia, int button, int disabled)
{ {
Evas_Object *o; Evas_Object *o;
@ -118,7 +118,7 @@ e_dialog_button_disable_num_set(E_Dialog *dia, int button, int disabled)
return 1; return 1;
} }
EAPI int E_API int
e_dialog_button_disable_num_get(E_Dialog *dia, int button) e_dialog_button_disable_num_get(E_Dialog *dia, int button)
{ {
Evas_Object *o; Evas_Object *o;
@ -129,13 +129,13 @@ e_dialog_button_disable_num_get(E_Dialog *dia, int button)
return ret; return ret;
} }
EAPI void E_API void
e_dialog_title_set(E_Dialog *dia, const char *title) e_dialog_title_set(E_Dialog *dia, const char *title)
{ {
e_win_title_set(dia->win, title); e_win_title_set(dia->win, title);
} }
EAPI void E_API void
e_dialog_text_set(E_Dialog *dia, const char *text) e_dialog_text_set(E_Dialog *dia, const char *text)
{ {
if (!dia->text_object) if (!dia->text_object)
@ -152,7 +152,7 @@ e_dialog_text_set(E_Dialog *dia, const char *text)
edje_object_part_text_set(dia->text_object, "e.textblock.message", text); edje_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) e_dialog_icon_set(E_Dialog *dia, const char *icon, Evas_Coord size)
{ {
if (!icon) if (!icon)
@ -187,7 +187,7 @@ e_dialog_icon_set(E_Dialog *dia, const char *icon, Evas_Coord size)
edje_object_message_signal_process(dia->bg_object); edje_object_message_signal_process(dia->bg_object);
} }
EAPI void E_API void
e_dialog_border_icon_set(E_Dialog *dia, const char *icon) e_dialog_border_icon_set(E_Dialog *dia, const char *icon)
{ {
E_Client *ec; E_Client *ec;
@ -197,7 +197,7 @@ e_dialog_border_icon_set(E_Dialog *dia, const char *icon)
eina_stringshare_replace(&ec->internal_icon, 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) e_dialog_content_set(E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coord minh)
{ {
int mw, mh; int mw, mh;
@ -213,7 +213,7 @@ e_dialog_content_set(E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coor
evas_object_show(obj); evas_object_show(obj);
} }
EAPI void E_API void
e_dialog_resizable_set(E_Dialog *dia, int resizable) e_dialog_resizable_set(E_Dialog *dia, int resizable)
{ {
dia->resizable = resizable; dia->resizable = resizable;
@ -234,7 +234,7 @@ e_dialog_resizable_set(E_Dialog *dia, int resizable)
} }
} }
EAPI void E_API void
e_dialog_parent_set(E_Dialog *dia, E_Win *win) e_dialog_parent_set(E_Dialog *dia, E_Win *win)
{ {
if (!dia) return; if (!dia) return;
@ -247,7 +247,7 @@ e_dialog_parent_set(E_Dialog *dia, E_Win *win)
ecore_evas_modal_set(dia->win->ecore_evas, !!win); ecore_evas_modal_set(dia->win->ecore_evas, !!win);
} }
EAPI void E_API void
e_dialog_show(E_Dialog *dia) e_dialog_show(E_Dialog *dia)
{ {
Evas_Coord mw, mh; Evas_Coord mw, mh;

28
src/bin/e_dialog.h
View File

@ -28,20 +28,20 @@ struct _E_Dialog
typedef void (*E_Dialog_Cb)(void *data, E_Dialog *dia); typedef void (*E_Dialog_Cb)(void *data, E_Dialog *dia);
EAPI E_Dialog *e_dialog_new (E_Comp *c, const char *name, const char *class); E_API E_Dialog *e_dialog_new (E_Comp *c, const char *name, const char *class);
EAPI E_Dialog *e_dialog_normal_win_new (E_Comp *c, const char *name, const char *class); E_API E_Dialog *e_dialog_normal_win_new (E_Comp *c, const char *name, const char *class);
EAPI void e_dialog_parent_set(E_Dialog *dia, E_Win *win); E_API void e_dialog_parent_set(E_Dialog *dia, E_Win *win);
EAPI void e_dialog_button_add (E_Dialog *dia, const char *label, const char *icon, E_Dialog_Cb func, void *data); E_API 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); E_API 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); E_API 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); E_API int e_dialog_button_disable_num_get (E_Dialog *dia, int button);
EAPI void e_dialog_title_set (E_Dialog *dia, const char *title); E_API void e_dialog_title_set (E_Dialog *dia, const char *title);
EAPI void e_dialog_text_set (E_Dialog *dia, const char *text); E_API 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); E_API 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); E_API 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); E_API 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); E_API void e_dialog_resizable_set (E_Dialog *dia, int resizable);
EAPI void e_dialog_show (E_Dialog *dia); E_API void e_dialog_show (E_Dialog *dia);
#endif #endif
#endif #endif

46
src/bin/e_dnd.c
View File

@ -170,13 +170,13 @@ e_dnd_shutdown(void)
return 1; return 1;
} }
EAPI E_Drag * E_API E_Drag *
e_drag_current_get(void) e_drag_current_get(void)
{ {
return _drag_current; return _drag_current;
} }
EAPI E_Drag * E_API E_Drag *
e_drag_new(E_Comp *comp, int x, int y, e_drag_new(E_Comp *comp, int x, int y,
const char **types, unsigned int num_types, const char **types, unsigned int num_types,
void *data, int size, void *data, int size,
@ -226,13 +226,13 @@ e_drag_new(E_Comp *comp, int x, int y,
return drag; return drag;
} }
EAPI Evas * E_API Evas *
e_drag_evas_get(const E_Drag *drag) e_drag_evas_get(const E_Drag *drag)
{ {
return drag->evas; return drag->evas;
} }
EAPI void E_API void
e_drag_object_set(E_Drag *drag, Evas_Object *object) e_drag_object_set(E_Drag *drag, Evas_Object *object)
{ {
EINA_SAFETY_ON_NULL_RETURN(object); EINA_SAFETY_ON_NULL_RETURN(object);
@ -248,7 +248,7 @@ e_drag_object_set(E_Drag *drag, Evas_Object *object)
evas_object_pass_events_set(drag->comp_object, 1); evas_object_pass_events_set(drag->comp_object, 1);
} }
EAPI void E_API void
e_drag_move(E_Drag *drag, int x, int y) e_drag_move(E_Drag *drag, int x, int y)
{ {
if ((drag->x == x) && (drag->y == y)) return; if ((drag->x == x) && (drag->y == y)) return;
@ -258,7 +258,7 @@ e_drag_move(E_Drag *drag, int x, int y)
evas_object_move(drag->comp_object, x, y); evas_object_move(drag->comp_object, x, y);
} }
EAPI void E_API void
e_drag_resize(E_Drag *drag, int w, int h) e_drag_resize(E_Drag *drag, int w, int h)
{ {
if ((drag->w == w) && (drag->h == h)) return; if ((drag->w == w) && (drag->h == h)) return;
@ -268,13 +268,13 @@ e_drag_resize(E_Drag *drag, int w, int h)
evas_object_resize(drag->comp_object, w, h); evas_object_resize(drag->comp_object, w, h);
} }
EAPI int E_API int
e_dnd_active(void) e_dnd_active(void)
{ {
return _drag_win != 0; return _drag_win != 0;
} }
EAPI int E_API int
e_drag_start(E_Drag *drag, int x, int y) e_drag_start(E_Drag *drag, int x, int y)
{ {
const Eina_List *l; const Eina_List *l;
@ -332,7 +332,7 @@ e_drag_start(E_Drag *drag, int x, int y)
return 1; return 1;
} }
EAPI int E_API int
e_drag_xdnd_start(E_Drag *drag, int x, int y) e_drag_xdnd_start(E_Drag *drag, int x, int y)
{ {
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY
@ -402,14 +402,14 @@ e_drag_xdnd_start(E_Drag *drag, int x, int y)
return 1; return 1;
} }
EAPI void E_API void
e_drop_handler_xds_set(E_Drop_Handler *handler, Eina_Bool (*cb)(void *data, const char *type)) e_drop_handler_xds_set(E_Drop_Handler *handler, Eina_Bool (*cb)(void *data, const char *type))
{ {
handler->cb.xds = cb; handler->cb.xds = cb;
} }
/* should only be used for windows */ /* should only be used for windows */
EAPI void E_API void
e_drop_xds_update(Eina_Bool enable, const char *value) e_drop_xds_update(Eina_Bool enable, const char *value)
{ {
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY
@ -443,7 +443,7 @@ e_drop_xds_update(Eina_Bool enable, const char *value)
#endif #endif
} }
EAPI E_Drop_Handler * E_API E_Drop_Handler *
e_drop_handler_add(E_Object *obj, e_drop_handler_add(E_Object *obj,
void *data, void *data,
void (*enter_cb)(void *data, const char *type, void *event), void (*enter_cb)(void *data, const char *type, void *event),
@ -479,7 +479,7 @@ e_drop_handler_add(E_Object *obj,
return handler; return handler;
} }
EAPI void E_API void
e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h) e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h)
{ {
handler->x = x; handler->x = x;
@ -488,7 +488,7 @@ e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h)
handler->h = h; handler->h = h;
} }
EAPI int E_API int
e_drop_inside(const E_Drop_Handler *handler, int x, int y) e_drop_inside(const E_Drop_Handler *handler, int x, int y)
{ {
int dx, dy; int dx, dy;
@ -499,7 +499,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); 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) e_drop_handler_del(E_Drop_Handler *handler)
{ {
unsigned int i; unsigned int i;
@ -525,7 +525,7 @@ e_drop_handler_del(E_Drop_Handler *handler)
free(handler); free(handler);
} }
EAPI int E_API int
e_drop_xdnd_register_set(Ecore_Window win, int reg) e_drop_xdnd_register_set(Ecore_Window win, int reg)
{ {
if (e_comp_get(NULL)->comp_type != E_PIXMAP_TYPE_X) return 0; if (e_comp_get(NULL)->comp_type != E_PIXMAP_TYPE_X) return 0;
@ -549,7 +549,7 @@ e_drop_xdnd_register_set(Ecore_Window win, int reg)
return 1; return 1;
} }
EAPI void E_API void
e_drop_handler_responsive_set(E_Drop_Handler *handler) e_drop_handler_responsive_set(E_Drop_Handler *handler)
{ {
Ecore_X_Window hwin = _e_drag_win_get(handler, 1); Ecore_X_Window hwin = _e_drag_win_get(handler, 1);
@ -559,7 +559,7 @@ e_drop_handler_responsive_set(E_Drop_Handler *handler)
eina_hash_set(_drop_handlers_responsives, &hwin, eina_list_append(l, 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) e_drop_handler_responsive_get(const E_Drop_Handler *handler)
{ {
Ecore_X_Window hwin = _e_drag_win_get(handler, 1); Ecore_X_Window hwin = _e_drag_win_get(handler, 1);
@ -569,32 +569,32 @@ e_drop_handler_responsive_get(const E_Drop_Handler *handler)
return l && eina_list_data_find(l, handler); return l && eina_list_data_find(l, handler);
} }
EAPI void E_API void
e_drop_handler_action_set(unsigned int action) e_drop_handler_action_set(unsigned int action)
{ {
_action = action; _action = action;
} }
EAPI unsigned int E_API unsigned int
e_drop_handler_action_get(void) e_drop_handler_action_get(void)
{ {
return _action; 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)) e_drag_key_down_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e))
{ {
drag->cb.key_down = func; 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)) e_drag_key_up_cb_set(E_Drag *drag, void (*func)(E_Drag *drag, Ecore_Event_Key *e))
{ {
drag->cb.key_up = func; drag->cb.key_up = func;
} }
/* from ecore_x_selection.c */ /* from ecore_x_selection.c */
EAPI Eina_List * E_API Eina_List *
e_dnd_util_text_uri_list_convert(char *data, int size) e_dnd_util_text_uri_list_convert(char *data, int size)
{ {
char *tmp; char *tmp;

46
src/bin/e_dnd.h
View File

@ -111,29 +111,29 @@ struct E_Dnd_X_Moz_Url
EINTERN int e_dnd_init(void); EINTERN int e_dnd_init(void);
EINTERN int e_dnd_shutdown(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 */ /* x and y are the top left coords of the object that is to be dragged */
EAPI E_Drag *e_drag_new(E_Comp *comp, int x, int y, E_API E_Drag *e_drag_new(E_Comp *comp, int x, int y,
const char **types, unsigned int num_types, const char **types, unsigned int num_types,
void *data, int size, void *data, int size,
void *(*convert_cb)(E_Drag * drag, const char *type), void *(*convert_cb)(E_Drag * drag, const char *type),
void (*finished_cb)(E_Drag *drag, int dropped)); void (*finished_cb)(E_Drag *drag, int dropped));
EAPI Evas *e_drag_evas_get(const E_Drag *drag); E_API Evas *e_drag_evas_get(const E_Drag *drag);
EAPI void e_drag_object_set(E_Drag *drag, Evas_Object *object); E_API void e_drag_object_set(E_Drag *drag, Evas_Object *object);
EAPI void e_drag_move(E_Drag *drag, int x, int y); E_API void e_drag_move(E_Drag *drag, int x, int y);
EAPI void e_drag_resize(E_Drag *drag, int w, int h); E_API 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)); E_API 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 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 */ /* 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); E_API 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_xdnd_start(E_Drag *drag, int x, int y);
EAPI void e_drop_xds_update(Eina_Bool enable, const char *value); E_API 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)); E_API 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, E_API E_Drop_Handler *e_drop_handler_add(E_Object *obj,
void *data, void *data,
void (*enter_cb)(void *data, const char *type, void *event), void (*enter_cb)(void *data, const char *type, void *event),
void (*move_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,
void (*drop_cb)(void *data, const char *type, void *event), void (*drop_cb)(void *data, const char *type, void *event),
const char **types, unsigned int num_types, const char **types, unsigned int num_types,
int x, int y, int w, int h); 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); E_API 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); E_API int e_drop_inside(const E_Drop_Handler *handler, int x, int y);
EAPI void e_drop_handler_del(E_Drop_Handler *handler); E_API void e_drop_handler_del(E_Drop_Handler *handler);
EAPI int e_drop_xdnd_register_set(Ecore_Window win, int reg); E_API int e_drop_xdnd_register_set(Ecore_Window win, int reg);
EAPI void e_drop_handler_responsive_set(E_Drop_Handler *handler); E_API void e_drop_handler_responsive_set(E_Drop_Handler *handler);
EAPI int e_drop_handler_responsive_get(const E_Drop_Handler *handler); E_API int e_drop_handler_responsive_get(const E_Drop_Handler *handler);
EAPI void e_drop_handler_action_set(unsigned int action); E_API void e_drop_handler_action_set(unsigned int action);
EAPI unsigned int e_drop_handler_action_get(void); E_API unsigned int e_drop_handler_action_get(void);
EAPI Eina_List *e_dnd_util_text_uri_list_convert(char *data, int size); E_API Eina_List *e_dnd_util_text_uri_list_convert(char *data, int size);
static inline void static inline void

4
src/bin/e_dpms.c
View File

@ -14,7 +14,7 @@ static unsigned int _e_dpms_timeout_suspend = 0;
static unsigned int _e_dpms_timeout_off = 0; static unsigned int _e_dpms_timeout_off = 0;
static int _e_dpms_enabled = EINA_FALSE; static int _e_dpms_enabled = EINA_FALSE;
EAPI void E_API void
e_dpms_update(void) e_dpms_update(void)
{ {
unsigned int standby = 0, suspend = 0, off = 0; unsigned int standby = 0, suspend = 0, off = 0;
@ -65,7 +65,7 @@ e_dpms_update(void)
#endif #endif
} }
EAPI void E_API void
e_dpms_force_update(void) e_dpms_force_update(void)
{ {
unsigned int standby = 0, suspend = 0, off = 0; unsigned int standby = 0, suspend = 0, off = 0;

4
src/bin/e_dpms.h
View File

@ -6,8 +6,8 @@
EINTERN int e_dpms_init(void); EINTERN int e_dpms_init(void);
EINTERN int e_dpms_shutdown(void); EINTERN int e_dpms_shutdown(void);
EAPI void e_dpms_update(void); E_API void e_dpms_update(void);
EAPI void e_dpms_force_update(void); E_API void e_dpms_force_update(void);
#endif #endif
#endif #endif

28
src/bin/e_entry.c
View File

@ -61,7 +61,7 @@ static int _e_entry_smart_use = 0;
* @param evas the evas where the entry object should be added * @param evas the evas where the entry object should be added
* @return Returns the new entry object * @return Returns the new entry object
*/ */
EAPI Evas_Object * E_API Evas_Object *
e_entry_add(Evas *evas) e_entry_add(Evas *evas)
{ {
if (!_e_entry_smart) if (!_e_entry_smart)
@ -101,7 +101,7 @@ e_entry_add(Evas *evas)
* @param entry an entry object * @param entry an entry object
* @param text the text to set * @param text the text to set
*/ */
EAPI void E_API void
e_entry_text_set(Evas_Object *entry, const char *_text) e_entry_text_set(Evas_Object *entry, const char *_text)
{ {
E_Entry_Smart_Data *sd; E_Entry_Smart_Data *sd;
@ -139,7 +139,7 @@ e_entry_text_set(Evas_Object *entry, const char *_text)
* @param entry an entry object * @param entry an entry object
* @return Returns the text of the entry object * @return Returns the text of the entry object
*/ */
EAPI const char * E_API const char *
e_entry_text_get(Evas_Object *entry) e_entry_text_get(Evas_Object *entry)
{ {
E_Entry_Smart_Data *sd; E_Entry_Smart_Data *sd;
@ -164,7 +164,7 @@ e_entry_text_get(Evas_Object *entry)
* *
* @param entry an entry object * @param entry an entry object
*/ */
EAPI void E_API void
e_entry_clear(Evas_Object *entry) e_entry_clear(Evas_Object *entry)
{ {
if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR(); if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
@ -176,7 +176,7 @@ e_entry_clear(Evas_Object *entry)
* *
* @param entry an entry object * @param entry an entry object
*/ */
EAPI void E_API void
e_entry_select_all(Evas_Object *entry) e_entry_select_all(Evas_Object *entry)
{ {
E_Entry_Smart_Data *sd; E_Entry_Smart_Data *sd;
@ -195,7 +195,7 @@ e_entry_select_all(Evas_Object *entry)
* @param entry an entry object * @param entry an entry object
* @param password_mode 1 to turn on password mode, 0 to turn it off * @param password_mode 1 to turn on password mode, 0 to turn it off
*/ */
EAPI void E_API void
e_entry_password_set(Evas_Object *entry, int password_mode) e_entry_password_set(Evas_Object *entry, int password_mode)
{ {
E_Entry_Smart_Data *sd; E_Entry_Smart_Data *sd;
@ -239,7 +239,7 @@ e_entry_password_set(Evas_Object *entry, int password_mode)
* @param minw the location where to store the minimun width of the entry * @param minw the location where to store the minimun width of the entry
* @param minh the location where to store the minimun height of the entry * @param minh the location where to store the minimun height of the entry
*/ */
EAPI void E_API void
e_entry_size_min_get(Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh) e_entry_size_min_get(Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh)
{ {
E_Entry_Smart_Data *sd; E_Entry_Smart_Data *sd;
@ -261,7 +261,7 @@ e_entry_size_min_get(Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh)
* *
* @param entry the entry to focus * @param entry the entry to focus
*/ */
EAPI void E_API void
e_entry_focus(Evas_Object *entry) e_entry_focus(Evas_Object *entry)
{ {
E_Entry_Smart_Data *sd; E_Entry_Smart_Data *sd;
@ -290,7 +290,7 @@ e_entry_focus(Evas_Object *entry)
* *
* @param entry the entry object to unfocus * @param entry the entry object to unfocus
*/ */
EAPI void E_API void
e_entry_unfocus(Evas_Object *entry) e_entry_unfocus(Evas_Object *entry)
{ {
E_Entry_Smart_Data *sd; E_Entry_Smart_Data *sd;
@ -313,7 +313,7 @@ e_entry_unfocus(Evas_Object *entry)
* *
* @param entry the entry object to enable * @param entry the entry object to enable
*/ */
EAPI void E_API void
e_entry_enable(Evas_Object *entry) e_entry_enable(Evas_Object *entry)
{ {
E_Entry_Smart_Data *sd; E_Entry_Smart_Data *sd;
@ -338,7 +338,7 @@ e_entry_enable(Evas_Object *entry)
* *
* @param entry the entry object to disable * @param entry the entry object to disable
*/ */
EAPI void E_API void
e_entry_disable(Evas_Object *entry) e_entry_disable(Evas_Object *entry)
{ {
E_Entry_Smart_Data *sd; E_Entry_Smart_Data *sd;
@ -361,7 +361,7 @@ e_entry_disable(Evas_Object *entry)
* *
* @param entry the entry object to enable * @param entry the entry object to enable
*/ */
EAPI void E_API void
e_entry_edit(Evas_Object *entry) e_entry_edit(Evas_Object *entry)
{ {
E_Entry_Smart_Data *sd; E_Entry_Smart_Data *sd;
@ -389,7 +389,7 @@ e_entry_edit(Evas_Object *entry)
* *
* @param entry the entry object to disable * @param entry the entry object to disable
*/ */
EAPI void E_API void
e_entry_noedit(Evas_Object *entry) e_entry_noedit(Evas_Object *entry)
{ {
E_Entry_Smart_Data *sd; E_Entry_Smart_Data *sd;
@ -410,7 +410,7 @@ e_entry_noedit(Evas_Object *entry)
/** /**
* Disable right click menu for an entry * Disable right click menu for an entry
*/ */
EAPI void E_API void
e_entry_nomenu(Evas_Object *entry) e_entry_nomenu(Evas_Object *entry)
{ {
if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR(); if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();

28
src/bin/e_entry.h
View File

@ -3,20 +3,20 @@
#ifndef E_ENTRY_H #ifndef E_ENTRY_H
#define E_ENTRY_H #define E_ENTRY_H
EAPI Evas_Object *e_entry_add (Evas *evas); E_API Evas_Object *e_entry_add (Evas *evas);
EAPI void e_entry_text_set (Evas_Object *entry, const char *text); E_API void e_entry_text_set (Evas_Object *entry, const char *text);
EAPI const char *e_entry_text_get (Evas_Object *entry); E_API const char *e_entry_text_get (Evas_Object *entry);
EAPI void e_entry_clear (Evas_Object *entry); E_API void e_entry_clear (Evas_Object *entry);
EAPI void e_entry_select_all (Evas_Object *entry); E_API void e_entry_select_all (Evas_Object *entry);
EAPI void e_entry_password_set (Evas_Object *entry, int password_mode); E_API void e_entry_password_set (Evas_Object *entry, int password_mode);
EAPI void e_entry_size_min_get (Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh); E_API void e_entry_size_min_get (Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh);
EAPI void e_entry_focus (Evas_Object *entry); E_API void e_entry_focus (Evas_Object *entry);
EAPI void e_entry_unfocus (Evas_Object *entry); E_API void e_entry_unfocus (Evas_Object *entry);
EAPI void e_entry_enable (Evas_Object *entry); E_API void e_entry_enable (Evas_Object *entry);
EAPI void e_entry_disable (Evas_Object *entry); E_API void e_entry_disable (Evas_Object *entry);
EAPI void e_entry_edit (Evas_Object *entry); E_API void e_entry_edit (Evas_Object *entry);
EAPI void e_entry_noedit (Evas_Object *entry); E_API void e_entry_noedit (Evas_Object *entry);
EAPI void e_entry_nomenu(Evas_Object *entry); E_API void e_entry_nomenu(Evas_Object *entry);
#endif #endif
#endif #endif

2
src/bin/e_entry_dialog.c
View File

@ -9,7 +9,7 @@ static void _e_entry_dialog_delete(E_Win *win);
static void _e_entry_cb_key_down(void *data, Evas_Object *obj, void *event_info); static void _e_entry_cb_key_down(void *data, Evas_Object *obj, void *event_info);
/* Externally accesible functions */ /* 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, e_entry_dialog_show(const char *title, const char *icon, const char *text,
const char *initial_text, const char *initial_text,
const char *button_text, const char *button2_text, const char *button_text, const char *button2_text,

2
src/bin/e_entry_dialog.h
View File

@ -25,7 +25,7 @@ struct _E_Entry_Dialog
} cancel; } 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 *icon,
const char *text, const char *text,
const char *initial_text, const char *initial_text,

4
src/bin/e_env.c
View File

@ -32,13 +32,13 @@ e_env_shutdown(void)
return 1; return 1;
} }
EAPI void E_API void
e_env_set(const char *var, const char *val) e_env_set(const char *var, const char *val)
{ {
e_util_env_set(var, val); e_util_env_set(var, val);
} }
EAPI void E_API void
e_env_unset(const char *var) e_env_unset(const char *var)
{ {
e_util_env_set(var, NULL); e_util_env_set(var, NULL);

4
src/bin/e_env.h
View File

@ -8,8 +8,8 @@
EINTERN int e_env_init(void); EINTERN int e_env_init(void);
EINTERN int e_env_shutdown(void); EINTERN int e_env_shutdown(void);
EAPI void e_env_set(const char *var, const char *val); E_API void e_env_set(const char *var, const char *val);
EAPI void e_env_unset(const char *var); E_API void e_env_unset(const char *var);
#endif #endif
#endif #endif

2
src/bin/e_error.c
View File

@ -5,7 +5,7 @@
/* local subsystem globals */ /* local subsystem globals */
/* externally accessible functions */ /* externally accessible functions */
EAPI void E_API void
e_error_message_show_internal(char *txt) e_error_message_show_internal(char *txt)
{ {
/* FIXME: maybe log these to a file and display them at some point */ /* FIXME: maybe log these to a file and display them at some point */

2
src/bin/e_error.h
View File

@ -12,7 +12,7 @@
#ifndef E_ERROR_H #ifndef E_ERROR_H
#define 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
#endif #endif

32
src/bin/e_exec.c
View File

@ -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 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; static void *_e_exec_executor_data = NULL;
EAPI int E_EVENT_EXEC_NEW = -1; E_API int E_EVENT_EXEC_NEW = -1;
EAPI int E_EVENT_EXEC_NEW_CLIENT = -1; E_API int E_EVENT_EXEC_NEW_CLIENT = -1;
EAPI int E_EVENT_EXEC_DEL = -1; E_API int E_EVENT_EXEC_DEL = -1;
/* externally accessible functions */ /* externally accessible functions */
EINTERN int EINTERN int
@ -112,14 +112,14 @@ e_exec_shutdown(void)
return 1; 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_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_func = func;
_e_exec_executor_data = (void *)data; _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, e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec,
Eina_List *files, const char *launch_method) Eina_List *files, const char *launch_method)
{ {
@ -214,7 +214,7 @@ e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec,
return inst; return inst;
} }
EAPI void E_API void
e_exec_phony_del(E_Exec_Instance *inst) e_exec_phony_del(E_Exec_Instance *inst)
{ {
if (!inst) return; if (!inst) return;
@ -224,7 +224,7 @@ e_exec_phony_del(E_Exec_Instance *inst)
_e_exec_instance_free(inst); _e_exec_instance_free(inst);
} }
EAPI E_Exec_Instance * E_API E_Exec_Instance *
e_exec_phony(E_Client *ec) e_exec_phony(E_Client *ec)
{ {
E_Exec_Instance *inst; E_Exec_Instance *inst;
@ -290,7 +290,7 @@ e_exec_phony(E_Client *ec)
return inst; 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_startup_id_pid_instance_find(int id, pid_t pid)
{ {
E_Exec_Search search; E_Exec_Search search;
@ -303,7 +303,7 @@ e_exec_startup_id_pid_instance_find(int id, pid_t pid)
return search.inst; return search.inst;
} }
EAPI Efreet_Desktop * E_API Efreet_Desktop *
e_exec_startup_id_pid_find(int id, pid_t pid) e_exec_startup_id_pid_find(int id, pid_t pid)
{ {
E_Exec_Instance *inst; E_Exec_Instance *inst;
@ -313,7 +313,7 @@ e_exec_startup_id_pid_find(int id, pid_t pid)
return inst->desktop; return inst->desktop;
} }
EAPI E_Exec_Instance * E_API E_Exec_Instance *
e_exec_startup_desktop_instance_find(Efreet_Desktop *desktop) e_exec_startup_desktop_instance_find(Efreet_Desktop *desktop)
{ {
E_Exec_Search search; E_Exec_Search search;
@ -351,14 +351,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_exec_instance_found(E_Exec_Instance *inst)
{ {
E_FREE_FUNC(inst->expire_timer, ecore_timer_del); E_FREE_FUNC(inst->expire_timer, ecore_timer_del);
_e_exe_instance_watchers_call(inst, E_EXEC_WATCH_STARTED); _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_exec_instance_client_add(E_Exec_Instance *inst, E_Client *ec)
{ {
e_object_ref(E_OBJECT(ec)); e_object_ref(E_OBJECT(ec));
@ -368,7 +368,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); 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_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; E_Exec_Watch *iw;
@ -380,7 +380,7 @@ e_exec_instance_watcher_add(E_Exec_Instance *inst, void (*func)(void *data, E_Ex
inst->watchers = eina_list_append(inst->watchers, iw); 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_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; E_Exec_Watch *iw;
@ -1238,14 +1238,14 @@ _dialog_save_cb(void *data __UNUSED__, void *data2)
fclose(f); fclose(f);
} }
EAPI const Eina_List * E_API const Eina_List *
e_exec_desktop_instances_find(const Efreet_Desktop *desktop) e_exec_desktop_instances_find(const Efreet_Desktop *desktop)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(desktop, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(desktop, NULL);
return eina_hash_find(e_exec_instances, desktop->orig_path ?: desktop->name); 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) e_exec_instances_get(void)
{ {
return e_exec_instances; return e_exec_instances;

32
src/bin/e_exec.h
View File

@ -33,25 +33,25 @@ typedef enum
EINTERN int e_exec_init(void); EINTERN int e_exec_init(void);
EINTERN int e_exec_shutdown(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); 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);
EAPI 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(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); E_API E_Exec_Instance *e_exec_phony(E_Client *ec);
EAPI void e_exec_phony_del(E_Exec_Instance *inst); E_API 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); E_API 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); E_API 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); E_API E_Exec_Instance *e_exec_startup_desktop_instance_find(Efreet_Desktop *desktop);
EAPI void e_exec_instance_found(E_Exec_Instance *inst); E_API 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); 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);
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); 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);
EAPI const Eina_List *e_exec_desktop_instances_find(const Efreet_Desktop *desktop); E_API const Eina_List *e_exec_desktop_instances_find(const Efreet_Desktop *desktop);
EAPI const Eina_Hash *e_exec_instances_get(void); E_API 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_instance_client_add(E_Exec_Instance *inst, E_Client *ec);
/* sends E_Exec_Instance */ /* sends E_Exec_Instance */
EAPI extern int E_EVENT_EXEC_NEW; E_API extern int E_EVENT_EXEC_NEW;
EAPI extern int E_EVENT_EXEC_NEW_CLIENT; E_API extern int E_EVENT_EXEC_NEW_CLIENT;
EAPI extern int E_EVENT_EXEC_DEL; E_API extern int E_EVENT_EXEC_DEL;
#endif #endif
#endif #endif

24
src/bin/e_exehist.c
View File

@ -1,7 +1,7 @@
#include "e.h" #include "e.h"
#include <libgen.h> #include <libgen.h>
EAPI int E_EVENT_EXEHIST_UPDATE = 0; E_API int E_EVENT_EXEHIST_UPDATE = 0;
/* local subsystem functions */ /* local subsystem functions */
typedef struct _E_Exehist E_Exehist; typedef struct _E_Exehist E_Exehist;
@ -82,7 +82,7 @@ e_exehist_shutdown(void)
return 1; return 1;
} }
EAPI void E_API void
e_exehist_startup_id_set(int id) e_exehist_startup_id_set(int id)
{ {
_e_exehist_load(); _e_exehist_load();
@ -92,7 +92,7 @@ e_exehist_startup_id_set(int id)
_e_exehist_unload_queue(); _e_exehist_unload_queue();
} }
EAPI int E_API int
e_exehist_startup_id_get(void) e_exehist_startup_id_get(void)
{ {
int id; int id;
@ -103,7 +103,7 @@ e_exehist_startup_id_get(void)
return id; return id;
} }
EAPI void E_API void
e_exehist_add(const char *launch_method, const char *exe) e_exehist_add(const char *launch_method, const char *exe)
{ {
E_Exehist_Item *ei; E_Exehist_Item *ei;
@ -127,7 +127,7 @@ e_exehist_add(const char *launch_method, const char *exe)
_e_exehist_unload_queue(); _e_exehist_unload_queue();
} }
EAPI void E_API void
e_exehist_del(const char *exe) e_exehist_del(const char *exe)
{ {
E_Exehist_Item *ei; E_Exehist_Item *ei;
@ -155,7 +155,7 @@ e_exehist_del(const char *exe)
ecore_event_add(E_EVENT_EXEHIST_UPDATE, NULL, NULL, NULL); ecore_event_add(E_EVENT_EXEHIST_UPDATE, NULL, NULL, NULL);
} }
EAPI void E_API void
e_exehist_clear(void) e_exehist_clear(void)
{ {
_e_exehist_load(); _e_exehist_load();
@ -166,7 +166,7 @@ e_exehist_clear(void)
_e_exehist_unload_queue(); _e_exehist_unload_queue();
} }
EAPI int E_API int
e_exehist_popularity_get(const char *exe) e_exehist_popularity_get(const char *exe)
{ {
Eina_List *l; Eina_List *l;
@ -188,7 +188,7 @@ e_exehist_popularity_get(const char *exe)
return count; return count;
} }
EAPI double E_API double
e_exehist_newest_run_get(const char *exe) e_exehist_newest_run_get(const char *exe)
{ {
Eina_List *l; Eina_List *l;
@ -213,13 +213,13 @@ e_exehist_newest_run_get(const char *exe)
return 0.0; return 0.0;
} }
EAPI Eina_List * E_API Eina_List *
e_exehist_list_get(void) e_exehist_list_get(void)
{ {
return e_exehist_sorted_list_get(E_EXEHIST_SORT_BY_DATE, 0); 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) e_exehist_sorted_list_get(E_Exehist_Sort sort_type, int max)
{ {
Eina_List *list = NULL, *pop = NULL, *l = NULL, *m; 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; return list;
} }
EAPI void E_API void
e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop) e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop)
{ {
const char *f; const char *f;
@ -363,7 +363,7 @@ e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop)
_e_exehist_unload_queue(); _e_exehist_unload_queue();
} }
EAPI Efreet_Desktop * E_API Efreet_Desktop *
e_exehist_mime_desktop_get(const char *mime) e_exehist_mime_desktop_get(const char *mime)
{ {
Efreet_Desktop *desktop; Efreet_Desktop *desktop;

24
src/bin/e_exehist.h
View File

@ -14,19 +14,19 @@ typedef enum _E_Exehist_Sort
EINTERN int e_exehist_init(void); EINTERN int e_exehist_init(void);
EINTERN int e_exehist_shutdown(void); EINTERN int e_exehist_shutdown(void);
EAPI void e_exehist_startup_id_set(int id); E_API void e_exehist_startup_id_set(int id);
EAPI int e_exehist_startup_id_get(void); E_API int e_exehist_startup_id_get(void);
EAPI void e_exehist_add(const char *launch_method, const char *exe); E_API void e_exehist_add(const char *launch_method, const char *exe);
EAPI void e_exehist_del(const char *exe); E_API void e_exehist_del(const char *exe);
EAPI void e_exehist_clear(void); E_API void e_exehist_clear(void);
EAPI int e_exehist_popularity_get(const char *exe); E_API int e_exehist_popularity_get(const char *exe);
EAPI double e_exehist_newest_run_get(const char *exe); E_API double e_exehist_newest_run_get(const char *exe);
EAPI Eina_List *e_exehist_list_get(void); E_API Eina_List *e_exehist_list_get(void);
EAPI Eina_List *e_exehist_sorted_list_get(E_Exehist_Sort sort_type, int max); E_API 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); E_API 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 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
#endif #endif

6
src/bin/e_filereg.c
View File

@ -36,7 +36,7 @@ e_filereg_shutdown(void)
return 1; return 1;
} }
EAPI int E_API int
e_filereg_register(const char *path) e_filereg_register(const char *path)
{ {
Filereg_Item *fi = NULL; Filereg_Item *fi = NULL;
@ -55,7 +55,7 @@ e_filereg_register(const char *path)
return 1; return 1;
} }
EAPI void E_API void
e_filereg_deregister(const char *path) e_filereg_deregister(const char *path)
{ {
Filereg_Item *fi = NULL; 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) e_filereg_file_protected(const char *path)
{ {
if (eina_hash_find(_e_filereg, path)) return EINA_TRUE; if (eina_hash_find(_e_filereg, path)) return EINA_TRUE;

6
src/bin/e_filereg.h
View File

@ -7,9 +7,9 @@
EINTERN int e_filereg_init(void); EINTERN int e_filereg_init(void);
EINTERN int e_filereg_shutdown(void); EINTERN int e_filereg_shutdown(void);
EAPI int e_filereg_register(const char * path); E_API int e_filereg_register(const char * path);
EAPI void e_filereg_deregister(const char * path); E_API void e_filereg_deregister(const char * path);
EAPI Eina_Bool e_filereg_file_protected(const char * path); E_API Eina_Bool e_filereg_file_protected(const char * path);
#endif #endif
#endif #endif

56
src/bin/e_flowlayout.c
View File

@ -68,14 +68,14 @@ static void _e_flowlayout_smart_clip_unset(Evas_Object *obj);
static Evas_Smart *_e_smart = NULL; static Evas_Smart *_e_smart = NULL;
/* externally accessible functions */ /* externally accessible functions */
EAPI Evas_Object * E_API Evas_Object *
e_flowlayout_add(Evas *evas) e_flowlayout_add(Evas *evas)
{ {
_e_flowlayout_smart_init(); _e_flowlayout_smart_init();
return evas_object_smart_add(evas, _e_smart); return evas_object_smart_add(evas, _e_smart);
} }
EAPI int E_API int
e_flowlayout_freeze(Evas_Object *obj) e_flowlayout_freeze(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -87,7 +87,7 @@ e_flowlayout_freeze(Evas_Object *obj)
return sd->frozen; return sd->frozen;
} }
EAPI int E_API int
e_flowlayout_thaw(Evas_Object *obj) e_flowlayout_thaw(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -100,7 +100,7 @@ e_flowlayout_thaw(Evas_Object *obj)
return sd->frozen; return sd->frozen;
} }
EAPI void E_API void
e_flowlayout_orientation_set(Evas_Object *obj, int horizontal) e_flowlayout_orientation_set(Evas_Object *obj, int horizontal)
{ {
E_Smart_Data *sd; 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); if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd);
} }
EAPI int E_API int
e_flowlayout_orientation_get(Evas_Object *obj) e_flowlayout_orientation_get(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -126,7 +126,7 @@ e_flowlayout_orientation_get(Evas_Object *obj)
return sd->horizontal; return sd->horizontal;
} }
EAPI void E_API void
e_flowlayout_flowdirection_set(Evas_Object *obj, int right, int bottom) e_flowlayout_flowdirection_set(Evas_Object *obj, int right, int bottom)
{ {
E_Smart_Data *sd; 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); 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_flowlayout_flowdirection_get(Evas_Object *obj, int *right, int *bottom)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -156,7 +156,7 @@ e_flowlayout_flowdirection_get(Evas_Object *obj, int *right, int *bottom)
if (bottom) *bottom = sd->flowright; if (bottom) *bottom = sd->flowright;
} }
EAPI void E_API void
e_flowlayout_homogenous_set(Evas_Object *obj, int homogenous) e_flowlayout_homogenous_set(Evas_Object *obj, int homogenous)
{ {
E_Smart_Data *sd; 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); if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd);
} }
EAPI int E_API int
e_flowlayout_homogenous_get(Evas_Object *obj) e_flowlayout_homogenous_get(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -181,7 +181,7 @@ e_flowlayout_homogenous_get(Evas_Object *obj)
return sd->homogenous; return sd->homogenous;
} }
EAPI void E_API void
e_flowlayout_fill_set(Evas_Object *obj, int fill) e_flowlayout_fill_set(Evas_Object *obj, int fill)
{ {
E_Smart_Data *sd; 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); if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd);
} }
EAPI int E_API int
e_flowlayout_fill_get(Evas_Object *obj) e_flowlayout_fill_get(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -206,7 +206,7 @@ e_flowlayout_fill_get(Evas_Object *obj)
return sd->fill; return sd->fill;
} }
EAPI int E_API int
e_flowlayout_pack_start(Evas_Object *obj, Evas_Object *child) e_flowlayout_pack_start(Evas_Object *obj, Evas_Object *child)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -221,7 +221,7 @@ e_flowlayout_pack_start(Evas_Object *obj, Evas_Object *child)
return 0; return 0;
} }
EAPI int E_API int
e_flowlayout_pack_end(Evas_Object *obj, Evas_Object *child) e_flowlayout_pack_end(Evas_Object *obj, Evas_Object *child)
{ {
E_Smart_Data *sd; 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; 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_flowlayout_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *before)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -259,7 +259,7 @@ e_flowlayout_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *befo
return i; return i;
} }
EAPI int E_API int
e_flowlayout_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after) e_flowlayout_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -282,7 +282,7 @@ e_flowlayout_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after
return i; return i;
} }
EAPI int E_API int
e_flowlayout_pack_count_get(Evas_Object *obj) e_flowlayout_pack_count_get(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -293,7 +293,7 @@ e_flowlayout_pack_count_get(Evas_Object *obj)
return eina_list_count(sd->items); return eina_list_count(sd->items);
} }
EAPI Evas_Object * E_API Evas_Object *
e_flowlayout_pack_object_nth(Evas_Object *obj, int n) e_flowlayout_pack_object_nth(Evas_Object *obj, int n)
{ {
E_Smart_Data *sd; 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); return eina_list_nth(sd->items, n);
} }
EAPI Evas_Object * E_API Evas_Object *
e_flowlayout_pack_object_first(Evas_Object *obj) e_flowlayout_pack_object_first(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -315,7 +315,7 @@ e_flowlayout_pack_object_first(Evas_Object *obj)
return eina_list_data_get(sd->items); return eina_list_data_get(sd->items);
} }
EAPI Evas_Object * E_API Evas_Object *
e_flowlayout_pack_object_last(Evas_Object *obj) e_flowlayout_pack_object_last(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -326,7 +326,7 @@ e_flowlayout_pack_object_last(Evas_Object *obj)
return eina_list_last_data_get(sd->items); 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_flowlayout_pack_object_prev(Evas_Object *obj, Evas_Object *child)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -341,7 +341,7 @@ e_flowlayout_pack_object_prev(Evas_Object *obj, Evas_Object *child)
return NULL; return NULL;
} }
EAPI Evas_Object * E_API Evas_Object *
e_flowlayout_pack_object_next(Evas_Object *obj, Evas_Object *child) e_flowlayout_pack_object_next(Evas_Object *obj, Evas_Object *child)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -356,7 +356,7 @@ e_flowlayout_pack_object_next(Evas_Object *obj, Evas_Object *child)
return NULL; 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_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; 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); if (bi->sd->frozen <= 0) _e_flowlayout_smart_reconfigure(bi->sd);
} }
EAPI void E_API void
e_flowlayout_unpack(Evas_Object *obj) e_flowlayout_unpack(Evas_Object *obj)
{ {
E_Flowlayout_Item *bi; E_Flowlayout_Item *bi;
@ -393,7 +393,7 @@ e_flowlayout_unpack(Evas_Object *obj)
if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd); 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_flowlayout_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
{ {
E_Smart_Data *sd; 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; 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_flowlayout_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
{ {
E_Smart_Data *sd; 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; if (maxh) *maxh = sd->max.h;
} }
EAPI int E_API int
e_flowlayout_max_children(Evas_Object *obj) e_flowlayout_max_children(Evas_Object *obj)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;
@ -431,7 +431,7 @@ e_flowlayout_max_children(Evas_Object *obj)
return sd->rows * sd->cols; return sd->rows * sd->cols;
} }
EAPI void E_API void
e_flowlayout_align_get(Evas_Object *obj, double *ax, double *ay) e_flowlayout_align_get(Evas_Object *obj, double *ax, double *ay)
{ {
E_Smart_Data *sd; 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; if (ay) *ay = sd->align.y;
} }
EAPI void E_API void
e_flowlayout_align_set(Evas_Object *obj, double ax, double ay) e_flowlayout_align_set(Evas_Object *obj, double ax, double ay)
{ {
E_Smart_Data *sd; E_Smart_Data *sd;

54
src/bin/e_flowlayout.h
View File

@ -3,34 +3,34 @@
#ifndef E_FLOWLAYOUT_H #ifndef E_FLOWLAYOUT_H
#define E_FLOWLAYOUT_H #define E_FLOWLAYOUT_H
EAPI Evas_Object *e_flowlayout_add (Evas *evas); E_API Evas_Object *e_flowlayout_add (Evas *evas);
EAPI int e_flowlayout_freeze (Evas_Object *obj); E_API int e_flowlayout_freeze (Evas_Object *obj);
EAPI int e_flowlayout_thaw (Evas_Object *obj); E_API int e_flowlayout_thaw (Evas_Object *obj);
EAPI void e_flowlayout_orientation_set (Evas_Object *obj, int horizontal); E_API void e_flowlayout_orientation_set (Evas_Object *obj, int horizontal);
EAPI int e_flowlayout_orientation_get (Evas_Object *obj); E_API int e_flowlayout_orientation_get (Evas_Object *obj);
EAPI void e_flowlayout_flowdirection_set (Evas_Object *obj, int right, int bottom); E_API 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); E_API void e_flowlayout_flowdirection_get (Evas_Object *obj, int *right, int *bottom);
EAPI void e_flowlayout_homogenous_set (Evas_Object *obj, int homogenous); E_API void e_flowlayout_homogenous_set (Evas_Object *obj, int homogenous);
EAPI int e_flowlayout_fill_get (Evas_Object *obj); E_API int e_flowlayout_fill_get (Evas_Object *obj);
EAPI void e_flowlayout_fill_set (Evas_Object *obj, int fill); E_API void e_flowlayout_fill_set (Evas_Object *obj, int fill);
EAPI int e_flowlayout_pack_start (Evas_Object *obj, Evas_Object *child); E_API int e_flowlayout_pack_start (Evas_Object *obj, Evas_Object *child);
EAPI int e_flowlayout_pack_end (Evas_Object *obj, Evas_Object *child); E_API 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); E_API 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); E_API int e_flowlayout_pack_after (Evas_Object *obj, Evas_Object *child, Evas_Object *after);
EAPI int e_flowlayout_pack_count_get (Evas_Object *obj); E_API int e_flowlayout_pack_count_get (Evas_Object *obj);
EAPI Evas_Object *e_flowlayout_pack_object_nth (Evas_Object *obj, int n); E_API Evas_Object *e_flowlayout_pack_object_nth (Evas_Object *obj, int n);
EAPI Evas_Object *e_flowlayout_pack_object_first (Evas_Object *obj); E_API Evas_Object *e_flowlayout_pack_object_first (Evas_Object *obj);
EAPI Evas_Object *e_flowlayout_pack_object_last (Evas_Object *obj); E_API Evas_Object *e_flowlayout_pack_object_last (Evas_Object *obj);
EAPI Evas_Object *e_flowlayout_pack_object_prev(Evas_Object *obj, Evas_Object *child); E_API 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); E_API 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); 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);
EAPI void e_flowlayout_unpack (Evas_Object *obj); E_API void e_flowlayout_unpack (Evas_Object *obj);
EAPI void e_flowlayout_size_min_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh); E_API 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); E_API 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); E_API 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 void e_flowlayout_align_set (Evas_Object *obj, double ax, double ay);
/* This function only works if homogenous is set */ /* 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
#endif #endif

126
src/bin/e_fm.c
View File

@ -886,7 +886,7 @@ e_fm2_shutdown(void)
return 1; return 1;
} }
EAPI Evas_Object * E_API Evas_Object *
e_fm2_add(Evas *evas) e_fm2_add(Evas *evas)
{ {
return evas_object_smart_add(evas, _e_fm2_smart); return evas_object_smart_add(evas, _e_fm2_smart);
@ -1020,7 +1020,7 @@ _e_fm2_thread_cleanup_cb(void *d __UNUSED__, Ecore_Thread *et __UNUSED__)
_e_fm2_favorites_thread = NULL; _e_fm2_favorites_thread = NULL;
} }
EAPI void E_API void
e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path) e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
{ {
const char *real_path; const char *real_path;
@ -1162,49 +1162,49 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
sd->tmp.iter = EINA_FALSE; sd->tmp.iter = EINA_FALSE;
} }
EAPI void E_API void
e_fm2_underlay_show(Evas_Object *obj) e_fm2_underlay_show(Evas_Object *obj)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
evas_object_show(sd->underlay); evas_object_show(sd->underlay);
} }
EAPI void E_API void
e_fm2_underlay_hide(Evas_Object *obj) e_fm2_underlay_hide(Evas_Object *obj)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
evas_object_hide(sd->underlay); evas_object_hide(sd->underlay);
} }
EAPI void E_API void
e_fm2_all_unsel(Evas_Object *obj) e_fm2_all_unsel(Evas_Object *obj)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
_e_fm2_icon_desel_any(obj); _e_fm2_icon_desel_any(obj);
} }
EAPI void E_API void
e_fm2_all_sel(Evas_Object *obj) e_fm2_all_sel(Evas_Object *obj)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
_e_fm2_icon_sel_any(obj); _e_fm2_icon_sel_any(obj);
} }
EAPI void E_API void
e_fm2_first_sel(Evas_Object *obj) e_fm2_first_sel(Evas_Object *obj)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
_e_fm2_icon_sel_first(obj, EINA_FALSE); _e_fm2_icon_sel_first(obj, EINA_FALSE);
} }
EAPI void E_API void
e_fm2_last_sel(Evas_Object *obj) e_fm2_last_sel(Evas_Object *obj)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
_e_fm2_icon_sel_last(obj, EINA_FALSE); _e_fm2_icon_sel_last(obj, EINA_FALSE);
} }
EAPI void E_API void
e_fm2_custom_theme_set(Evas_Object *obj, const char *path) e_fm2_custom_theme_set(Evas_Object *obj, const char *path)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
@ -1219,7 +1219,7 @@ e_fm2_custom_theme_set(Evas_Object *obj, const char *path)
"rubberband"); "rubberband");
} }
EAPI void E_API void
e_fm2_custom_theme_content_set(Evas_Object *obj, const char *content) e_fm2_custom_theme_content_set(Evas_Object *obj, const char *content)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
@ -1232,7 +1232,7 @@ e_fm2_custom_theme_content_set(Evas_Object *obj, const char *content)
"overlay"); "overlay");
} }
EAPI void E_API void
e_fm2_path_get(Evas_Object *obj, const char **dev, const char **path) e_fm2_path_get(Evas_Object *obj, const char **dev, const char **path)
{ {
if (dev) *dev = NULL; if (dev) *dev = NULL;
@ -1399,7 +1399,7 @@ _e_fm2_dir_save_props(E_Fm2_Smart_Data *sd)
e_fm2_custom_file_flush(); e_fm2_custom_file_flush();
} }
EAPI void E_API void
e_fm2_refresh(Evas_Object *obj) e_fm2_refresh(Evas_Object *obj)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
@ -1425,7 +1425,7 @@ e_fm2_refresh(Evas_Object *obj)
sd->tmp.iter = EINA_FALSE; sd->tmp.iter = EINA_FALSE;
} }
EAPI int E_API int
e_fm2_has_parent_get(Evas_Object *obj) e_fm2_has_parent_get(Evas_Object *obj)
{ {
EFM_SMART_CHECK(0); EFM_SMART_CHECK(0);
@ -1436,14 +1436,14 @@ e_fm2_has_parent_get(Evas_Object *obj)
return 1; return 1;
} }
EAPI const char * E_API const char *
e_fm2_real_path_get(Evas_Object *obj) e_fm2_real_path_get(Evas_Object *obj)
{ {
EFM_SMART_CHECK(NULL); EFM_SMART_CHECK(NULL);
return sd->realpath; return sd->realpath;
} }
EAPI void E_API void
e_fm2_parent_go(Evas_Object *obj) e_fm2_parent_go(Evas_Object *obj)
{ {
char *p, *path; char *p, *path;
@ -1461,7 +1461,7 @@ e_fm2_parent_go(Evas_Object *obj)
} }
} }
EAPI void E_API void
e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg) e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
@ -1478,14 +1478,14 @@ e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg)
sd->config->theme.icons = eina_stringshare_add(cfg->theme.icons); 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) e_fm2_config_get(Evas_Object *obj)
{ {
EFM_SMART_CHECK(NULL); EFM_SMART_CHECK(NULL);
return sd->config; return sd->config;
} }
EAPI Eina_List * E_API Eina_List *
e_fm2_selected_list_get(Evas_Object *obj) e_fm2_selected_list_get(Evas_Object *obj)
{ {
Eina_List *list = NULL, *l; Eina_List *list = NULL, *l;
@ -1497,7 +1497,7 @@ e_fm2_selected_list_get(Evas_Object *obj)
return list; return list;
} }
EAPI Eina_List * E_API Eina_List *
e_fm2_all_list_get(Evas_Object *obj) e_fm2_all_list_get(Evas_Object *obj)
{ {
Eina_List *list = NULL, *l; Eina_List *list = NULL, *l;
@ -1511,14 +1511,14 @@ e_fm2_all_list_get(Evas_Object *obj)
return list; return list;
} }
EAPI void E_API void
e_fm2_deselect_all(Evas_Object *obj) e_fm2_deselect_all(Evas_Object *obj)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
_e_fm2_icon_desel_any(obj); _e_fm2_icon_desel_any(obj);
} }
EAPI void E_API void
e_fm2_select_set(Evas_Object *obj, const char *file, int select_) e_fm2_select_set(Evas_Object *obj, const char *file, int select_)
{ {
Eina_List *l; Eina_List *l;
@ -1541,7 +1541,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) e_fm2_file_show(Evas_Object *obj, const char *file)
{ {
Eina_List *l; Eina_List *l;
@ -1558,7 +1558,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) e_fm2_icon_menu_replace_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
@ -1566,7 +1566,7 @@ e_fm2_icon_menu_replace_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data)
sd->icon_menu.replace.data = 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) e_fm2_icon_menu_start_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
@ -1574,7 +1574,7 @@ e_fm2_icon_menu_start_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *
sd->icon_menu.start.data = data; 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) e_fm2_icon_menu_end_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *data)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
@ -1582,42 +1582,42 @@ e_fm2_icon_menu_end_extend_callback_set(Evas_Object *obj, E_Fm_Cb func, void *da
sd->icon_menu.end.data = data; 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) e_fm2_icon_menu_flags_set(Evas_Object *obj, E_Fm2_Menu_Flags flags)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
sd->icon_menu.flags = flags; 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) e_fm2_icon_menu_flags_get(Evas_Object *obj)
{ {
EFM_SMART_CHECK(0); EFM_SMART_CHECK(0);
return sd->icon_menu.flags; return sd->icon_menu.flags;
} }
EAPI void E_API void
e_fm2_view_flags_set(Evas_Object *obj, E_Fm2_View_Flags flags) e_fm2_view_flags_set(Evas_Object *obj, E_Fm2_View_Flags flags)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
sd->view_flags = flags; sd->view_flags = flags;
} }
EAPI E_Fm2_View_Flags E_API E_Fm2_View_Flags
e_fm2_view_flags_get(Evas_Object *obj) e_fm2_view_flags_get(Evas_Object *obj)
{ {
EFM_SMART_CHECK(0); EFM_SMART_CHECK(0);
return sd->view_flags; return sd->view_flags;
} }
EAPI E_Object * E_API E_Object *
e_fm2_window_object_get(Evas_Object *obj) e_fm2_window_object_get(Evas_Object *obj)
{ {
EFM_SMART_CHECK(NULL); EFM_SMART_CHECK(NULL);
return sd->eobj; return sd->eobj;
} }
EAPI void E_API void
e_fm2_window_object_set(Evas_Object *obj, E_Object *eobj) e_fm2_window_object_set(Evas_Object *obj, E_Object *eobj)
{ {
const char *drop[] = {"text/uri-list", "text/x-moz-url", "XdndDirectSave0"}; const char *drop[] = {"text/uri-list", "text/x-moz-url", "XdndDirectSave0"};
@ -1698,14 +1698,14 @@ _e_fm2_icons_update_helper(E_Fm2_Smart_Data *sd, Eina_Bool icon_only)
e_fm2_custom_file_flush(); e_fm2_custom_file_flush();
} }
EAPI void E_API void
e_fm2_icons_update(Evas_Object *obj) e_fm2_icons_update(Evas_Object *obj)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
_e_fm2_icons_update_helper(sd, EINA_FALSE); _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) e_fm2_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
@ -1720,7 +1720,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); 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) e_fm2_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
@ -1728,7 +1728,7 @@ e_fm2_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
if (y) *y = sd->pos.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) e_fm2_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
{ {
Evas_Coord mx, my; Evas_Coord mx, my;
@ -1741,7 +1741,7 @@ e_fm2_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
if (y) *y = my; if (y) *y = my;
} }
EAPI void E_API void
e_fm2_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) e_fm2_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
@ -1749,7 +1749,7 @@ e_fm2_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
if (h) *h = sd->max.h; if (h) *h = sd->max.h;
} }
EAPI void E_API void
e_fm2_all_icons_update(void) e_fm2_all_icons_update(void)
{ {
Evas_Object *o; Evas_Object *o;
@ -2229,7 +2229,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 force_gen force thumbnail generation.
* @param type_ret string that identifies type of icon. * @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, e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic,
Evas_Smart_Cb gen_func, Evas_Smart_Cb gen_func,
void *data, int force_gen, const char **type_ret) void *data, int force_gen, const char **type_ret)
@ -2315,14 +2315,14 @@ e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic,
return _e_fm2_icon_explicit_theme_get(evas, ic, "text/plain", type_ret); 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) e_fm2_icon_file_info_get(E_Fm2_Icon *ic)
{ {
if (!ic) return NULL; if (!ic) return NULL;
return &(ic->info); 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) e_fm2_icon_geometry_get(E_Fm2_Icon *ic, int *x, int *y, int *w, int *h)
{ {
int xx, yy, ww, hh; int xx, yy, ww, hh;
@ -2543,7 +2543,7 @@ _e_fm2_client_file_mkdir(const char *path, const char *rel, int rel_to, int x, i
#endif #endif
EAPI int E_API int
e_fm2_client_file_move(Evas_Object *e_fm, const char *args) e_fm2_client_file_move(Evas_Object *e_fm, const char *args)
{ {
int id; int id;
@ -2554,7 +2554,7 @@ e_fm2_client_file_move(Evas_Object *e_fm, const char *args)
return id; return id;
} }
EAPI int E_API int
e_fm2_client_file_copy(Evas_Object *e_fm, const char *args) 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); int id = _e_fm_client_send_new(E_FM_OP_COPY, (void *)args, strlen(args) + 1);
@ -2562,7 +2562,7 @@ e_fm2_client_file_copy(Evas_Object *e_fm, const char *args)
return id; return id;
} }
EAPI int E_API int
e_fm2_client_file_symlink(Evas_Object *e_fm, const char *args) 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); int id = _e_fm_client_send_new(E_FM_OP_SYMLINK, (void *)args, strlen(args) + 1);
@ -2570,7 +2570,7 @@ e_fm2_client_file_symlink(Evas_Object *e_fm, const char *args)
return id; return id;
} }
EAPI int E_API int
_e_fm2_client_mount(const char *udi, const char *mountpoint) _e_fm2_client_mount(const char *udi, const char *mountpoint)
{ {
char *d; char *d;
@ -2595,7 +2595,7 @@ _e_fm2_client_mount(const char *udi, const char *mountpoint)
return _e_fm_client_send_new(E_FM_OP_MOUNT, (void *)d, l); 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) _e_fm2_client_unmount(const char *udi)
{ {
char *d; char *d;
@ -2614,7 +2614,7 @@ _e_fm2_client_unmount(const char *udi)
return _e_fm_client_send_new(E_FM_OP_UNMOUNT, (void *)d, l); 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) _e_fm2_client_eject(const char *udi)
{ {
char *data; char *data;
@ -2668,7 +2668,7 @@ _e_fm2_client_monitor_list_end(Evas_Object *obj)
_e_fm2_live_process_begin(obj); _e_fm2_live_process_begin(obj);
} }
EAPI void E_API void
_e_fm2_file_force_update(const char *path) _e_fm2_file_force_update(const char *path)
{ {
Evas_Object *o; Evas_Object *o;
@ -2708,7 +2708,7 @@ _e_fm2_file_force_update(const char *path)
free(dir); free(dir);
} }
EAPI void E_API void
e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e) e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
{ {
Evas_Object *obj; Evas_Object *obj;
@ -3215,7 +3215,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) e_fm2_client_del(Ecore_Ipc_Event_Client_Del *e)
{ {
Eina_List *l; Eina_List *l;
@ -5132,7 +5132,7 @@ _e_fm2_icon_desktop_url_eval(const char *val)
return s; return s;
} }
EAPI const char * E_API const char *
e_fm2_desktop_url_eval(const char *val) e_fm2_desktop_url_eval(const char *val)
{ {
return _e_fm2_icon_desktop_url_eval(val); return _e_fm2_icon_desktop_url_eval(val);
@ -11508,7 +11508,7 @@ _e_fm2_operation_abort_internal(E_Fm2_Op_Registry_Entry *ere)
_e_fm_client_send(E_FM_OP_ABORT, ere->id, NULL, 0); _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_operation_abort(int id)
{ {
E_Fm2_Op_Registry_Entry *ere; E_Fm2_Op_Registry_Entry *ere;
@ -11521,7 +11521,7 @@ e_fm2_operation_abort(int id)
e_fm2_op_registry_entry_unref(ere); 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) 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; int x, y, step_w, step_h;
@ -11559,28 +11559,28 @@ e_fm2_optimal_size_calc(Evas_Object *obj, int minw, int maxw, int maxh, int *w,
return EINA_TRUE; return EINA_TRUE;
} }
EAPI E_Fm2_View_Mode E_API E_Fm2_View_Mode
e_fm2_view_mode_get(Evas_Object *obj) e_fm2_view_mode_get(Evas_Object *obj)
{ {
EFM_SMART_CHECK(0); EFM_SMART_CHECK(0);
return _e_fm2_view_mode_get(sd); return _e_fm2_view_mode_get(sd);
} }
EAPI Eina_Bool E_API Eina_Bool
e_fm2_typebuf_visible_get(Evas_Object *obj) e_fm2_typebuf_visible_get(Evas_Object *obj)
{ {
EFM_SMART_CHECK(EINA_FALSE); EFM_SMART_CHECK(EINA_FALSE);
return sd->typebuf_visible; return sd->typebuf_visible;
} }
EAPI void E_API void
e_fm2_typebuf_clear(Evas_Object *obj) e_fm2_typebuf_clear(Evas_Object *obj)
{ {
EFM_SMART_CHECK(); EFM_SMART_CHECK();
_e_fm2_typebuf_hide(obj); _e_fm2_typebuf_hide(obj);
} }
EAPI void E_API void
e_fm2_overlay_clip_to(Evas_Object *obj, Evas_Object *clip) e_fm2_overlay_clip_to(Evas_Object *obj, Evas_Object *clip)
{ {
int x, y, w, h; int x, y, w, h;
@ -11608,13 +11608,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) e_fm2_real_path_map(const char *dev, const char *path)
{ {
return _e_fm2_dev_path_map(NULL, dev, path); return _e_fm2_dev_path_map(NULL, dev, path);
} }
EAPI void E_API void
e_fm2_favorites_init(void) e_fm2_favorites_init(void)
{ {
Eina_List *files; Eina_List *files;
@ -11637,21 +11637,21 @@ e_fm2_favorites_init(void)
} }
} }
EAPI unsigned int E_API unsigned int
e_fm2_selected_count(Evas_Object *obj) e_fm2_selected_count(Evas_Object *obj)
{ {
EFM_SMART_CHECK(0); EFM_SMART_CHECK(0);
return eina_list_count(sd->selected_icons); 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) e_fm2_drop_icon_get(Evas_Object *obj)
{ {
EFM_SMART_CHECK(NULL); EFM_SMART_CHECK(NULL);
return sd->drop_icon ? &sd->drop_icon->info : 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_path_list_get(const Eina_List *uri_list)
{ {
E_Fm2_Uri *uri; E_Fm2_Uri *uri;
@ -11683,7 +11683,7 @@ e_fm2_uri_path_list_get(const Eina_List *uri_list)
return path_list; return path_list;
} }
EAPI Efreet_Desktop * E_API Efreet_Desktop *
e_fm2_desktop_get(Evas_Object *obj) e_fm2_desktop_get(Evas_Object *obj)
{ {
EFM_SMART_CHECK(NULL); EFM_SMART_CHECK(NULL);
@ -11691,7 +11691,7 @@ e_fm2_desktop_get(Evas_Object *obj)
return sd->desktop; return sd->desktop;
} }
EAPI void E_API void
e_fm2_drop_menu(Evas_Object *obj, char *args) e_fm2_drop_menu(Evas_Object *obj, char *args)
{ {
E_Menu *menu; E_Menu *menu;

124
src/bin/e_fm.h
View File

@ -150,76 +150,76 @@ 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_init(void);
EINTERN int e_fm2_shutdown(void); EINTERN int e_fm2_shutdown(void);
EAPI Evas_Object *e_fm2_add(Evas *evas); E_API Evas_Object *e_fm2_add(Evas *evas);
EAPI void e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path); E_API 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); E_API 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); E_API void e_fm2_custom_theme_content_set(Evas_Object *obj, const char *content);
EAPI void e_fm2_underlay_show(Evas_Object *obj); E_API void e_fm2_underlay_show(Evas_Object *obj);
EAPI void e_fm2_underlay_hide(Evas_Object *obj); E_API void e_fm2_underlay_hide(Evas_Object *obj);
EAPI void e_fm2_all_unsel(Evas_Object *obj); E_API void e_fm2_all_unsel(Evas_Object *obj);
EAPI void e_fm2_all_sel(Evas_Object *obj); E_API void e_fm2_all_sel(Evas_Object *obj);
EAPI void e_fm2_first_sel(Evas_Object *obj); E_API void e_fm2_first_sel(Evas_Object *obj);
EAPI void e_fm2_last_sel(Evas_Object *obj); E_API void e_fm2_last_sel(Evas_Object *obj);
EAPI void e_fm2_path_get(Evas_Object *obj, const char **dev, const char **path); E_API void e_fm2_path_get(Evas_Object *obj, const char **dev, const char **path);
EAPI void e_fm2_refresh(Evas_Object *obj); E_API void e_fm2_refresh(Evas_Object *obj);
EAPI const char *e_fm2_real_path_get(Evas_Object *obj); E_API const char *e_fm2_real_path_get(Evas_Object *obj);
EAPI int e_fm2_has_parent_get(Evas_Object *obj); E_API int e_fm2_has_parent_get(Evas_Object *obj);
EAPI void e_fm2_parent_go(Evas_Object *obj); E_API void e_fm2_parent_go(Evas_Object *obj);
EAPI void e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg); E_API void e_fm2_config_set(Evas_Object *obj, E_Fm2_Config *cfg);
EAPI E_Fm2_Config *e_fm2_config_get(Evas_Object *obj); E_API E_Fm2_Config *e_fm2_config_get(Evas_Object *obj);
EAPI Eina_List *e_fm2_selected_list_get(Evas_Object *obj); E_API Eina_List *e_fm2_selected_list_get(Evas_Object *obj);
EAPI Eina_List *e_fm2_all_list_get(Evas_Object *obj); E_API Eina_List *e_fm2_all_list_get(Evas_Object *obj);
EAPI void e_fm2_select_set(Evas_Object *obj, const char *file, int select); E_API void e_fm2_select_set(Evas_Object *obj, const char *file, int select);
EAPI void e_fm2_deselect_all(Evas_Object *obj); E_API void e_fm2_deselect_all(Evas_Object *obj);
EAPI void e_fm2_file_show(Evas_Object *obj, const char *file); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API 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); E_API E_Fm2_View_Flags e_fm2_view_flags_get(Evas_Object *obj);
EAPI E_Object *e_fm2_window_object_get(Evas_Object *obj); E_API E_Object *e_fm2_window_object_get(Evas_Object *obj);
EAPI void e_fm2_window_object_set(Evas_Object *obj, E_Object *eobj); E_API void e_fm2_window_object_set(Evas_Object *obj, E_Object *eobj);
EAPI void e_fm2_icons_update(Evas_Object *obj); E_API void e_fm2_icons_update(Evas_Object *obj);
EAPI void e_fm2_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y); E_API 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); E_API 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); E_API 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); E_API void e_fm2_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
EAPI void e_fm2_all_icons_update(void); E_API void e_fm2_all_icons_update(void);
EAPI void e_fm2_operation_abort(int id); E_API 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_icon_get(Evas *evas, E_Fm2_Icon *ic, Evas_Smart_Cb gen_func,
void *data, int force_gen, const char **type_ret); void *data, int force_gen, const char **type_ret);
EAPI E_Fm2_Icon_Info *e_fm2_icon_file_info_get(E_Fm2_Icon *ic); E_API 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); E_API 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); E_API Eina_Bool e_fm2_typebuf_visible_get(Evas_Object *obj);
EAPI void e_fm2_typebuf_clear(Evas_Object *obj); E_API void e_fm2_typebuf_clear(Evas_Object *obj);
EAPI void e_fm2_overlay_clip_to(Evas_Object *fm, Evas_Object *clip); E_API void e_fm2_overlay_clip_to(Evas_Object *fm, Evas_Object *clip);
EAPI void e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e); E_API void e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e);
EAPI void e_fm2_client_del(Ecore_Ipc_Event_Client_Del *e); E_API void e_fm2_client_del(Ecore_Ipc_Event_Client_Del *e);
EAPI E_Fm2_View_Mode e_fm2_view_mode_get(Evas_Object *obj); E_API 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); E_API 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); E_API const char *e_fm2_real_path_map(const char *dev, const char *path);
EAPI void e_fm2_favorites_init(void); E_API void e_fm2_favorites_init(void);
EAPI unsigned int e_fm2_selected_count(Evas_Object *obj); E_API unsigned int e_fm2_selected_count(Evas_Object *obj);
EAPI const char *e_fm2_desktop_url_eval(const char *val); E_API const char *e_fm2_desktop_url_eval(const char *val);
EAPI E_Fm2_Icon_Info *e_fm2_drop_icon_get(Evas_Object *obj); E_API E_Fm2_Icon_Info *e_fm2_drop_icon_get(Evas_Object *obj);
EAPI void e_fm2_drop_menu(Evas_Object *e_fm, char *args); E_API 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); E_API Eina_List *e_fm2_uri_path_list_get(const Eina_List *uri_list);
EAPI Efreet_Desktop *e_fm2_desktop_get(Evas_Object *obj); E_API Efreet_Desktop *e_fm2_desktop_get(Evas_Object *obj);
EAPI int e_fm2_client_file_move(Evas_Object *e_fm, const char *args); E_API 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); E_API 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); E_API 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); E_API int _e_fm2_client_mount(const char *udi, const char *mountpoint);
EAPI int _e_fm2_client_unmount(const char *udi); E_API int _e_fm2_client_unmount(const char *udi);
EAPI void _e_fm2_file_force_update(const char *path); E_API void _e_fm2_file_force_update(const char *path);
#endif #endif
#endif #endif

19
src/bin/e_fm/e_fm_ipc.h
View File

@ -1,6 +1,7 @@
#ifndef E_FM_IPC_H #ifndef E_FM_IPC_H
#define E_FM_IPC_H #define E_FM_IPC_H
#include "e_fm_main.h"
#include "e_fm_shared_types.h" #include "e_fm_shared_types.h"
int _e_fm_ipc_init(void); 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); Eina_Bool _e_fm_ipc_slave_del_cb(void *data, int type, void *event);
void e_fm_ipc_volume_add(E_Volume *v); void e_fm_ipc_volume_add(E_Volume *v);
EAPI E_Storage *e_storage_add(const char *udi); E_API E_Storage *e_storage_add(const char *udi);
EAPI void e_storage_del(const char *udi); E_API void e_storage_del(const char *udi);
EAPI E_Storage *e_storage_find(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); E_API E_Volume *e_volume_add(const char *udi, char first_time);
EAPI void e_volume_del(const char *udi); E_API void e_volume_del(const char *udi);
EAPI E_Volume *e_volume_find(const char *udi); E_API E_Volume *e_volume_find(const char *udi);
EAPI void e_volume_mount(E_Volume *v); E_API void e_volume_mount(E_Volume *v);
EAPI void e_volume_unmount(E_Volume *v); E_API void e_volume_unmount(E_Volume *v);
EAPI void e_volume_eject(E_Volume *v); E_API void e_volume_eject(E_Volume *v);
#endif #endif

18
src/bin/e_fm/e_fm_main.c
View File

@ -46,6 +46,8 @@ void *alloca (size_t);
#include <Ecore_File.h> #include <Ecore_File.h>
#include <Eet.h> #include <Eet.h>
#include "e_fm_main.h"
#define E_TYPEDEFS #define E_TYPEDEFS
#include "e_config_data.h" #include "e_config_data.h"
#include "e_fm_op.h" #include "e_fm_op.h"
@ -77,8 +79,8 @@ static Efm_Mode mode = EFM_MODE_USING_RASTER_MOUNT;
* *
*/ */
#ifndef EAPI #ifndef E_API
#define EAPI #define E_API
#endif #endif
#include "e_fm_main.h" #include "e_fm_main.h"
@ -217,7 +219,7 @@ _e_volume_free(E_Volume *v)
/* API functions */ /* API functions */
EAPI void E_API void
e_volume_mount(E_Volume *v) e_volume_mount(E_Volume *v)
{ {
switch (mode) switch (mode)
@ -242,7 +244,7 @@ e_volume_mount(E_Volume *v)
} }
EAPI void E_API void
e_volume_unmount(E_Volume *v) e_volume_unmount(E_Volume *v)
{ {
switch (mode) switch (mode)
@ -266,7 +268,7 @@ e_volume_unmount(E_Volume *v)
} }
} }
EAPI void E_API void
e_volume_eject(E_Volume *v) e_volume_eject(E_Volume *v)
{ {
switch (mode) 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) e_volume_find(const char *udi)
{ {
switch (mode) switch (mode)
@ -312,7 +314,7 @@ e_volume_find(const char *udi)
return NULL; return NULL;
} }
EAPI void E_API void
e_storage_del(const char *udi) e_storage_del(const char *udi)
{ {
switch (mode) 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) e_storage_find(const char *udi)
{ {
switch (mode) switch (mode)

25
src/bin/e_fm/e_fm_main.h
View File

@ -13,6 +13,31 @@
#define ERR(...) EINA_LOG_DOM_ERR(efm_log_dom, __VA_ARGS__) #define ERR(...) EINA_LOG_DOM_ERR(efm_log_dom, __VA_ARGS__)
#define CRI(...) EINA_LOG_DOM_CRIT(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 Ecore_Ipc_Server *_e_fm_ipc_server;
extern int efm_log_dom; extern int efm_log_dom;

4
src/bin/e_fm/e_fm_main_udisks2.c
View File

@ -919,7 +919,9 @@ _volume_eject_umount_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *p
E_Volume *v = data; E_Volume *v = data;
if (eldbus_message_error_get(msg, &name, &txt)) 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) else if (v->optype == E_VOLUME_OP_TYPE_EJECT)
{ {
vols_ejecting = eina_list_remove(vols_ejecting, v); vols_ejecting = eina_list_remove(vols_ejecting, v);

27
src/bin/e_fm_cmdline.c
View File

@ -12,6 +12,31 @@
#include <Efreet.h> #include <Efreet.h>
#include <Eldbus.h> #include <Eldbus.h>
# 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 Eldbus_Connection *conn = NULL;
static int retval = EXIT_SUCCESS; static int retval = EXIT_SUCCESS;
static int pending = 0; static int pending = 0;
@ -136,7 +161,7 @@ static const Ecore_Getopt options = {
} }
}; };
EAPI int E_API int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
Eina_Bool quit_option = EINA_FALSE; Eina_Bool quit_option = EINA_FALSE;

12
src/bin/e_fm_custom.c
View File

@ -103,7 +103,7 @@ e_fm2_custom_file_shutdown(void)
_e_fm2_custom_dir_edd = NULL; _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_get(const char *path)
{ {
E_Fm2_Custom_File *cf; E_Fm2_Custom_File *cf;
@ -146,7 +146,7 @@ _e_fm2_custom_dir_dup(const E_Fm2_Custom_Dir *dir)
return copy; 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_dup(const E_Fm2_Custom_File *cf)
{ {
E_Fm2_Custom_File *copy; E_Fm2_Custom_File *copy;
@ -163,7 +163,7 @@ e_fm2_custom_file_dup(const E_Fm2_Custom_File *cf)
return copy; 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_set(const char *path, const E_Fm2_Custom_File *cf)
{ {
E_Fm2_Custom_File *cf1; 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; _e_fm2_custom_writes = 1;
} }
EAPI void E_API void
e_fm2_custom_file_del(const char *path) e_fm2_custom_file_del(const char *path)
{ {
Eina_List *list, *l; Eina_List *list, *l;
@ -217,7 +217,7 @@ e_fm2_custom_file_del(const char *path)
_e_fm2_custom_writes = 1; _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_rename(const char *path, const char *new_path)
{ {
E_Fm2_Custom_File *cf, *cf2; 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; _e_fm2_custom_writes = 1;
} }
EAPI void E_API void
e_fm2_custom_file_flush(void) e_fm2_custom_file_flush(void)
{ {
if (!_e_fm2_custom_file) return; if (!_e_fm2_custom_file) return;

12
src/bin/e_fm_custom.h
View File

@ -53,13 +53,13 @@ struct _E_Fm2_Custom_File
EINTERN int e_fm2_custom_file_init(void); EINTERN int e_fm2_custom_file_init(void);
EINTERN void e_fm2_custom_file_shutdown(void); EINTERN void e_fm2_custom_file_shutdown(void);
EAPI E_Fm2_Custom_File *e_fm2_custom_file_get(const char *path); E_API 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); E_API 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); E_API void e_fm2_custom_file_del(const char *path);
EAPI void e_fm2_custom_file_rename(const char *path, const char *new_path); E_API void e_fm2_custom_file_rename(const char *path, const char *new_path);
EAPI void e_fm2_custom_file_flush(void); 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
#endif #endif

42
src/bin/e_fm_device.c
View File

@ -119,7 +119,7 @@ _e_fm2_device_volume_setup(E_Volume *v)
E_FREE(size); E_FREE(size);
} }
EAPI void E_API void
e_fm2_device_storage_add(E_Storage *s) e_fm2_device_storage_add(E_Storage *s)
{ {
Eina_List *l; 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) e_fm2_device_storage_del(E_Storage *s)
{ {
// printf("STO- %s\n", s->udi); // 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); _e_fm_shared_device_storage_free(s);
} }
EAPI E_Storage * E_API E_Storage *
e_fm2_device_storage_find(const char *udi) e_fm2_device_storage_find(const char *udi)
{ {
Eina_List *l; Eina_List *l;
@ -207,7 +207,7 @@ e_fm2_device_storage_find(const char *udi)
return NULL; return NULL;
} }
EAPI void E_API void
e_fm2_device_volume_add(E_Volume *v) e_fm2_device_volume_add(E_Volume *v)
{ {
E_Storage *s; E_Storage *s;
@ -280,7 +280,7 @@ e_fm2_device_volume_add(E_Volume *v)
if (v->storage) _e_fm2_device_volume_setup(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_device_volume_del(E_Volume *v)
{ {
E_Fm2_Mount *m; E_Fm2_Mount *m;
@ -376,7 +376,7 @@ _e_fm2_volume_erase(E_Volume *v)
_e_fm2_file_force_update(buf); _e_fm2_file_force_update(buf);
} }
EAPI E_Volume * E_API E_Volume *
e_fm2_device_volume_find(const char *udi) e_fm2_device_volume_find(const char *udi)
{ {
Eina_List *l; Eina_List *l;
@ -393,7 +393,7 @@ e_fm2_device_volume_find(const char *udi)
return NULL; return NULL;
} }
EAPI E_Volume * E_API E_Volume *
e_fm2_device_volume_find_fast(const char *udi) e_fm2_device_volume_find_fast(const char *udi)
{ {
Eina_List *l; Eina_List *l;
@ -407,7 +407,7 @@ e_fm2_device_volume_find_fast(const char *udi)
return NULL; return NULL;
} }
EAPI const char * E_API const char *
e_fm2_device_volume_mountpoint_get(E_Volume *v) e_fm2_device_volume_mountpoint_get(E_Volume *v)
{ {
char buf[PATH_MAX] = {0}; char buf[PATH_MAX] = {0};
@ -436,7 +436,7 @@ e_fm2_device_volume_mountpoint_get(E_Volume *v)
return eina_stringshare_add(buf); 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_add(E_Fm2_Mount *m, char *args, size_t size, size_t length)
{ {
E_Fm2_Device_Mount_Op *mop; 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; return mop;
} }
EAPI void E_API void
e_fm2_device_mount_add(E_Volume *v, e_fm2_device_mount_add(E_Volume *v,
const char *mountpoint) 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); // 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_device_mount_del(E_Volume *v)
{ {
E_Fm2_Mount *m; 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) e_fm2_device_mount_free(E_Fm2_Mount *m)
{ {
if (!m) return; if (!m) return;
@ -488,7 +488,7 @@ e_fm2_device_mount_free(E_Fm2_Mount *m)
free(m); free(m);
} }
EAPI E_Fm2_Mount * E_API E_Fm2_Mount *
e_fm2_device_mount_find(const char *path) e_fm2_device_mount_find(const char *path)
{ {
Eina_List *l; Eina_List *l;
@ -507,7 +507,7 @@ e_fm2_device_mount_find(const char *path)
return NULL; return NULL;
} }
EAPI E_Fm2_Mount * E_API E_Fm2_Mount *
e_fm2_device_mount(E_Volume *v, e_fm2_device_mount(E_Volume *v,
Ecore_Cb mount_ok, Ecore_Cb mount_ok,
Ecore_Cb mount_fail, Ecore_Cb mount_fail,
@ -547,7 +547,7 @@ e_fm2_device_mount(E_Volume *v,
return m; return m;
} }
EAPI void E_API void
e_fm2_device_mount_fail(E_Volume *v) e_fm2_device_mount_fail(E_Volume *v)
{ {
E_Fm2_Mount *m; 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_fm2_device_unmount(E_Fm2_Mount *m)
{ {
E_Volume *v; 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) e_fm2_device_unmount_fail(E_Volume *v)
{ {
Eina_List *l; Eina_List *l;
@ -688,7 +688,7 @@ _e_fm2_device_check_desktop_icons_cb(void *data, Ecore_Thread *eth __UNUSED__)
E_FREE_LIST(data, free); E_FREE_LIST(data, free);
} }
EAPI void E_API void
e_fm2_device_show_desktop_icons(void) e_fm2_device_show_desktop_icons(void)
{ {
Eina_List *l; 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) e_fm2_device_hide_desktop_icons(void)
{ {
Eina_List *l; 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) e_fm2_device_check_desktop_icons(void)
{ {
Eina_List *l, *thd = NULL; 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); _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) e_fm2_device_volume_list_get(void)
{ {
return _e_vols; return _e_vols;

42
src/bin/e_fm_device.h
View File

@ -4,32 +4,32 @@
#include "e.h" #include "e.h"
#include "e_fm.h" #include "e_fm.h"
EAPI void e_fm2_device_storage_add(E_Storage *s); E_API void e_fm2_device_storage_add(E_Storage *s);
EAPI void e_fm2_device_storage_del(E_Storage *s); E_API void e_fm2_device_storage_del(E_Storage *s);
EAPI E_Storage *e_fm2_device_storage_find(const char *udi); E_API E_Storage *e_fm2_device_storage_find(const char *udi);
EAPI void e_fm2_device_volume_add(E_Volume *s); E_API void e_fm2_device_volume_add(E_Volume *s);
EAPI void e_fm2_device_volume_del(E_Volume *s); E_API void e_fm2_device_volume_del(E_Volume *s);
EAPI E_Volume *e_fm2_device_volume_find(const char *udi); E_API E_Volume *e_fm2_device_volume_find(const char *udi);
EAPI E_Volume *e_fm2_device_volume_find_fast(const char *udi); E_API 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 const char *e_fm2_device_volume_mountpoint_get(E_Volume *v);
EAPI void e_fm2_device_mount_add(E_Volume *v, const char *mountpoint); E_API 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); 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);
EAPI void e_fm2_device_mount_free(E_Fm2_Mount *m) EINA_ARG_NONNULL(1); E_API void e_fm2_device_mount_free(E_Fm2_Mount *m) EINA_ARG_NONNULL(1);
EAPI void e_fm2_device_mount_del(E_Volume *v); E_API void e_fm2_device_mount_del(E_Volume *v);
EAPI E_Fm2_Mount *e_fm2_device_mount_find(const char *path); E_API E_Fm2_Mount *e_fm2_device_mount_find(const char *path);
EAPI E_Fm2_Mount *e_fm2_device_mount(E_Volume *v, E_API E_Fm2_Mount *e_fm2_device_mount(E_Volume *v,
Ecore_Cb mount_ok, Ecore_Cb mount_fail, Ecore_Cb mount_ok, Ecore_Cb mount_fail,
Ecore_Cb unmount_ok, Ecore_Cb unmount_fail, Ecore_Cb unmount_ok, Ecore_Cb unmount_fail,
void *data); void *data);
EAPI void e_fm2_device_mount_fail(E_Volume *v); E_API void e_fm2_device_mount_fail(E_Volume *v);
EAPI void e_fm2_device_unmount(E_Fm2_Mount *m); E_API 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_unmount_fail(E_Volume *v);
EAPI void e_fm2_device_show_desktop_icons(void); E_API void e_fm2_device_show_desktop_icons(void);
EAPI void e_fm2_device_hide_desktop_icons(void); E_API void e_fm2_device_hide_desktop_icons(void);
EAPI void e_fm2_device_check_desktop_icons(void); E_API void e_fm2_device_check_desktop_icons(void);
EAPI Eina_List *e_fm2_device_volume_list_get(void); E_API Eina_List *e_fm2_device_volume_list_get(void);
#endif #endif

Some files were not shown because too many files have changed in this diff Show More