vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* e: remove warning due to Ecore API change. 

SVN revision: 49833
This commit is contained in:
Cedric BAIL 2010-06-24 16:19:12 +00:00
parent 61d7b9fe28
commit c6a118d738
154 changed files with 2466 additions and 2402 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/bin/e_acpi.c
View File

@ -19,11 +19,11 @@ struct _ACPIDevice
};
/* local function prototypes */
static int _e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event);
static int _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event);
static Eina_Bool _e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event);
static Eina_Bool _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event);
static void _e_acpi_cb_event_free(void *data __UNUSED__, void *event);
static int _e_acpi_lid_status_get(const char *device, const char *bus);
static int _e_acpi_cb_event(void *data __UNUSED__, int type __UNUSED__, void *event);
static Eina_Bool _e_acpi_cb_event(void *data __UNUSED__, int type __UNUSED__, void *event);
/* local variables */
static int _e_acpi_events_frozen = 0;
@ -153,14 +153,14 @@ e_acpi_events_thaw(void)
}
/* local functions */
static int
_e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event)
static Eina_Bool
_e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Con_Event_Server_Del *ev;
Ecore_Event_Handler *hdl;
ev = event;
if (ev->server != _e_acpid) return 1;
if (ev->server != _e_acpid) return ECORE_CALLBACK_PASS_ON;
/* cleanup event handlers */
EINA_LIST_FREE(_e_acpid_hdls, hdl)
@ -169,11 +169,11 @@ _e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event)
/* kill the server if existing */
if (_e_acpid) ecore_con_server_del(_e_acpid);
_e_acpid = NULL;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
static Eina_Bool
_e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Con_Event_Server_Data *ev;
ACPIDevice *dev;
@ -189,7 +189,7 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
/* parse out this acpi string into separate pieces */
if (sscanf(ev->data, "%s %s %d %d", device, bus, &sig, &status) != 4)
return 1;
return ECORE_CALLBACK_PASS_ON;
/* create new event structure to raise */
acpi_event = E_NEW(E_Event_Acpi, 1);
@ -248,7 +248,7 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
/* actually raise the event */
ecore_event_add(event_type, acpi_event, _e_acpi_cb_event_free, NULL);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void
@ -299,13 +299,13 @@ _e_acpi_lid_status_get(const char *device, const char *bus)
return E_ACPI_LID_UNKNOWN;
}
static int
_e_acpi_cb_event(void *data __UNUSED__, int type __UNUSED__, void *event)
static Eina_Bool
_e_acpi_cb_event(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Acpi *ev;
ev = event;
if (_e_acpi_events_frozen > 0) return 1;
if (_e_acpi_events_frozen > 0) return ECORE_CALLBACK_PASS_ON;
e_bindings_acpi_event_handle(E_BINDING_CONTEXT_NONE, NULL, ev);
return 1;
return ECORE_CALLBACK_PASS_ON;
}

216
src/bin/e_actions.c
View File

@ -13,71 +13,71 @@
act = e_action_add(#name); \
if (act) act->func.go = _e_actions_act_##name##_go; \
}
#define ACT_FN_GO(act) \
static void _e_actions_act_##act##_go(E_Object *obj, const char *params)
#define ACT_FN_GO(act, use) \
static void _e_actions_act_##act##_go(E_Object *obj, use const char *params)
#define ACT_GO_MOUSE(name) \
{ \
act = e_action_add(#name); \
if (act) act->func.go_mouse = _e_actions_act_##name##_go_mouse; \
}
#define ACT_FN_GO_MOUSE(act) \
static void _e_actions_act_##act##_go_mouse(E_Object *obj, const char *params, Ecore_Event_Mouse_Button *ev)
#define ACT_FN_GO_MOUSE(act, use) \
static void _e_actions_act_##act##_go_mouse(E_Object *obj, use const char *params, Ecore_Event_Mouse_Button *ev)
#define ACT_GO_WHEEL(name) \
{ \
act = e_action_add(#name); \
if (act) act->func.go_wheel = _e_actions_act_##name##_go_wheel; \
}
#define ACT_FN_GO_WHEEL(act) \
static void _e_actions_act_##act##_go_wheel(E_Object *obj, const char *params, Ecore_Event_Mouse_Wheel *ev)
#define ACT_FN_GO_WHEEL(act, use) \
static void _e_actions_act_##act##_go_wheel(E_Object *obj, use const char *params, Ecore_Event_Mouse_Wheel *ev)
#define ACT_GO_EDGE(name) \
{ \
act = e_action_add(#name); \
if (act) act->func.go_edge = _e_actions_act_##name##_go_edge; \
}
#define ACT_FN_GO_EDGE(act) \
static void _e_actions_act_##act##_go_edge(E_Object *obj, const char *params, E_Event_Zone_Edge *ev)
#define ACT_FN_GO_EDGE(act, use) \
static void _e_actions_act_##act##_go_edge(E_Object *obj, use const char *params, E_Event_Zone_Edge *ev)
#define ACT_GO_SIGNAL(name) \
{ \
act = e_action_add(#name); \
if (act) act->func.go_signal = _e_actions_act_##name##_go_signal; \
}
#define ACT_FN_GO_SIGNAL(act) \
static void _e_actions_act_##act##_go_signal(E_Object *obj, const char *params, const char *sig, const char *src)
#define ACT_FN_GO_SIGNAL(act, use) \
static void _e_actions_act_##act##_go_signal(E_Object *obj, use const char *params, const char *sig, const char *src)
#define ACT_GO_KEY(name) \
{ \
act = e_action_add(#name); \
if (act) act->func.go_key = _e_actions_act_##name##_go_key; \
}
#define ACT_FN_GO_KEY(act) \
static void _e_actions_act_##act##_go_key(E_Object *obj, const char *params, Ecore_Event_Key *ev)
#define ACT_FN_GO_KEY(act, use) \
static void _e_actions_act_##act##_go_key(E_Object *obj, use const char *params, Ecore_Event_Key *ev)
#define ACT_END(name) \
{ \
act = e_action_add(#name); \
if (act) act->func.end = _e_actions_act_##name##_end; \
}
#define ACT_FN_END(act) \
static void _e_actions_act_##act##_end(E_Object *obj, const char *params)
#define ACT_FN_END(act, use) \
static void _e_actions_act_##act##_end(E_Object *obj, use const char *params)
#define ACT_END_MOUSE(name) \
{ \
act = e_action_add(#name); \
if (act) act->func.end_mouse = _e_actions_act_##name##_end_mouse; \
}
#define ACT_FN_END_MOUSE(act) \
static void _e_actions_act_##act##_end_mouse(E_Object *obj, const char *params, Ecore_Event_Mouse_Button *ev)
#define ACT_FN_END_MOUSE(act, use) \
static void _e_actions_act_##act##_end_mouse(E_Object *obj, use const char *params, Ecore_Event_Mouse_Button *ev)
#define ACT_END_KEY(name) \
{ \
act = e_action_add(#name); \
if (act) act->func.end_key = _e_actions_act_##name##_end_key; \
}
#define ACT_FN_END_KEY(act) \
static void _e_actions_act_##act##_end_key(E_Object *obj, const char *params, Ecore_Event_Key *ev)
#define ACT_FN_END_KEY(act, use) \
static void _e_actions_act_##act##_end_key(E_Object *obj, use const char *params, Ecore_Event_Key *ev)
#define ACT_GO_ACPI(name) \
{ \
act = e_action_add(#name); \
if (act) act->func.go_acpi = _e_actions_act_##name##_go_acpi; \
}
#define ACT_FN_GO_ACPI(act) \
static void _e_actions_act_##act##_go_acpi(E_Object *obj, const char *params, E_Event_Acpi *ev)
#define ACT_FN_GO_ACPI(act, use) \
static void _e_actions_act_##act##_go_acpi(E_Object *obj, use const char *params, E_Event_Acpi *ev)
/* local subsystem functions */
static void _e_action_free(E_Action *act);
@ -86,7 +86,7 @@ static int _action_groups_sort_cb(const void *d1, const void *d2);
/* to save writing this in N places - the sctions are defined here */
/***************************************************************************/
ACT_FN_GO(window_move)
ACT_FN_GO(window_move, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -95,7 +95,7 @@ ACT_FN_GO(window_move)
e_border_act_move_begin((E_Border *)obj, NULL);
}
ACT_FN_GO_MOUSE(window_move)
ACT_FN_GO_MOUSE(window_move, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -104,7 +104,7 @@ ACT_FN_GO_MOUSE(window_move)
e_border_act_move_begin((E_Border *)obj, ev);
}
ACT_FN_GO_SIGNAL(window_move)
ACT_FN_GO_SIGNAL(window_move, )
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -123,7 +123,7 @@ ACT_FN_GO_SIGNAL(window_move)
}
}
ACT_FN_END(window_move)
ACT_FN_END(window_move, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -131,7 +131,7 @@ ACT_FN_END(window_move)
e_border_act_move_end((E_Border *)obj, NULL);
}
ACT_FN_END_MOUSE(window_move)
ACT_FN_END_MOUSE(window_move, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -139,7 +139,7 @@ ACT_FN_END_MOUSE(window_move)
e_border_act_move_end((E_Border *)obj, ev);
}
ACT_FN_GO_KEY(window_move)
ACT_FN_GO_KEY(window_move, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -153,7 +153,7 @@ ACT_FN_GO_KEY(window_move)
}
/***************************************************************************/
ACT_FN_GO(window_resize)
ACT_FN_GO(window_resize, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -162,7 +162,7 @@ ACT_FN_GO(window_resize)
e_border_act_resize_begin((E_Border *)obj, NULL);
}
ACT_FN_GO_MOUSE(window_resize)
ACT_FN_GO_MOUSE(window_resize, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -171,7 +171,7 @@ ACT_FN_GO_MOUSE(window_resize)
e_border_act_resize_begin((E_Border *)obj, ev);
}
ACT_FN_GO_SIGNAL(window_resize)
ACT_FN_GO_SIGNAL(window_resize, )
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -191,7 +191,7 @@ ACT_FN_GO_SIGNAL(window_resize)
}
}
ACT_FN_END(window_resize)
ACT_FN_END(window_resize, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -199,7 +199,7 @@ ACT_FN_END(window_resize)
e_border_act_resize_end((E_Border *)obj, NULL);
}
ACT_FN_END_MOUSE(window_resize)
ACT_FN_END_MOUSE(window_resize, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -207,7 +207,7 @@ ACT_FN_END_MOUSE(window_resize)
e_border_act_resize_end((E_Border *)obj, ev);
}
ACT_FN_GO_KEY(window_resize)
ACT_FN_GO_KEY(window_resize, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -221,7 +221,7 @@ ACT_FN_GO_KEY(window_resize)
}
/***************************************************************************/
ACT_FN_GO(window_menu)
ACT_FN_GO(window_menu, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -233,7 +233,7 @@ ACT_FN_GO(window_menu)
e_border_act_menu_begin((E_Border *)obj, NULL, 0);
}
ACT_FN_GO_MOUSE(window_menu)
ACT_FN_GO_MOUSE(window_menu, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -245,7 +245,7 @@ ACT_FN_GO_MOUSE(window_menu)
e_border_act_menu_begin((E_Border *)obj, ev, 0);
}
ACT_FN_GO_KEY(window_menu)
ACT_FN_GO_KEY(window_menu, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -258,7 +258,7 @@ ACT_FN_GO_KEY(window_menu)
}
/***************************************************************************/
ACT_FN_GO(window_raise)
ACT_FN_GO(window_raise, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -272,7 +272,7 @@ ACT_FN_GO(window_raise)
}
/***************************************************************************/
ACT_FN_GO(window_lower)
ACT_FN_GO(window_lower, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -286,7 +286,7 @@ ACT_FN_GO(window_lower)
}
/***************************************************************************/
ACT_FN_GO(window_close)
ACT_FN_GO(window_close, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -333,7 +333,7 @@ _e_actions_cb_kill_dialog_delete(E_Win *win)
_e_actions_cb_kill_dialog_cancel(NULL, dia);
}
ACT_FN_GO(window_kill)
ACT_FN_GO(window_kill, __UNUSED__)
{
E_Border *bd;
char dialog_text[1024];
@ -382,7 +382,7 @@ ACT_FN_GO(window_kill)
}
/***************************************************************************/
ACT_FN_GO(window_sticky_toggle)
ACT_FN_GO(window_sticky_toggle, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -402,7 +402,7 @@ ACT_FN_GO(window_sticky_toggle)
}
/***************************************************************************/
ACT_FN_GO(window_sticky)
ACT_FN_GO(window_sticky, )
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -427,7 +427,7 @@ ACT_FN_GO(window_sticky)
}
/***************************************************************************/
ACT_FN_GO(window_iconic_toggle)
ACT_FN_GO(window_iconic_toggle, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -447,7 +447,7 @@ ACT_FN_GO(window_iconic_toggle)
}
/***************************************************************************/
ACT_FN_GO(window_iconic)
ACT_FN_GO(window_iconic, )
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -472,7 +472,7 @@ ACT_FN_GO(window_iconic)
}
/***************************************************************************/
ACT_FN_GO(window_fullscreen_toggle)
ACT_FN_GO(window_fullscreen_toggle, )
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -498,7 +498,7 @@ ACT_FN_GO(window_fullscreen_toggle)
}
/***************************************************************************/
ACT_FN_GO(window_fullscreen)
ACT_FN_GO(window_fullscreen, )
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -537,7 +537,7 @@ ACT_FN_GO(window_fullscreen)
}
/***************************************************************************/
ACT_FN_GO(window_maximized_toggle)
ACT_FN_GO(window_maximized_toggle, )
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -587,7 +587,7 @@ maximize:
}
}
/***************************************************************************/
ACT_FN_GO(window_maximized)
ACT_FN_GO(window_maximized, )
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -641,7 +641,7 @@ ACT_FN_GO(window_maximized)
}
/***************************************************************************/
ACT_FN_GO(window_shaded_toggle)
ACT_FN_GO(window_shaded_toggle, )
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -695,7 +695,7 @@ ACT_FN_GO(window_shaded_toggle)
}
/***************************************************************************/
ACT_FN_GO(window_shaded)
ACT_FN_GO(window_shaded, )
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -744,7 +744,7 @@ ACT_FN_GO(window_shaded)
}
/***************************************************************************/
ACT_FN_GO(window_borderless_toggle)
ACT_FN_GO(window_borderless_toggle, __UNUSED__)
{
if ((!obj) || (obj->type != E_BORDER_TYPE))
obj = E_OBJECT(e_border_focused_get());
@ -765,7 +765,7 @@ ACT_FN_GO(window_borderless_toggle)
}
/***************************************************************************/
ACT_FN_GO(window_pinned_toggle)
ACT_FN_GO(window_pinned_toggle, __UNUSED__)
{
if ((!obj) || (obj->type != E_BORDER_TYPE))
obj = E_OBJECT(e_border_focused_get());
@ -784,7 +784,7 @@ ACT_FN_GO(window_pinned_toggle)
}
/***************************************************************************/
ACT_FN_GO(window_move_by)
ACT_FN_GO(window_move_by, )
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -813,7 +813,7 @@ ACT_FN_GO(window_move_by)
}
/***************************************************************************/
ACT_FN_GO(window_move_to)
ACT_FN_GO(window_move_to, )
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -868,7 +868,7 @@ ACT_FN_GO(window_move_to)
}
/***************************************************************************/
ACT_FN_GO(window_move_to_center)
ACT_FN_GO(window_move_to_center, __UNUSED__)
{
E_Border *bd;
int x, y;
@ -896,7 +896,7 @@ ACT_FN_GO(window_move_to_center)
}
/***************************************************************************/
ACT_FN_GO(window_resize_by)
ACT_FN_GO(window_resize_by, )
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -929,7 +929,7 @@ ACT_FN_GO(window_resize_by)
}
/***************************************************************************/
ACT_FN_GO(window_push)
ACT_FN_GO(window_push, )
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -1040,7 +1040,7 @@ ACT_FN_GO(window_push)
}
/***************************************************************************/
ACT_FN_GO(window_drag_icon)
ACT_FN_GO(window_drag_icon, __UNUSED__)
{
if (!obj) obj = E_OBJECT(e_border_focused_get());
if (!obj) return;
@ -1060,7 +1060,7 @@ ACT_FN_GO(window_drag_icon)
}
/***************************************************************************/
ACT_FN_GO(window_desk_move_by)
ACT_FN_GO(window_desk_move_by, )
{
E_Border *bd;
int x, y;
@ -1119,7 +1119,7 @@ ACT_FN_GO(window_desk_move_by)
}
/***************************************************************************/
ACT_FN_GO(window_desk_move_to)
ACT_FN_GO(window_desk_move_to, )
{
E_Border *bd;
int x, y;
@ -1161,8 +1161,8 @@ _e_actions_zone_get(E_Object *obj)
}
return e_util_zone_current_get(e_manager_current_get());
}
ACT_FN_GO(desk_flip_by)
ACT_FN_GO(desk_flip_by, )
{
E_Zone *zone;
@ -1180,7 +1180,7 @@ ACT_FN_GO(desk_flip_by)
}
/***************************************************************************/
ACT_FN_GO(desk_flip_to)
ACT_FN_GO(desk_flip_to, )
{
E_Zone *zone;
@ -1207,7 +1207,7 @@ ACT_FN_GO(desk_flip_to)
#define ACT_FLIP_DOWN_RIGHT(zone) ((e_config->desk_flip_wrap && ((zone)->desk_x_count > 1) && ((zone)->desk_y_count > 1)) || ((((zone)->desk_x_current + 1) < (zone)->desk_x_count) && (((zone)->desk_y_current + 1) < (zone)->desk_y_count)))
#define ACT_FLIP_DOWN_LEFT(zone) ((e_config->desk_flip_wrap && ((zone)->desk_x_count > 1) && ((zone)->desk_y_count > 1)) || (((zone)->desk_x_current > 0) && (((zone)->desk_y_current + 1) < (zone)->desk_y_count)))
ACT_FN_GO_EDGE(desk_flip_in_direction)
ACT_FN_GO_EDGE(desk_flip_in_direction, )
{
E_Zone *zone;
E_Desk *current = NULL;
@ -1311,7 +1311,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction)
}
/***************************************************************************/
ACT_FN_GO(desk_linear_flip_by)
ACT_FN_GO(desk_linear_flip_by, )
{
E_Zone *zone;
@ -1329,7 +1329,7 @@ ACT_FN_GO(desk_linear_flip_by)
}
/***************************************************************************/
ACT_FN_GO(desk_linear_flip_to)
ACT_FN_GO(desk_linear_flip_to, )
{
E_Zone *zone;
@ -1363,7 +1363,7 @@ ACT_FN_GO(desk_linear_flip_to)
/***************************************************************************/
ACT_FN_GO(desk_flip_by_all)
ACT_FN_GO(desk_flip_by_all, )
{
if (params)
{
@ -1377,7 +1377,7 @@ ACT_FN_GO(desk_flip_by_all)
}
/***************************************************************************/
ACT_FN_GO(desk_flip_to_all)
ACT_FN_GO(desk_flip_to_all, )
{
if (params)
{
@ -1391,7 +1391,7 @@ ACT_FN_GO(desk_flip_to_all)
}
/***************************************************************************/
ACT_FN_GO(desk_linear_flip_by_all)
ACT_FN_GO(desk_linear_flip_by_all, )
{
if (params)
{
@ -1405,7 +1405,7 @@ ACT_FN_GO(desk_linear_flip_by_all)
}
/***************************************************************************/
ACT_FN_GO(desk_linear_flip_to_all)
ACT_FN_GO(desk_linear_flip_to_all, )
{
if (params)
{
@ -1419,7 +1419,7 @@ ACT_FN_GO(desk_linear_flip_to_all)
}
/***************************************************************************/
ACT_FN_GO(screen_send_to)
ACT_FN_GO(screen_send_to, )
{
E_Zone *zone;
@ -1456,7 +1456,7 @@ ACT_FN_GO(screen_send_to)
}
}
ACT_FN_GO(screen_send_by)
ACT_FN_GO(screen_send_by, )
{
E_Zone *zone;
@ -1526,7 +1526,7 @@ ACT_FN_GO(screen_send_by)
/***************************************************************************/
#if 0
ACT_FN_GO(zone_desk_flip_by)
ACT_FN_GO(zone_desk_flip_by, )
{
if (params)
{
@ -1542,7 +1542,7 @@ ACT_FN_GO(zone_desk_flip_by)
/***************************************************************************/
#if 0
ACT_FN_GO(zone_desk_flip_to)
ACT_FN_GO(zone_desk_flip_to, )
{
if (params)
{
@ -1558,7 +1558,7 @@ ACT_FN_GO(zone_desk_flip_to)
/***************************************************************************/
#if 0
ACT_FN_GO(zone_desk_linear_flip_by)
ACT_FN_GO(zone_desk_linear_flip_by, )
{
if (params)
{
@ -1574,7 +1574,7 @@ ACT_FN_GO(zone_desk_linear_flip_by)
/***************************************************************************/
#if 0
ACT_FN_GO(zone_desk_linear_flip_to)
ACT_FN_GO(zone_desk_linear_flip_to, )
{
if (params)
{
@ -1613,7 +1613,7 @@ _e_actions_menu_find(const char *name)
return NULL;
}
ACT_FN_GO(menu_show)
ACT_FN_GO(menu_show, )
{
E_Zone *zone;
@ -1643,7 +1643,7 @@ ACT_FN_GO(menu_show)
}
}
ACT_FN_GO_MOUSE(menu_show)
ACT_FN_GO_MOUSE(menu_show, )
{
E_Zone *zone;
@ -1675,7 +1675,7 @@ ACT_FN_GO_MOUSE(menu_show)
}
}
ACT_FN_GO_KEY(menu_show)
ACT_FN_GO_KEY(menu_show, )
{
E_Zone *zone;
@ -1705,7 +1705,7 @@ ACT_FN_GO_KEY(menu_show)
}
/***************************************************************************/
ACT_FN_GO(exec)
ACT_FN_GO(exec, )
{
E_Zone *zone;
@ -1718,7 +1718,7 @@ ACT_FN_GO(exec)
}
/***************************************************************************/
ACT_FN_GO(app)
ACT_FN_GO(app, )
{
E_Zone *zone;
@ -1755,7 +1755,7 @@ ACT_FN_GO(app)
}
/***************************************************************************/
ACT_FN_GO(desk_deskshow_toggle)
ACT_FN_GO(desk_deskshow_toggle, __UNUSED__)
{
E_Zone *zone;
@ -1764,7 +1764,7 @@ ACT_FN_GO(desk_deskshow_toggle)
if (zone) e_desk_deskshow(zone);
}
ACT_FN_GO(cleanup_windows)
ACT_FN_GO(cleanup_windows, __UNUSED__)
{
E_Zone *zone;
@ -1803,7 +1803,7 @@ _e_actions_cb_exit_dialog_delete(E_Win *win)
_e_actions_cb_exit_dialog_cancel(NULL, dia);
}
ACT_FN_GO(exit)
ACT_FN_GO(exit, )
{
if ((params) && (!strcmp(params, "now")))
{
@ -1837,25 +1837,25 @@ ACT_FN_GO(exit)
}
/***************************************************************************/
ACT_FN_GO(restart)
ACT_FN_GO(restart, __UNUSED__)
{
e_sys_action_do(E_SYS_RESTART, NULL);
}
/***************************************************************************/
ACT_FN_GO(exit_now)
ACT_FN_GO(exit_now, __UNUSED__)
{
e_sys_action_do(E_SYS_EXIT_NOW, NULL);
}
/***************************************************************************/
ACT_FN_GO(halt_now)
ACT_FN_GO(halt_now, __UNUSED__)
{
e_sys_action_do(E_SYS_HALT_NOW, NULL);
}
/***************************************************************************/
ACT_FN_GO(mode_presentation_toggle)
ACT_FN_GO(mode_presentation_toggle, __UNUSED__)
{
e_config->mode.presentation = !e_config->mode.presentation;
e_config_mode_changed();
@ -1863,7 +1863,7 @@ ACT_FN_GO(mode_presentation_toggle)
}
/***************************************************************************/
ACT_FN_GO(mode_offline_toggle)
ACT_FN_GO(mode_offline_toggle, __UNUSED__)
{
e_config->mode.offline = !e_config->mode.offline;
e_config_mode_changed();
@ -1900,7 +1900,7 @@ _e_actions_cb_logout_dialog_delete(E_Win *win)
_e_actions_cb_logout_dialog_cancel(NULL, dia);
}
ACT_FN_GO(logout)
ACT_FN_GO(logout, )
{
if ((params) && (!strcmp(params, "now")))
{
@ -1963,7 +1963,7 @@ _e_actions_cb_halt_dialog_delete(E_Win *win)
_e_actions_cb_halt_dialog_cancel(NULL, dia);
}
ACT_FN_GO(halt)
ACT_FN_GO(halt, )
{
if ((params) && (!strcmp(params, "now")))
{
@ -2026,7 +2026,7 @@ _e_actions_cb_reboot_dialog_delete(E_Win *win)
_e_actions_cb_reboot_dialog_cancel(NULL, dia);
}
ACT_FN_GO(reboot)
ACT_FN_GO(reboot, )
{
if ((params) && (!strcmp(params, "now")))
{
@ -2089,7 +2089,7 @@ _e_actions_cb_suspend_dialog_delete(E_Win *win)
_e_actions_cb_suspend_dialog_cancel(NULL, dia);
}
ACT_FN_GO(suspend)
ACT_FN_GO(suspend, )
{
if ((params) && (!strcmp(params, "now")))
{
@ -2152,7 +2152,7 @@ _e_actions_cb_hibernate_dialog_delete(E_Win *win)
_e_actions_cb_hibernate_dialog_cancel(NULL, dia);
}
ACT_FN_GO(hibernate)
ACT_FN_GO(hibernate, )
{
if ((params) && (!strcmp(params, "now")))
{
@ -2186,7 +2186,7 @@ ACT_FN_GO(hibernate)
}
/***************************************************************************/
ACT_FN_GO(pointer_resize_push)
ACT_FN_GO(pointer_resize_push, )
{
if (!obj) return;
if (obj->type == E_BORDER_TYPE)
@ -2204,7 +2204,7 @@ ACT_FN_GO(pointer_resize_push)
}
/***************************************************************************/
ACT_FN_GO(pointer_resize_pop)
ACT_FN_GO(pointer_resize_pop, )
{
if (!obj) return;
if (obj->type == E_BORDER_TYPE)
@ -2221,7 +2221,7 @@ ACT_FN_GO(pointer_resize_pop)
}
/***************************************************************************/
ACT_FN_GO(desk_lock)
ACT_FN_GO(desk_lock, __UNUSED__)
{
/* E_Zone *zone;
@ -2231,7 +2231,7 @@ ACT_FN_GO(desk_lock)
}
/***************************************************************************/
ACT_FN_GO(shelf_show)
ACT_FN_GO(shelf_show, )
{
Eina_List *l;
E_Shelf *es;
@ -2262,7 +2262,7 @@ if ((!params) || (params && (fnmatch(params, es->name, 0) == 0))) \
e_shelf_toggle(es, 0); \
}
ACT_FN_GO_EDGE(shelf_show)
ACT_FN_GO_EDGE(shelf_show, )
{
Eina_List *l;
E_Shelf *es;
@ -2345,7 +2345,7 @@ _delayed_action_free(Delayed_Action *da)
free(da);
}
static int
static Eina_Bool
_delayed_action_cb_timer(void *data)
{
Delayed_Action *da;
@ -2360,7 +2360,7 @@ _delayed_action_cb_timer(void *data)
}
_delayed_actions = eina_list_remove(_delayed_actions, da);
_delayed_action_free(da);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -2509,8 +2509,8 @@ _delayed_action_mouse_del(E_Object *obj, const char *params, Ecore_Event_Mouse_B
EINA_LIST_FOREACH(_delayed_actions, l, da)
{
if ((da->obj == obj) && (da->mouse) &&
(ev->buttons == da->button))
if ((da->obj == obj) && (da->mouse) &&
((int) ev->buttons == da->button))
{
_delayed_action_do(da);
_delayed_action_free(da);
@ -2521,32 +2521,32 @@ _delayed_action_mouse_del(E_Object *obj, const char *params, Ecore_Event_Mouse_B
}
// obj , params , ev
ACT_FN_GO_KEY(delayed_action)
ACT_FN_GO_KEY(delayed_action, )
{
_delayed_action_key_add(obj, params, ev);
}
ACT_FN_GO_MOUSE(delayed_action)
ACT_FN_GO_MOUSE(delayed_action, )
{
_delayed_action_mouse_add(obj, params, ev);
}
ACT_FN_END_KEY(delayed_action)
ACT_FN_END_KEY(delayed_action, )
{
_delayed_action_key_del(obj, params, ev);
}
ACT_FN_END_MOUSE(delayed_action)
ACT_FN_END_MOUSE(delayed_action, )
{
_delayed_action_mouse_del(obj, params, ev);
}
ACT_FN_GO_ACPI(dim_screen)
ACT_FN_GO_ACPI(dim_screen, __UNUSED__)
{
printf("Dim Screen\n");
}
ACT_FN_GO_ACPI(undim_screen)
ACT_FN_GO_ACPI(undim_screen, __UNUSED__)
{
printf("Undim Screen\n");
}

8
src/bin/e_bg.c
View File

@ -6,7 +6,7 @@
/* local subsystem functions */
static void _e_bg_signal(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _e_bg_event_bg_update_free(void *data, void *event);
static int _e_bg_slide_animator(void *data);
static Eina_Bool _e_bg_slide_animator(void *data);
static void _e_bg_image_import_dialog_done(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode);
static void _e_bg_image_import_done(void *data, Eina_Bool ok, const char *image_path, const char *edje_path);
@ -710,7 +710,7 @@ _e_bg_event_bg_update_free(void *data __UNUSED__, void *event)
free(event);
}
static int
static Eina_Bool
_e_bg_slide_animator(void *data)
{
E_Bg_Anim_Params *params;
@ -773,9 +773,9 @@ _e_bg_slide_animator(void *data)
evas_object_data_del(zone->bg_object, "switch_animator");
evas_object_data_del(zone->bg_object, "switch_animator_params");
E_FREE(params);
return 0;
return ECORE_CALLBACK_CANCEL;
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static void

10
src/bin/e_bindings.c
View File

@ -14,7 +14,7 @@ static void _e_bindings_acpi_free(E_Binding_Acpi *bind);
static int _e_bindings_context_match(E_Binding_Context bctxt, E_Binding_Context ctxt);
static E_Binding_Modifier _e_bindings_modifiers(unsigned int modifiers);
static int _e_ecore_modifiers(E_Binding_Modifier modifiers);
static int _e_bindings_edge_cb_timer(void *data);
static Eina_Bool _e_bindings_edge_cb_timer(void *data);
/* local subsystem globals */
@ -190,7 +190,7 @@ e_bindings_mouse_down_find(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mo
mod = _e_bindings_modifiers(ev->modifiers);
EINA_LIST_FOREACH(mouse_bindings, l, bind)
{
if ((bind->button == ev->buttons) &&
if ((bind->button == (int) ev->buttons) &&
((bind->any_mod) || (bind->mod == mod)))
{
if (_e_bindings_context_match(bind->ctxt, ctxt))
@ -234,7 +234,7 @@ e_bindings_mouse_up_find(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mous
mod = _e_bindings_modifiers(ev->modifiers);
EINA_LIST_FOREACH(mouse_bindings, l, bind)
{
if ((bind->button == ev->buttons) &&
if ((bind->button == (int) ev->buttons) &&
((bind->any_mod) || (bind->mod == mod)))
{
if (_e_bindings_context_match(bind->ctxt, ctxt))
@ -1078,7 +1078,7 @@ _e_ecore_modifiers(E_Binding_Modifier modifiers)
return mod;
}
static int
static Eina_Bool
_e_bindings_edge_cb_timer(void *data)
{
E_Binding_Edge_Data *ed;
@ -1105,6 +1105,6 @@ _e_bindings_edge_cb_timer(void *data)
/* Duplicate event */
E_FREE(ev);
return 0;
return ECORE_CALLBACK_CANCEL;
}

462
src/bin/e_border.c
View File

File diff suppressed because it is too large Load Diff

2
src/bin/e_border.h
View File

@ -127,7 +127,7 @@ typedef struct _E_Event_Border_Simple E_Event_Border_Unfullscreen;
#ifndef E_BORDER_H
#define E_BORDER_H
#define E_BORDER_TYPE 0xE0b01002
#define E_BORDER_TYPE (int) 0xE0b01002
struct _E_Border
{

3
src/bin/e_box.c
View File

@ -652,6 +652,9 @@ _e_box_smart_init(void)
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
_e_smart = evas_smart_class_new(&sc);

8
src/bin/e_canvas.c
View File

@ -4,7 +4,7 @@
#include "e.h"
/* local subsystem functions */
static int _e_canvas_cb_flush(void *data);
static Eina_Bool _e_canvas_cb_flush(void *data);
/* local subsystem globals */
static Eina_List *_e_canvases = NULL;
@ -233,10 +233,10 @@ e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
}
/* local subsystem functions */
static int
_e_canvas_cb_flush(void *data)
static Eina_Bool
_e_canvas_cb_flush(__UNUSED__ void *data)
{
e_canvas_cache_flush();
return 1;
return ECORE_CALLBACK_RENEW;
}

4
src/bin/e_config.c
View File

@ -16,7 +16,7 @@ static int _e_config_revisions = 0;
/* local subsystem functions */
static void _e_config_save_cb(void *data);
static void _e_config_free(E_Config *cfg);
static int _e_config_cb_timer(void *data);
static Eina_Bool _e_config_cb_timer(void *data);
static int _e_config_eet_close_handle(Eet_File *ef, char *file);
static void _e_config_acpi_bindings_add(void);
@ -1830,7 +1830,7 @@ _e_config_free(E_Config *ecf)
E_FREE(ecf);
}
static int
static Eina_Bool
_e_config_cb_timer(void *data)
{
e_util_dialog_show(_("Settings Upgraded"), "%s", (char *)data);

6
src/bin/e_config_dialog.c
View File

@ -6,7 +6,7 @@
/* local subsystem functions */
static void _e_config_dialog_free(E_Config_Dialog *cfd);
static void _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type);
static int _e_config_dialog_cb_auto_apply_timer(void *data);
static Eina_Bool _e_config_dialog_cb_auto_apply_timer(void *data);
static void _e_config_dialog_cb_dialog_del(void *obj);
static void _e_config_dialog_cb_ok(void *data, E_Dialog *dia);
static void _e_config_dialog_cb_apply(void *data, E_Dialog *dia);
@ -285,7 +285,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
if (cfd->icon) e_dialog_border_icon_set(cfd->dia, cfd->icon);
}
static int
static Eina_Bool
_e_config_dialog_cb_auto_apply_timer(void *data)
{
E_Config_Dialog *cfd;
@ -305,7 +305,7 @@ _e_config_dialog_cb_auto_apply_timer(void *data)
if (cfd->view->advanced.apply_cfdata)
cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata);
}
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void

6
src/bin/e_configure.c
View File

@ -4,7 +4,7 @@
#include "e.h"
static void _e_configure_efreet_desktop_update(void);
static int _e_configure_cb_efreet_desktop_cache_update(void *data, int type, void *event);
static Eina_Bool _e_configure_cb_efreet_desktop_cache_update(void *data, int type, void *event);
static void _e_configure_registry_item_full_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container *con, const char *params), void (*generic_func) (E_Container *con, const char *params), Efreet_Desktop *desktop);
EAPI Eina_List *e_configure_registry = NULL;
@ -177,8 +177,8 @@ _e_configure_efreet_desktop_update(void)
efreet_desktop_free(desktop);
}
static int
_e_configure_cb_efreet_desktop_cache_update(void *data, int type, void *event)
static Eina_Bool
_e_configure_cb_efreet_desktop_cache_update(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
{
_e_configure_efreet_desktop_update();
return 1;

56
src/bin/e_container.c
View File

@ -15,12 +15,12 @@ static void _e_container_free(E_Container *con);
static E_Container *_e_container_find_by_event_window(Ecore_X_Window win);
static int _e_container_cb_mouse_in(void *data, int type, void *event);
static int _e_container_cb_mouse_out(void *data, int type, void *event);
static int _e_container_cb_mouse_down(void *data, int type, void *event);
static int _e_container_cb_mouse_up(void *data, int type, void *event);
static int _e_container_cb_mouse_move(void *data, int type, void *event);
static int _e_container_cb_mouse_wheel(void *data, int type, void *event);
static Eina_Bool _e_container_cb_mouse_in(void *data, int type, void *event);
static Eina_Bool _e_container_cb_mouse_out(void *data, int type, void *event);
static Eina_Bool _e_container_cb_mouse_down(void *data, int type, void *event);
static Eina_Bool _e_container_cb_mouse_up(void *data, int type, void *event);
static Eina_Bool _e_container_cb_mouse_move(void *data, int type, void *event);
static Eina_Bool _e_container_cb_mouse_wheel(void *data, int type, void *event);
static void _e_container_shape_del(E_Container_Shape *es);
static void _e_container_shape_free(E_Container_Shape *es);
@ -247,7 +247,7 @@ e_container_number_get(E_Manager *man, int num)
E_OBJECT_TYPE_CHECK_RETURN(man, E_MANAGER_TYPE, NULL);
EINA_LIST_FOREACH(man->containers, l, con)
{
if (con->num == num) return con;
if ((int) con->num == num) return con;
}
return NULL;
}
@ -338,7 +338,7 @@ e_container_zone_number_get(E_Container *con, int num)
E_OBJECT_TYPE_CHECK_RETURN(con, E_CONTAINER_TYPE, NULL);
EINA_LIST_FOREACH(con->zones, l, zone)
{
if (zone->num == num) return zone;
if ((int) zone->num == num) return zone;
}
return NULL;
}
@ -503,8 +503,8 @@ e_container_shape_rects_set(E_Container_Shape *es, Ecore_X_Rectangle *rects, int
if ((rects) && (num == 1) &&
(rects[0].x == 0) &&
(rects[0].y == 0) &&
(rects[0].width == es->w) &&
(rects[0].height == es->h))
((int) rects[0].width == es->w) &&
((int) rects[0].height == es->h))
{
/* do nothing */
}
@ -968,8 +968,8 @@ _e_container_find_by_event_window(Ecore_X_Window win)
return NULL;
}
static int
_e_container_cb_mouse_in(void *data, int type, void *event)
static Eina_Bool
_e_container_cb_mouse_in(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Mouse_In *ev;
E_Border *bd;
@ -984,11 +984,11 @@ _e_container_cb_mouse_in(void *data, int type, void *event)
ecore_event_evas_modifier_lock_update(con->bg_evas, ev->modifiers);
evas_event_feed_mouse_in(con->bg_evas, ev->time, NULL);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_container_cb_mouse_out(void *data, int type, void *event)
static Eina_Bool
_e_container_cb_mouse_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Mouse_Out *ev;
E_Container *con;
@ -1002,11 +1002,11 @@ _e_container_cb_mouse_out(void *data, int type, void *event)
evas_event_feed_mouse_cancel(con->bg_evas, ev->time, NULL);
evas_event_feed_mouse_out(con->bg_evas, ev->time, NULL);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_container_cb_mouse_down(void *data, int type, void *event)
static Eina_Bool
_e_container_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Mouse_Button *ev;
E_Container *con;
@ -1024,11 +1024,11 @@ _e_container_cb_mouse_down(void *data, int type, void *event)
ecore_event_evas_modifier_lock_update(con->bg_evas, ev->modifiers);
evas_event_feed_mouse_down(con->bg_evas, ev->buttons, flags, ev->timestamp, NULL);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_container_cb_mouse_up(void *data, int type, void *event)
static Eina_Bool
_e_container_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Mouse_Button *ev;
E_Container *con;
@ -1042,11 +1042,11 @@ _e_container_cb_mouse_up(void *data, int type, void *event)
e_bindings_mouse_up_event_handle(E_BINDING_CONTEXT_CONTAINER,
E_OBJECT(con), ev);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_container_cb_mouse_move(void *data, int type, void *event)
static Eina_Bool
_e_container_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Mouse_Move *ev;
E_Container *con;
@ -1061,8 +1061,8 @@ _e_container_cb_mouse_move(void *data, int type, void *event)
return 1;
}
static int
_e_container_cb_mouse_wheel(void *data, int type, void *event)
static Eina_Bool
_e_container_cb_mouse_wheel(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Mouse_Wheel *ev;
E_Container *con;
@ -1078,7 +1078,7 @@ _e_container_cb_mouse_wheel(void *data, int type, void *event)
evas_event_feed_mouse_wheel(con->bg_evas, ev->direction, ev->z, ev->timestamp, NULL);
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void
@ -1228,7 +1228,7 @@ _e_container_resize_handle(E_Container *con)
}
static void
_e_container_event_container_resize_free(void *data, void *ev)
_e_container_event_container_resize_free(__UNUSED__ void *data, void *ev)
{
E_Event_Container_Resize *e;

4
src/bin/e_container.h
View File

@ -24,8 +24,8 @@ typedef struct _E_Event_Container_Resize E_Event_Container_Resize;
#ifndef E_CONTAINER_H
#define E_CONTAINER_H
#define E_CONTAINER_TYPE 0xE0b01003
#define E_CONTAINER_SHAPE_TYPE 0xE0b01004
#define E_CONTAINER_TYPE (int) 0xE0b01003
#define E_CONTAINER_SHAPE_TYPE (int) 0xE0b01004
struct _E_Container
{

36
src/bin/e_desk.c
View File

@ -16,10 +16,10 @@ static void _e_desk_event_desk_deskshow_free(void *data, void *ev);
static void _e_desk_event_desk_name_change_free(void *data, void *ev);
static void _e_desk_show_begin(E_Desk *desk, int mode, int dx, int dy);
static void _e_desk_show_end(E_Desk *desk);
static int _e_desk_show_animator(void *data);
static Eina_Bool _e_desk_show_animator(void *data);
static void _e_desk_hide_begin(E_Desk *desk, int mode, int dx, int dy);
static void _e_desk_hide_end(E_Desk *desk);
static int _e_desk_hide_animator(void *data);
static Eina_Bool _e_desk_hide_animator(void *data);
EAPI int E_EVENT_DESK_SHOW = 0;
EAPI int E_EVENT_DESK_BEFORE_SHOW = 0;
@ -68,9 +68,9 @@ e_desk_new(E_Zone *zone, int x, int y)
EINA_LIST_FOREACH(e_config->desktop_names, l, cfname)
{
if ((cfname->container >= 0) &&
(zone->container->num != cfname->container)) continue;
((int) zone->container->num != cfname->container)) continue;
if ((cfname->zone >= 0) &&
(zone->num != cfname->zone)) continue;
((int) zone->num != cfname->zone)) continue;
if ((cfname->desk_x != desk->x) || (cfname->desk_y != desk->y))
continue;
desk->name = eina_stringshare_add(cfname->name);
@ -167,9 +167,9 @@ e_desk_name_update(void)
EINA_LIST_FOREACH(e_config->desktop_names, l, cfname)
{
if ((cfname->container >= 0) &&
(con->num != cfname->container)) continue;
((int) con->num != cfname->container)) continue;
if ((cfname->zone >= 0) &&
(zone->num != cfname->zone)) continue;
((int) zone->num != cfname->zone)) continue;
if ((cfname->desk_x != d_x) ||
(cfname->desk_y != d_y)) continue;
e_desk_name_set(desk,cfname->name);
@ -294,7 +294,7 @@ e_desk_show(E_Desk *desk)
if (!cf_es) continue;
zone = e_util_zone_current_get(e_manager_current_get());
if (cf_es->zone != zone->num) continue;
if (cf_es->zone != (int) zone->num) continue;
EINA_LIST_FOREACH(es->cfg->desk_list, ll, sd)
{
@ -521,7 +521,7 @@ _e_desk_free(E_Desk *desk)
}
static void
_e_desk_event_desk_show_free(void *data, void *event)
_e_desk_event_desk_show_free(__UNUSED__ void *data, void *event)
{
E_Event_Desk_Show *ev;
@ -531,7 +531,7 @@ _e_desk_event_desk_show_free(void *data, void *event)
}
static void
_e_desk_event_desk_before_show_free(void *data, void *event)
_e_desk_event_desk_before_show_free(__UNUSED__ void *data, void *event)
{
E_Event_Desk_Before_Show *ev;
@ -541,7 +541,7 @@ _e_desk_event_desk_before_show_free(void *data, void *event)
}
static void
_e_desk_event_desk_after_show_free(void *data, void *event)
_e_desk_event_desk_after_show_free(__UNUSED__ void *data, void *event)
{
E_Event_Desk_After_Show *ev;
@ -551,7 +551,7 @@ _e_desk_event_desk_after_show_free(void *data, void *event)
}
static void
_e_desk_event_desk_deskshow_free(void *data, void *event)
_e_desk_event_desk_deskshow_free(__UNUSED__ void *data, void *event)
{
E_Event_Desk_Show *ev;
@ -561,7 +561,7 @@ _e_desk_event_desk_deskshow_free(void *data, void *event)
}
static void
_e_desk_event_desk_name_change_free(void *data, void *event)
_e_desk_event_desk_name_change_free(__UNUSED__ void *data, void *event)
{
E_Event_Desk_Name_Change *ev;
@ -670,7 +670,7 @@ _e_desk_show_end(E_Desk *desk)
_e_desk_event_desk_after_show_free, NULL);
}
static int
static Eina_Bool
_e_desk_show_animator(void *data)
{
E_Desk *desk;
@ -707,9 +707,9 @@ _e_desk_show_animator(void *data)
{
_e_desk_show_end(desk);
desk->animator = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static void
@ -806,7 +806,7 @@ _e_desk_hide_end(E_Desk *desk)
ecore_x_window_shadow_tree_flush();
}
static int
static Eina_Bool
_e_desk_hide_animator(void *data)
{
E_Desk *desk;
@ -842,7 +842,7 @@ _e_desk_hide_animator(void *data)
{
_e_desk_hide_end(desk);
desk->animator = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
return 1;
return ECORE_CALLBACK_RENEW;
}

66
src/bin/e_desklock.c
View File

@ -70,13 +70,13 @@ static int _e_desklock_fullscreen_count = 0;
/***********************************************************************/
static int _e_desklock_cb_key_down(void *data, int type, void *event);
static int _e_desklock_cb_mouse_down(void *data, int type, void *event);
static int _e_desklock_cb_mouse_up(void *data, int type, void *event);
static int _e_desklock_cb_mouse_wheel(void *data, int type, void *event);
static int _e_desklock_cb_mouse_move(void *data, int type, void *event);
static int _e_desklock_cb_custom_desklock_exit(void *data, int type, void *event);
static int _e_desklock_cb_idle_poller(void *data);
static Eina_Bool _e_desklock_cb_key_down(void *data, int type, void *event);
static Eina_Bool _e_desklock_cb_mouse_down(void *data, int type, void *event);
static Eina_Bool _e_desklock_cb_mouse_up(void *data, int type, void *event);
static Eina_Bool _e_desklock_cb_mouse_wheel(void *data, int type, void *event);
static Eina_Bool _e_desklock_cb_mouse_move(void *data, int type, void *event);
static Eina_Bool _e_desklock_cb_custom_desklock_exit(void *data, int type, void *event);
static Eina_Bool _e_desklock_cb_idle_poller(void *data);
static void _e_desklock_null(void);
static void _e_desklock_passwd_update(void);
@ -87,7 +87,7 @@ static int _e_desklock_check_auth(void);
static void _e_desklock_state_set(int state);
#ifdef HAVE_PAM
static int _e_desklock_cb_exit(void *data, int type, void *event);
static Eina_Bool _e_desklock_cb_exit(void *data, int type, void *event);
static int _desklock_auth(char *passwd);
static int _desklock_pam_init(E_Desklock_Auth *da);
static int _desklock_auth_pam_conv(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr);
@ -96,8 +96,8 @@ static char *_desklock_auth_get_current_host(void);
#endif
static void _e_desklock_ask_presentation_mode(void);
static int _e_desklock_handler_border_fullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__);
static int _e_desklock_handler_border_unfullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__);
static Eina_Bool _e_desklock_handler_border_fullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__);
static Eina_Bool _e_desklock_handler_border_unfullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__);
EAPI int E_EVENT_DESKLOCK = 0;
@ -479,7 +479,7 @@ e_desklock_hide(void)
}
}
static int
static Eina_Bool
_e_desklock_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Event_Key *ev = event;
@ -510,28 +510,28 @@ _e_desklock_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_desklock_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_desklock_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_desklock_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_desklock_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
E_Desklock_Popup_Data *edp;
@ -541,7 +541,7 @@ _e_desklock_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *even
current_zone = e_zone_current_get(e_container_current_get(e_manager_current_get()));
if (current_zone == last_active_zone)
return 1;
return ECORE_CALLBACK_PASS_ON;
EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
{
@ -553,7 +553,7 @@ _e_desklock_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *even
evas_object_show(edp->login_box);
}
last_active_zone = current_zone;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void
@ -690,7 +690,7 @@ _e_desklock_state_set(int state)
#ifdef HAVE_PAM
static int
static Eina_Bool
_e_desklock_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Del *ev = event;
@ -726,7 +726,7 @@ _e_desklock_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
if (_e_desklock_exit_handler) ecore_event_handler_del(_e_desklock_exit_handler);
_e_desklock_exit_handler = NULL;
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
@ -907,11 +907,11 @@ _desklock_auth_get_current_host(void)
}
#endif
static int
static Eina_Bool
_e_desklock_cb_custom_desklock_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Del *ev = event;
if (ev->exe != _e_custom_desklock_exe) return 1;
if (ev->exe != _e_custom_desklock_exe) return ECORE_CALLBACK_PASS_ON;
if (ev->exit_code != 0)
{
@ -920,10 +920,10 @@ _e_desklock_cb_custom_desklock_exit(void *data __UNUSED__, int type __UNUSED__,
e_desklock_hide();
return 0;
return ECORE_CALLBACK_DONE;
}
static int
static Eina_Bool
_e_desklock_cb_idle_poller(void *data __UNUSED__)
{
if ((e_config->desklock_autolock_idle) && (!e_config->mode.presentation) &&
@ -932,7 +932,7 @@ _e_desklock_cb_idle_poller(void *data __UNUSED__)
double idle, max;
/* If a desklock is already up, bail */
if ((_e_custom_desklock_exe) || (edd)) return 1;
if ((_e_custom_desklock_exe) || (edd)) return ECORE_CALLBACK_RENEW;
idle = ecore_x_screensaver_idle_time_get();
max = e_config->desklock_autolock_idle_timeout;
@ -962,7 +962,7 @@ _e_desklock_cb_idle_poller(void *data __UNUSED__)
}
/* Make sure our poller persists. */
return 1;
return ECORE_CALLBACK_RENEW;
}
static void
@ -1075,19 +1075,19 @@ _e_desklock_ask_presentation_mode(void)
_e_desklock_ask_presentation_dia = dia;
}
static int
static Eina_Bool
_e_desklock_handler_border_fullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
_e_desklock_fullscreen_count++;
if (_e_desklock_fullscreen_count == 1) e_desklock_init();
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_desklock_handler_border_unfullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
_e_desklock_fullscreen_count--;
if (_e_desklock_fullscreen_count == 0) e_desklock_init();
else if (_e_desklock_fullscreen_count < 0) _e_desklock_fullscreen_count = 0;
return 1;
return ECORE_CALLBACK_PASS_ON;
}

143
src/bin/e_dnd.c
View File

@ -28,19 +28,19 @@ static void _e_drag_end(Ecore_X_Window root, int x, int y);
static void _e_drag_xdnd_end(Ecore_X_Window root, int x, int y);
static void _e_drag_free(E_Drag *drag);
static int _e_dnd_cb_window_shape(void *data, int type, void *event);
static Eina_Bool _e_dnd_cb_window_shape(void *data, int type, void *event);
static int _e_dnd_cb_key_down(void *data, int type, void *event);
static int _e_dnd_cb_key_up(void *data, int type, void *event);
static int _e_dnd_cb_mouse_up(void *data, int type, void *event);
static int _e_dnd_cb_mouse_move(void *data, int type, void *event);
static int _e_dnd_cb_event_dnd_enter(void *data, int type, void *event);
static int _e_dnd_cb_event_dnd_leave(void *data, int type, void *event);
static int _e_dnd_cb_event_dnd_position(void *data, int type, void *event);
static int _e_dnd_cb_event_dnd_status(void *data, int type, void *event);
static int _e_dnd_cb_event_dnd_finished(void *data, int type, void *event);
static int _e_dnd_cb_event_dnd_drop(void *data, int type, void *event);
static int _e_dnd_cb_event_dnd_selection(void *data, int type, void *event);
static Eina_Bool _e_dnd_cb_key_down(void *data, int type, void *event);
static Eina_Bool _e_dnd_cb_key_up(void *data, int type, void *event);
static Eina_Bool _e_dnd_cb_mouse_up(void *data, int type, void *event);
static Eina_Bool _e_dnd_cb_mouse_move(void *data, int type, void *event);
static Eina_Bool _e_dnd_cb_event_dnd_enter(void *data, int type, void *event);
static Eina_Bool _e_dnd_cb_event_dnd_leave(void *data, int type, void *event);
static Eina_Bool _e_dnd_cb_event_dnd_position(void *data, int type, void *event);
static Eina_Bool _e_dnd_cb_event_dnd_status(void *data, int type, void *event);
static Eina_Bool _e_dnd_cb_event_dnd_finished(void *data, int type, void *event);
static Eina_Bool _e_dnd_cb_event_dnd_drop(void *data, int type, void *event);
static Eina_Bool _e_dnd_cb_event_dnd_selection(void *data, int type, void *event);
/* local subsystem globals */
@ -157,7 +157,7 @@ e_drag_new(E_Container *container, int x, int y,
void (*finished_cb)(E_Drag *drag, int dropped))
{
E_Drag *drag;
int i;
unsigned int i;
/* No need to create a drag object without type */
if ((!types) || (!num_types)) return NULL;
@ -298,7 +298,7 @@ e_drag_start(E_Drag *drag, int x, int y)
EINA_LIST_FOREACH(_drop_handlers, l, h)
{
int i, j;
unsigned int i, j;
h->active = 0;
eina_stringshare_del(h->active_type);
@ -366,7 +366,7 @@ e_drop_handler_add(E_Object *obj,
const char **types, unsigned int num_types, int x, int y, int w, int h)
{
E_Drop_Handler *handler;
int i;
unsigned int i;
handler = calloc(1, sizeof(E_Drop_Handler) + num_types * sizeof(char *));
if (!handler) return NULL;
@ -413,7 +413,7 @@ e_drop_inside(const E_Drop_Handler *handler, int x, int y)
EAPI void
e_drop_handler_del(E_Drop_Handler *handler)
{
int i;
unsigned int i;
_drop_handlers = eina_list_remove(_drop_handlers, handler);
for (i = 0; i < handler->num_types; i++)
@ -1039,7 +1039,7 @@ _e_drag_xdnd_end(Ecore_X_Window win, int x, int y)
static void
_e_drag_free(E_Drag *drag)
{
int i;
unsigned int i;
if (drag == _drag_current)
{
@ -1086,8 +1086,8 @@ _e_drag_free(E_Drag *drag)
}
static int
_e_dnd_cb_window_shape(void *data, int ev_type, void *ev)
static Eina_Bool
_e_dnd_cb_window_shape(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
{
Ecore_X_Event_Window_Shape *e = ev;
const Eina_List *l;
@ -1098,81 +1098,82 @@ _e_dnd_cb_window_shape(void *data, int ev_type, void *ev)
if (drag->evas_win == e->win)
drag->need_shape_export = 1;
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_dnd_cb_key_down(void *data, int type, void *event)
static Eina_Bool
_e_dnd_cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Key *ev;
ev = event;
if (ev->window != _drag_win) return 1;
if (ev->window != _drag_win) return ECORE_CALLBACK_PASS_ON;
if (!_drag_current) return 1;
if (!_drag_current) return ECORE_CALLBACK_PASS_ON;
if (_drag_current->cb.key_down)
_drag_current->cb.key_down(_drag_current, ev);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_dnd_cb_key_up(void *data, int type, void *event)
static Eina_Bool
_e_dnd_cb_key_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Key *ev;
ev = event;
if (ev->window != _drag_win) return 1;
if (ev->window != _drag_win) return ECORE_CALLBACK_PASS_ON;
if (!_drag_current) return 1;
if (!_drag_current) return ECORE_CALLBACK_PASS_ON;
if (_drag_current->cb.key_up)
_drag_current->cb.key_up(_drag_current, ev);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_dnd_cb_mouse_up(void *data, int type, void *event)
static Eina_Bool
_e_dnd_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Mouse_Button *ev;
ev = event;
if (ev->window != _drag_win) return 1;
if (ev->window != _drag_win) return ECORE_CALLBACK_PASS_ON;
_e_drag_end(_drag_win_root, ev->x, ev->y);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_dnd_cb_mouse_move(void *data, int type, void *event)
static Eina_Bool
_e_dnd_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Mouse_Move *ev;
ev = event;
if (ev->window != _drag_win) return 1;
if (ev->window != _drag_win) return ECORE_CALLBACK_PASS_ON;
if (!_xdnd)
_e_drag_update(_drag_win_root, ev->x, ev->y,
ECORE_X_ATOM_XDND_ACTION_PRIVATE);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_dnd_cb_event_dnd_enter(void *data, int type, void *event)
static Eina_Bool
_e_dnd_cb_event_dnd_enter(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Xdnd_Enter *ev;
E_Drop_Handler *h;
const char *id;
const Eina_List *l;
int i, j;
unsigned int j;
int i;
ev = event;
id = e_util_winid_str_get(ev->win);
if (!eina_hash_find(_drop_win_hash, id)) return 1;
if (!eina_hash_find(_drop_win_hash, id)) return ECORE_CALLBACK_PASS_ON;
EINA_LIST_FOREACH(_drop_handlers, l, h)
{
@ -1223,11 +1224,11 @@ _e_dnd_cb_event_dnd_enter(void *data, int type, void *event)
}
#endif
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_dnd_cb_event_dnd_leave(void *data, int type, void *event)
static Eina_Bool
_e_dnd_cb_event_dnd_leave(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Xdnd_Leave *ev;
E_Event_Dnd_Leave leave_ev;
@ -1237,7 +1238,7 @@ _e_dnd_cb_event_dnd_leave(void *data, int type, void *event)
ev = event;
id = e_util_winid_str_get(ev->win);
if (!eina_hash_find(_drop_win_hash, id)) return 1;
if (!eina_hash_find(_drop_win_hash, id)) return ECORE_CALLBACK_PASS_ON;
leave_ev.x = 0;
leave_ev.y = 0;
@ -1261,11 +1262,11 @@ _e_dnd_cb_event_dnd_leave(void *data, int type, void *event)
eina_stringshare_del(_xdnd->type);
E_FREE(_xdnd);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_dnd_cb_event_dnd_position(void *data, int type, void *event)
static Eina_Bool
_e_dnd_cb_event_dnd_position(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Xdnd_Position *ev;
Ecore_X_Rectangle rect;
@ -1283,7 +1284,7 @@ _e_dnd_cb_event_dnd_position(void *data, int type, void *event)
{
// double t2 = ecore_time_get() - t1; ////
// printf("DND POS EV 1 %3.7f\n", t2); ////
return 1;
return ECORE_CALLBACK_PASS_ON;
}
rect.x = 0;
@ -1312,27 +1313,27 @@ _e_dnd_cb_event_dnd_position(void *data, int type, void *event)
}
// double t2 = ecore_time_get() - t1; ////
// printf("DND POS EV 2 %3.7f\n", t2); ////
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_dnd_cb_event_dnd_status(void *data, int type, void *event)
static Eina_Bool
_e_dnd_cb_event_dnd_status(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Xdnd_Status *ev;
ev = event;
if (ev->win != _drag_win) return 1;
return 1;
if (ev->win != _drag_win) return ECORE_CALLBACK_PASS_ON;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_dnd_cb_event_dnd_finished(void *data, int type, void *event)
static Eina_Bool
_e_dnd_cb_event_dnd_finished(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Xdnd_Finished *ev;
ev = event;
if (!ev->completed) return 1;
if (!ev->completed) return ECORE_CALLBACK_PASS_ON;
if (_drag_current)
{
@ -1346,29 +1347,29 @@ _e_dnd_cb_event_dnd_finished(void *data, int type, void *event)
ecore_x_window_free(_drag_win);
_drag_win = 0;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_dnd_cb_event_dnd_drop(void *data, int type, void *event)
static Eina_Bool
_e_dnd_cb_event_dnd_drop(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Xdnd_Drop *ev;
const char *id;
ev = event;
id = e_util_winid_str_get(ev->win);
if (!eina_hash_find(_drop_win_hash, id)) return 1;
if (!eina_hash_find(_drop_win_hash, id)) return ECORE_CALLBACK_PASS_ON;
ecore_x_selection_xdnd_request(ev->win, _xdnd->type);
_xdnd->x = ev->position.x;
_xdnd->y = ev->position.y;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_dnd_cb_event_dnd_selection(void *data, int type, void *event)
static Eina_Bool
_e_dnd_cb_event_dnd_selection(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Selection_Notify *ev;
const char *id;
@ -1376,8 +1377,8 @@ _e_dnd_cb_event_dnd_selection(void *data, int type, void *event)
ev = event;
id = e_util_winid_str_get(ev->win);
if (!eina_hash_find(_drop_win_hash, id)) return 1;
if (ev->selection != ECORE_X_SELECTION_XDND) return 1;
if (!eina_hash_find(_drop_win_hash, id)) return ECORE_CALLBACK_PASS_ON;
if (ev->selection != ECORE_X_SELECTION_XDND) return ECORE_CALLBACK_PASS_ON;
if (_type_text_uri_list == _xdnd->type)
{
@ -1447,5 +1448,5 @@ _e_dnd_cb_event_dnd_selection(void *data, int type, void *event)
ecore_x_dnd_send_finished();
eina_stringshare_del(_xdnd->type);
E_FREE(_xdnd);
return 1;
return ECORE_CALLBACK_PASS_ON;
}

12
src/bin/e_dpms.c
View File

@ -8,28 +8,28 @@ static Ecore_Event_Handler *_e_dpms_handler_border_fullscreen = NULL;
static Ecore_Event_Handler *_e_dpms_handler_border_unfullscreen = NULL;
static int _e_dpms_fullscreen_count = 0;
static int
static Eina_Bool
_e_dpms_handler_config_mode_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
e_dpms_init();
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_dpms_handler_border_fullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
_e_dpms_fullscreen_count++;
if (_e_dpms_fullscreen_count == 1) e_dpms_init();
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_dpms_handler_border_unfullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
_e_dpms_fullscreen_count--;
if (_e_dpms_fullscreen_count == 0) e_dpms_init();
else if (_e_dpms_fullscreen_count < 0) _e_dpms_fullscreen_count = 0;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
EAPI int

3
src/bin/e_editable.c
View File

@ -89,6 +89,9 @@ e_editable_add(Evas *evas)
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
_e_editable_smart = evas_smart_class_new(&sc);

43
src/bin/e_entry.c
View File

@ -37,7 +37,7 @@ static void _e_entry_key_up_cb(void *data, Evas *e, Evas_Object *obj, void *even
static void _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_entry_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_entry_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static int _e_entry_x_selection_notify_handler(void *data, int type, void *event);
static Eina_Bool _e_entry_x_selection_notify_handler(void *data, int type, void *event);
static void _e_entry_x_selection_update(Evas_Object *entry);
static void _e_entry_key_down_windows(Evas_Object *entry, Evas_Event_Key_Down *event);
@ -60,8 +60,8 @@ static void _e_entry_cb_select_all(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_entry_cb_delete(void *data, E_Menu *m, E_Menu_Item *mi);
#ifdef HAVE_ECORE_IMF
static int _e_entry_cb_imf_retrieve_surrounding(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos);
static int _e_entry_cb_imf_event_commit(void *data, int type, void *event);
static int _e_entry_cb_imf_event_delete_surrounding(void *data, int type, void *event);
static Eina_Bool _e_entry_cb_imf_event_commit(void *data, int type, void *event);
static Eina_Bool _e_entry_cb_imf_event_delete_surrounding(void *data, int type, void *event);
#endif
/* local subsystem globals */
@ -102,6 +102,9 @@ e_entry_add(Evas *evas)
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
_e_entry_smart = evas_smart_class_new(&sc);
@ -342,7 +345,7 @@ e_entry_disable(Evas_Object *entry)
/* Called when a key has been pressed by the user */
static void
_e_entry_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
_e_entry_key_down_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
{
E_Entry_Smart_Data *sd;
@ -370,7 +373,7 @@ _e_entry_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
/* Called when a key has been released by the user */
static void
_e_entry_key_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
_e_entry_key_up_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
{
E_Entry_Smart_Data *sd;
@ -393,7 +396,7 @@ _e_entry_key_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
/* Called when the entry object is pressed by the mouse */
static void
_e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
_e_entry_mouse_down_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
{
E_Entry_Smart_Data *sd;
Evas_Event_Mouse_Down *event;
@ -548,7 +551,7 @@ _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
/* Called when the entry object is released by the mouse */
static void
_e_entry_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
_e_entry_mouse_up_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
{
E_Entry_Smart_Data *sd;
@ -577,7 +580,7 @@ _e_entry_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
/* Called when the mouse moves over the entry object */
static void
_e_entry_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
_e_entry_mouse_move_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
{
E_Entry_Smart_Data *sd;
Evas_Event_Mouse_Move *event;
@ -621,8 +624,8 @@ _e_entry_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
}
/* Called when the the "selection_notify" event is emitted */
static int
_e_entry_x_selection_notify_handler(void *data, int type, void *event)
static Eina_Bool
_e_entry_x_selection_notify_handler(void *data, __UNUSED__ int type, void *event)
{
Evas_Object *entry;
E_Entry_Smart_Data *sd;
@ -663,7 +666,7 @@ _e_entry_x_selection_notify_handler(void *data, int type, void *event)
if (changed)
evas_object_smart_callback_call(entry, "changed", NULL);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
/* Updates the X selection with the selected text of the entry */
@ -1382,8 +1385,8 @@ static int
return 1;
}
static int
_e_entry_cb_imf_event_commit(void *data, int type, void *event)
static Eina_Bool
_e_entry_cb_imf_event_commit(void *data, __UNUSED__ int type, void *event)
{
Evas_Object *entry;
E_Entry_Smart_Data *sd;
@ -1395,10 +1398,10 @@ _e_entry_cb_imf_event_commit(void *data, int type, void *event)
int changed = 0;
if ((!(entry = data)) || (!(sd = evas_object_smart_data_get(entry))))
return 1;
return ECORE_CALLBACK_PASS_ON;
if (sd->imf_context != ev->ctx)
return 1;
return ECORE_CALLBACK_PASS_ON;
editable = sd->editable_object;
cursor_pos = e_editable_cursor_pos_get(editable);
@ -1414,11 +1417,11 @@ _e_entry_cb_imf_event_commit(void *data, int type, void *event)
if (changed)
evas_object_smart_callback_call(entry, "changed", NULL);
return 0;
return ECORE_CALLBACK_DONE;
}
static int
_e_entry_cb_imf_event_delete_surrounding(void *data, int type, void *event)
static Eina_Bool
_e_entry_cb_imf_event_delete_surrounding(void *data, __UNUSED__ int type, void *event)
{
E_Entry_Smart_Data *sd;
Ecore_IMF_Event_Delete_Surrounding *ev = event;
@ -1428,7 +1431,7 @@ _e_entry_cb_imf_event_delete_surrounding(void *data, int type, void *event)
sd = data;
if (sd->imf_context != ev->ctx)
return 1;
return ECORE_CALLBACK_PASS_ON;
editable = sd->editable_object;
cursor_pos = e_editable_cursor_pos_get(editable);
@ -1436,6 +1439,6 @@ _e_entry_cb_imf_event_delete_surrounding(void *data, int type, void *event)
cursor_pos + ev->offset,
cursor_pos + ev->offset + ev->n_chars);
return 0;
return ECORE_CALLBACK_DONE;
}
#endif

28
src/bin/e_exec.c
View File

@ -42,8 +42,8 @@ struct _E_Config_Dialog_Data
/* local subsystem functions */
static E_Exec_Instance *_e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining);
static int _e_exec_cb_expire_timer(void *data);
static int _e_exec_cb_exit(void *data, int type, void *event);
static Eina_Bool _e_exec_cb_expire_timer(void *data);
static Eina_Bool _e_exec_cb_exit(void *data, int type, void *event);
static Eina_Bool _e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data);
@ -120,7 +120,7 @@ e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec,
inst = _e_exec_cb_exec(launch, NULL, strdup(exec), 0);
else
inst = efreet_desktop_command_get(desktop, files,
_e_exec_cb_exec, launch);
(Efreet_Desktop_Command_Cb) _e_exec_cb_exec, launch);
}
else
inst = _e_exec_cb_exec(launch, NULL, strdup(exec), 0);
@ -279,7 +279,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
return inst;
}
static int
static Eina_Bool
_e_exec_cb_expire_timer(void *data)
{
E_Exec_Instance *inst;
@ -287,7 +287,7 @@ _e_exec_cb_expire_timer(void *data)
inst = data;
e_exec_start_pending = eina_list_remove(e_exec_start_pending, inst->desktop);
inst->expire_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -316,28 +316,28 @@ _e_exec_instance_free(E_Exec_Instance *inst)
static int
static Eina_Bool
_e_exec_cb_instance_finish(void *data)
{
_e_exec_instance_free(data);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
_e_exec_cb_exit(void *data, int type, void *event)
static Eina_Bool
_e_exec_cb_exit(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Exe_Event_Del *ev;
E_Exec_Instance *inst;
ev = event;
if (!ev->exe) return 1;
if (!ev->exe) return ECORE_CALLBACK_PASS_ON;
// if (ecore_exe_tag_get(ev->exe)) printf(" tag %s\n", ecore_exe_tag_get(ev->exe));
if (!(ecore_exe_tag_get(ev->exe) &&
if (!(ecore_exe_tag_get(ev->exe) &&
(!strcmp(ecore_exe_tag_get(ev->exe), "E/exec"))))
return 1;
return ECORE_CALLBACK_PASS_ON;
inst = ecore_exe_data_get(ev->exe);
if (!inst) return 1;
if (!inst) return ECORE_CALLBACK_PASS_ON;
/* /bin/sh uses this if cmd not found */
if ((ev->exited) &&
@ -400,7 +400,7 @@ _e_exec_cb_exit(void *data, int type, void *event)
else
_e_exec_instance_free(inst);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool

5
src/bin/e_flowlayout.c
View File

@ -855,7 +855,10 @@ _e_flowlayout_smart_init(void)
NULL,
NULL,
NULL,
NULL
NULL,
NULL,
NULL,
NULL
};
_e_smart = evas_smart_class_new(&sc);
}

75
src/bin/e_fm.c
View File

@ -288,8 +288,8 @@ static void _e_fm2_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *ev
static void _e_fm2_cb_scroll_job(void *data);
static void _e_fm2_cb_resize_job(void *data);
static int _e_fm2_cb_icon_sort(const void *data1, const void *data2);
static int _e_fm2_cb_scan_timer(void *data);
static int _e_fm2_cb_sort_idler(void *data);
static Eina_Bool _e_fm2_cb_scan_timer(void *data);
static Eina_Bool _e_fm2_cb_sort_idler(void *data);
static void _e_fm2_obj_icons_place(E_Fm2_Smart_Data *sd);
@ -383,8 +383,8 @@ static void _e_fm2_live_file_changed(Evas_Object *obj, const char *file, E_Fm2_F
static void _e_fm2_live_process_begin(Evas_Object *obj);
static void _e_fm2_live_process_end(Evas_Object *obj);
static void _e_fm2_live_process(Evas_Object *obj);
static int _e_fm2_cb_live_idler(void *data);
static int _e_fm2_cb_live_timer(void *data);
static Eina_Bool _e_fm2_cb_live_idler(void *data);
static Eina_Bool _e_fm2_cb_live_timer(void *data);
static int _e_fm2_theme_edje_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *category, const char *group);
static int _e_fm2_theme_edje_icon_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *category, const char *group);
@ -565,18 +565,18 @@ _e_fm2_icon_h_get(const E_Fm2_Smart_Data *sd)
return sd->config->icon.list.h;
}
static int
static Eina_Bool
_e_fm2_mime_flush_cb(void *data __UNUSED__)
{
efreet_mime_type_cache_flush();
return 1;
return ECORE_CALLBACK_RENEW;
}
static int
static Eina_Bool
_e_fm2_mime_clear_cb(void *data __UNUSED__)
{
efreet_mime_type_cache_clear();
return 1;
return ECORE_CALLBACK_RENEW;
}
static void
@ -649,16 +649,16 @@ _e_fm2_op_registry_entry_print(const E_Fm2_Op_Registry_Entry *ere)
ere->src, ere->dst);
}
static int
_e_fm2_op_registry_entry_add_cb(void *data, int type, void *event)
static Eina_Bool
_e_fm2_op_registry_entry_add_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
const E_Fm2_Op_Registry_Entry *ere = event;
printf("E FM OPERATION STARTED: id=%d, op=%d\n", ere->id, ere->op);
return ECORE_CALLBACK_RENEW;
}
static int
_e_fm2_op_registry_entry_del_cb(void *data, int type, void *event)
static Eina_Bool
_e_fm2_op_registry_entry_del_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
const E_Fm2_Op_Registry_Entry *ere = event;
puts("E FM OPERATION FINISHED:");
@ -667,8 +667,8 @@ _e_fm2_op_registry_entry_del_cb(void *data, int type, void *event)
return ECORE_CALLBACK_RENEW;
}
static int
_e_fm2_op_registry_entry_changed_cb(void *data, int type, void *event)
static Eina_Bool
_e_fm2_op_registry_entry_changed_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
const E_Fm2_Op_Registry_Entry *ere = event;
puts("E FM OPERATION CHANGED:");
@ -713,6 +713,9 @@ e_fm2_init(void)
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
_e_fm2_smart = evas_smart_class_new(&sc);
@ -2125,7 +2128,7 @@ _e_fm2_icon_imc_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_ret)
E_Input_Method_Config *imc;
Efreet_Desktop *desktop;
Eet_File *imc_ef;
Evas_Object *o;
Evas_Object *o = NULL;
char buf[PATH_MAX];
if (!ic->info.file)
@ -5546,22 +5549,22 @@ _e_fm2_typebuf_match_func(E_Fm2_Icon *ic, void* data)
(e_util_glob_case_match(ic->info.file, tb))));
}
static int
static Eina_Bool
_e_fm_typebuf_timer_cb(void *data)
{
Evas_Object *obj = data;
E_Fm2_Smart_Data *sd;
if (!data) return 0;
if (!data) return ECORE_CALLBACK_CANCEL;
sd = evas_object_smart_data_get(obj);
if (!sd) return 0;
if (!sd) return ECORE_CALLBACK_CANCEL;
if (!sd->typebuf_visible) return 0;
if (!sd->typebuf_visible) return ECORE_CALLBACK_CANCEL;
_e_fm2_typebuf_hide(obj);
sd->typebuf.timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -7352,19 +7355,19 @@ _e_fm2_cb_icon_sort(const void *data1, const void *data2)
return strcmp(l1, l2);
}
static int
static Eina_Bool
_e_fm2_cb_scan_timer(void *data)
{
E_Fm2_Smart_Data *sd;
sd = evas_object_smart_data_get(data);
if (!sd) return 0;
if (!sd) return ECORE_CALLBACK_CANCEL;
_e_fm2_queue_process(data);
sd->scan_timer = NULL;
if (!sd->listing)
{
_e_fm2_client_monitor_list_end(data);
return 0;
return ECORE_CALLBACK_CANCEL;
}
if (sd->busy_count > 0)
sd->scan_timer = ecore_timer_add(0.2, _e_fm2_cb_scan_timer, sd->obj);
@ -7373,24 +7376,24 @@ _e_fm2_cb_scan_timer(void *data)
if (!sd->sort_idler)
sd->sort_idler = ecore_idler_add(_e_fm2_cb_sort_idler, data);
}
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_fm2_cb_sort_idler(void *data)
{
E_Fm2_Smart_Data *sd;
sd = evas_object_smart_data_get(data);
if (!sd) return 0;
if (!sd) return ECORE_CALLBACK_CANCEL;
_e_fm2_queue_process(data);
if (!sd->listing)
{
sd->sort_idler = NULL;
_e_fm2_client_monitor_list_end(data);
return 0;
return ECORE_CALLBACK_CANCEL;
}
return 1;
return ECORE_CALLBACK_RENEW;
}
/**************************/
@ -9587,14 +9590,14 @@ _e_fm2_live_process(Evas_Object *obj)
free(a);
}
static int
static Eina_Bool
_e_fm2_cb_live_idler(void *data)
{
E_Fm2_Smart_Data *sd;
double t;
sd = evas_object_smart_data_get(data);
if (!sd) return 0;
if (!sd) return ECORE_CALLBACK_CANCEL;
t = ecore_time_get();
do
{
@ -9602,7 +9605,7 @@ _e_fm2_cb_live_idler(void *data)
_e_fm2_live_process(data);
}
while ((ecore_time_get() - t) > 0.02);
if (sd->live.actions) return 1;
if (sd->live.actions) return ECORE_CALLBACK_RENEW;
_e_fm2_live_process_end(data);
_e_fm2_cb_live_timer(data);
if ((sd->order_file) || (sd->config->view.always_order))
@ -9610,16 +9613,16 @@ _e_fm2_cb_live_idler(void *data)
e_fm2_refresh(data);
}
sd->live.idler = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_fm2_cb_live_timer(void *data)
{
E_Fm2_Smart_Data *sd;
sd = evas_object_smart_data_get(data);
if (!sd) return 0;
if (!sd) return ECORE_CALLBACK_CANCEL;
if (sd->queue) _e_fm2_queue_process(data);
else if (sd->iconlist_changed)
{
@ -9637,9 +9640,9 @@ _e_fm2_cb_live_timer(void *data)
}
sd->live.deletions = 0;
sd->live.timer = NULL;
if ((!sd->queue) && (!sd->live.idler)) return 0;
if ((!sd->queue) && (!sd->live.idler)) return ECORE_CALLBACK_CANCEL;
sd->live.timer = ecore_timer_add(0.2, _e_fm2_cb_live_timer, data);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int

90
src/bin/e_fm_main.c
View File

@ -153,9 +153,9 @@ struct _E_Fm_Task
/* local subsystem functions */
static int _e_ipc_init(void);
static int _e_ipc_cb_server_add(void *data, int type, void *event);
static int _e_ipc_cb_server_del(void *data, int type, void *event);
static int _e_ipc_cb_server_data(void *data, int type, void *event);
static Eina_Bool _e_ipc_cb_server_add(void *data, int type, void *event);
static Eina_Bool _e_ipc_cb_server_del(void *data, int type, void *event);
static Eina_Bool _e_ipc_cb_server_data(void *data, int type, void *event);
static void _e_fm_monitor_start(int id, const char *path);
static void _e_fm_monitor_start_try(E_Fm_Task *task);
@ -172,12 +172,12 @@ static int _e_client_send(int id, E_Fm_Op_Type type, void *data, int size);
static int _e_fm_slave_run(E_Fm_Op_Type type, const char *args, int id);
static E_Fm_Slave *_e_fm_slave_get(int id);
static int _e_fm_slave_send(E_Fm_Slave *slave, E_Fm_Op_Type type, void *data, int size);
static int _e_fm_slave_data_cb(void *data, int type, void *event);
static int _e_fm_slave_error_cb(void *data, int type, void *event);
static int _e_fm_slave_del_cb(void *data, int type, void *event);
static Eina_Bool _e_fm_slave_data_cb(void *data, int type, void *event);
static Eina_Bool _e_fm_slave_error_cb(void *data, int type, void *event);
static Eina_Bool _e_fm_slave_del_cb(void *data, int type, void *event);
static void _e_cb_file_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path);
static int _e_cb_recent_clean(void *data);
static Eina_Bool _e_cb_recent_clean(void *data);
static void _e_file_add_mod(E_Dir *ed, const char *path, E_Fm_Op_Type op, int listing);
static void _e_file_add(E_Dir *ed, const char *path, int listing);
@ -186,8 +186,8 @@ static void _e_file_mod(E_Dir *ed, const char *path);
static void _e_file_mon_dir_del(E_Dir *ed, const char *path);
static void _e_file_mon_list_sync(E_Dir *ed);
static int _e_cb_file_mon_list_idler(void *data);
static int _e_cb_fop_trash_idler(void *data);
static Eina_Bool _e_cb_file_mon_list_idler(void *data);
static Eina_Bool _e_cb_fop_trash_idler(void *data);
static char *_e_str_list_remove(Eina_List **list, char *str);
static void _e_fm_reorder(const char *file, const char *dst, const char *relative, int after);
static void _e_dir_del(E_Dir *ed);
@ -217,15 +217,15 @@ static void _e_dbus_cb_vol_prop_mount_modified(void *data, void *reply_data, DBu
static void _e_dbus_cb_vol_mounted(void *user_data, void *method_return, DBusError *error);
static void _e_dbus_cb_vol_unmounted(void *user_data, void *method_return, DBusError *error);
static void _e_dbus_cb_vol_unmounted_before_eject(void *user_data, void *method_return, DBusError *error);
static int _e_dbus_vb_vol_ejecting_after_unmount(void *data);
static Eina_Bool _e_dbus_vb_vol_ejecting_after_unmount(void *data);
static void _e_dbus_cb_vol_ejected(void *user_data, void *method_return, DBusError *error);
static int _e_dbus_format_error_msg(char **buf, E_Volume *v, DBusError *error);
static void _hal_test(void *data, DBusMessage *msg, DBusError *error);
static void _e_hal_poll(void *data, DBusMessage *msg);
static int _e_dbus_vol_mount_timeout(void *data);
static int _e_dbus_vol_unmount_timeout(void *data);
static int _e_dbus_vol_eject_timeout(void *data);
static Eina_Bool _e_dbus_vol_mount_timeout(void *data);
static Eina_Bool _e_dbus_vol_unmount_timeout(void *data);
static Eina_Bool _e_dbus_vol_eject_timeout(void *data);
@ -954,7 +954,7 @@ e_volume_find(const char *udi)
return NULL;
}
static int
static Eina_Bool
_e_dbus_vol_mount_timeout(void *data)
{
E_Volume *v = data;
@ -971,7 +971,7 @@ _e_dbus_vol_mount_timeout(void *data)
0, 0, 0, buf, size);
free(buf);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -1056,7 +1056,7 @@ e_volume_mount(E_Volume *v)
eina_list_free(opt);
}
static int
static Eina_Bool
_e_dbus_vol_unmount_timeout(void *data)
{
E_Volume *v = data;
@ -1073,7 +1073,7 @@ _e_dbus_vol_unmount_timeout(void *data)
0, 0, 0, buf, size);
free(buf);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -1124,7 +1124,7 @@ e_volume_unmount(E_Volume *v)
_e_dbus_cb_vol_unmounted, v);
}
static int
static Eina_Bool
_e_dbus_vol_eject_timeout(void *data)
{
E_Volume *v = data;
@ -1141,10 +1141,10 @@ _e_dbus_vol_eject_timeout(void *data)
0, 0, 0, buf, size);
free(buf);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_dbus_vb_vol_ejecting_after_unmount(void *data)
{
E_Volume *v = data;
@ -1153,7 +1153,7 @@ _e_dbus_vb_vol_ejecting_after_unmount(void *data)
v->op = e_hal_device_volume_eject(_e_dbus_conn, v->udi, NULL,
_e_dbus_cb_vol_ejected, v);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -1250,8 +1250,8 @@ _e_ipc_init(void)
return 1;
}
static int
_e_ipc_cb_server_add(void *data, int type, void *event)
static Eina_Bool
_e_ipc_cb_server_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Ipc_Event_Server_Add *e;
@ -1260,15 +1260,15 @@ _e_ipc_cb_server_add(void *data, int type, void *event)
6/*E_IPC_DOMAIN_FM*/,
E_FM_OP_HELLO,
0, 0, 0, NULL, 0); /* send hello */
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_ipc_cb_server_del(void *data, int type, void *event)
static Eina_Bool
_e_ipc_cb_server_del(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
{
/* quit now */
ecore_main_loop_quit();
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void
@ -1583,13 +1583,13 @@ _e_fm_handle_error_response(int id, E_Fm_Op_Type type)
}
static int
static Eina_Bool
_e_ipc_cb_server_data(void *data, int type, void *event)
{
Ecore_Ipc_Event_Server_Data *e;
e = event;
if (e->major != 6/*E_IPC_DOMAIN_FM*/) return 1;
if (e->major != 6/*E_IPC_DOMAIN_FM*/) return ECORE_CALLBACK_PASS_ON;
switch (e->minor)
{
case E_FM_OP_MONITOR_START: /* monitor dir (and implicitly list) */
@ -1782,7 +1782,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
6/*E_IPC_DOMAIN_FM*/,
E_FM_OP_OK,
0, e->ref, 0, NULL, 0);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int _e_client_send(int id, E_Fm_Op_Type type, void *data, int size)
@ -1854,7 +1854,8 @@ static int _e_fm_slave_send(E_Fm_Slave *slave, E_Fm_Op_Type type, void *data, in
return result;
}
static int _e_fm_slave_data_cb(void *data, int type, void *event)
static Eina_Bool
_e_fm_slave_data_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Exe_Event_Data *e = event;
E_Fm_Slave *slave;
@ -1862,7 +1863,7 @@ static int _e_fm_slave_data_cb(void *data, int type, void *event)
char *sdata;
int ssize;
if (!e) return 1;
if (!e) return ECORE_CALLBACK_PASS_ON;
slave = ecore_exe_data_get(e->exe);
@ -1902,10 +1903,11 @@ static int _e_fm_slave_data_cb(void *data, int type, void *event)
ssize -= size;
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int _e_fm_slave_error_cb(void *data, int type, void *event)
static Eina_Bool
_e_fm_slave_error_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Exe_Event_Data *e = event;
E_Fm_Slave *slave;
@ -1919,8 +1921,8 @@ static int _e_fm_slave_error_cb(void *data, int type, void *event)
return 1;
}
static int
_e_fm_slave_del_cb(void *data, int type, void *event)
static Eina_Bool
_e_fm_slave_del_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Exe_Event_Del *e = event;
E_Fm_Slave *slave;
@ -2012,7 +2014,7 @@ _e_cb_file_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, c
free(dir);
}
static int
static Eina_Bool
_e_cb_recent_clean(void *data)
{
E_Dir *ed;
@ -2032,9 +2034,9 @@ _e_cb_recent_clean(void *data)
free(m);
}
ed->cleaning = 0;
if (ed->recent_mods) return 1;
if (ed->recent_mods) return ECORE_CALLBACK_RENEW;
ed->recent_clean = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
@ -2181,7 +2183,7 @@ _e_file_mon_list_sync(E_Dir *ed)
0, ed->id, ed->sync, NULL, 0);
}
static int
static Eina_Bool
_e_cb_file_mon_list_idler(void *data)
{
E_Dir *ed;
@ -2217,10 +2219,10 @@ _e_cb_file_mon_list_idler(void *data)
ed->sync_time = 0.0;
ed->idler = NULL;
if (!ed->fq) _e_file_add(ed, "", 2);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_cb_fop_trash_idler(void *data)
{
E_Fop *fop = NULL;
@ -2270,7 +2272,7 @@ _e_cb_fop_trash_idler(void *data)
{
/* Move failed. Spec says delete files that can't be trashed */
ecore_file_unlink(fop->src);
return 0;
return ECORE_CALLBACK_CANCEL;
}
}
@ -2300,7 +2302,7 @@ _e_cb_fop_trash_idler(void *data)
eina_stringshare_del(fop->dst);
free(fop);
_e_fops = eina_list_remove(_e_fops, fop);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static char *

36
src/bin/e_fm_op.c
View File

@ -60,13 +60,13 @@ static E_Fm_Op_Task *_e_fm_op_task_new();
static void _e_fm_op_task_free(void *t);
static void _e_fm_op_remove_link_task(E_Fm_Op_Task *task);
static int _e_fm_op_stdin_data(void *data, Ecore_Fd_Handler * fd_handler);
static Eina_Bool _e_fm_op_stdin_data(void *data, Ecore_Fd_Handler * fd_handler);
static void _e_fm_op_set_up_idlers();
static void _e_fm_op_delete_idler(int *mark);
static int _e_fm_op_idler_handle_error(int *mark, Eina_List **queue, Eina_List **node, E_Fm_Op_Task *task);
static int _e_fm_op_work_idler(void *data);
static int _e_fm_op_scan_idler(void *data);
static Eina_Bool _e_fm_op_work_idler(void *data);
static Eina_Bool _e_fm_op_scan_idler(void *data);
static void _e_fm_op_send_error(E_Fm_Op_Task * task, E_Fm_Op_Type type, const char *fmt, ...);
static void _e_fm_op_rollback(E_Fm_Op_Task * task);
@ -413,7 +413,7 @@ _e_fm_op_remove_link_task(E_Fm_Op_Task *task)
* variable _e_fm_op_stdin_buffer to deal with a situation, when read()
* did not actually read enough data.
*/
static int
static Eina_Bool
_e_fm_op_stdin_data(void *data, Ecore_Fd_Handler * fd_handler)
{
int fd;
@ -509,7 +509,7 @@ _e_fm_op_stdin_data(void *data, Ecore_Fd_Handler * fd_handler)
buf = _e_fm_op_stdin_buffer + length;
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static void
@ -640,7 +640,7 @@ _e_fm_op_idler_handle_error(int *mark, Eina_List **queue, Eina_List **node, E_Fm
* If we have an abort (_e_fm_op_abort = 1), then _atom() should recognize it and do smth.
* After this, just finish everything.
*/
static int
static Eina_Bool
_e_fm_op_work_idler(void *data)
{
/* E_Fm_Op_Task is marked static here because _e_fm_op_work_queue can be populated with another
@ -673,18 +673,18 @@ _e_fm_op_work_idler(void *data)
/* You may want to look at the comment in _e_fm_op_scan_atom() about this separator thing. */
_e_fm_op_work_queue = eina_list_remove_list(_e_fm_op_work_queue, _e_fm_op_separator);
node = NULL;
return 1;
return ECORE_CALLBACK_RENEW;
}
if ((_e_fm_op_scan_idler_p == NULL) && (!_e_fm_op_work_error) &&
(!_e_fm_op_scan_error))
ecore_main_loop_quit();
return 1;
return ECORE_CALLBACK_RENEW;
}
if (_e_fm_op_idler_handle_error(&_e_fm_op_work_error, &_e_fm_op_work_queue, &node, task))
return 1;
return ECORE_CALLBACK_RENEW;
task->started = 1;
@ -708,17 +708,17 @@ _e_fm_op_work_idler(void *data)
{
/* So, _atom did what it whats in case of abort. Now to idler. */
ecore_main_loop_quit();
return 0;
return ECORE_CALLBACK_CANCEL;
}
return 1;
return ECORE_CALLBACK_RENEW;
}
/* This works pretty much the same as _e_fm_op_work_idler(), except that
* if this is a dir, then look into its contents and create a task
* for those files. And we don't have _e_fm_op_separator here.
*/
int
Eina_Bool
_e_fm_op_scan_idler(void *data)
{
static Eina_List *node = NULL;
@ -739,17 +739,17 @@ _e_fm_op_scan_idler(void *data)
if (!task)
{
_e_fm_op_scan_idler_p = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
if (_e_fm_op_idler_handle_error(&_e_fm_op_scan_error, &_e_fm_op_scan_queue, &node, task))
return 1;
return ECORE_CALLBACK_RENEW;
if (_e_fm_op_abort)
{
/* We're marked for abortion. */
ecore_main_loop_quit();
return 0;
return ECORE_CALLBACK_CANCEL;
}
if (task->type == E_FM_OP_COPY_STAT_INFO)
@ -809,11 +809,11 @@ _e_fm_op_scan_idler(void *data)
closedir(dir);
dir = NULL;
node = NULL;
return 1;
return ECORE_CALLBACK_RENEW;
}
if ((!strcmp(de->d_name, ".") || (!strcmp(de->d_name, ".."))))
return 1;
return ECORE_CALLBACK_RENEW;
ntask = _e_fm_op_task_new();
ntask->type = task->type;
@ -845,7 +845,7 @@ _e_fm_op_scan_idler(void *data)
}
}
return 1;
return ECORE_CALLBACK_RENEW;
}
/* Packs and sends an error to STDOUT.

9
src/bin/e_focus.c
View File

@ -4,7 +4,7 @@
#include "e.h"
/* local subsystem functions */
static int _e_focus_raise_timer(void* data);
static Eina_Bool _e_focus_raise_timer(void* data);
/* local subsystem globals */
@ -205,14 +205,13 @@ e_focus_setdown(E_Border *bd)
/* local subsystem functions */
static int
static Eina_Bool
_e_focus_raise_timer(void* data)
{
E_Border *bd;
bd = data;
if (!bd->lock_user_stacking) e_border_raise(bd);
bd->raise_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}

32
src/bin/e_gadcon.c
View File

@ -11,8 +11,8 @@ static void _e_gadcon_free(E_Gadcon *gc);
static void _e_gadcon_client_free(E_Gadcon_Client *gcc);
static void _e_gadcon_moveresize_handle(E_Gadcon_Client *gcc);
static int _e_gadcon_cb_client_scroll_timer(void *data);
static int _e_gadcon_cb_client_scroll_animator(void *data);
static Eina_Bool _e_gadcon_cb_client_scroll_timer(void *data);
static Eina_Bool _e_gadcon_cb_client_scroll_animator(void *data);
static void _e_gadcon_cb_client_frame_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_gadcon_cb_client_frame_moveresize(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_gadcon_client_save(E_Gadcon_Client *gcc);
@ -79,8 +79,8 @@ static void e_gadcon_layout_pack_aspect_pad_set(Evas_Object *obj, int w, int h);
static void e_gadcon_layout_unpack(Evas_Object *obj);
static void _e_gadcon_provider_populate_request(const E_Gadcon_Client_Class *cc);
static void _e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *cc);
static int _e_gadcon_provider_populate_idler(void *data);
static int _e_gadcon_custom_populate_idler(void *data);
static Eina_Bool _e_gadcon_provider_populate_idler(void *data);
static Eina_Bool _e_gadcon_custom_populate_idler(void *data);
static int _e_gadcon_location_change(E_Gadcon_Client * gcc, E_Gadcon_Location *src, E_Gadcon_Location *dst);
/********************/
@ -1618,7 +1618,7 @@ _e_gadcon_moveresize_handle(E_Gadcon_Client *gcc)
);
}
static int
static Eina_Bool
_e_gadcon_cb_client_scroll_timer(void *data)
{
E_Gadcon_Client *gcc;
@ -1631,14 +1631,14 @@ _e_gadcon_cb_client_scroll_timer(void *data)
{
gcc->scroll_pos = gcc->scroll_wanted;
gcc->scroll_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
v = 0.05;
gcc->scroll_pos = (gcc->scroll_pos * (1.0 - v)) + (gcc->scroll_wanted * v);
return 1;
return ECORE_CALLBACK_RENEW;
}
static int
static Eina_Bool
_e_gadcon_cb_client_scroll_animator(void *data)
{
E_Gadcon_Client *gcc;
@ -1651,13 +1651,13 @@ _e_gadcon_cb_client_scroll_animator(void *data)
if (!gcc->scroll_timer)
{
gcc->scroll_animator = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
if (gcc->scroll_cb.func)
gcc->scroll_cb.func(gcc->scroll_cb.data);
return 1;
return ECORE_CALLBACK_RENEW;
}
static void
@ -2512,7 +2512,7 @@ _e_gadcon_client_cb_menu_post(void *data, E_Menu *m)
gcc->menu = NULL;
}
static int
static Eina_Bool
_e_gadcon_client_cb_instant_edit_timer(void *data)
{
E_Gadcon_Client *gcc;
@ -2521,7 +2521,7 @@ _e_gadcon_client_cb_instant_edit_timer(void *data)
e_gadcon_client_edit_begin(gcc);
_e_gadcon_client_move_start(gcc);
gcc->instant_edit_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -4932,7 +4932,7 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
}
}
static int
static Eina_Bool
_e_gadcon_custom_populate_idler(void *data)
{
const E_Gadcon_Client_Class *cc;
@ -4953,10 +4953,10 @@ _e_gadcon_custom_populate_idler(void *data)
}
custom_populate_idler = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_gadcon_provider_populate_idler(void *data __UNUSED__)
{
const E_Gadcon_Client_Class *cc;
@ -4981,7 +4981,7 @@ _e_gadcon_provider_populate_idler(void *data __UNUSED__)
e_gadcon_layout_thaw(gc->o_container);
populate_idler = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void

6
src/bin/e_ilist.c
View File

@ -44,7 +44,7 @@ static void _e_smart_event_key_down (void *data, Evas *evas, Evas_Object *obj,
static void _e_typebuf_add (Evas_Object *obj, const char *s);
static void _e_typebuf_match (Evas_Object *obj);
static int _e_typebuf_timer_cb (void *data);
static Eina_Bool _e_typebuf_timer_cb(void *data);
static void _e_typebuf_timer_update (Evas_Object *obj);
static void _e_typebuf_timer_delete (Evas_Object *obj);
static void _e_typebuf_clean (Evas_Object *obj);
@ -1354,13 +1354,13 @@ _e_typebuf_match(Evas_Object *obj)
free(match);
}
static int
static Eina_Bool
_e_typebuf_timer_cb(void *data)
{
Evas_Object *obj = data;
_e_typebuf_clean(obj);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void

6
src/bin/e_init.c
View File

@ -6,7 +6,7 @@
EAPI int E_EVENT_INIT_DONE = 0;
/* local function prototypes */
static int _e_init_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event);
static Eina_Bool _e_init_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event);
/* local variables */
static const char *title = NULL;
@ -210,7 +210,7 @@ e_init_count_get(void)
}
/* local functions */
static int
static Eina_Bool
_e_init_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Del *ev;
@ -222,5 +222,5 @@ _e_init_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event
// ecore_exe_free(init_exe);
init_exe = NULL;
}
return 1;
return ECORE_CALLBACK_RENEW;
}

46
src/bin/e_init_main.c
View File

@ -29,9 +29,9 @@ EAPI void e_init_done(void);
/* local subsystem functions */
static int _e_ipc_init(void);
static int _e_ipc_cb_server_add(void *data, int type, void *event);
static int _e_ipc_cb_server_del(void *data, int type, void *event);
static int _e_ipc_cb_server_data(void *data, int type, void *event);
static Eina_Bool _e_ipc_cb_server_add(void *data, int type, void *event);
static Eina_Bool _e_ipc_cb_server_del(void *data, int type, void *event);
static Eina_Bool _e_ipc_cb_server_data(void *data, int type, void *event);
/* local subsystem globals */
static Ecore_Ipc_Server *_e_ipc_server = NULL;
@ -45,11 +45,11 @@ static Ecore_X_Window *initwins = NULL;
static int initwins_num = 0;
static Ecore_Ipc_Server *server = NULL;
static int
static Eina_Bool
delayed_ok(void *data)
{
kill(getppid(), SIGUSR2);
return 0;
return ECORE_CALLBACK_CANCEL;
}
int
@ -145,8 +145,8 @@ _e_ipc_init(void)
return 1;
}
static int
_e_ipc_cb_server_add(void *data, int type, void *event)
static Eina_Bool
_e_ipc_cb_server_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Ipc_Event_Server_Add *e;
@ -158,24 +158,24 @@ _e_ipc_cb_server_add(void *data, int type, void *event)
0, 0, 0,
initwins, initwins_num * sizeof(Ecore_X_Window));
ecore_ipc_server_flush(server);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_ipc_cb_server_del(void *data, int type, void *event)
static Eina_Bool
_e_ipc_cb_server_del(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
{
/* quit now */
ecore_main_loop_quit();
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_ipc_cb_server_data(void *data, int type, void *event)
static Eina_Bool
_e_ipc_cb_server_data(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Ipc_Event_Server_Data *e;
e = event;
if (e->major != 7/*E_IPC_DOMAIN_INIT*/) return 1;
if (e->major != 7/*E_IPC_DOMAIN_INIT*/) return ECORE_CALLBACK_PASS_ON;
switch (e->minor)
{
case 1:
@ -188,14 +188,14 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
default:
break;
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void _e_init_cb_signal_disable(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _e_init_cb_signal_enable(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _e_init_cb_signal_done_ok(void *data, Evas_Object *obj, const char *emission, const char *source);
static int _e_init_cb_window_configure(void *data, int ev_type, void *ev);
static int _e_init_cb_timeout(void *data);
static Eina_Bool _e_init_cb_window_configure(void *data, int ev_type, void *ev);
static Eina_Bool _e_init_cb_timeout(void *data);
static Ecore_Evas *_e_init_evas_new(Ecore_X_Window root, int w, int h, Ecore_X_Window *winret);
/* local subsystem globals */
@ -399,27 +399,27 @@ _e_init_cb_signal_done_ok(void *data, Evas_Object *obj, const char *emission, co
ecore_main_loop_quit();
}
static int
_e_init_cb_window_configure(void *data, int ev_type, void *ev)
static Eina_Bool
_e_init_cb_window_configure(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
{
Ecore_X_Event_Window_Configure *e;
e = ev;
/* really simple - don't handle xinerama - because this event will only
* happen in single head */
if (e->win != _e_init_root_win) return 1;
if (e->win != _e_init_root_win) return ECORE_CALLBACK_PASS_ON;
ecore_evas_resize(_e_init_ecore_evas, e->w, e->h);
evas_object_resize(_e_init_object, e->w, e->h);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_init_cb_timeout(void *data)
{
e_init_hide();
_e_init_timeout_timer = NULL;
ecore_main_loop_quit();
return 0;
return ECORE_CALLBACK_CANCEL;
}
static Ecore_Evas *

4
src/bin/e_int_border_remember.c
View File

@ -156,7 +156,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
}
for (j = 0; bd->client.icccm.command.argv[i][j]; j++)
{
if (k >= (sizeof(buf) - 10))
if (k >= (int) (sizeof(buf) - 10))
{
buf[k] = 0;
goto done;
@ -357,7 +357,7 @@ _check_matches(E_Remember *rem, int update)
match &= ~E_REMEMBER_MATCH_ROLE;
if ((match & E_REMEMBER_MATCH_TYPE) &&
(rem->type == bd->client.netwm.type))
(rem->type == (int) bd->client.netwm.type))
match &= ~E_REMEMBER_MATCH_TYPE;
if ((match & E_REMEMBER_MATCH_TRANSIENT) &&

14
src/bin/e_int_config_modules.c
View File

@ -390,7 +390,7 @@ _types_list_sort(const void *data1, const void *data2)
return strcmp(t1->name, t2->name);
}
static int
static Eina_Bool
_fill_data_loader_iterate(void *data)
{
E_Config_Dialog_Data *cfdata = data;
@ -420,20 +420,20 @@ _fill_data_loader_iterate(void *data)
{
_widget_list_populate(cfdata);
cfdata->data_loader = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static int
static Eina_Bool
_fill_data_delayed(void *data)
{
E_Config_Dialog_Data *cfdata = data;
cfdata->data_loader = ecore_idler_add(_fill_data_loader_iterate, cfdata);
cfdata->data_delay = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static Eina_Bool
@ -560,7 +560,7 @@ _widget_list_populate(E_Config_Dialog_Data *cfdata)
evas_event_thaw(cfdata->evas);
}
static int
static Eina_Bool
_widget_list_item_selected_postponed(void *data)
{
E_Config_Dialog_Data *cfdata = data;
@ -607,7 +607,7 @@ _widget_list_item_selected_postponed(void *data)
e_widget_textblock_markup_set(cfdata->o_desc, description);
cfdata->selected.idler = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void

22
src/bin/e_int_gadcon_config.c
View File

@ -24,13 +24,13 @@ static void _fill_data(E_Config_Dialog_Data *cfdata);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Eina_Bool _free_gadgets(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__);
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static int _cb_load_timer(void *data);
static Eina_Bool _cb_load_timer(void *data);
static void _fill_list(E_Config_Dialog_Data *cfdata);
static void _cb_list_selected(void *data);
static void _cb_add(void *data, void *data2 __UNUSED__);
static void _cb_del(void *data, void *data2 __UNUSED__);
static CFGadget *_search_hash(E_Config_Dialog_Data *cfdata, const char *name);
static int _cb_mod_update(void *data, int type, void *event __UNUSED__);
static Eina_Bool _cb_mod_update(void *data, int type, void *event __UNUSED__);
EAPI void
e_int_gadcon_config_shelf(E_Gadcon *gc)
@ -174,15 +174,15 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
return ot;
}
static int
_cb_load_timer(void *data)
static Eina_Bool
_cb_load_timer(void *data)
{
E_Config_Dialog_Data *cfdata;
if (!(cfdata = data)) return 1;
if (!(cfdata = data)) return ECORE_CALLBACK_RENEW;
_fill_list(cfdata);
cfdata->load_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -382,13 +382,13 @@ _search_hash(E_Config_Dialog_Data *cfdata, const char *name)
return ret;
}
static int
_cb_mod_update(void *data, int type, void *event __UNUSED__)
static Eina_Bool
_cb_mod_update(void *data, int type, void *event __UNUSED__)
{
E_Config_Dialog_Data *cfdata;
if (type != E_EVENT_MODULE_UPDATE) return 1;
if (!(cfdata = data)) return 1;
if (type != E_EVENT_MODULE_UPDATE) return ECORE_CALLBACK_PASS_ON;
if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON;
_fill_list(cfdata);
return 1;
return ECORE_CALLBACK_PASS_ON;
}

4
src/bin/e_int_menus.c
View File

@ -1189,7 +1189,7 @@ _e_int_menus_clients_title_abbrv(const char *title)
int max_len;
max_len = e_config->clientlist_max_caption_len;
if ((e_config->clientlist_limit_caption_len) && (strlen(title) > max_len))
if ((e_config->clientlist_limit_caption_len) && ((int) strlen(title) > max_len))
{
char *abbv;
const char *left, *right;
@ -1422,7 +1422,7 @@ _e_int_menus_shelves_pre_cb(void *data, E_Menu *m)
if (!s) continue;
if (s->zone->num != zone->num) continue;
if (s->cfg->container != con->num) continue;
if (s->cfg->container != (int) con->num) continue;
name = s->name;
if (!name) name = _("Shelf #");

3
src/bin/e_int_shelf_config.c
View File

@ -472,7 +472,8 @@ static void
_fill_desks(E_Config_Dialog_Data *cfdata)
{
Evas *evas;
int mw, x, y, i;
int mw, x, y;
int i = 0;
evas = evas_object_evas_get(cfdata->o_desk_list);
evas_event_freeze(evas);

14
src/bin/e_intl.c
View File

@ -50,7 +50,7 @@ static void _e_intl_locale_hash_free(Eina_Hash *language_hash);
static Eina_Bool _e_intl_locale_hash_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
/* Input Method Configuration and Management */
static int _e_intl_cb_exit(void *data, int type, void *event);
static Eina_Bool _e_intl_cb_exit(void *data, int type, void *event);
static Eina_List *_e_intl_imc_dir_scan(const char *dir);
EAPI int
@ -416,19 +416,19 @@ e_intl_imc_system_path_get(void)
return _e_intl_imc_system_path;
}
static int
_e_intl_cb_exit(void *data, int type, void *event)
static Eina_Bool
_e_intl_cb_exit(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Exe_Event_Del *ev;
ev = event;
if (!ev->exe) return 1;
if (!ev->exe) return ECORE_CALLBACK_PASS_ON;
if (!(ecore_exe_tag_get(ev->exe) &&
(!strcmp(ecore_exe_tag_get(ev->exe), "E/im_exec")))) return 1;
_e_intl_input_method_exec = NULL;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void
@ -547,7 +547,7 @@ _e_intl_locale_alias_get(const char *language)
Eina_Hash *alias_hash;
char *alias;
char *lower_language;
int i;
unsigned int i;
if ((language == NULL) || (!strncmp(language, "POSIX", strlen("POSIX"))))
return strdup("C");
@ -639,7 +639,7 @@ e_intl_locale_parts_get(const char *locale)
/* Parse State */
int state = 0; /* start out looking for the language */
int locale_idx;
unsigned int locale_idx;
int tmp_idx = 0;
/* Parse Loop - Seperators are _ . @ */

68
src/bin/e_ipc.c
View File

@ -1,10 +1,10 @@
#include "e.h"
#ifdef USE_IPC
#ifdef USE_IPC
/* local subsystem functions */
static int _e_ipc_cb_client_add(void *data __UNUSED__, int type __UNUSED__, void *event);
static int _e_ipc_cb_client_del(void *data __UNUSED__, int type __UNUSED__, void *event);
static int _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event);
static Eina_Bool _e_ipc_cb_client_add(void *data __UNUSED__, int type __UNUSED__, void *event);
static Eina_Bool _e_ipc_cb_client_del(void *data __UNUSED__, int type __UNUSED__, void *event);
static Eina_Bool _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event);
/* local subsystem globals */
static Ecore_Ipc_Server *_e_ipc_server = NULL;
@ -14,11 +14,11 @@ static Ecore_Ipc_Server *_e_ipc_server = NULL;
EAPI int
e_ipc_init(void)
{
#ifdef USE_IPC
#ifdef USE_IPC
char buf[1024];
char *tmp, *user, *disp;
int pid;
tmp = getenv("TMPDIR");
if (!tmp) tmp = "/tmp";
user = getenv("USER");
@ -33,12 +33,12 @@ e_ipc_init(void)
else
{
struct stat st;
if (stat(buf, &st) == 0)
{
if ((st.st_uid ==
if ((st.st_uid ==
getuid()) &&
((st.st_mode & (S_IFDIR|S_IRWXU|S_IRWXG|S_IRWXO)) ==
((st.st_mode & (S_IFDIR|S_IRWXU|S_IRWXG|S_IRWXO)) ==
(S_IRWXU|S_IFDIR)))
{
}
@ -71,16 +71,16 @@ e_ipc_init(void)
ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_ADD, _e_ipc_cb_client_add, NULL);
ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DEL, _e_ipc_cb_client_del, NULL);
ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DATA, _e_ipc_cb_client_data, NULL);
e_ipc_codec_init();
#endif
#endif
return 1;
}
EAPI int
e_ipc_shutdown(void)
{
#ifdef USE_IPC
#ifdef USE_IPC
e_ipc_codec_shutdown();
if (_e_ipc_server)
{
@ -91,40 +91,40 @@ e_ipc_shutdown(void)
return 1;
}
#ifdef USE_IPC
#ifdef USE_IPC
/* local subsystem globals */
static int
static Eina_Bool
_e_ipc_cb_client_add(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Ipc_Event_Client_Add *e;
e = event;
if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return 1;
return 1;
if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return ECORE_CALLBACK_PASS_ON;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_ipc_cb_client_del(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Ipc_Event_Client_Del *e;
e = event;
if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return 1;
if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return ECORE_CALLBACK_PASS_ON;
/* delete client sruct */
e_thumb_client_del(e);
e_fm2_client_del(e);
e_init_client_del(e);
ecore_ipc_client_del(e->client);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Ipc_Event_Client_Data *e;
e = event;
if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return 1;
if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return ECORE_CALLBACK_PASS_ON;
switch (e->major)
{
case E_IPC_DOMAIN_SETUP:
@ -136,21 +136,21 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
case E_IPC_OP_EXEC_ACTION:
{
E_Ipc_2Str *req = NULL;
if (e_ipc_codec_2str_dec(e->data, e->size, &req))
{
Eina_List *m = e_manager_list();
int len, ok = 0;
void *d;
if (m)
{
E_Manager *man = eina_list_data_get(m);
if (man)
{
E_Action *act = e_action_find(req->str1);
if (act && act->func.go)
{
act->func.go(E_OBJECT(man), req->str2);
@ -158,17 +158,17 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
}
}
}
d = e_ipc_codec_int_enc(ok, &len);
if (d)
{
ecore_ipc_client_send(e->client,
E_IPC_DOMAIN_REPLY,
E_IPC_OP_EXEC_ACTION_REPLY,
ecore_ipc_client_send(e->client,
E_IPC_DOMAIN_REPLY,
E_IPC_OP_EXEC_ACTION_REPLY,
0, 0, 0, d, len);
free(d);
}
if (req)
{
E_FREE(req->str1);
@ -195,5 +195,5 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
break;
}
return 1;
}
}
#endif

5
src/bin/e_layout.c
View File

@ -305,7 +305,7 @@ _e_layout_smart_disown(Evas_Object *obj)
}
static void
_e_layout_smart_item_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info)
_e_layout_smart_item_del_hook(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, __UNUSED__ void *event_info)
{
e_layout_unpack(obj);
}
@ -359,6 +359,9 @@ _e_layout_smart_init(void)
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
_e_smart = evas_smart_class_new(&sc);

3
src/bin/e_livethumb.c
View File

@ -213,6 +213,9 @@ _e_smart_init(void)
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
_e_smart = evas_smart_class_new(&sc);

64
src/bin/e_main.c
View File

@ -76,14 +76,14 @@ static int _e_main_path_init(void);
static int _e_main_path_shutdown(void);
static void _e_main_cb_x_fatal(void *data __UNUSED__);
static int _e_main_cb_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__);
static int _e_main_cb_signal_hup(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__);
static int _e_main_cb_signal_user(void *data __UNUSED__, int ev_type __UNUSED__, void *ev);
static int _e_main_cb_x_flusher(void *data __UNUSED__);
static int _e_main_cb_idler_before(void *data __UNUSED__);
static int _e_main_cb_idler_after(void *data __UNUSED__);
static int _e_main_cb_eet_cacheburst_end(void *data __UNUSED__);
static int _e_main_cb_startup_fake_end(void *data __UNUSED__);
static Eina_Bool _e_main_cb_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__);
static Eina_Bool _e_main_cb_signal_hup(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__);
static Eina_Bool _e_main_cb_signal_user(void *data __UNUSED__, int ev_type __UNUSED__, void *ev);
static Eina_Bool _e_main_cb_x_flusher(void *data __UNUSED__);
static Eina_Bool _e_main_cb_idler_before(void *data __UNUSED__);
static Eina_Bool _e_main_cb_idler_after(void *data __UNUSED__);
static Eina_Bool _e_main_cb_eet_cacheburst_end(void *data __UNUSED__);
static Eina_Bool _e_main_cb_startup_fake_end(void *data __UNUSED__);
static void _e_main_desk_save(void);
static void _e_main_desk_restore(E_Manager *man, E_Container *con);
static void _e_main_test_svg_loader(void);
@ -115,13 +115,17 @@ static double t0, t1, t2;
#define TS(x)
#endif
static int
#undef DBG_EINA_STRINGSHARE
#ifdef DBG_EINA_STRINGSHARE
static Eina_Bool
stdbg(void *data __UNUSED__)
{
// enable to debug eina stringshare usage
// eina_stringshare_dump();
return 0;
// enable to debug eina stringshare usage
eina_stringshare_dump();
return ECORE_CALLBACK_CANCEL;
}
#endif
/* externally accessible functions */
int
@ -1103,8 +1107,10 @@ main(int argc, char **argv)
starting = 0;
/* start our main loop */
#ifdef DBG_EINA_STRINGSHARE
// enable to debug eina stringshare usage
// ecore_timer_add(5.0, stdbg, NULL);
ecore_timer_add(5.0, stdbg, NULL);
#endif
ecore_main_loop_begin();
@ -1516,22 +1522,22 @@ _e_main_cb_x_fatal(void *data __UNUSED__)
// ecore_main_loop_quit();
}
static int
static Eina_Bool
_e_main_cb_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
{
/* called on ctrl-c, kill (pid) (also SIGINT, SIGTERM and SIGQIT) */
e_sys_action_do(E_SYS_EXIT, NULL);
return 1;
return ECORE_CALLBACK_RENEW;
}
static int
static Eina_Bool
_e_main_cb_signal_hup(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
{
e_sys_action_do(E_SYS_RESTART, NULL);
return 1;
return ECORE_CALLBACK_RENEW;
}
static int
static Eina_Bool
_e_main_cb_signal_user(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_Event_Signal_User *e = ev;
@ -1545,18 +1551,18 @@ _e_main_cb_signal_user(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
// FIXME: another core util for doing things with e
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static int
static Eina_Bool
_e_main_cb_x_flusher(void *data __UNUSED__)
{
eet_clearcache();
ecore_x_flush();
return 1;
return ECORE_CALLBACK_RENEW;
}
static int
static Eina_Bool
_e_main_cb_idler_before(void *data __UNUSED__)
{
Eina_List *l, *pl;
@ -1587,10 +1593,10 @@ _e_main_cb_idler_before(void *data __UNUSED__)
_e_cacheburst--;
/* eet_cacheburst(_e_cacheburst); */
edje_thaw();
return 1;
return ECORE_CALLBACK_RENEW;
}
static int
static Eina_Bool
_e_main_cb_idler_after(void *data __UNUSED__)
{
edje_freeze();
@ -1606,22 +1612,22 @@ _e_main_cb_idler_after(void *data __UNUSED__)
e_precache_end = 1;
}
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static int
static Eina_Bool
_e_main_cb_eet_cacheburst_end(void *data __UNUSED__)
{
_e_cacheburst--;
/* eet_cacheburst(_e_cacheburst); */
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_main_cb_startup_fake_end(void *data __UNUSED__)
{
e_init_hide();
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void

80
src/bin/e_manager.c
View File

@ -6,14 +6,14 @@
/* local subsystem functions */
static void _e_manager_free(E_Manager *man);
static int _e_manager_cb_window_show_request(void *data, int ev_type, void *ev);
static int _e_manager_cb_window_configure(void *data, int ev_type, void *ev);
static int _e_manager_cb_key_up(void *data, int ev_type, void *ev);
static int _e_manager_cb_key_down(void *data, int ev_type, void *ev);
static int _e_manager_cb_frame_extents_request(void *data, int ev_type, void *ev);
static int _e_manager_cb_ping(void *data, int ev_type, void *ev);
static int _e_manager_cb_screensaver_notify(void *data, int ev_type, void *ev);
static int _e_manager_cb_client_message(void *data, int ev_type, void *ev);
static Eina_Bool _e_manager_cb_window_show_request(void *data, int ev_type, void *ev);
static Eina_Bool _e_manager_cb_window_configure(void *data, int ev_type, void *ev);
static Eina_Bool _e_manager_cb_key_up(void *data, int ev_type, void *ev);
static Eina_Bool _e_manager_cb_key_down(void *data, int ev_type, void *ev);
static Eina_Bool _e_manager_cb_frame_extents_request(void *data, int ev_type, void *ev);
static Eina_Bool _e_manager_cb_ping(void *data, int ev_type, void *ev);
static Eina_Bool _e_manager_cb_screensaver_notify(void *data, int ev_type, void *ev);
static Eina_Bool _e_manager_cb_client_message(void *data, int ev_type, void *ev);
static Eina_Bool _e_manager_frame_extents_free_cb(const Eina_Hash *hash __UNUSED__,
const void *key __UNUSED__,
@ -540,22 +540,22 @@ _e_manager_free(E_Manager *man)
free(man);
}
static int
static Eina_Bool
_e_manager_cb_window_show_request(void *data, int ev_type __UNUSED__, void *ev)
{
E_Manager *man;
Ecore_X_Event_Window_Show_Request *e;
man = data;
e = ev;
if (e_stolen_win_get(e->win)) return 1;
if (ecore_x_window_parent_get(e->win) != man->root)
return 1; /* try other handlers for this */
return ECORE_CALLBACK_PASS_ON; /* try other handlers for this */
{
E_Container *con;
E_Border *bd;
con = e_container_current_get(man);
if (!e_border_find_by_client_window(e->win))
{
@ -564,10 +564,10 @@ _e_manager_cb_window_show_request(void *data, int ev_type __UNUSED__, void *ev)
ecore_x_window_show(e->win);
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_manager_cb_window_configure(void *data, int ev_type __UNUSED__, void *ev)
{
E_Manager *man;
@ -575,12 +575,12 @@ _e_manager_cb_window_configure(void *data, int ev_type __UNUSED__, void *ev)
man = data;
e = ev;
if (e->win != man->root) return 1;
if (e->win != man->root) return ECORE_CALLBACK_PASS_ON;
e_manager_resize(man, e->w, e->h);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_manager_cb_key_down(void *data, int ev_type __UNUSED__, void *ev)
{
E_Manager *man;
@ -589,14 +589,14 @@ _e_manager_cb_key_down(void *data, int ev_type __UNUSED__, void *ev)
man = data;
e = ev;
if (e->event_window != man->root) return 1;
if (e->event_window != man->root) return ECORE_CALLBACK_PASS_ON;
if (e->root_window != man->root) man = _e_manager_get_for_root(e->root_window);
if (e_bindings_key_down_event_handle(E_BINDING_CONTEXT_MANAGER, E_OBJECT(man), ev))
return 0;
return 1;
return ECORE_CALLBACK_DONE;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_manager_cb_key_up(void *data, int ev_type __UNUSED__, void *ev)
{
E_Manager *man;
@ -605,14 +605,14 @@ _e_manager_cb_key_up(void *data, int ev_type __UNUSED__, void *ev)
man = data;
e = ev;
if (e->event_window != man->root) return 1;
if (e->event_window != man->root) return ECORE_CALLBACK_PASS_ON;
if (e->root_window != man->root) man = _e_manager_get_for_root(e->root_window);
if (e_bindings_key_up_event_handle(E_BINDING_CONTEXT_MANAGER, E_OBJECT(man), ev))
return 0;
return 1;
return ECORE_CALLBACK_DONE;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev)
{
E_Manager *man;
@ -630,7 +630,7 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev
con = e_container_current_get(man);
e = ev;
if (ecore_x_window_parent_get(e->win) != man->root) return 1;
if (ecore_x_window_parent_get(e->win) != man->root) return ECORE_CALLBACK_PASS_ON;
/* TODO:
* * We need to check if we remember this window, and border locking is set
@ -745,10 +745,10 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev
if (extents)
ecore_x_netwm_frame_size_set(e->win, extents->l, extents->r, extents->t, extents->b);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_manager_cb_ping(void *data, int ev_type __UNUSED__, void *ev)
{
E_Manager *man;
@ -758,24 +758,24 @@ _e_manager_cb_ping(void *data, int ev_type __UNUSED__, void *ev)
man = data;
e = ev;
if (e->win != man->root) return 1;
if (e->win != man->root) return ECORE_CALLBACK_PASS_ON;
bd = e_border_find_by_client_window(e->event_win);
if (!bd) return 1;
if (!bd) return ECORE_CALLBACK_PASS_ON;
bd->ping_ok = 1;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_manager_cb_timer_post_screensaver_lock(void *data __UNUSED__)
{
e_desklock_show_autolocked();
timer_post_screensaver_lock = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_manager_cb_screensaver_notify(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_X_Event_Screensaver_Notify *e = ev;
@ -802,11 +802,11 @@ _e_manager_cb_screensaver_notify(void *data __UNUSED__, int ev_type __UNUSED__,
}
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_manager_cb_client_message(void *data, int ev_type, void *ev)
static Eina_Bool
_e_manager_cb_client_message(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
{
Ecore_X_Event_Client_Message *e;
E_Border *bd;
@ -859,7 +859,7 @@ _e_manager_cb_client_message(void *data, int ev_type, void *ev)
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
@ -867,7 +867,7 @@ _e_manager_frame_extents_free_cb(const Eina_Hash *hash __UNUSED__, const void *k
void *data, void *fdata __UNUSED__)
{
free(data);
return 1;
return EINA_TRUE;
}
static E_Manager *

2
src/bin/e_manager.h
View File

@ -9,7 +9,7 @@ typedef struct _E_Manager E_Manager;
#ifndef E_MANAGER_H
#define E_MANAGER_H
#define E_MANAGER_TYPE 0xE0b01008
#define E_MANAGER_TYPE (int) 0xE0b01008
struct _E_Manager
{

82
src/bin/e_menu.c
View File

@ -76,14 +76,14 @@ static void _e_menu_cb_intercept_container_resize(void *data, Evas_Object *o, Ev
static void _e_menu_cb_ecore_evas_resize(Ecore_Evas *ee);
static void _e_menu_cb_item_in(void *data, Evas *evas, Evas_Object *obj, void *event_info);
static void _e_menu_cb_item_out(void *data, Evas *evas, Evas_Object *obj, void *event_info);
static int _e_menu_cb_key_down(void *data, int type, void *event);
static int _e_menu_cb_key_up(void *data, int type, void *event);
static int _e_menu_cb_mouse_down(void *data, int type, void *event);
static int _e_menu_cb_mouse_up(void *data, int type, void *event);
static int _e_menu_cb_mouse_move(void *data, int type, void *event);
static int _e_menu_cb_mouse_wheel(void *data, int type, void *event);
static int _e_menu_cb_scroll_animator(void *data);
static int _e_menu_cb_window_shape(void *data, int ev_type, void *ev);
static Eina_Bool _e_menu_cb_key_down(void *data, int type, void *event);
static Eina_Bool _e_menu_cb_key_up(void *data, int type, void *event);
static Eina_Bool _e_menu_cb_mouse_down(void *data, int type, void *event);
static Eina_Bool _e_menu_cb_mouse_up(void *data, int type, void *event);
static Eina_Bool _e_menu_cb_mouse_move(void *data, int type, void *event);
static Eina_Bool _e_menu_cb_mouse_wheel(void *data, int type, void *event);
static Eina_Bool _e_menu_cb_scroll_animator(void *data);
static Eina_Bool _e_menu_cb_window_shape(void *data, int ev_type, void *ev);
static void _e_menu_cb_item_submenu_post_default(void *data, E_Menu *m, E_Menu_Item *mi);
static Eina_Bool _e_menu_categories_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
@ -2553,7 +2553,7 @@ _e_menu_cb_ecore_evas_resize(Ecore_Evas *ee)
}
static void
_e_menu_cb_item_in(void *data, Evas *evas, Evas_Object *obj, void *event_info)
_e_menu_cb_item_in(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object *obj, __UNUSED__ void *event_info)
{
E_Menu_Item *mi;
@ -2562,7 +2562,7 @@ _e_menu_cb_item_in(void *data, Evas *evas, Evas_Object *obj, void *event_info)
}
static void
_e_menu_cb_item_out(void *data, Evas *evas, Evas_Object *obj, void *event_info)
_e_menu_cb_item_out(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object *obj, void *event_info)
{
E_Menu_Item *mi;
Evas_Event_Mouse_In *ev;
@ -2585,13 +2585,13 @@ _e_menu_cb_item_out(void *data, Evas *evas, Evas_Object *obj, void *event_info)
}
}
static int
_e_menu_cb_key_down(void *data, int type, void *event)
static Eina_Bool
_e_menu_cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Key *ev;
ev = event;
if (ev->window != _e_menu_win) return 1;
if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
if ((!strcmp(ev->key, "Up")) || (!strcmp(ev->key, "KP_Up")))
_e_menu_item_activate_previous();
else if ((!strcmp(ev->key, "Down")) || (!strcmp(ev->key, "KP_Down")))
@ -2635,17 +2635,17 @@ _e_menu_cb_key_down(void *data, int type, void *event)
_e_menu_item_activate_last();
else if (ev->compose)
_e_menu_item_activate_char(ev->compose);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_menu_cb_key_up(void *data, int type, void *event)
static Eina_Bool
_e_menu_cb_key_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Key *ev;
ev = event;
if (ev->window != _e_menu_win) return 1;
return 1;
if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
return ECORE_CALLBACK_PASS_ON;
}
/* we need all of these because menus are special and grab the mouse and
@ -2653,13 +2653,13 @@ _e_menu_cb_key_up(void *data, int type, void *event)
* events directly to the canvases from our grab window
*/
static int
_e_menu_cb_mouse_down(void *data, int type, void *event)
static Eina_Bool
_e_menu_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Mouse_Button *ev;
ev = event;
if (ev->window != _e_menu_win) return 1;
if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
/* Only allow dragging from floating menus for now.
* The reason for this is that for non floating menus,
@ -2669,25 +2669,25 @@ _e_menu_cb_mouse_down(void *data, int type, void *event)
if (_e_menu_activate_floating)
_e_menu_activate_maybe_drag = 1;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_menu_cb_mouse_up(void *data, int type, void *event)
static Eina_Bool
_e_menu_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Mouse_Button *ev;
Ecore_X_Time t;
int ret = 0;
ev = event;
if (ev->window != _e_menu_win) return 1;
if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
t = ev->timestamp - _e_menu_activate_time;
if ((_e_menu_activate_time != 0) &&
(t < (e_config->menus_click_drag_timeout * 1000)))
{
_e_menu_activate_floating = 1;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
if (_e_menu_activate_dragging)
@ -2710,11 +2710,11 @@ _e_menu_cb_mouse_up(void *data, int type, void *event)
_e_menu_deactivate_all();
else if (!_e_menu_activate_floating)
_e_menu_deactivate_all();
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_menu_cb_mouse_move(void *data, int type, void *event)
static Eina_Bool
_e_menu_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Mouse_Move *ev;
Eina_List *l, *tmp;
@ -2725,7 +2725,7 @@ _e_menu_cb_mouse_move(void *data, int type, void *event)
int is_fast = 0;
ev = event;
if (ev->window != _e_menu_win) return 1;
if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
fast_move_threshold = e_config->menus_fast_mouse_move_threshhold;
dx = ev->x - _e_menu_x;
dy = ev->y - _e_menu_y;
@ -2768,16 +2768,16 @@ _e_menu_cb_mouse_move(void *data, int type, void *event)
_e_menu_y = ev->y;
_e_menu_time = ev->timestamp;
_e_menu_mouse_autoscroll_check();
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_menu_cb_mouse_wheel(void *data, int type, void *event)
static Eina_Bool
_e_menu_cb_mouse_wheel(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Mouse_Wheel *ev;
ev = event;
if (ev->window != _e_menu_win) return 1;
if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
if (ev->z < 0) /* up */
{
int i;
@ -2792,11 +2792,11 @@ _e_menu_cb_mouse_wheel(void *data, int type, void *event)
for (i = ev->z; i > 0; i--)
_e_menu_item_activate_next();
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_menu_cb_scroll_animator(void *data)
static Eina_Bool
_e_menu_cb_scroll_animator(__UNUSED__ void *data)
{
double t, dt;
double dx, dy;
@ -2845,8 +2845,8 @@ _e_menu_cb_scroll_animator(void *data)
return 1;
}
static int
_e_menu_cb_window_shape(void *data, int ev_type, void *ev)
static Eina_Bool
_e_menu_cb_window_shape(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
{
Eina_List *l;
Ecore_X_Event_Window_Shape *e;
@ -2858,7 +2858,7 @@ _e_menu_cb_window_shape(void *data, int ev_type, void *ev)
if (m->evas_win == e->win)
m->need_shape_export = 1;
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void
@ -2875,7 +2875,7 @@ _e_menu_cb_item_submenu_post_default(void *data, E_Menu *m, E_Menu_Item *mi)
static Eina_Bool
_e_menu_categories_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata)
_e_menu_categories_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, __UNUSED__ void *fdata)
{
E_Menu_Category_Callback *cb;
E_Menu_Category *cat;

12
src/bin/e_module.c
View File

@ -15,7 +15,7 @@ static void _e_module_free(E_Module *m);
static void _e_module_dialog_disable_show(const char *title, const char *body, E_Module *m);
static void _e_module_cb_dialog_disable(void *data, E_Dialog *dia);
static void _e_module_event_update_free(void *data, void *event);
static int _e_module_cb_idler(void *data);
static Eina_Bool _e_module_cb_idler(void *data);
static int _e_module_sort_priority(const void *d1, const void *d2);
/* local subsystem globals */
@ -531,8 +531,8 @@ _e_module_cb_dialog_disable(void *data, E_Dialog *dia)
e_config_save_queue();
}
static int
_e_module_cb_idler(void *data)
static Eina_Bool
_e_module_cb_idler(__UNUSED__ void *data)
{
if (_e_modules_delayed)
{
@ -550,13 +550,13 @@ _e_module_cb_idler(void *data)
if (_e_modules_delayed)
{
e_util_wakeup();
return 1;
return ECORE_CALLBACK_RENEW;
}
ecore_event_add(E_EVENT_MODULE_INIT_END, NULL, NULL, NULL);
_e_module_idler = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
@ -571,7 +571,7 @@ _e_module_sort_priority(const void *d1, const void *d2)
static void
_e_module_event_update_free(void *data, void *event)
_e_module_event_update_free(__UNUSED__ void *data, void *event)
{
E_Event_Module_Update *ev;

8
src/bin/e_msg.c
View File

@ -21,7 +21,7 @@ struct _E_Msg_Event
};
/* local subsystem functions */
static int _e_msg_event_cb(void *data, int ev_type, void *ev);
static Eina_Bool _e_msg_event_cb(void *data, int ev_type, void *ev);
static void _e_msg_event_free(void *data, void *ev);
/* local subsystem globals */
@ -110,8 +110,8 @@ e_msg_handler_del(E_Msg_Handler *emsgh)
/* local subsystem functions */
static int
_e_msg_event_cb(void *data, int ev_type, void *ev)
static Eina_Bool
_e_msg_event_cb(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
{
E_Msg_Event *e;
Eina_List *l;
@ -133,7 +133,7 @@ _e_msg_event_cb(void *data, int ev_type, void *ev)
}
static void
_e_msg_event_free(void *data, void *ev)
_e_msg_event_free(__UNUSED__ void *data, void *ev)
{
E_Msg_Event *e;

42
src/bin/e_msgbus.c
View File

@ -135,14 +135,14 @@ _e_msgbus_request_name_cb(void *data, DBusMessage *msg, DBusError *err)
/* Core Handlers */
static DBusMessage*
_e_msgbus_core_restart_cb(E_DBus_Object *obj, DBusMessage *msg)
_e_msgbus_core_restart_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
{
e_sys_action_do(E_SYS_RESTART, NULL);
return dbus_message_new_method_return(msg);
}
static DBusMessage*
_e_msgbus_core_shutdown_cb(E_DBus_Object *obj, DBusMessage *msg)
_e_msgbus_core_shutdown_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
{
e_sys_action_do(E_SYS_EXIT, NULL);
return dbus_message_new_method_return(msg);
@ -150,7 +150,7 @@ _e_msgbus_core_shutdown_cb(E_DBus_Object *obj, DBusMessage *msg)
/* Modules Handlers */
static DBusMessage*
_e_msgbus_module_load_cb(E_DBus_Object *obj, DBusMessage *msg)
_e_msgbus_module_load_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
{
DBusMessageIter iter;
char *module;
@ -167,8 +167,8 @@ _e_msgbus_module_load_cb(E_DBus_Object *obj, DBusMessage *msg)
return dbus_message_new_method_return(msg);
}
static DBusMessage*
_e_msgbus_module_unload_cb(E_DBus_Object *obj, DBusMessage *msg)
static DBusMessage*
_e_msgbus_module_unload_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
{
DBusMessageIter iter;
char *module;
@ -187,8 +187,8 @@ _e_msgbus_module_unload_cb(E_DBus_Object *obj, DBusMessage *msg)
return dbus_message_new_method_return(msg);
}
static DBusMessage*
_e_msgbus_module_enable_cb(E_DBus_Object *obj, DBusMessage *msg)
static DBusMessage*
_e_msgbus_module_enable_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
{
DBusMessageIter iter;
char *module;
@ -205,8 +205,8 @@ _e_msgbus_module_enable_cb(E_DBus_Object *obj, DBusMessage *msg)
return dbus_message_new_method_return(msg);
}
static DBusMessage*
_e_msgbus_module_disable_cb(E_DBus_Object *obj, DBusMessage *msg)
static DBusMessage*
_e_msgbus_module_disable_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
{
DBusMessageIter iter;
char *module;
@ -223,8 +223,8 @@ _e_msgbus_module_disable_cb(E_DBus_Object *obj, DBusMessage *msg)
return dbus_message_new_method_return(msg);
}
static DBusMessage*
_e_msgbus_module_list_cb(E_DBus_Object *obj, DBusMessage *msg)
static DBusMessage*
_e_msgbus_module_list_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
{
Eina_List *l;
E_Module *mod;
@ -255,8 +255,8 @@ _e_msgbus_module_list_cb(E_DBus_Object *obj, DBusMessage *msg)
}
/* Profile Handlers */
static DBusMessage*
_e_msgbus_profile_set_cb(E_DBus_Object *obj, DBusMessage *msg)
static DBusMessage*
_e_msgbus_profile_set_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
{
DBusMessageIter iter;
char *profile;
@ -273,8 +273,8 @@ _e_msgbus_profile_set_cb(E_DBus_Object *obj, DBusMessage *msg)
return dbus_message_new_method_return(msg);
}
static DBusMessage*
_e_msgbus_profile_get_cb(E_DBus_Object *obj, DBusMessage *msg)
static DBusMessage*
_e_msgbus_profile_get_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
{
DBusMessageIter iter;
DBusMessage *reply;
@ -289,8 +289,8 @@ _e_msgbus_profile_get_cb(E_DBus_Object *obj, DBusMessage *msg)
return reply;
}
static DBusMessage*
_e_msgbus_profile_list_cb(E_DBus_Object *obj, DBusMessage *msg)
static DBusMessage*
_e_msgbus_profile_list_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
{
Eina_List *l;
const char *name;
@ -311,8 +311,8 @@ _e_msgbus_profile_list_cb(E_DBus_Object *obj, DBusMessage *msg)
return reply;
}
static DBusMessage*
_e_msgbus_profile_add_cb(E_DBus_Object *obj, DBusMessage *msg)
static DBusMessage*
_e_msgbus_profile_add_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
{
DBusMessageIter iter;
char *profile;
@ -326,8 +326,8 @@ _e_msgbus_profile_add_cb(E_DBus_Object *obj, DBusMessage *msg)
}
static DBusMessage*
_e_msgbus_profile_delete_cb(E_DBus_Object *obj, DBusMessage *msg)
static DBusMessage*
_e_msgbus_profile_delete_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
{
DBusMessageIter iter;
char *profile;

12
src/bin/e_order.c
View File

@ -8,7 +8,7 @@ static void _e_order_free(E_Order *eo);
static void _e_order_cb_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path);
static void _e_order_read(E_Order *eo);
static void _e_order_save(E_Order *eo);
static int _e_order_cb_efreet_cache_update(void *data, int ev_type, void *ev);
static Eina_Bool _e_order_cb_efreet_cache_update(void *data, int ev_type, void *ev);
static Eina_List *orders = NULL;
static Eina_List *handlers = NULL;
@ -161,7 +161,7 @@ _e_order_free(E_Order *eo)
free(eo);
}
static int
static Eina_Bool
_e_order_cb_monitor_delay(void *data)
{
E_Order *eo = data;
@ -170,7 +170,7 @@ _e_order_cb_monitor_delay(void *data)
_e_order_read(eo);
if (eo->cb.update) eo->cb.update(eo->cb.data, eo);
eo->delay = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -254,8 +254,8 @@ _e_order_save(E_Order *eo)
fclose(f);
}
static int
_e_order_cb_efreet_cache_update(void *data, int ev_type, void *ev)
static Eina_Bool
_e_order_cb_efreet_cache_update(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *ev)
{
Eina_List *l;
E_Order *eo;
@ -266,5 +266,5 @@ _e_order_cb_efreet_cache_update(void *data, int ev_type, void *ev)
_e_order_read(eo);
if (eo->cb.update) eo->cb.update(eo->cb.data, eo);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}

3
src/bin/e_pan.c
View File

@ -273,6 +273,9 @@ _e_smart_init(void)
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
_e_smart = evas_smart_class_new(&sc);

58
src/bin/e_pointer.c
View File

@ -28,13 +28,13 @@ static void _e_pointer_stack_free(E_Pointer_Stack *elem);
static void _e_pointer_type_set(E_Pointer *p, const char *type);
static void _e_pointer_active_handle(E_Pointer *p);
static int _e_pointer_cb_mouse_down(void *data, int type, void *event);
static int _e_pointer_cb_mouse_up(void *data, int type, void *event);
static int _e_pointer_cb_mouse_move(void *data, int type, void *event);
static int _e_pointer_cb_mouse_wheel(void *data, int type, void *event);
static int _e_pointer_cb_idle_timer_pre(void *data);
static int _e_pointer_cb_idle_timer_wait(void *data);
static int _e_pointer_cb_idle_poller(void *data);
static Eina_Bool _e_pointer_cb_mouse_down(void *data, int type, void *event);
static Eina_Bool _e_pointer_cb_mouse_up(void *data, int type, void *event);
static Eina_Bool _e_pointer_cb_mouse_move(void *data, int type, void *event);
static Eina_Bool _e_pointer_cb_mouse_wheel(void *data, int type, void *event);
static Eina_Bool _e_pointer_cb_idle_timer_pre(void *data);
static Eina_Bool _e_pointer_cb_idle_timer_wait(void *data);
static Eina_Bool _e_pointer_cb_idle_poller(void *data);
/* externally accessible functions */
EAPI int
@ -297,7 +297,7 @@ _e_pointer_canvas_del(E_Pointer *p)
}
static void
_e_pointer_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
_e_pointer_cb_move(void *data, Evas *e __UNUSED__, __UNUSED__ Evas_Object *obj, __UNUSED__ void *event_info)
{
E_Pointer *p;
Evas_Coord x, y;
@ -456,8 +456,8 @@ _e_pointer_active_handle(E_Pointer *p)
p->idle_timer = ecore_timer_loop_add(1.0, _e_pointer_cb_idle_timer_pre, p);
}
static int
_e_pointer_cb_mouse_down(void *data, int type, void *event)
static Eina_Bool
_e_pointer_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
{
Eina_List *l;
E_Pointer *p;
@ -472,11 +472,11 @@ _e_pointer_cb_mouse_down(void *data, int type, void *event)
"e,action,mouse,down", "e");
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_pointer_cb_mouse_up(void *data, int type, void *event)
static Eina_Bool
_e_pointer_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
{
Eina_List *l;
E_Pointer *p;
@ -491,11 +491,11 @@ _e_pointer_cb_mouse_up(void *data, int type, void *event)
"e,action,mouse,up", "e");
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_pointer_cb_mouse_move(void *data, int type, void *event)
static Eina_Bool
_e_pointer_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
{
Eina_List *l;
E_Pointer *p;
@ -510,11 +510,11 @@ _e_pointer_cb_mouse_move(void *data, int type, void *event)
"e,action,mouse,move", "e");
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_pointer_cb_mouse_wheel(void *data, int type, void *event)
static Eina_Bool
_e_pointer_cb_mouse_wheel(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
{
Eina_List *l;
E_Pointer *p;
@ -529,10 +529,10 @@ _e_pointer_cb_mouse_wheel(void *data, int type, void *event)
"e,action,mouse,wheel", "e");
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_pointer_cb_idle_timer_pre(void *data)
{
E_Pointer *p;
@ -543,10 +543,10 @@ _e_pointer_cb_idle_timer_pre(void *data)
p->x = x;
p->y = y;
p->idle_timer = ecore_timer_loop_add(4.0, _e_pointer_cb_idle_timer_wait, p);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_pointer_cb_idle_timer_wait(void *data)
{
E_Pointer *p;
@ -558,16 +558,16 @@ _e_pointer_cb_idle_timer_wait(void *data)
if (p->idle_poller) ecore_poller_del(p->idle_poller);
p->idle_poller = NULL;
p->idle_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
if (!p->idle_poller)
p->idle_poller = ecore_poller_add(ECORE_POLLER_CORE, 64,
_e_pointer_cb_idle_poller, p);
p->idle_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_pointer_cb_idle_poller(void *data)
{
E_Pointer *p;
@ -578,7 +578,7 @@ _e_pointer_cb_idle_poller(void *data)
(!e_config->idle_cursor))
{
p->idle_poller = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
/* check if pointer actually moved since the 1 second post-mouse move idle
* pre-timer that fetches the position */
@ -597,7 +597,7 @@ _e_pointer_cb_idle_poller(void *data)
p->idle = 0;
}
/* use poller to check from now on */
return 1;
return ECORE_CALLBACK_RENEW;
}
/* we are idle - report it if not idle before */
if (!p->idle)
@ -606,5 +606,5 @@ _e_pointer_cb_idle_poller(void *data)
edje_object_signal_emit(p->pointer_object, "e,state,mouse,idle", "e");
p->idle = 1;
}
return 1;
return ECORE_CALLBACK_RENEW;
}

20
src/bin/e_popup.c
View File

@ -5,8 +5,8 @@
/* local subsystem functions */
static void _e_popup_free(E_Popup *pop);
static int _e_popup_idle_enterer(void *data);
static int _e_popup_cb_window_shape(void *data, int ev_type, void *ev);
static Eina_Bool _e_popup_idle_enterer(void *data);
static Eina_Bool _e_popup_cb_window_shape(void *data, int ev_type, void *ev);
/* local subsystem globals */
static Ecore_Event_Handler *_e_popup_window_shape_handler = NULL;
@ -239,14 +239,14 @@ e_popup_idler_before(void)
rects[i].width -= rects[i].x;
rects[i].x = 0;
}
if ((rects[i].x + rects[i].width) > pop->w)
if ((rects[i].x + (int) rects[i].width) > pop->w)
rects[i].width = rects[i].width - rects[i].x;
if (rects[i].y < 0)
{
rects[i].height -= rects[i].y;
rects[i].y = 0;
}
if ((rects[i].y + rects[i].height) > pop->h)
if ((rects[i].y + (int) rects[i].height) > pop->h)
rects[i].height = rects[i].height - rects[i].y;
if ((orects[i].x != rects[i].x) ||
@ -316,22 +316,22 @@ _e_popup_free(E_Popup *pop)
free(pop);
}
static int
static Eina_Bool
_e_popup_idle_enterer(void *data)
{
E_Popup *pop;
if (!(pop = data)) return 0;
if (!(pop = data)) return ECORE_CALLBACK_CANCEL;
ecore_evas_move(pop->ecore_evas,
pop->zone->x + pop->x,
pop->zone->y + pop->y);
e_container_shape_show(pop->shape);
pop->idle_enterer = NULL;
return 0;
return ECORE_CALLBACK_RENEW;
}
static int
_e_popup_cb_window_shape(void *data, int ev_type, void *ev)
static Eina_Bool
_e_popup_cb_window_shape(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
{
E_Popup *pop;
Ecore_X_Event_Window_Shape *e;
@ -339,5 +339,5 @@ _e_popup_cb_window_shape(void *data, int ev_type, void *ev)
e = ev;
pop = e_popup_find_by_window(e->win);
if (pop) pop->need_shape_export = 1;
return 1;
return ECORE_CALLBACK_PASS_ON;
}

6
src/bin/e_powersave.c
View File

@ -11,7 +11,7 @@ struct _E_Powersave_Deferred_Action
};
/* local subsystem functions */
static int _e_powersave_cb_deferred_timer(void *data);
static Eina_Bool _e_powersave_cb_deferred_timer(void *data);
static void _e_powersave_mode_eval(void);
static void _e_powersave_event_update_free(void *data __UNUSED__, void *event);
@ -131,7 +131,7 @@ e_powersave_mode_get(void)
/* local subsystem functions */
static int
static Eina_Bool
_e_powersave_cb_deferred_timer(void *data)
{
E_Powersave_Deferred_Action *pa;
@ -144,7 +144,7 @@ _e_powersave_cb_deferred_timer(void *data)
}
walking_deferred_actions--;
if (!deferred_actions) deferred_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void

12
src/bin/e_remember.c
View File

@ -20,7 +20,7 @@ static E_Remember *_e_remember_find(E_Border *bd, int check_usable);
static void _e_remember_cb_hook_pre_post_fetch(void *data, void *bd);
static void _e_remember_cb_hook_eval_post_new_border(void *data, void *bd);
static void _e_remember_init_edd(void);
static int _e_remember_restore_cb(void *data, int type, void *event);
static Eina_Bool _e_remember_restore_cb(void *data, int type, void *event);
/* local subsystem globals */
static Eina_List *hooks = NULL;
@ -126,8 +126,8 @@ e_remember_internal_save(void)
e_config_domain_save("e_remember_restart", e_remember_list_edd, remembers);
}
static int
_e_remember_restore_cb(void *data, int type, void *event)
static Eina_Bool
_e_remember_restore_cb(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
{
E_Remember *rem;
Eina_List *l;
@ -189,7 +189,7 @@ _e_remember_restore_cb(void *data, int type, void *event)
if (handlers) eina_list_free(handlers);
handlers = NULL;
return 0;
return ECORE_CALLBACK_DONE;
}
EAPI E_Remember *
@ -530,7 +530,7 @@ _e_remember_find(E_Border *bd, int check_usable)
!e_util_both_str_empty(rem->role, bd->client.icccm.window_role))
continue;
if (rem->match & E_REMEMBER_MATCH_TYPE &&
rem->type != bd->client.netwm.type)
rem->type != (int) bd->client.netwm.type)
continue;
if (rem->match & E_REMEMBER_MATCH_TRANSIENT &&
!(rem->transient && bd->client.icccm.transient_for != 0) &&
@ -598,7 +598,7 @@ _e_remember_cb_hook_eval_post_new_border(void *data, void *border)
}
static void
_e_remember_cb_hook_pre_post_fetch(void *data, void *border)
_e_remember_cb_hook_pre_post_fetch(__UNUSED__ void *data, void *border)
{
E_Border *bd = border;
E_Remember *rem = NULL;

16
src/bin/e_screensaver.c
View File

@ -11,11 +11,11 @@ static E_Dialog *_e_screensaver_ask_presentation_dia = NULL;
static int _e_screensaver_ask_presentation_count = 0;
static int _e_screensaver_fullscreen_count = 0;
static int
static Eina_Bool
_e_screensaver_handler_config_mode_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
e_screensaver_init();
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void
@ -128,7 +128,7 @@ _e_screensaver_ask_presentation_mode(void)
_e_screensaver_ask_presentation_dia = dia;
}
static int
static Eina_Bool
_e_screensaver_handler_screensaver_notify_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_X_Event_Screensaver_Notify *e = event;
@ -149,24 +149,24 @@ _e_screensaver_handler_screensaver_notify_cb(void *data __UNUSED__, int type __U
else if (_e_screensaver_ask_presentation_count)
_e_screensaver_ask_presentation_count = 0;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_screensaver_handler_border_fullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
_e_screensaver_fullscreen_count++;
if (_e_screensaver_fullscreen_count == 1) e_screensaver_init();
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_screensaver_handler_border_unfullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
_e_screensaver_fullscreen_count--;
if (_e_screensaver_fullscreen_count == 0) e_screensaver_init();
else if (_e_screensaver_fullscreen_count < 0) _e_screensaver_fullscreen_count = 0;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
EAPI int

10
src/bin/e_scrollframe.c
View File

@ -71,7 +71,7 @@ static void _e_smart_pan_changed_hook(void *data, Evas_Object *obj, void *event_
static void _e_smart_pan_pan_changed_hook(void *data, Evas_Object *obj, void *event_info);
static void _e_smart_event_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static int _e_smart_momentum_animator(void *data);
static Eina_Bool _e_smart_momentum_animator(void *data);
static void _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
@ -493,7 +493,7 @@ _e_smart_event_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
}
}
static int
static Eina_Bool
_e_smart_momentum_animator(void *data)
{
E_Smart_Data *sd;
@ -516,10 +516,10 @@ _e_smart_momentum_animator(void *data)
if (dt >= 1.0)
{
sd->down.momentum_animator = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static void
@ -1121,7 +1121,7 @@ _e_smart_init(void)
_e_smart_color_set,
_e_smart_clip_set,
_e_smart_clip_unset,
NULL, NULL, NULL, NULL
NULL, NULL, NULL, NULL, NULL, NULL, NULL
};
_e_smart = evas_smart_class_new(&sc);
}

50
src/bin/e_shelf.c
View File

@ -19,13 +19,13 @@ static void _e_shelf_cb_menu_items_append(void *data, E_Gadcon_Client *gcc, E_Me
static void _e_shelf_cb_locked_set(void *data, int lock);
static void _e_shelf_cb_urgent_show(void *data);
static void _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
static int _e_shelf_cb_mouse_in(void *data, int type, void *event);
static int _e_shelf_cb_mouse_out(void *data, int type, void *event);
static Eina_Bool _e_shelf_cb_mouse_in(void *data, int type, void *event);
static Eina_Bool _e_shelf_cb_mouse_out(void *data, int type, void *event);
static int _e_shelf_cb_id_sort(const void *data1, const void *data2);
static int _e_shelf_cb_hide_animator(void *data);
static int _e_shelf_cb_hide_animator_timer(void *data);
static int _e_shelf_cb_hide_urgent_timer(void *data);
static int _e_shelf_cb_instant_hide_timer(void *data);
static Eina_Bool _e_shelf_cb_hide_animator(void *data);
static Eina_Bool _e_shelf_cb_hide_animator_timer(void *data);
static Eina_Bool _e_shelf_cb_hide_urgent_timer(void *data);
static Eina_Bool _e_shelf_cb_instant_hide_timer(void *data);
static void _e_shelf_menu_pre_cb(void *data, E_Menu *m);
static void _e_shelf_gadcon_client_remove(void *data, E_Gadcon_Client *gcc);
static int _e_shelf_gadcon_client_add(void *data, const E_Gadcon_Client_Class *cc);
@ -1349,13 +1349,13 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf
}
}
static int
static Eina_Bool
_e_shelf_cb_mouse_in(void *data, int type, void *event)
{
E_Shelf *es;
es = data;
if (es->cfg->autohide_show_action) return 1;
if (es->cfg->autohide_show_action) return ECORE_CALLBACK_PASS_ON;
if (type == E_EVENT_ZONE_EDGE_MOVE)
{
@ -1363,7 +1363,7 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
int show = 0;
ev = event;
if (es->zone != ev->zone) return 1;
if (es->zone != ev->zone) return ECORE_CALLBACK_PASS_ON;
switch (es->gadcon->orient)
{
case E_GADCON_ORIENT_FLOAT:
@ -1422,7 +1422,7 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
Ecore_X_Event_Mouse_In *ev;
ev = event;
if (!es->popup) return 1;
if (!es->popup) return ECORE_CALLBACK_PASS_ON;
if (ev->win == es->popup->evas_win)
{
edje_object_signal_emit(es->o_base, "e,state,focused", "e");
@ -1434,17 +1434,17 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
Ecore_Event_Mouse_Move *ev;
ev = event;
if (!es->popup) return 1;
if (!es->popup) return ECORE_CALLBACK_PASS_ON;
if (ev->event_window == es->popup->evas_win)
{
edje_object_signal_emit(es->o_base, "e,state,focused", "e");
e_shelf_toggle(es, 1);
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_shelf_cb_mouse_out(void *data, int type, void *event)
{
E_Shelf *es;
@ -1460,7 +1460,7 @@ _e_shelf_cb_mouse_out(void *data, int type, void *event)
if (es->popup) win = es->popup->evas_win;
else win = es->zone->container->event_win;
if (ev->win != win) return 1;
if (ev->win != win) return ECORE_CALLBACK_PASS_ON;
/*
* ECORE_X_EVENT_DETAIL_INFERIOR means focus went to children windows
@ -1471,11 +1471,11 @@ _e_shelf_cb_mouse_out(void *data, int type, void *event)
* not get mouse out itself, so it will stay visible and
* autohide will fail.
*/
if (ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return 1;
if (ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return ECORE_CALLBACK_PASS_ON;
e_shelf_toggle(es, 0);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
@ -1490,7 +1490,7 @@ _e_shelf_cb_id_sort(const void *data1, const void *data2)
return 0;
}
static int
static Eina_Bool
_e_shelf_cb_hide_animator(void *data)
{
E_Shelf *es;
@ -1577,7 +1577,7 @@ _e_shelf_cb_hide_animator(void *data)
break;
}
return 1;
return ECORE_CALLBACK_RENEW;
end:
es->hide_animator = NULL;
@ -1587,10 +1587,10 @@ end:
e_shelf_toggle(es, 0);
else
_e_shelf_toggle_border_fix(es);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_shelf_cb_hide_animator_timer(void *data)
{
E_Shelf *es;
@ -1599,10 +1599,10 @@ _e_shelf_cb_hide_animator_timer(void *data)
if (!es->hide_animator)
es->hide_animator = ecore_animator_add(_e_shelf_cb_hide_animator, es);
es->hide_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_shelf_cb_hide_urgent_timer(void *data)
{
E_Shelf *es;
@ -1610,10 +1610,10 @@ _e_shelf_cb_hide_urgent_timer(void *data)
es = data;
es->hide_timer = NULL;
if (es->urgent_show) e_shelf_toggle(es, 0);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_shelf_cb_instant_hide_timer(void *data)
{
E_Shelf *es;
@ -1658,7 +1658,7 @@ _e_shelf_cb_instant_hide_timer(void *data)
}
es->instant_timer = NULL;
_e_shelf_toggle_border_fix(es);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void

11
src/bin/e_slidecore.c
View File

@ -33,7 +33,7 @@ struct _E_Smart_Item
};
/* local subsystem functions */
static int _e_smart_cb_slide_animator(void *data);
static Eina_Bool _e_smart_cb_slide_animator(void *data);
static void _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
@ -108,7 +108,7 @@ e_slidecore_slide_time_set(Evas_Object *obj, double t)
/* local subsystem functions */
static int
static Eina_Bool
_e_smart_cb_slide_animator(void *data)
{
E_Smart_Data *sd;
@ -126,9 +126,9 @@ _e_smart_cb_slide_animator(void *data)
if (t >= 1.0)
{
sd->slide_animator = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static void
@ -409,6 +409,9 @@ _e_smart_init(void)
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
_e_smart = evas_smart_class_new(&sc);

6
src/bin/e_slider.c
View File

@ -35,7 +35,7 @@ struct _E_Slider_Special_Value
};
/* local subsystem functions */
static int _e_smart_set_timer(void *data);
static Eina_Bool _e_smart_set_timer(void *data);
static void _e_smart_value_update(E_Smart_Data *sd);
static void _e_smart_value_update_now(E_Smart_Data *sd);
static void _e_smart_value_fetch(E_Smart_Data *sd);
@ -245,7 +245,7 @@ e_slider_special_value_add(Evas_Object *obj, double value, double error, const c
}
/* local subsystem functions */
static int
static Eina_Bool
_e_smart_set_timer(void *data)
{
E_Smart_Data *sd = data;
@ -257,7 +257,7 @@ _e_smart_set_timer(void *data)
if (sd->reversed) pos = 1.0 - pos;
edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.slider", pos, pos);
sd->set_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void

11
src/bin/e_spectrum.c
View File

@ -20,7 +20,7 @@ struct _E_Spectrum
Ecore_Timer *draw_timer;
};
static int _e_spectrum_redraw(void *d);
static Eina_Bool _e_spectrum_redraw(void *d);
static void
_e_spectrum_smart_add(Evas_Object *o)
@ -170,6 +170,9 @@ _e_spectrum_smart_init(void)
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
_e_spectrum_smart = evas_smart_class_new(&sc);
@ -263,7 +266,7 @@ _e_spectrum_2d_color_at(E_Spectrum *sp, int x, int y, int *r, int *g, int *b)
if (b) *b = bb;
}
static int
static Eina_Bool
_e_spectrum_redraw(void *d)
{
E_Spectrum *sp = d;
@ -276,7 +279,7 @@ _e_spectrum_redraw(void *d)
if (!data)
{
sp->draw_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
switch (sp->mode)
@ -321,7 +324,7 @@ _e_spectrum_redraw(void *d)
evas_object_image_data_set(sp->o_spectrum, data);
evas_object_image_data_update_add(sp->o_spectrum, 0, 0, sp->iw, sp->ih);
sp->draw_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void

2
src/bin/e_startup.c
View File

@ -69,7 +69,7 @@ _e_startup(void)
}
static void
_e_startup_next_cb(void *data)
_e_startup_next_cb(__UNUSED__ void *data)
{
_e_startup();
}

30
src/bin/e_sys.c
View File

@ -4,12 +4,12 @@
#include "e.h"
/* local subsystem functions */
static int _e_sys_cb_timer(void *data);
static int _e_sys_cb_exit(void *data, int type, void *event);
static Eina_Bool _e_sys_cb_timer(void *data);
static Eina_Bool _e_sys_cb_exit(void *data, int type, void *event);
static void _e_sys_cb_logout_logout(void *data, E_Dialog *dia);
static void _e_sys_cb_logout_wait(void *data, E_Dialog *dia);
static void _e_sys_cb_logout_abort(void *data, E_Dialog *dia);
static int _e_sys_cb_logout_timer(void *data);
static Eina_Bool _e_sys_cb_logout_timer(void *data);
static void _e_sys_logout_after(void);
static void _e_sys_logout_begin(E_Sys_Action a_after);
static void _e_sys_current_action(void);
@ -163,8 +163,8 @@ e_sys_con_extra_action_list_get(void)
}
/* local subsystem functions */
static int
_e_sys_cb_timer(void *data)
static Eina_Bool
_e_sys_cb_timer(__UNUSED__ void *data)
{
/* exec out sys helper and ask it to test if we are allowed to do these
* things
@ -180,10 +180,10 @@ _e_sys_cb_timer(void *data)
_e_sys_suspend_check_exe = ecore_exe_run(buf, NULL);
snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t hibernate", e_prefix_lib_get());
_e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_sys_cb_exit(void *data, int type, void *event)
{
Ecore_Exe_Event_Del *ev;
@ -205,7 +205,7 @@ _e_sys_cb_exit(void *data, int type, void *event)
}
_e_sys_action_current = E_SYS_NONE;
_e_sys_exe = NULL;
return 1;
return ECORE_CALLBACK_RENEW;
}
if ((_e_sys_halt_check_exe) && (ev->exe == _e_sys_halt_check_exe))
{
@ -245,7 +245,7 @@ _e_sys_cb_exit(void *data, int type, void *event)
_e_sys_hibernate_check_exe = NULL;
}
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static void
@ -316,7 +316,7 @@ _e_sys_logout_confirm_dialog_update(int remaining)
e_dialog_text_set(_e_sys_logout_confirm_dialog, txt);
}
static int
static Eina_Bool
_e_sys_cb_logout_timer(void *data)
{
Eina_List *l;
@ -344,12 +344,12 @@ _e_sys_cb_logout_timer(void *data)
if (remaining > 0)
{
_e_sys_logout_confirm_dialog_update(remaining);
return 1;
return ECORE_CALLBACK_RENEW;
}
else
{
_e_sys_cb_logout_logout(NULL, _e_sys_logout_confirm_dialog);
return 0;
return ECORE_CALLBACK_CANCEL;
}
}
else
@ -377,14 +377,14 @@ _e_sys_cb_logout_timer(void *data)
e_dialog_show(dia);
_e_sys_logout_begin_time = now;
}
return 1;
return ECORE_CALLBACK_RENEW;
}
}
return 1;
return ECORE_CALLBACK_RENEW;
after:
_e_sys_logout_after();
_e_sys_logout_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void

3
src/bin/e_table.c
View File

@ -822,6 +822,9 @@ _e_table_smart_init(void)
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
_e_smart = evas_smart_class_new(&sc);

18
src/bin/e_thumb.c
View File

@ -26,8 +26,8 @@ static void _e_thumb_hash_del(int objid);
static Evas_Object *_e_thumb_hash_find(int objid);
static void _e_thumb_thumbnailers_kill(void);
static void _e_thumb_thumbnailers_kill_cancel(void);
static int _e_thumb_cb_kill(void *data);
static int _e_thumb_cb_exe_event_del(void *data, int type, void *event);
static Eina_Bool _e_thumb_cb_kill(void *data);
static Eina_Bool _e_thumb_cb_exe_event_del(void *data, int type, void *event);
/* local subsystem globals */
static Eina_List *_thumbnailers = NULL;
@ -137,7 +137,7 @@ e_thumb_icon_begin(Evas_Object *obj)
if (!eth->file) return;
if (!_thumbnailers)
{
while (eina_list_count(_thumbnailers_exe) < _num_thumbnailers)
while ((int) eina_list_count(_thumbnailers_exe) < _num_thumbnailers)
{
Ecore_Exe *exe;
@ -394,8 +394,8 @@ _e_thumb_thumbnailers_kill_cancel(void)
_kill_timer = NULL;
}
static int
_e_thumb_cb_kill(void *data)
static Eina_Bool
_e_thumb_cb_kill(__UNUSED__ void *data)
{
Eina_List *l;
Ecore_Exe *exe;
@ -403,11 +403,11 @@ _e_thumb_cb_kill(void *data)
EINA_LIST_FOREACH(_thumbnailers_exe, l, exe)
ecore_exe_terminate(exe);
_kill_timer = NULL;
return 0;
return ECORE_CALLBACK_DONE;
}
static int
_e_thumb_cb_exe_event_del(void *data, int type, void *event)
static Eina_Bool
_e_thumb_cb_exe_event_del(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Exe_Event_Del *ev;
Ecore_Exe *exe;
@ -422,5 +422,5 @@ _e_thumb_cb_exe_event_del(void *data, int type, void *event)
break;
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}

32
src/bin/e_thumb_main.c
View File

@ -47,10 +47,10 @@ struct _E_Thumb
/* local subsystem functions */
static int _e_ipc_init(void);
static int _e_ipc_cb_server_add(void *data, int type, void *event);
static int _e_ipc_cb_server_del(void *data, int type, void *event);
static int _e_ipc_cb_server_data(void *data, int type, void *event);
static int _e_cb_timer(void *data);
static Eina_Bool _e_ipc_cb_server_add(void *data, int type, void *event);
static Eina_Bool _e_ipc_cb_server_del(void *data, int type, void *event);
static Eina_Bool _e_ipc_cb_server_data(void *data, int type, void *event);
static Eina_Bool _e_cb_timer(void *data);
static void _e_thumb_generate(E_Thumb *eth);
static char *_e_thumb_file_id(char *file, char *key);
@ -144,8 +144,8 @@ _e_ipc_init(void)
return 1;
}
static int
_e_ipc_cb_server_add(void *data, int type, void *event)
static Eina_Bool
_e_ipc_cb_server_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Ipc_Event_Server_Add *e;
@ -154,19 +154,19 @@ _e_ipc_cb_server_add(void *data, int type, void *event)
5/*E_IPC_DOMAIN_THUMB*/,
1/*hello*/,
0, 0, 0, NULL, 0); /* send hello */
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_ipc_cb_server_del(void *data, int type, void *event)
static Eina_Bool
_e_ipc_cb_server_del(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
/* quit now */
ecore_main_loop_quit();
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_ipc_cb_server_data(void *data, int type, void *event)
static Eina_Bool
_e_ipc_cb_server_data(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Ipc_Event_Server_Data *e;
E_Thumb *eth;
@ -175,7 +175,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
char *key = NULL;
e = event;
if (e->major != 5/*E_IPC_DOMAIN_THUMB*/) return 1;
if (e->major != 5/*E_IPC_DOMAIN_THUMB*/) return ECORE_CALLBACK_PASS_ON;
switch (e->minor)
{
case 1:
@ -223,10 +223,10 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
default:
break;
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_cb_timer(void *data)
{
E_Thumb *eth;
@ -249,7 +249,7 @@ _e_cb_timer(void *data)
}
else
_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
typedef struct _Color Color;

30
src/bin/e_utils.c
View File

@ -57,13 +57,13 @@ struct _E_Util_Image_Import_Handle
};
/* local subsystem functions */
static int _e_util_cb_delayed_del(void *data);
static int _e_util_wakeup_cb(void *data);
static Eina_Bool _e_util_cb_delayed_del(void *data);
static Eina_Bool _e_util_wakeup_cb(void *data);
static void _e_util_image_import_settings_do(void *data, E_Dialog *dia);
static void _e_util_image_import_settings_del(void *obj);
static int _e_util_image_import_exit(void *data, int type __UNUSED__, void *event);
static Eina_Bool _e_util_image_import_exit(void *data, int type __UNUSED__, void *event);
static void _e_util_image_import_handle_free(E_Util_Image_Import_Handle *handle);
/* local subsystem globals */
@ -1409,18 +1409,18 @@ e_util_image_import_cancel(E_Util_Image_Import_Handle *handle)
}
/* local subsystem functions */
static int
static Eina_Bool
_e_util_cb_delayed_del(void *data)
{
e_object_del(E_OBJECT(data));
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
_e_util_wakeup_cb(void *data)
static Eina_Bool
_e_util_wakeup_cb(__UNUSED__ void *data)
{
_e_util_dummy_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -1445,14 +1445,14 @@ _e_util_image_import_settings_del(void *obj)
E_FREE(ctxt);
}
static int
static Eina_Bool
_e_util_image_import_exit(void *data, int type __UNUSED__, void *event)
{
E_Util_Image_Import_Handle *handle = data;
Ecore_Exe_Event_Del *ev = event;
Eina_Bool ok;
if (ev->exe != handle->exe) return 1;
if (ev->exe != handle->exe) return ECORE_CALLBACK_PASS_ON;
ok = (ev->exit_code == 0);
@ -1461,7 +1461,7 @@ _e_util_image_import_exit(void *data, int type __UNUSED__, void *event)
_e_util_image_import_handle_free(handle);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -1475,7 +1475,7 @@ _e_util_image_import_handle_free(E_Util_Image_Import_Handle *handle)
E_FREE(handle);
}
static int
static Eina_Bool
_e_util_conf_timer_old(void *data)
{
char *module_name = data;
@ -1498,10 +1498,10 @@ _e_util_conf_timer_old(void *data)
e_util_dialog_internal(buf, msg);
E_FREE(module_name);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_util_conf_timer_new(void *data)
{
char *module_name = data;
@ -1522,7 +1522,7 @@ _e_util_conf_timer_new(void *data)
e_util_dialog_internal(buf, msg);
E_FREE(module_name);
return 0;
return ECORE_CALLBACK_CANCEL;
}
EAPI Eina_Bool

12
src/bin/e_widget_deskpreview.c
View File

@ -24,7 +24,7 @@ static void _e_wid_del_hook(Evas_Object *obj);
static void _e_wid_reconfigure(E_Widget_Data *wd);
static void _e_wid_desk_cb_config(void *data, Evas *evas, Evas_Object *obj, void *event);
static void _e_wid_cb_resize(void *data, Evas *evas, Evas_Object *obj, void *event);
static int _e_wid_cb_bg_update(void *data, int type, void *event);
static Eina_Bool _e_wid_cb_bg_update(void *data, int type, void *event);
EAPI Evas_Object *
e_widget_deskpreview_add(Evas *evas, int nx, int ny)
@ -224,16 +224,16 @@ _e_wid_cb_resize(void *data, Evas *evas, Evas_Object *obj, void *event)
_e_wid_reconfigure(wd);
}
static int
_e_wid_cb_bg_update(void *data, int type, void *event)
static Eina_Bool
_e_wid_cb_bg_update(void *data, int type, void *event)
{
E_Event_Bg_Update *ev;
E_Widget_Data *wd;
Eina_List *l;
Evas_Object *o;
if (type != E_EVENT_BG_UPDATE) return 1;
if (!(wd = data)) return 1;
if (type != E_EVENT_BG_UPDATE) return ECORE_CALLBACK_PASS_ON;
if (!(wd = data)) return ECORE_CALLBACK_PASS_ON;
ev = event;
EINA_LIST_FOREACH(wd->desks, l, o)
@ -253,5 +253,5 @@ _e_wid_cb_bg_update(void *data, int type, void *event)
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}

6
src/bin/e_widget_ilist.c
View File

@ -49,12 +49,12 @@ static void _e_wid_cb_item_hilight(void *data, void *data2);
static void _e_wid_cb_selected(void *data, Evas_Object *obj, void *event_info);
static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info);
static int _queue_timer(void *data);
static Eina_Bool _queue_timer(void *data);
static void _queue_queue(Evas_Object *obj);
static void _queue_append(Evas_Object *obj, int command, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data), void *data, const char *val, int relative, int use_relative, int item);
static void _queue_remove(Evas_Object *obj, E_Widget_Queue_Item *qi, int del);
static int
static Eina_Bool
_queue_timer(void *data)
{
Evas_Object *obj;
@ -180,7 +180,7 @@ _queue_timer(void *data)
e_widget_ilist_thaw(obj);
e_widget_ilist_go(obj);
_queue_queue(obj);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void

80
src/bin/e_zone.c
View File

@ -11,13 +11,13 @@ static void _e_zone_free(E_Zone *zone);
static void _e_zone_cb_bg_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
static void _e_zone_cb_bg_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info);
static void _e_zone_event_zone_desk_count_set_free(void *data, void *ev);
static int _e_zone_cb_mouse_in(void *data, int type, void *event);
static int _e_zone_cb_mouse_out(void *data, int type, void *event);
static int _e_zone_cb_mouse_down(void *data, int type, void *event);
static int _e_zone_cb_mouse_up(void *data, int type, void *event);
static int _e_zone_cb_mouse_move(void *data, int type, void *event);
static int _e_zone_cb_desk_after_show(void *data, int type, void *event);
static int _e_zone_cb_edge_timer(void *data);
static Eina_Bool _e_zone_cb_mouse_in(void *data, int type, void *event);
static Eina_Bool _e_zone_cb_mouse_out(void *data, int type, void *event);
static Eina_Bool _e_zone_cb_mouse_down(void *data, int type, void *event);
static Eina_Bool _e_zone_cb_mouse_up(void *data, int type, void *event);
static Eina_Bool _e_zone_cb_mouse_move(void *data, int type, void *event);
static Eina_Bool _e_zone_cb_desk_after_show(void *data, int type, void *event);
static Eina_Bool _e_zone_cb_edge_timer(void *data);
static void _e_zone_event_move_resize_free(void *data, void *ev);
static void _e_zone_event_add_free(void *data, void *ev);
static void _e_zone_event_del_free(void *data, void *ev);
@ -1092,7 +1092,7 @@ _e_zone_free(E_Zone *zone)
}
static void
_e_zone_cb_bg_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
_e_zone_cb_bg_mouse_down(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object *obj, __UNUSED__ void *event_info)
{
E_Zone *zone;
@ -1122,7 +1122,7 @@ _e_zone_cb_bg_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_i
}
static void
_e_zone_cb_bg_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
_e_zone_cb_bg_mouse_up(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object *obj, __UNUSED__ void *event_info)
{
E_Zone *zone;
@ -1156,7 +1156,7 @@ _e_zone_cb_bg_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_inf
}
static void
_e_zone_event_zone_desk_count_set_free(void *data, void *ev)
_e_zone_event_zone_desk_count_set_free(__UNUSED__ void *data, void *ev)
{
E_Event_Zone_Desk_Count_Set *e;
@ -1165,8 +1165,8 @@ _e_zone_event_zone_desk_count_set_free(void *data, void *ev)
free(e);
}
static int
_e_zone_cb_mouse_in(void *data, int type, void *event)
static Eina_Bool
_e_zone_cb_mouse_in(void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Mouse_In *ev;
E_Event_Zone_Edge *zev;
@ -1177,7 +1177,7 @@ _e_zone_cb_mouse_in(void *data, int type, void *event)
zone = data;
edge = _e_zone_detect_edge(zone, ev->win);
if (edge == E_ZONE_EDGE_NONE) return 1;
if (edge == E_ZONE_EDGE_NONE) return ECORE_CALLBACK_PASS_ON;
zev = E_NEW(E_Event_Zone_Edge, 1);
zev->zone = zone;
@ -1188,11 +1188,11 @@ _e_zone_cb_mouse_in(void *data, int type, void *event)
ecore_event_add(E_EVENT_ZONE_EDGE_IN, zev, NULL, NULL);
e_bindings_edge_in_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_zone_cb_mouse_out(void *data, int type, void *event)
static Eina_Bool
_e_zone_cb_mouse_out(void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Mouse_Out *ev;
E_Event_Zone_Edge *zev;
@ -1203,7 +1203,7 @@ _e_zone_cb_mouse_out(void *data, int type, void *event)
zone = data;
edge = _e_zone_detect_edge(zone, ev->win);
if (edge == E_ZONE_EDGE_NONE) return 1;
if (edge == E_ZONE_EDGE_NONE) return ECORE_CALLBACK_PASS_ON;
zev = E_NEW(E_Event_Zone_Edge, 1);
zev->zone = zone;
@ -1213,11 +1213,11 @@ _e_zone_cb_mouse_out(void *data, int type, void *event)
zev->modifiers = ev->modifiers;
ecore_event_add(E_EVENT_ZONE_EDGE_OUT, zev, NULL, NULL);
e_bindings_edge_out_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_zone_cb_mouse_down(void *data, int type, void *event)
static Eina_Bool
_e_zone_cb_mouse_down(void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Mouse_Button *ev;
E_Event_Zone_Edge *zev;
@ -1228,7 +1228,7 @@ _e_zone_cb_mouse_down(void *data, int type, void *event)
zone = data;
edge = _e_zone_detect_edge(zone, ev->window);
if (edge == E_ZONE_EDGE_NONE) return 1;
if (edge == E_ZONE_EDGE_NONE) return ECORE_CALLBACK_PASS_ON;
zev = E_NEW(E_Event_Zone_Edge, 1);
zev->zone = zone;
@ -1238,11 +1238,11 @@ _e_zone_cb_mouse_down(void *data, int type, void *event)
zev->modifiers = ev->modifiers;
ecore_event_add(E_EVENT_ZONE_EDGE_OUT, zev, NULL, NULL);
e_bindings_edge_down_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_zone_cb_mouse_up(void *data, int type, void *event)
static Eina_Bool
_e_zone_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Mouse_Button *ev;
E_Event_Zone_Edge *zev;
@ -1253,7 +1253,7 @@ _e_zone_cb_mouse_up(void *data, int type, void *event)
zone = data;
edge = _e_zone_detect_edge(zone, ev->window);
if (edge == E_ZONE_EDGE_NONE) return 1;
if (edge == E_ZONE_EDGE_NONE) return ECORE_CALLBACK_PASS_ON;
zev = E_NEW(E_Event_Zone_Edge, 1);
zev->zone = zone;
@ -1263,11 +1263,11 @@ _e_zone_cb_mouse_up(void *data, int type, void *event)
zev->modifiers = ev->modifiers;
ecore_event_add(E_EVENT_ZONE_EDGE_OUT, zev, NULL, NULL);
e_bindings_edge_up_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_zone_cb_mouse_move(void *data, int type, void *event)
static Eina_Bool
_e_zone_cb_mouse_move(void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Mouse_Move *ev;
E_Event_Zone_Edge *zev;
@ -1278,7 +1278,7 @@ _e_zone_cb_mouse_move(void *data, int type, void *event)
zone = data;
edge = _e_zone_detect_edge(zone, ev->window);
if (edge == E_ZONE_EDGE_NONE) return 1;
if (edge == E_ZONE_EDGE_NONE) return ECORE_CALLBACK_PASS_ON;
zev = E_NEW(E_Event_Zone_Edge, 1);
zev->zone = zone;
@ -1287,24 +1287,24 @@ _e_zone_cb_mouse_move(void *data, int type, void *event)
zev->y = ev->root.y;
zev->modifiers = ev->modifiers;
ecore_event_add(E_EVENT_ZONE_EDGE_MOVE, zev, NULL, NULL);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_zone_cb_desk_after_show(void *data, int type, void *event)
static Eina_Bool
_e_zone_cb_desk_after_show(void *data, __UNUSED__ int type, void *event)
{
E_Event_Desk_Show *ev;
E_Zone *zone;
ev = event;
zone = data;
if (ev->desk->zone != zone) return 1;
if (ev->desk->zone != zone) return ECORE_CALLBACK_PASS_ON;
zone->flip.switching = 0;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_zone_cb_edge_timer(void *data)
{
E_Zone *zone;
@ -1315,7 +1315,7 @@ _e_zone_cb_edge_timer(void *data)
if (!act)
{
E_FREE(zone->flip.ev);
return 0;
return ECORE_CALLBACK_CANCEL;
}
if (act->func.go_edge)
@ -1326,11 +1326,11 @@ _e_zone_cb_edge_timer(void *data)
zone->flip.bind->timer = NULL;
E_FREE(zone->flip.ev);
return 0;
return ECORE_CALLBACK_RENEW;
}
static void
_e_zone_event_move_resize_free(void *data, void *ev)
_e_zone_event_move_resize_free(__UNUSED__ void *data, void *ev)
{
E_Event_Zone_Move_Resize *e;
@ -1340,7 +1340,7 @@ _e_zone_event_move_resize_free(void *data, void *ev)
}
static void
_e_zone_event_add_free(void *data, void *ev)
_e_zone_event_add_free(__UNUSED__ void *data, void *ev)
{
E_Event_Zone_Add *e;
@ -1350,7 +1350,7 @@ _e_zone_event_add_free(void *data, void *ev)
}
static void
_e_zone_event_del_free(void *data, void *ev)
_e_zone_event_del_free(__UNUSED__ void *data, void *ev)
{
E_Event_Zone_Del *e;

2
src/bin/e_zone.h
View File

@ -30,7 +30,7 @@ typedef struct _E_Event_Zone_Edge E_Event_Zone_Edge;
#ifndef E_ZONE_H
#define E_ZONE_H
#define E_ZONE_TYPE 0xE0b0100d
#define E_ZONE_TYPE (int) 0xE0b0100d
struct _E_Zone
{

50
src/modules/battery/batget.c
View File

@ -52,7 +52,7 @@
#define CHECK_SYS_CLASS_POWER_SUPPLY 4
static void init(void);
static int poll_cb(void *data);
static Eina_Bool poll_cb(void *data);
static int poll_interval = 512;
static Ecore_Poller *poller = NULL;
@ -423,7 +423,7 @@ darwin_check(void)
/* new linux power class api to get power info - brand new and this code
* may have bugs, but it is a good attempt to get it right */
#if 0
static int linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd_handler);
static Eina_Bool linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd_handler);
static void linux_sys_class_power_supply_check(void);
#endif
static void linux_sys_class_power_supply_init(void);
@ -455,18 +455,18 @@ static Eina_List *events = NULL;
#if 0
static Ecore_Timer *sys_class_delay_check = NULL;
static int
static Eina_Bool
linux_sys_class_power_supply_cb_delay_check(void *data)
{
linux_sys_class_power_supply_init();
poll_cb(NULL);
sys_class_delay_check = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static Ecore_Timer *re_init_timer = NULL;
static int
static Eina_Bool
linux_sys_class_power_supply_cb_re_init(void *data)
{
Sys_Class_Power_Supply_Uevent *sysev;
@ -484,10 +484,10 @@ linux_sys_class_power_supply_cb_re_init(void *data)
}
linux_sys_class_power_supply_init();
re_init_timer = NULL;
return 0;
}
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd_handler)
{
Sys_Class_Power_Supply_Uevent *sysev;
@ -531,7 +531,7 @@ linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd
sys_class_delay_check = ecore_timer_add(0.2, linux_sys_class_power_supply_cb_delay_check, NULL);
}
}
return 1;
return ECORE_CALLBACK_CANCEL;
}
#endif
static void
@ -870,9 +870,9 @@ linux_sys_class_power_supply_check(void)
* linux_sys_class_power_supply_init/check() though as this is the new
* power class api to poll for power stuff
*/
static int linux_acpi_cb_acpid_add(void *data, int type, void *event);
static int linux_acpi_cb_acpid_del(void *data, int type, void *event);
static int linux_acpi_cb_acpid_data(void *data, int type, void *event);
static Eina_Bool linux_acpi_cb_acpid_add(void *data, int type, void *event);
static Eina_Bool linux_acpi_cb_acpid_del(void *data, int type, void *event);
static Eina_Bool linux_acpi_cb_acpid_data(void *data, int type, void *event);
static void linux_acpi_init(void);
static void linux_acpi_check(void);
@ -886,22 +886,22 @@ static Ecore_Timer *delay_check = NULL;
static int event_fd = -1;
static Ecore_Fd_Handler *event_fd_handler = NULL;
static int
static Eina_Bool
linux_acpi_cb_delay_check(void *data __UNUSED__)
{
linux_acpi_init();
poll_cb(NULL);
delay_check = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
linux_acpi_cb_acpid_add(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
linux_acpi_cb_acpid_del(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
ecore_con_server_del(acpid);
@ -912,18 +912,18 @@ linux_acpi_cb_acpid_del(void *data __UNUSED__, int type __UNUSED__, void *event
acpid_handler_del = NULL;
if (acpid_handler_data) ecore_event_handler_del(acpid_handler_data);
acpid_handler_data = NULL;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
linux_acpi_cb_acpid_data(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
if (delay_check) ecore_timer_del(delay_check);
delay_check = ecore_timer_add(0.2, linux_acpi_cb_delay_check, NULL);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
linux_acpi_cb_event_fd_active(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler)
{
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
@ -957,7 +957,7 @@ linux_acpi_cb_event_fd_active(void *data __UNUSED__, Ecore_Fd_Handler *fd_handle
delay_check = ecore_timer_add(0.2, linux_acpi_cb_delay_check, NULL);
}
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static void
@ -1478,7 +1478,7 @@ init(void)
#endif
}
static int
static Eina_Bool
poll_cb(void *data __UNUSED__)
{
int ptime_left;
@ -1511,7 +1511,7 @@ poll_cb(void *data __UNUSED__)
}
#elif defined(HAVE_CFBASE_H) /* OS X */
darwin_check();
return 1;
return ECORE_CALLBACK_RENEW;
#else
switch (mode)
{
@ -1548,7 +1548,7 @@ poll_cb(void *data __UNUSED__)
battery_full, time_left, time_left, have_battery, have_power);
fflush(stdout);
}
return 1;
return ECORE_CALLBACK_RENEW;
}
int

24
src/modules/battery/e_mod_main.c
View File

@ -39,15 +39,15 @@ struct _Instance
};
static void _battery_update(int full, int time_left, int time_full, Eina_Bool have_battery, Eina_Bool have_power);
static int _battery_cb_exe_data(void *data, int type, void *event);
static int _battery_cb_exe_del(void *data, int type, void *event);
static Eina_Bool _battery_cb_exe_data(void *data, int type, void *event);
static Eina_Bool _battery_cb_exe_del(void *data, int type, void *event);
static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _menu_cb_post(void *data, E_Menu *m);
static void _battery_face_level_set(Evas_Object *battery, double level);
static void _battery_face_time_set(Evas_Object *battery, int time);
static void _battery_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi);
static int _battery_cb_warning_popup_timeout(void *data);
static Eina_Bool _battery_cb_warning_popup_timeout(void *data);
static void _battery_cb_warning_popup_hide(void *data, Evas *e, Evas_Object *obj, void *event);
static void _battery_warning_popup_destroy(Instance *inst);
static void _battery_warning_popup(Instance *inst, int time, double percent);
@ -407,7 +407,7 @@ _battery_config_updated(void)
}
}
static int
static Eina_Bool
_battery_cb_warning_popup_timeout(void *data)
{
Instance *inst;
@ -415,7 +415,7 @@ _battery_cb_warning_popup_timeout(void *data)
inst = data;
e_gadcon_popup_hide(inst->warning);
battery_config->alert_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -602,7 +602,7 @@ _battery_update(int full, int time_left, int time_full, Eina_Bool have_battery,
battery_config->have_power = have_power;
}
static int
static Eina_Bool
_battery_cb_exe_data(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Data *ev;
@ -611,7 +611,7 @@ _battery_cb_exe_data(void *data __UNUSED__, int type __UNUSED__, void *event)
int i;
ev = event;
if (ev->exe != battery_config->batget_exe) return 1;
if (ev->exe != battery_config->batget_exe) return ECORE_CALLBACK_PASS_ON;
if ((ev->lines) && (ev->lines[0].line))
{
@ -655,18 +655,18 @@ _battery_cb_exe_data(void *data __UNUSED__, int type __UNUSED__, void *event)
}
}
}
return 0;
}
return ECORE_CALLBACK_DONE;
}
static int
static Eina_Bool
_battery_cb_exe_del(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Del *ev;
ev = event;
if (ev->exe != battery_config->batget_exe) return 1;
if (ev->exe != battery_config->batget_exe) return ECORE_CALLBACK_PASS_ON;
battery_config->batget_exe = NULL;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
/* module setup */

34
src/modules/bluez/e_mod_main.c
View File

@ -189,21 +189,21 @@ _bluez_cb_toggle_powered(E_Object *obj __UNUSED__, const char *params __UNUSED__
static void _bluez_popup_del(E_Bluez_Instance *inst);
static int
static Eina_Bool
_bluez_popup_input_window_mouse_up_cb(void *data, int type __UNUSED__, void *event)
{
Ecore_Event_Mouse_Button *ev = event;
E_Bluez_Instance *inst = data;
if (ev->window != inst->ui.input.win)
return 1;
return ECORE_CALLBACK_PASS_ON;
_bluez_popup_del(inst);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_bluez_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *event)
{
Ecore_Event_Key *ev = event;
@ -211,13 +211,13 @@ _bluez_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *eve
const char *keysym;
if (ev->window != inst->ui.input.win)
return 1;
return ECORE_CALLBACK_PASS_ON;
keysym = ev->key;
if (strcmp(keysym, "Escape") == 0)
_bluez_popup_del(inst);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void
@ -549,7 +549,7 @@ _bluez_popup_device_selected(void *data)
}
}
static int
static Eina_Bool
_bluez_event_devicefound(void *data, int type __UNUSED__, void *event __UNUSED__)
{
E_Bluez_Module_Context *ctxt = data;
@ -1096,7 +1096,7 @@ _bluez_actions_unregister(E_Bluez_Module_Context *ctxt)
}
}
static int
static Eina_Bool
_bluez_manager_changed_do(void *data)
{
E_Bluez_Module_Context *ctxt = data;
@ -1104,7 +1104,7 @@ _bluez_manager_changed_do(void *data)
//FIXME: reload the default adapter maybe?
ctxt->poller.manager_changed = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -1178,7 +1178,7 @@ _default_adapter_callback(void *data, DBusMessage *msg, DBusError *err __UNUSED_
}
}
static int
static Eina_Bool
_bluez_event_manager_in(void *data, int type __UNUSED__, void *event __UNUSED__)
{
E_Bluez_Module_Context *ctxt = data;
@ -1188,14 +1188,14 @@ _bluez_event_manager_in(void *data, int type __UNUSED__, void *event __UNUSED__)
element = e_bluez_manager_get();
if (!e_bluez_manager_default_adapter(_default_adapter_callback, ctxt))
return 0;
return ECORE_CALLBACK_DONE;
e_bluez_element_listener_add(element, _bluez_manager_changed, ctxt, NULL);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_bluez_event_manager_out(void *data, int type __UNUSED__, void *event __UNUSED__)
{
E_Bluez_Module_Context *ctxt = data;
@ -1203,10 +1203,10 @@ _bluez_event_manager_out(void *data, int type __UNUSED__, void *event __UNUSED__
ctxt->has_manager = EINA_FALSE;
eina_stringshare_replace(&ctxt->default_adapter, NULL);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_bluez_event_element_updated(void *data, int type __UNUSED__, void *event __UNUSED__)
{
E_Bluez_Module_Context *ctxt = data;
@ -1215,7 +1215,7 @@ _bluez_event_element_updated(void *data, int type __UNUSED__, void *event __UNUS
E_Bluez_Instance *inst;
Eina_List *l;
if (!e_bluez_element_is_adapter(element)) return 1;
if (!e_bluez_element_is_adapter(element)) return ECORE_CALLBACK_PASS_ON;
if (!e_bluez_adapter_powered_get(element, &powered))
powered = EINA_FALSE;
@ -1236,7 +1236,7 @@ _bluez_event_element_updated(void *data, int type __UNUSED__, void *event __UNUS
_bluez_gadget_update(inst);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void

232
src/modules/comp/e_mod_comp.c
View File

@ -515,16 +515,16 @@ _e_mod_comp_pre_swap(void *data, Evas *e)
}
}
static int
static Eina_Bool
_e_mod_comp_cb_delayed_update_timer(void *data)
{
E_Comp *c = data;
_e_mod_comp_render_queue(c);
c->new_up_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_e_mod_comp_cb_update(E_Comp *c)
{
E_Comp_Win *cw;
@ -759,9 +759,9 @@ _e_mod_comp_cb_update(E_Comp *c)
{
c->render_overflow = 0;
if (c->render_animator) c->render_animator = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static void
@ -771,7 +771,7 @@ _e_mod_comp_cb_job(void *data)
_e_mod_comp_cb_update(data);
}
static int
static Eina_Bool
_e_mod_comp_cb_animator(void *data)
{
return _e_mod_comp_cb_update(data);
@ -863,7 +863,7 @@ _e_mod_comp_win_do_shadow(E_Comp_Win *cw)
return 1;
}
static int
static Eina_Bool
_e_mod_comp_win_damage_timeout(void *data)
{
E_Comp_Win *cw = data;
@ -881,7 +881,7 @@ _e_mod_comp_win_damage_timeout(void *data)
cw->drawme = 1;
_e_mod_comp_win_render_queue(cw);
cw->update_timeout = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -1748,72 +1748,72 @@ _e_mod_comp_win_reshape(E_Comp_Win *cw)
//////////////////////////////////////////////////////////////////////////
static int
_e_mod_comp_create(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_create(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Window_Create *ev = event;
E_Comp_Win *cw;
E_Comp *c = _e_mod_comp_find(ev->parent);
if (!c) return 1;
if (_e_mod_comp_win_find(ev->win)) return 1;
if (c->win == ev->win) return 1;
if (c->ee_win == ev->win) return 1;
if (!c) return ECORE_CALLBACK_PASS_ON;
if (_e_mod_comp_win_find(ev->win)) return ECORE_CALLBACK_PASS_ON;
if (c->win == ev->win) return ECORE_CALLBACK_PASS_ON;
if (c->ee_win == ev->win) return ECORE_CALLBACK_PASS_ON;
cw = _e_mod_comp_win_add(c, ev->win);
if (cw) _e_mod_comp_win_configure(cw, ev->x, ev->y, ev->w, ev->h, ev->border);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_destroy(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_destroy(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Window_Destroy *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
if (cw->animating) cw->delete_me = 1;
else _e_mod_comp_win_del(cw);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_show(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_show(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Window_Show *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
if (!cw) return 1;
if (cw->visible) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
if (cw->visible) return ECORE_CALLBACK_PASS_ON;
_e_mod_comp_win_show(cw);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_hide(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_hide(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Window_Hide *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
if (!cw) return 1;
if (!cw->visible) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
if (!cw->visible) return ECORE_CALLBACK_PASS_ON;
_e_mod_comp_win_hide(cw);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_reparent(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_reparent(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Window_Reparent *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
DBG("== repar [0x%x] to [0x%x]\n", ev->win, ev->parent);
if (ev->parent != cw->c->man->root)
_e_mod_comp_win_del(cw);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_configure(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_configure(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Window_Configure *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
if (ev->abovewin == 0)
{
@ -1838,38 +1838,38 @@ _e_mod_comp_configure(void *data, int type, void *event)
{
_e_mod_comp_win_configure(cw, ev->x, ev->y, ev->w, ev->h, ev->border);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_stack(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_stack(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Window_Stack *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
if (ev->detail == ECORE_X_WINDOW_STACK_ABOVE) _e_mod_comp_win_raise(cw);
else _e_mod_comp_win_lower(cw);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_property(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_property(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Window_Property *ev = event;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_message(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_message(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Client_Message *ev = event;
E_Comp_Win *cw = NULL;
if ((ev->message_type != ECORE_X_ATOM_E_COMP_SYNC_DRAW_DONE) ||
(ev->format != 32)) return 1;
(ev->format != 32)) return ECORE_CALLBACK_PASS_ON;
cw = _e_mod_comp_border_client_find(ev->data.l[0]);
if (!cw) return 1;
if (!cw->bd) return 1;
if (ev->data.l[0] != cw->bd->client.win) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
if (!cw->bd) return ECORE_CALLBACK_PASS_ON;
if (ev->data.l[0] != cw->bd->client.win) return ECORE_CALLBACK_PASS_ON;
if (cw->bd)
{
if (cw->counter)
@ -1888,33 +1888,33 @@ _e_mod_comp_message(void *data, int type, void *event)
_e_mod_comp_win_render_queue(cw);
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_shape(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_shape(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Window_Shape *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
_e_mod_comp_win_reshape(cw);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_damage(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_damage(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Damage *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_damage_find(ev->damage);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
_e_mod_comp_win_damage(cw,
ev->area.x, ev->area.y,
ev->area.width, ev->area.height, 1);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_damage_win(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_damage_win(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Window_Damage *ev = event;
Eina_List *l;
@ -1931,11 +1931,11 @@ _e_mod_comp_damage_win(void *data, int type, void *event)
break;
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_randr(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_randr(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
{
Eina_List *l;
E_Comp *c;
@ -1944,136 +1944,136 @@ _e_mod_comp_randr(void *data, int type, void *event)
{
ecore_evas_resize(c->ee, c->man->w, c->man->h);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_bd_add(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_bd_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
E_Event_Border_Add *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
// fimxe: add/enable compositing here not in show event for borders
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_bd_del(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_bd_del(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
E_Event_Border_Remove *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
if (cw->bd == ev->border) _e_mod_comp_object_del(cw, ev->border);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_bd_show(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_bd_show(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
E_Event_Border_Show *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
// fimxe: show compwin here
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_bd_hide(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_bd_hide(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
E_Event_Border_Hide *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
// fimxe: hide compwin here
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_bd_move(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_bd_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
E_Event_Border_Move *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
// fimxe: do move here for composited bd
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_bd_resize(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_bd_resize(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
E_Event_Border_Resize *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
// fimxe: do resize here instead of conf notify
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_bd_iconify(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_bd_iconify(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
E_Event_Border_Iconify *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
// fimxe: special iconfiy anim
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_bd_uniconify(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_bd_uniconify(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
E_Event_Border_Uniconify *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
// fimxe: special uniconfiy anim
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_bd_urgent_change(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_bd_urgent_change(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
E_Event_Border_Urgent_Change *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
if (cw->bd->client.icccm.urgent)
edje_object_signal_emit(cw->shobj, "e,state,urgent,on", "e");
else
edje_object_signal_emit(cw->shobj, "e,state,urgent,off", "e");
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_bd_focus_in(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_bd_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
E_Event_Border_Focus_In *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
edje_object_signal_emit(cw->shobj, "e,state,focus,on", "e");
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_bd_focus_out(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_bd_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
E_Event_Border_Focus_Out *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
edje_object_signal_emit(cw->shobj, "e,state,focus,off", "e");
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_e_mod_comp_bd_property(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_bd_property(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
E_Event_Border_Property *ev = event;
E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
if (!cw) return 1;
if (!cw) return ECORE_CALLBACK_PASS_ON;
// fimxe: other properties?
return 1;
return ECORE_CALLBACK_PASS_ON;
}
//////////////////////////////////////////////////////////////////////////
static int
_e_mod_comp_key_down(void *data, int type, void *event)
static Eina_Bool
_e_mod_comp_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_Event_Key *ev = event;
@ -2092,7 +2092,7 @@ _e_mod_comp_key_down(void *data, int type, void *event)
e_sys_action_do(E_SYS_RESTART, NULL);
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
//////////////////////////////////////////////////////////////////////////

4
src/modules/comp/e_mod_config.c
View File

@ -236,7 +236,7 @@ _shadow_changed(void *data, Evas_Object *obj, void *event_info)
}
}
static int
static Eina_Bool
_style_demo(void *data)
{
Eina_List *style_shadows, *l;
@ -276,7 +276,7 @@ _style_demo(void *data)
break;
}
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static void

10
src/modules/conf/e_conf.c
View File

@ -57,7 +57,7 @@ static void _e_configure_item_cb(void *data);
static void _e_configure_focus_cb(void *data, Evas_Object *obj);
static void _e_configure_keydown_cb(void *data, Evas *e, Evas_Object *obj, void *event);
static void _e_configure_fill_cat_list(void *data);
static int _e_configure_module_update_cb(void *data, int type, void *event);
static Eina_Bool _e_configure_module_update_cb(void *data, int type, void *event);
static E_Configure *_e_configure = NULL;
@ -513,16 +513,16 @@ _e_configure_fill_cat_list(void *data)
evas_event_thaw(evas_object_evas_get(eco->cat_list));
}
static int
static Eina_Bool
_e_configure_module_update_cb(void *data, int type __UNUSED__, void *event __UNUSED__)
{
E_Configure *eco;
int sel = 0;
if (!(eco = data)) return 1;
if (!eco->cat_list) return 1;
if (!(eco = data)) return ECORE_CALLBACK_PASS_ON;
if (!eco->cat_list) return ECORE_CALLBACK_PASS_ON;
sel = e_widget_toolbar_item_selected_get(eco->cat_list);
_e_configure_fill_cat_list(eco);
e_widget_toolbar_item_select(eco->cat_list, sel);
return 1;
return ECORE_CALLBACK_PASS_ON;
}

8
src/modules/conf/e_mod_main.c
View File

@ -23,7 +23,7 @@ static void _cb_button_click(void *data, void *data2);
static void _conf_new(void);
static void _conf_free(void);
static int _conf_timer(void *data);
static Eina_Bool _conf_timer(void *data);
static E_Module *conf_module = NULL;
static E_Action *act = NULL;
@ -477,10 +477,10 @@ _conf_free(void)
E_FREE(conf);
}
static int
_conf_timer(void *data)
static Eina_Bool
_conf_timer(__UNUSED__ void *data)
{
e_util_dialog_show(_("Configuration Panel Configuration Updated"),
"%s", (char *)data);
return 0;
return ECORE_CALLBACK_CANCEL;
}

20
src/modules/conf_acpibindings/e_int_config_acpibindings.c
View File

@ -33,8 +33,8 @@ static void _cb_actions_changed(void *data);
static void _cb_entry_changed(void *data, void *data2 __UNUSED__);
static void _cb_add_binding(void *data, void *data2 __UNUSED__);
static void _cb_del_binding(void *data, void *data2 __UNUSED__);
static int _cb_grab_key_down(void *data, int type __UNUSED__, void *event);
static int _cb_acpi_event(void *data, int type, void *event);
static Eina_Bool _cb_grab_key_down(void *data, int type __UNUSED__, void *event);
static Eina_Bool _cb_acpi_event(void *data, int type, void *event);
/* local variables */
static E_Dialog *grab_dlg = NULL;
@ -570,15 +570,15 @@ _cb_del_binding(void *data, void *data2 __UNUSED__)
_fill_bindings(cfdata);
}
static int
static Eina_Bool
_cb_grab_key_down(void *data, int type __UNUSED__, void *event)
{
E_Config_Dialog_Data *cfdata;
Ecore_Event_Key *ev;
ev = event;
if (ev->window != grab_win) return 1;
if (!(cfdata = data)) return 1;
if (ev->window != grab_win) return ECORE_CALLBACK_PASS_ON;
if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON;
if (!strcmp(ev->keyname, "Escape"))
{
Ecore_Event_Handler *hdl;
@ -597,11 +597,11 @@ _cb_grab_key_down(void *data, int type __UNUSED__, void *event)
/* unfreeze acpi events */
e_acpi_events_thaw();
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_cb_acpi_event(void *data, int type, void *event)
static Eina_Bool
_cb_acpi_event(void *data, __UNUSED__ int type, void *event)
{
E_Event_Acpi *ev;
E_Config_Dialog_Data *cfdata;
@ -609,7 +609,7 @@ _cb_acpi_event(void *data, int type, void *event)
Ecore_Event_Handler *hdl;
ev = event;
if (!(cfdata = data)) return 1;
if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON;
/* free the handlers */
EINA_LIST_FREE(grab_hdls, hdl)
@ -637,5 +637,5 @@ _cb_acpi_event(void *data, int type, void *event)
cfdata->bindings = eina_list_append(cfdata->bindings, bind);
_fill_bindings(cfdata);
return 0;
return ECORE_CALLBACK_DONE;
}

10
src/modules/conf_applications/e_int_config_apps.c
View File

@ -33,7 +33,7 @@ static void _cb_add(void *data, void *data2 __UNUSED__);
static void _cb_del(void *data, void *data2 __UNUSED__);
static void _cb_up(void *data, void *data2 __UNUSED__);
static void _cb_down(void *data, void *data2 __UNUSED__);
static int _cb_fill_delay(void *data);
static Eina_Bool _cb_fill_delay(void *data);
E_Config_Dialog *
e_int_config_apps_add(E_Container *con, const char *params __UNUSED__)
@ -606,17 +606,17 @@ _cb_down(void *data, void *data2 __UNUSED__)
evas_event_thaw(evas);
}
static int
_cb_fill_delay(void *data)
static Eina_Bool
_cb_fill_delay(void *data)
{
E_Config_Dialog_Data *cfdata;
int mw;
if (!(cfdata = data)) return 1;
if (!(cfdata = data)) return ECORE_CALLBACK_RENEW;
_fill_apps_list(cfdata);
e_widget_size_min_get(cfdata->o_list, &mw, NULL);
if (mw < (200 * e_scale)) mw = (200 * e_scale);
e_widget_size_min_set(cfdata->o_list, mw, (75 * e_scale));
cfdata->fill_delay = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}

16
src/modules/conf_colors/e_int_config_color_classes.c
View File

@ -140,8 +140,8 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Co
static void _config_color_class_free(CFColor_Class *ccc);
static void _config_color_class_icon_state_apply(CFColor_Class *ccc);
static void _config_color_class_end_state_apply(CFColor_Class *ccc);
static int _fill_data_delayed(void *data);
static int _color_changed_delay(void *data);
static Eina_Bool _fill_data_delayed(void *data);
static Eina_Bool _color_changed_delay(void *data);
E_Config_Dialog *
e_int_config_color_classes(E_Container *con, const char *params __UNUSED__)
@ -192,7 +192,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
E_FREE(cfdata);
}
static int
static Eina_Bool
_color_class_list_selection_idler(void *data)
{
E_Config_Dialog_Data *cfdata = data;
@ -316,7 +316,7 @@ _color_class_list_selection_idler(void *data)
cfdata->populating = EINA_FALSE;
cfdata->selection_idler = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -456,7 +456,7 @@ _custom_color_cb_change(void *data, Evas_Object *obj)
_color_class_list_selection_changed(cfdata, NULL);
}
static int
static Eina_Bool
_color_changed_delay(void *data)
{
E_Config_Dialog_Data *cfdata = data;
@ -475,7 +475,7 @@ _color_changed_delay(void *data)
col[2].r, col[2].g, col[2].b, col[2].a);
cfdata->delay_color_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -880,11 +880,11 @@ _fill_data(E_Config_Dialog_Data *cfdata)
}
}
static int
static Eina_Bool
_fill_data_delayed(void *data)
{
E_Config_Dialog_Data *cfdata = data;
cfdata->delay_load_timer = NULL;
_fill_data(cfdata);
return 0;
return ECORE_CALLBACK_CANCEL;
}

18
src/modules/conf_desk/e_int_config_desk.c
View File

@ -5,7 +5,7 @@ static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static void _cb_config(void *data, void *data2);
static int _cb_bg_change(void *data, int type, void *event);
static Eina_Bool _cb_bg_change(void *data, int type, void *event);
struct _E_Config_Dialog_Data
{
@ -184,26 +184,26 @@ _cb_config(void *data, void *data2)
e_configure_registry_call("internal/wallpaper_desk", e_container_current_get(e_manager_current_get()), buf);
}
static int
_cb_bg_change(void *data, int type, void *event)
static Eina_Bool
_cb_bg_change(void *data, int type, void *event)
{
E_Event_Bg_Update *ev;
E_Config_Dialog_Data *cfdata;
const char *file;
if (type != E_EVENT_BG_UPDATE) return 1;
if (type != E_EVENT_BG_UPDATE) return ECORE_CALLBACK_PASS_ON;
cfdata = data;
ev = event;
if (ev->container != cfdata->con_num) return 1;
if (ev->zone != cfdata->zone_num) return 1;
if (ev->desk_x != cfdata->desk_x) return 1;
if (ev->desk_y != cfdata->desk_y) return 1;
if (ev->container != cfdata->con_num) return ECORE_CALLBACK_PASS_ON;
if (ev->zone != cfdata->zone_num) return ECORE_CALLBACK_PASS_ON;
if (ev->desk_x != cfdata->desk_x) return ECORE_CALLBACK_PASS_ON;
if (ev->desk_y != cfdata->desk_y) return ECORE_CALLBACK_PASS_ON;
file = e_bg_file_get(cfdata->con_num, cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
E_FREE(cfdata->bg);
cfdata->bg = strdup(file);
e_widget_preview_edje_set(cfdata->preview, cfdata->bg, "e/desktop/background");
return 1;
return ECORE_CALLBACK_PASS_ON;
}

20
src/modules/conf_display/e_int_config_display.c
View File

@ -17,8 +17,8 @@ static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas *evas,
static void _load_resolutions (E_Config_Dialog_Data *cfdata);
static void _load_rates (E_Config_Dialog_Data *cfdata);
static void _ilist_item_change (void *data);
static int _deferred_noxrandr_error (void *data);
static int _deferred_norates_error (void *data);
static Eina_Bool _deferred_noxrandr_error (void *data);
static Eina_Bool _deferred_norates_error (void *data);
static int _sort_resolutions (const void *d1, const void *d2);
typedef struct _Resolution Resolution;
@ -158,7 +158,7 @@ _surebox_text_fill(SureBox *sb)
e_dialog_text_set(sb->dia, buf);
}
static int
static Eina_Bool
_surebox_timer_cb(void *data)
{
SureBox *sb;
@ -169,9 +169,9 @@ _surebox_timer_cb(void *data)
if (sb->iterations == 0)
{
_surebox_dialog_cb_no(sb, sb->dia);
return 0;
return ECORE_CALLBACK_CANCEL;
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static SureBox *
@ -525,7 +525,7 @@ _load_resolutions(E_Config_Dialog_Data *cfdata)
evas = evas_object_evas_get(cfdata->res_list);
if (e_widget_ilist_count(cfdata->res_list) !=
eina_list_count(cfdata->resolutions))
(int) eina_list_count(cfdata->resolutions))
{
evas_event_freeze(evas);
edje_freeze();
@ -630,7 +630,7 @@ _ilist_item_change(void *data)
_load_rates(data);
}
static int
static Eina_Bool
_deferred_noxrandr_error(void *data __UNUSED__)
{
e_util_dialog_show(_("Missing Features"),
@ -640,10 +640,10 @@ _deferred_noxrandr_error(void *data __UNUSED__)
"the support of this extension. It could also be<br>"
"that at the time <hilight>ecore</hilight> was built, there<br>"
"was no XRandR support detected."));
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_deferred_norates_error(void *data __UNUSED__)
{
e_util_dialog_show(_("No Refresh Rates Found"),
@ -652,5 +652,5 @@ _deferred_norates_error(void *data __UNUSED__)
"this is to be expected. However, if you are not, then<br>"
"the current refresh rate will be used when setting<br>"
"the resolution, which may cause <hilight>damage</hilight> to your screen."));
return 0;
return ECORE_CALLBACK_CANCEL;
}

8
src/modules/conf_icon_theme/e_int_config_icon_themes.c
View File

@ -156,7 +156,7 @@ struct _fill_icon_themes_data
Eina_Bool themes_loaded;
};
static int
static Eina_Bool
_fill_icon_themes(void *data)
{
struct _fill_icon_themes_data *d = data;
@ -179,7 +179,7 @@ _fill_icon_themes(void *data)
d->l = d->cfdata->icon_themes;
d->i = 0;
d->themes_loaded = 1;
return 1;
return ECORE_CALLBACK_RENEW;
}
if (!d->l)
@ -189,7 +189,7 @@ _fill_icon_themes(void *data)
d->cfdata->populating = EINA_FALSE;
_populate_preview(d->cfdata);
free(d);
return 0;
return ECORE_CALLBACK_CANCEL;
}
theme = d->l->data;
@ -217,7 +217,7 @@ _fill_icon_themes(void *data)
d->i++;
d->l = d->l->next;
return 1;
return ECORE_CALLBACK_RENEW;
}
static void

18
src/modules/conf_keybindings/e_int_config_keybindings.c
View File

@ -45,8 +45,8 @@ static int _key_binding_sort_cb(const void *d1, const void *d2);
/**************** grab window *******/
static void _grab_wnd_show(E_Config_Dialog_Data *cfdata);
static int _grab_key_down_cb(void *data, int type, void *event);
static int _grab_mouse_dumb_cb(void *data, int type, void *event);
static Eina_Bool _grab_key_down_cb(void *data, int type, void *event);
static Eina_Bool _grab_mouse_dumb_cb(void *data, int type, void *event);
struct _E_Config_Dialog_Data
{
@ -978,8 +978,8 @@ _grab_wnd_hide(E_Config_Dialog_Data *cfdata)
cfdata->locals.dia = NULL;
}
static int
_grab_key_down_cb(void *data, int type, void *event)
static Eina_Bool
_grab_key_down_cb(void *data, __UNUSED__ int type, void *event)
{
E_Config_Dialog_Data *cfdata;
Ecore_Event_Key *ev;
@ -987,7 +987,7 @@ _grab_key_down_cb(void *data, int type, void *event)
ev = event;
cfdata = data;
if (ev->window != cfdata->locals.bind_win) return 1;
if (ev->window != cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
if (!strcmp(ev->keyname, "Escape") &&
!(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) &&
@ -1167,13 +1167,13 @@ _grab_key_down_cb(void *data, int type, void *event)
_grab_wnd_hide(cfdata);
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_grab_mouse_dumb_cb(void *data, int type, void *event)
static Eina_Bool
_grab_mouse_dumb_cb(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
{
return 1;
return ECORE_CALLBACK_RENEW;
}
/********** Helper *********************************/

30
src/modules/conf_mousebindings/e_int_config_mousebindings.c
View File

@ -47,9 +47,9 @@ static int _wheel_binding_sort_cb(const void *d1, const void *d2);
/********* grab window **********/
static void _grab_wnd_show(E_Config_Dialog_Data *cfdata);
static void _grab_wnd_hide(E_Config_Dialog_Data *cfdata);
static int _grab_mouse_down_cb(void *data, int type, void *event);
static int _grab_mouse_wheel_cb(void *data, int type, void *event);
static int _grab_key_down_cb(void *data, int type, void *event);
static Eina_Bool _grab_mouse_down_cb(void *data, int type, void *event);
static Eina_Bool _grab_mouse_wheel_cb(void *data, int type, void *event);
static Eina_Bool _grab_key_down_cb(void *data, int type, void *event);
struct _E_Config_Dialog_Data
{
@ -1314,8 +1314,8 @@ _grab_wnd_hide(E_Config_Dialog_Data *cfdata)
cfdata->locals.dia = NULL;
}
static int
_grab_mouse_down_cb(void *data, int type, void *event)
static Eina_Bool
_grab_mouse_down_cb(void *data, __UNUSED__ int type, void *event)
{
Eina_List *l;
E_Config_Dialog_Data *cfdata;
@ -1328,7 +1328,7 @@ _grab_mouse_down_cb(void *data, int type, void *event)
ev = event;
cfdata = data;
if (ev->window != cfdata->locals.bind_win) return 1;
if (ev->window != cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
mod |= E_BINDING_MODIFIER_SHIFT;
@ -1413,11 +1413,11 @@ _grab_mouse_down_cb(void *data, int type, void *event)
_update_buttons(cfdata);
_grab_wnd_hide(cfdata);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_grab_mouse_wheel_cb(void *data, int type, void *event)
static Eina_Bool
_grab_mouse_wheel_cb(void *data, __UNUSED__ int type, void *event)
{
Eina_List *l;
E_Config_Binding_Wheel *bw = NULL;
@ -1429,7 +1429,7 @@ _grab_mouse_wheel_cb(void *data, int type, void *event)
ev = event;
cfdata = data;
if (ev->window != cfdata->locals.bind_win) return 1;
if (ev->window != cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
mod |= E_BINDING_MODIFIER_SHIFT;
@ -1528,18 +1528,18 @@ _grab_mouse_wheel_cb(void *data, int type, void *event)
_update_buttons(cfdata);
_grab_wnd_hide(cfdata);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_grab_key_down_cb(void *data, int type, void *event)
static Eina_Bool
_grab_key_down_cb(void *data, __UNUSED__ int type, void *event)
{
E_Config_Dialog_Data *cfdata;
Ecore_Event_Key *ev = event;
cfdata = data;
if (ev->window != cfdata->locals.bind_win) return 1;
if (ev->window != cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
if (!strcmp(ev->keyname, "Escape") &&
!(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) &&
@ -1549,5 +1549,5 @@ _grab_key_down_cb(void *data, int type, void *event)
{
_grab_wnd_hide(cfdata);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}

10
src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
View File

@ -48,7 +48,7 @@ struct _E_Config_Dialog_Data
};
static void _import_edj_gen(Import *import);
static int _import_cb_edje_cc_exit(void *data, int type, void *event);
static Eina_Bool _import_cb_edje_cc_exit(void *data, int type, void *event);
static void _import_cb_close(void *data, E_Dialog *dia);
static void _import_cb_ok(void *data, E_Dialog *dia);
static void _import_config_save(Import *import);
@ -352,15 +352,15 @@ _import_edj_gen(Import *import)
import->exe = ecore_exe_run(cmd, NULL);
}
static int
_import_cb_edje_cc_exit(void *data, int type, void *event)
static Eina_Bool
_import_cb_edje_cc_exit(void *data, __UNUSED__ int type, void *event)
{
Import *import;
Ecore_Exe_Event_Del *ev;
ev = event;
import = data;
if (ev->exe != import->exe) return 1;
if (ev->exe != import->exe) return ECORE_CALLBACK_PASS_ON;
if (ev->exit_code != 0)
{
@ -371,7 +371,7 @@ _import_cb_edje_cc_exit(void *data, int type, void *event)
e_int_config_wallpaper_update(import->parent, import->fdest);
e_int_config_wallpaper_gradient_del(import->dia);
return 0;
return ECORE_CALLBACK_DONE;
}
static void

10
src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
View File

@ -73,7 +73,7 @@ struct _E_Config_Dialog_Data
static void _fsel_path_save(FSel *fsel);
static void _import_edj_gen(Import *import);
static int _import_cb_edje_cc_exit(void *data, int type, void *event);
static Eina_Bool _import_cb_edje_cc_exit(void *data, int type, void *event);
static void _import_cb_delete(E_Win *win);
static void _import_cb_resize(E_Win *win);
static void _import_cb_close(void *data, void *data2);
@ -615,8 +615,8 @@ _import_edj_gen(Import *import)
import->exe = ecore_exe_run(cmd, NULL);
}
static int
_import_cb_edje_cc_exit(void *data, int type, void *event)
static Eina_Bool
_import_cb_edje_cc_exit(void *data, __UNUSED__ int type, void *event)
{
Import *import;
FSel *fsel;
@ -626,7 +626,7 @@ _import_cb_edje_cc_exit(void *data, int type, void *event)
ev = event;
import = data;
if (ev->exe != import->exe) return 1;
if (ev->exe != import->exe) return ECORE_CALLBACK_PASS_ON;
if (ev->exit_code != 0)
{
@ -655,7 +655,7 @@ _import_cb_edje_cc_exit(void *data, int type, void *event)
}
E_FREE(fdest);
return 0;
return ECORE_CALLBACK_DONE;
}
static void

32
src/modules/conf_wallpaper2/e_int_config_wallpaper.c
View File

@ -127,7 +127,7 @@ static void _item_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _item_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
static int _sort_cb(const void *d1, const void *d2);
static int
static Eina_Bool
_e_smart_reconfigure_do(void *data)
{
Evas_Object *obj = data;
@ -138,7 +138,7 @@ _e_smart_reconfigure_do(void *data)
static int recursion = 0;
Evas_Coord x, y, xx, yy, ww, hh, mw, mh, ox, oy, dd;
if (!sd) return 0;
if (!sd) return ECORE_CALLBACK_CANCEL;
if (sd->cx > (sd->cw - sd->w)) sd->cx = sd->cw - sd->w;
if (sd->cy > (sd->ch - sd->h)) sd->cy = sd->ch - sd->h;
if (sd->cx < 0) sd->cx = 0;
@ -415,7 +415,7 @@ _e_smart_reconfigure_do(void *data)
if (changed)
evas_object_smart_callback_call(obj, "changed", NULL);
if (recursion == 0) sd->idle_enter = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -549,7 +549,7 @@ _pan_info_set(Evas_Object *obj, Info *info)
}
static int
static Eina_Bool
_sel_anim(void *data)
{
Evas_Object *obj = data;
@ -603,17 +603,17 @@ _sel_anim(void *data)
sd->selin = EINA_TRUE;
sd->selout = EINA_FALSE;
sd->seltime = ecore_loop_time_get();
return 1;
return ECORE_CALLBACK_RENEW;
}
sd->selout = EINA_FALSE;
sd->selin = EINA_FALSE;
sd->animator = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static int
static Eina_Bool
_sel_timer(void *data)
{
Evas_Object *obj = data;
@ -625,7 +625,7 @@ _sel_timer(void *data)
sd->selin = EINA_FALSE;
}
sd->seltimer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -1025,7 +1025,7 @@ _wp_changed(void *data, Evas_Object *obj, void *event_info)
static void _scan(Info *info);
static int
static Eina_Bool
_idler(void *data)
{
struct dirent *dp;
@ -1035,7 +1035,7 @@ _idler(void *data)
if (!info->dir)
{
info->idler = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
dp = readdir(info->dir);
if (!dp)
@ -1046,23 +1046,23 @@ _idler(void *data)
info->dir = NULL;
info->idler = NULL;
_scan(info);
return 0;
return ECORE_CALLBACK_CANCEL;
}
if ((!strcmp(dp->d_name, ".")) || (!strcmp(dp->d_name, "..")))
return 1;
return ECORE_CALLBACK_RENEW;
if (dp->d_name[0] == '.')
return 1;
return ECORE_CALLBACK_RENEW;
snprintf(buf, sizeof(buf), "%s/%s", info->curdir, dp->d_name);
if (ecore_file_is_dir(buf))
{
info->dirs = eina_list_append(info->dirs, strdup(buf));
return 1;
return ECORE_CALLBACK_RENEW;
}
info->scans++;
_pan_file_add(info->span, buf, 0, 0);
e_util_wakeup();
return 1;
return ECORE_CALLBACK_RENEW;
}
static void

34
src/modules/connman/e_mod_main.c
View File

@ -856,7 +856,7 @@ _connman_services_reload(E_Connman_Module_Context *ctxt)
_connman_default_service_changed(ctxt);
}
static int
static Eina_Bool
_connman_default_service_changed_delayed_do(void *data)
{
E_Connman_Module_Context *ctxt = data;
@ -864,7 +864,7 @@ _connman_default_service_changed_delayed_do(void *data)
ctxt->poller.default_service_changed = NULL;
_connman_default_service_changed(ctxt);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -881,21 +881,21 @@ _connman_default_service_changed_delayed(E_Connman_Module_Context *ctxt)
static void _connman_popup_del(E_Connman_Instance *inst);
static int
static Eina_Bool
_connman_popup_input_window_mouse_up_cb(void *data, int type __UNUSED__, void *event)
{
Ecore_Event_Mouse_Button *ev = event;
E_Connman_Instance *inst = data;
if (ev->window != inst->ui.input.win)
return 1;
return ECORE_CALLBACK_PASS_ON;
_connman_popup_del(inst);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_connman_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *event)
{
Ecore_Event_Key *ev = event;
@ -903,13 +903,13 @@ _connman_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *e
const char *keysym;
if (ev->window != inst->ui.input.win)
return 1;
return ECORE_CALLBACK_PASS_ON;
keysym = ev->key;
if (strcmp(keysym, "Escape") == 0)
_connman_popup_del(inst);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void
@ -1635,7 +1635,7 @@ _connman_actions_unregister(E_Connman_Module_Context *ctxt)
}
}
static int
static Eina_Bool
_connman_manager_changed_do(void *data)
{
E_Connman_Module_Context *ctxt = data;
@ -1644,7 +1644,7 @@ _connman_manager_changed_do(void *data)
_connman_services_reload(ctxt);
ctxt->poller.manager_changed = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -1657,7 +1657,7 @@ _connman_manager_changed(void *data, const E_Connman_Element *element __UNUSED__
(ECORE_POLLER_CORE, 1, _connman_manager_changed_do, ctxt);
}
static int
static Eina_Bool
_connman_event_manager_in(void *data, int type __UNUSED__, void *event __UNUSED__)
{
E_Connman_Module_Context *ctxt = data;
@ -1671,10 +1671,10 @@ _connman_event_manager_in(void *data, int type __UNUSED__, void *event __UNUSED_
_connman_services_reload(ctxt);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_connman_event_manager_out(void *data, int type __UNUSED__, void *event __UNUSED__)
{
E_Connman_Module_Context *ctxt = data;
@ -1685,16 +1685,16 @@ _connman_event_manager_out(void *data, int type __UNUSED__, void *event __UNUSED
_connman_services_free(ctxt);
_connman_default_service_changed(ctxt);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_connman_event_mode_changed(void *data, int type __UNUSED__, void *event __UNUSED__)
{
E_Connman_Module_Context *ctxt = data;
if ((ctxt->offline_mode == e_config->mode.offline) ||
(!ctxt->has_manager))
return 1;
return ECORE_CALLBACK_PASS_ON;
if (!ctxt->offline_mode_pending)
{
if (!e_connman_manager_offline_mode_set(e_config->mode.offline,
@ -1704,7 +1704,7 @@ _connman_event_mode_changed(void *data, int type __UNUSED__, void *event __UNUSE
else
ctxt->offline_mode_pending = EINA_FALSE;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static E_Config_Dialog *

18
src/modules/cpufreq/e_mod_main.c
View File

@ -39,7 +39,7 @@ static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *e
static void _menu_cb_post(void *data, E_Menu *m);
static void _cpufreq_set_governor(const char *governor);
static void _cpufreq_set_frequency(int frequency);
static int _cpufreq_cb_check(void *data);
static Eina_Bool _cpufreq_cb_check(void *data);
static Status *_cpufreq_status_new();
static void _cpufreq_status_free(Status *s);
static int _cpufreq_status_check_available(Status *s);
@ -49,7 +49,7 @@ static void _cpufreq_face_update_available(Instance *inst);
static void _cpufreq_face_update_current(Instance *inst);
static void _cpufreq_face_cb_set_frequency(void *data, Evas_Object *o, const char *emission, const char *source);
static void _cpufreq_face_cb_set_governor(void *data, Evas_Object *o, const char *emission, const char *source);
static int _cpufreq_event_cb_powersave(void *data __UNUSED__, int type, void *event);
static Eina_Bool _cpufreq_event_cb_powersave(void *data __UNUSED__, int type, void *event);
static void _cpufreq_menu_fast(void *data, E_Menu *m, E_Menu_Item *mi);
static void _cpufreq_menu_medium(void *data, E_Menu *m, E_Menu_Item *mi);
@ -450,14 +450,14 @@ _cpufreq_set_frequency(int frequency)
}
}
static int
static Eina_Bool
_cpufreq_cb_check(void *data)
{
Instance *inst;
Eina_List *l;
int active;
if (cpufreq_config->menu_poll) return 1;
if (cpufreq_config->menu_poll) return ECORE_CALLBACK_RENEW;
active = cpufreq_config->status->active;
if (_cpufreq_status_check_current(cpufreq_config->status))
{
@ -479,7 +479,7 @@ _cpufreq_cb_check(void *data)
}
}
return 1;
return ECORE_CALLBACK_RENEW;
}
static Status *
@ -815,7 +815,7 @@ _cpufreq_face_cb_set_governor(void *data, Evas_Object *obj, const char *emission
if (next_governor != NULL) _cpufreq_set_governor(next_governor);
}
static int
static Eina_Bool
_cpufreq_event_cb_powersave(void *data __UNUSED__, int type, void *event)
{
E_Event_Powersave_Update *ev;
@ -823,8 +823,8 @@ _cpufreq_event_cb_powersave(void *data __UNUSED__, int type, void *event)
Eina_Bool has_powersave = EINA_FALSE;
Eina_Bool has_conservative = EINA_FALSE;
if (type != E_EVENT_POWERSAVE_UPDATE) return 1;
if (!cpufreq_config->auto_powersave) return 1;
if (type != E_EVENT_POWERSAVE_UPDATE) return ECORE_CALLBACK_PASS_ON;
if (!cpufreq_config->auto_powersave) return ECORE_CALLBACK_PASS_ON;
ev = event;
if (!cpufreq_config->status->orig_governor)
@ -862,7 +862,7 @@ _cpufreq_event_cb_powersave(void *data __UNUSED__, int type, void *event)
break;
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void

6
src/modules/everything-apps/e_mod_main.c
View File

@ -1324,7 +1324,7 @@ e_modapi_save(E_Module *m)
/* taken from e_exebuf.c */
static int
static Eina_Bool
_scan_idler(void *data)
{
struct stat st;
@ -1387,7 +1387,7 @@ _scan_idler(void *data)
}
}
exe_scan_idler = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
/* no dir is open - open the first path item */
if (!exe_dir)
@ -1436,7 +1436,7 @@ _scan_idler(void *data)
exe_path = eina_list_remove_list(exe_path, exe_path);
}
/* we have mroe scannign to do */
return 1;
return ECORE_CALLBACK_RENEW;
}
static void

12
src/modules/everything-aspell/e_mod_main.c
View File

@ -189,7 +189,7 @@ _suggestions_add(Plugin *p, const char *line)
}
}
static int
static Eina_Bool
_cb_data(void *data, int type __UNUSED__, void *event)
{
GET_PLUGIN(p, data);
@ -198,7 +198,7 @@ _cb_data(void *data, int type __UNUSED__, void *event)
const char *word;
if (e->exe != p->exe)
return 1;
return ECORE_CALLBACK_PASS_ON;
EVRY_PLUGIN_ITEMS_FREE(p);
@ -242,20 +242,20 @@ _cb_data(void *data, int type __UNUSED__, void *event)
if (p->base.items)
EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_cb_del(void *data, int type __UNUSED__, void *event)
{
Plugin *p = data;
Ecore_Exe_Event_Del *e = event;
if (e->exe != p->exe)
return 1;
return ECORE_CALLBACK_PASS_ON;
p->exe = NULL;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static Evry_Plugin *

36
src/modules/everything-calc/e_mod_main.c
View File

@ -7,9 +7,9 @@
#include "evry_api.h"
// TODO - show error when input not parseable
static int _cb_data(void *data, int type, void *event);
static int _cb_error(void *data, int type, void *event);
static int _cb_del(void *data, int type, void *event);
static Eina_Bool _cb_data(void *data, int type, void *event);
static Eina_Bool _cb_error(void *data, int type, void *event);
static Eina_Bool _cb_del(void *data, int type, void *event);
static const Evry_API *evry = NULL;
static Evry_Module *evry_module = NULL;
@ -108,8 +108,8 @@ _finish(Evry_Plugin *p)
active = EINA_FALSE;
}
static int
_cb_action_performed(void *data, int type, void *event)
static Eina_Bool
_cb_action_performed(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Eina_List *l;
Evry_Item *it, *it2, *it_old;
@ -117,10 +117,10 @@ _cb_action_performed(void *data, int type, void *event)
Evry_Plugin *p = _plug;
if (!ev->it1 || !(ev->it1->plugin == p))
return 1;
return ECORE_CALLBACK_PASS_ON;
if (!p->items)
return 1;
return ECORE_CALLBACK_PASS_ON;
/* remove duplicates */
if (p->items->next)
@ -134,7 +134,7 @@ _cb_action_performed(void *data, int type, void *event)
p->items = eina_list_promote_list(p->items, l);
evry->item_changed(it, 0, 1);
EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
}
}
@ -148,7 +148,7 @@ _cb_action_performed(void *data, int type, void *event)
evry->item_changed(it2, 0, 1);
EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
@ -178,14 +178,14 @@ _fetch(Evry_Plugin *p, const char *input)
return 1;
}
static int
static Eina_Bool
_cb_data(void *data, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Data *ev = event;
Evry_Plugin *p = data;
Evry_Item *it;
if (ev->exe != exe) return 1;
if (ev->exe != exe) return ECORE_CALLBACK_PASS_ON;
if (ev->lines)
{
@ -196,32 +196,32 @@ _cb_data(void *data, int type __UNUSED__, void *event)
if (it) evry->item_changed(it, 0, 0);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_cb_error(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Data *ev = event;
if (ev->exe != exe)
return 1;
return ECORE_CALLBACK_PASS_ON;
error = 1;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_cb_del(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Del *e = event;
if (e->exe != exe)
return 1;
return ECORE_CALLBACK_PASS_ON;
exe = NULL;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int

16
src/modules/everything-windows/e_mod_main.c
View File

@ -75,8 +75,8 @@ _border_item_add(Plugin *p, E_Border *bd)
return 1;
}
static int
_cb_border_remove(void *data, int type, void *event)
static Eina_Bool
_cb_border_remove(void *data, __UNUSED__ int type, void *event)
{
E_Event_Border_Remove *ev = event;
Border_Item *bi;
@ -87,7 +87,7 @@ _cb_border_remove(void *data, int type, void *event)
if (bi->border == ev->border)
break;
if (!bi) return 1;
if (!bi) return ECORE_CALLBACK_PASS_ON;
p->borders = eina_list_remove(p->borders, bi);
p->base.items = eina_list_remove(p->base.items, bi);
@ -95,17 +95,17 @@ _cb_border_remove(void *data, int type, void *event)
EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_cb_border_add(void *data, int type, void *event)
static Eina_Bool
_cb_border_add(void *data, __UNUSED__ int type, void *event)
{
E_Event_Border_Add *ev = event;
Plugin *p = data;
int min;
if (!_border_item_add(p, ev->border))
return 1;
return ECORE_CALLBACK_PASS_ON;
EVRY_PLUGIN_ITEMS_CLEAR(p);
@ -119,7 +119,7 @@ _cb_border_add(void *data, int type, void *event)
EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void

16
src/modules/everything/e_mod_main.c
View File

@ -7,12 +7,12 @@
static void _e_mod_action_cb(E_Object *obj, const char *params);
static void _e_mod_action_cb_edge(E_Object *obj, const char *params, E_Event_Zone_Edge *ev);
static int _e_mod_run_defer_cb(void *data);
static Eina_Bool _e_mod_run_defer_cb(void *data);
static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_mod_menu_add(void *data, E_Menu *m);
static void _config_init(void);
static void _config_free(void);
static int _cleanup_history(void *data);
static Eina_Bool _cleanup_history(void *data);
static void _evry_type_init(const char *type);
static Evry_API *_api = NULL;
@ -234,7 +234,7 @@ e_modapi_save(E_Module *m __UNUSED__)
/***************************************************************************/
Ecore_Event_Handler *
evry_event_handler_add(int type, int (*func) (void *data, int type, void *event), const void *data)
evry_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data)
{
return ecore_event_handler_add(_evry_events[type], func, data);
}
@ -321,18 +321,18 @@ evry_view_unregister(Evry_View *view)
/***************************************************************************/
static int
static Eina_Bool
_cleanup_history(void *data)
{
/* evrything is active */
if (evry_hist)
return 1;
return ECORE_CALLBACK_RENEW;
/* cleanup old entries */
evry_history_free();
evry_history_init();
return 1;
return ECORE_CALLBACK_RENEW;
}
static void
@ -496,7 +496,7 @@ _config_free(void)
static Ecore_Idle_Enterer *_idler = NULL;
static const char *_params = NULL;
static int
static Eina_Bool
_e_mod_run_defer_cb(void *data)
{
E_Zone *zone;
@ -505,7 +505,7 @@ _e_mod_run_defer_cb(void *data)
if (zone) evry_show(zone, E_ZONE_EDGE_NONE, _params);
_idler = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void

2
src/modules/everything/e_mod_main.h
View File

@ -328,7 +328,7 @@ int evry_view_toggle(Evry_State *s, const char *trigger);
int evry_gadget_init(void);
void evry_gadget_shutdown(void);
Ecore_Event_Handler *evry_event_handler_add(int type, int (*func) (void *data, int type, void *event), const void *data);
Ecore_Event_Handler *evry_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data);
extern Evry_History *evry_hist;
extern Evry_Config *evry_conf;

96
src/modules/everything/evry.c
View File

@ -22,7 +22,7 @@ static int _evry_backspace(Evry_Selector *sel);
static void _evry_update(Evry_Selector *sel, int fetch);
static void _evry_update_text_label(Evry_State *s);
static int _evry_clear(Evry_Selector *sel);
static int _evry_cb_update_timer(void *data);
static Eina_Bool _evry_cb_update_timer(void *data);
static Evry_State *_evry_state_new(Evry_Selector *sel, Eina_List *plugins);
static void _evry_state_pop(Evry_Selector *sel, int immediate);
@ -57,9 +57,9 @@ static void _evry_view_hide(Evry_Window *win, Evry_View *v, int slide);
static void _evry_item_desel(Evry_State *s);
static void _evry_item_sel(Evry_State *s, Evry_Item *it);
static int _evry_cb_key_down(void *data, int type, void *event);
static int _evry_cb_selection_notify(void *data, int type, void *event);
static int _evry_cb_mouse(void *data, int type, void *event);
static Eina_Bool _evry_cb_key_down(void *data, int type, void *event);
static Eina_Bool _evry_cb_selection_notify(void *data, int type, void *event);
static Eina_Bool _evry_cb_mouse(void *data, int type, void *event);
static Eina_List *windows = NULL;
@ -111,15 +111,15 @@ _evry_aggregator_fetch(Evry_State *s)
return 1;
}
static int
_evry_cb_item_changed(void *data, int type, void *event)
static Eina_Bool
_evry_cb_item_changed(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Evry_Event_Item_Changed *ev = event;
Evry_Selector *sel;
Evry_Item *it = ev->item;
if (!it || !it->plugin || !it->plugin->state)
return 1;
return ECORE_CALLBACK_PASS_ON;
sel = it->plugin->state->selector;
@ -128,10 +128,10 @@ _evry_cb_item_changed(void *data, int type, void *event)
_evry_selector_update(sel);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_cb_show_timer(void *data)
{
Evry_Window *win = data;
@ -155,10 +155,10 @@ _cb_show_timer(void *data)
win->visible = EINA_TRUE;
}
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
static Eina_Bool
_cb_hide_timer(void *data)
{
Evry_Window *win = data;
@ -166,7 +166,7 @@ _cb_hide_timer(void *data)
win->hide_timer = NULL;
evry_hide(win, 0);
return 0;
return ECORE_CALLBACK_CANCEL;
}
Evry_Window *
@ -527,7 +527,7 @@ _evry_selector_update_actions_do(Evry_Selector *sel)
return 1;
}
static int
static Eina_Bool
_evry_timer_cb_actions_get(void *data)
{
Evry_Selector *sel = data;
@ -542,7 +542,7 @@ _evry_timer_cb_actions_get(void *data)
_evry_view_show(win, s->view, 0);
}
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -878,13 +878,13 @@ _evry_cb_drag_finished(E_Drag *drag, int dropped)
}
#if 0
static int
_evry_cb_mouse_in(void *data, int type, void *event)
static Eina_Bool
_evry_cb_mouse_in(__UNUSED__ void *data, int type, void *event)
{
Ecore_X_Event_Mouse_In *ev = event;
if (ev->event_win != input_window)
return 1;
return ECORE_CALLBACK_PASS_ON;
e_grabinput_get(input_window, 0, input_window);
@ -894,27 +894,27 @@ _evry_cb_mouse_in(void *data, int type, void *event)
win->hide_timer = NULL;
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
_evry_cb_mouse_out(void *data, int type, void *event)
static Eina_Bool
_evry_cb_mouse_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
{
Ecore_X_Event_Mouse_In *ev = event;
if (!win || (ev->event_win != input_window))
return 1;
return ECORE_CALLBACK_PASS_ON;
if (win->hide_timer)
return 1;
return ECORE_CALLBACK_PASS_ON;
win->hide_timer = ecore_timer_add(0.3, _cb_hide_timer, win);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
#endif
static int
static Eina_Bool
_evry_cb_mouse(void *data, int type, void *event)
{
Ecore_Event_Mouse_Button *ev;
@ -924,10 +924,10 @@ _evry_cb_mouse(void *data, int type, void *event)
ev = event;
if (!win->grab)
return 1;
return ECORE_CALLBACK_PASS_ON;
if (ev->event_window != win->ewin->evas_win)
return 1;
return ECORE_CALLBACK_PASS_ON;
w = win->ewin;
@ -955,11 +955,11 @@ _evry_cb_mouse(void *data, int type, void *event)
GET_FILE(file, s->cur_item);
if (!(uri = evry_file_url_get(file)))
return 1;
return ECORE_CALLBACK_PASS_ON;
s_len = strlen(uri);
if (!(tmp = realloc(sel, sel_length + s_len + 2 + 1)))
return 1;
return ECORE_CALLBACK_PASS_ON;
sel = tmp;
memcpy(sel + sel_length, uri, s_len);
memcpy(sel + sel_length + s_len, "\r\n", 2);
@ -975,7 +975,7 @@ _evry_cb_mouse(void *data, int type, void *event)
e_drag_xdnd_start(d, ev->x, ev->y);
evry_hide(win, 0);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
}
else if (type == ECORE_EVENT_MOUSE_WHEEL)
@ -991,7 +991,7 @@ _evry_cb_mouse(void *data, int type, void *event)
if (!E_INSIDE(ev->x, ev->y, 0, 0, w->w, w->h))
{
win->mouse_out = 1;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
win->mouse_button = ev->buttons;
@ -1004,11 +1004,11 @@ _evry_cb_mouse(void *data, int type, void *event)
!E_INSIDE(ev->x, ev->y, 0, 0, w->w, w->h))
{
evry_hide(win, 0);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void
@ -1910,7 +1910,7 @@ _evry_cheat_history(Evry_State *s, int promote, int delete)
return 1;
}
static int
static Eina_Bool
_evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Event_Key *ev = event;
@ -1920,12 +1920,12 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
const char *old;
if (ev->event_window != win->ewin->evas_win)
return 1;
return ECORE_CALLBACK_PASS_ON;
if (!strcmp(ev->key, "Escape"))
{
evry_hide(win, 0);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
#ifdef DRAG_OFF_WINDOW
else if (win->grab && !strcmp(ev->key, "F1"))
@ -1945,7 +1945,7 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
e_border_show(ewin->border);
win->grab = 0;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
#endif
else if (ev->modifiers)
@ -1977,14 +1977,14 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
continue;
if (win->level > 0)
return 1;
return ECORE_CALLBACK_PASS_ON;
if (!(bind->params) &&
(CUR_SEL == OBJ_SEL) &&
((CUR_SEL)->state && (CUR_SEL)->state->cur_item))
{
_evry_selectors_shift(win, 1);
return 1;
return ECORE_CALLBACK_PASS_ON;
}
evry_hide(win, 1);
@ -2005,7 +2005,7 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
}
@ -2194,7 +2194,7 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
end:
ev->key = old;
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
@ -2266,7 +2266,7 @@ _evry_update(Evry_Selector *sel, int fetch)
}
}
static int
static Eina_Bool
_evry_cb_update_timer(void *data)
{
Evry_Selector *sel = data;
@ -2276,7 +2276,7 @@ _evry_cb_update_timer(void *data)
_evry_list_win_update(sel->state);
sel->update_timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
@ -2517,12 +2517,12 @@ _evry_view_show(Evry_Window *win, Evry_View *v, int slide)
}
}
static int
static Eina_Bool
_clear_timer(void *data)
{
_evry_state_clear(data);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -2970,15 +2970,15 @@ _evry_plugin_list_insert(Evry_State *s, Evry_Plugin *p)
s->cur_plugins = eina_list_append(s->cur_plugins, p);
}
static int
static Eina_Bool
_evry_cb_selection_notify(void *data, int type, void *event)
{
Ecore_X_Event_Selection_Notify *ev;
Evry_Window *win = data;
Evry_State *s = (CUR_SEL)->state;
if (!s || (data != win)) return 1;
if (!win->request_selection) return 1;
if (!s || (data != win)) return ECORE_CALLBACK_PASS_ON;
if (!win->request_selection) return ECORE_CALLBACK_PASS_ON;
win->request_selection = EINA_FALSE;
@ -2997,5 +2997,5 @@ _evry_cb_selection_notify(void *data, int type, void *event)
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}

2
src/modules/everything/evry_api.h
View File

@ -120,7 +120,7 @@ struct _Evry_API
History_Types *(*history_types_get)(Evry_Type type);
int (*history_item_usage_set)(Evry_Item *it, const char *input, const char *ctxt);
Ecore_Event_Handler *(*event_handler_add)(int type, int (*func) (void *data, int type, void *event), const void *data);
Ecore_Event_Handler *(*event_handler_add)(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data);
int log_dom;
};

32
src/modules/everything/evry_view.c
View File

@ -77,7 +77,7 @@ static View *view = NULL;
static void _view_clear(Evry_View *view);
static void _pan_item_select(Evas_Object *obj, Item *it, int scroll);
static void _animator_del(Evas_Object *obj);
static int _animator(void *data);
static Eina_Bool _animator(void *data);
static void
_thumb_gen(void *data, Evas_Object *obj, void *event_info)
@ -127,7 +127,7 @@ static int _sort_pos_cb(const void *d1, const void *d2)
return ((it1->x + it1->y * 4) - (it2->x + it2->y * 4));
}
static int
static Eina_Bool
_thumb_idler(void *data)
{
Smart_Data *sd = data;
@ -191,12 +191,12 @@ _thumb_idler(void *data)
e_util_wakeup();
sd->queue = eina_list_remove_list(sd->queue, l);
return 1;
return ECORE_CALLBACK_RENEW;
}
sd->thumb_idler = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -338,7 +338,7 @@ _item_hide(Item *it)
it->visible = EINA_FALSE;
}
static int
static Eina_Bool
_e_smart_reconfigure_do(void *data)
{
Evas_Object *obj = data;
@ -349,7 +349,7 @@ _e_smart_reconfigure_do(void *data)
Evas_Coord x, y, xx, yy, ww, hh, mw, mh, ox = 0, oy = 0;
Evas_Coord aspect_w, aspect_h;
if (!sd) return 0;
if (!sd) return ECORE_CALLBACK_CANCEL;
if (sd->cx > (sd->cw - sd->w)) sd->cx = sd->cw - sd->w;
if (sd->cy > (sd->ch - sd->h)) sd->cy = sd->ch - sd->h;
if (sd->cx < 0) sd->cx = 0;
@ -506,7 +506,7 @@ _e_smart_reconfigure_do(void *data)
sd->idle_enter = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void
@ -705,11 +705,11 @@ _animator_del(Evas_Object *obj)
sd->animator = NULL;
}
static int
static Eina_Bool
_animator(void *data)
{
Smart_Data *sd = evas_object_smart_data_get(data);
if (!sd) return 0;
if (!sd) return ECORE_CALLBACK_CANCEL;
double da;
double spd = ((25.0/ (double)e_config->framerate) /
@ -735,11 +735,11 @@ _animator(void *data)
}
if (wait)
return 1;
return ECORE_CALLBACK_RENEW;
_animator_del(data);
return 0;
return ECORE_CALLBACK_CANCEL;
}
@ -1355,7 +1355,7 @@ _cb_key_down(Evry_View *view, const Ecore_Event_Key *ev)
return 1;
}
static int
static Eina_Bool
_cb_item_changed(void *data, int type, void *event)
{
Evry_Event_Item_Changed *ev = event;
@ -1363,14 +1363,14 @@ _cb_item_changed(void *data, int type, void *event)
Eina_List *l;
Item *it;
Smart_Data *sd = evas_object_smart_data_get(v->span);
if (!sd) return 1;
if (!sd) return ECORE_CALLBACK_PASS_ON;
EINA_LIST_FOREACH(sd->items, l, it)
if (it->item == ev->item)
break;
if (!it)
return 1;
return ECORE_CALLBACK_PASS_ON;
if (ev->changed_selection)
{
@ -1379,7 +1379,7 @@ _cb_item_changed(void *data, int type, void *event)
}
if (!it->visible)
return 1;
return ECORE_CALLBACK_PASS_ON;
edje_object_part_text_set(it->frame, "e.text.label", it->item->label);
@ -1402,7 +1402,7 @@ _cb_item_changed(void *data, int type, void *event)
sd->thumb_idler = ecore_idle_enterer_add(_thumb_idler, sd);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static void

4
src/modules/everything/evry_view_tabs.c
View File

@ -17,7 +17,7 @@ static void _plugin_select(Tab_View *v, Evry_Plugin *p);
static void _plugin_next(Tab_View *v);
static void _plugin_prev(Tab_View *v);
static int
static Eina_Bool
_timer_cb(void *data)
{
Tab_View *v = data;
@ -25,7 +25,7 @@ _timer_cb(void *data)
_tabs_update(v);
v->timer = NULL;
return 0;
return ECORE_CALLBACK_CANCEL;
}
static void

32
src/modules/fileman/e_fwin.c
View File

@ -125,8 +125,8 @@ static void _e_fwin_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coo
static void _e_fwin_pan_scroll_update(E_Fwin_Page *page);
static void _e_fwin_zone_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
static int _e_fwin_zone_move_resize(void *data, int type, void *event);
static int _e_fwin_zone_del(void *data, int type, void *event);
static Eina_Bool _e_fwin_zone_move_resize(void *data, int type, void *event);
static Eina_Bool _e_fwin_zone_del(void *data, int type, void *event);
static void _e_fwin_config_set(E_Fwin_Page *page);
static void _e_fwin_window_title_set(E_Fwin_Page *page);
static void _e_fwin_page_resize(E_Fwin_Page *page);
@ -135,7 +135,7 @@ static int _e_fwin_dlg_cb_desk_sort(const void *p1, const void *p2);
static int _e_fwin_dlg_cb_desk_list_sort(const void *data1, const void *data2);
static void _e_fwin_op_registry_listener_cb(void *data, const E_Fm2_Op_Registry_Entry *ere);
static int _e_fwin_op_registry_entry_add_cb(void *data, int type, void *event);
static Eina_Bool _e_fwin_op_registry_entry_add_cb(void *data, int type, void *event);
static void _e_fwin_op_registry_entry_iter(E_Fwin_Page *page);
static void _e_fwin_op_registry_abort_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
@ -1360,17 +1360,17 @@ _e_fwin_zone_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event
e_fwin_all_unsel(fwin);
}
static int
static Eina_Bool
_e_fwin_zone_move_resize(void *data, int type, void *event)
{
E_Event_Zone_Move_Resize *ev;
E_Fwin *fwin;
if (type != E_EVENT_ZONE_MOVE_RESIZE) return 1;
if (type != E_EVENT_ZONE_MOVE_RESIZE) return ECORE_CALLBACK_PASS_ON;
fwin = data;
ev = event;
if (!fwin) return 1;
if (fwin->zone != ev->zone) return 1;
if (!fwin) return ECORE_CALLBACK_PASS_ON;
if (fwin->zone != ev->zone) return ECORE_CALLBACK_PASS_ON;
if (fwin->bg_obj)
{
evas_object_move(fwin->bg_obj, ev->zone->x, ev->zone->y);
@ -1383,22 +1383,22 @@ _e_fwin_zone_move_resize(void *data, int type, void *event)
evas_object_move(fwin->cur_page->scrollframe_obj, x, y);
evas_object_resize(fwin->cur_page->scrollframe_obj, w, h);
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}
static int
static Eina_Bool
_e_fwin_zone_del(void *data, int type, void *event)
{
E_Event_Zone_Del *ev;
E_Fwin *fwin;
if (type != E_EVENT_ZONE_DEL) return 1;
if (type != E_EVENT_ZONE_DEL) return ECORE_CALLBACK_PASS_ON;
fwin = data;
ev = event;
if (!fwin) return 1;
if (fwin->zone != ev->zone) return 1;
if (!fwin) return ECORE_CALLBACK_PASS_ON;
if (fwin->zone != ev->zone) return ECORE_CALLBACK_PASS_ON;
e_object_del(E_OBJECT(fwin));
return 1;
return ECORE_CALLBACK_PASS_ON;
}
@ -2216,7 +2216,7 @@ _e_fwin_op_registry_listener_cb(void *data, const E_Fm2_Op_Registry_Entry *ere)
edje_object_signal_emit(o, "e,action,set,normal", "e");
}
static int
static Eina_Bool
_e_fwin_op_registry_free_data_delayed(void *data)
{
evas_object_del((Evas_Object*)data);
@ -2229,8 +2229,8 @@ _e_fwin_op_registry_free_data(void *data)
ecore_timer_add(5.0, _e_fwin_op_registry_free_data_delayed, data);
}
static int
_e_fwin_op_registry_entry_add_cb(void *data, int type, void *event)
static Eina_Bool
_e_fwin_op_registry_entry_add_cb(void *data, __UNUSED__ int type, void *event)
{
E_Fm2_Op_Registry_Entry *ere = (E_Fm2_Op_Registry_Entry *)event;
E_Fwin_Page *page = data;

20
src/modules/fileman/e_mod_main.c
View File

@ -15,8 +15,8 @@ static void _e_mod_menu_volume_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_mod_menu_add(void *data, E_Menu *m);
static void _e_mod_fileman_config_load(void);
static void _e_mod_fileman_config_free(void);
static int _e_mod_cb_config_timer(void *data);
static int _e_mod_zone_add(void *data, int type, void *event);
static Eina_Bool _e_mod_cb_config_timer(void *data);
static Eina_Bool _e_mod_zone_add(void *data, int type, void *event);
static E_Module *conf_module = NULL;
static E_Action *act = NULL;
@ -517,23 +517,23 @@ _e_mod_fileman_config_free(void)
E_FREE(fileman_config);
}
static int
_e_mod_cb_config_timer(void *data)
static Eina_Bool
_e_mod_cb_config_timer(void *data)
{
e_util_dialog_show(_("Fileman Settings Updated"), "%s", (char *)data);
return 0;
return ECORE_CALLBACK_CANCEL;
}
static int
_e_mod_zone_add(void *data, int type, void *event)
static Eina_Bool
_e_mod_zone_add(__UNUSED__ void *data, int type, void *event)
{
E_Event_Zone_Add *ev;
E_Zone *zone;
if (type != E_EVENT_ZONE_ADD) return 1;
if (type != E_EVENT_ZONE_ADD) return ECORE_CALLBACK_PASS_ON;
ev = event;
zone = ev->zone;
if (e_fwin_zone_find(zone)) return 1;
if (e_fwin_zone_find(zone)) return ECORE_CALLBACK_PASS_ON;
if ((zone->container->num == 0) && (zone->num == 0) &&
(fileman_config->view.show_desktop_icons))
e_fwin_zone_new(zone, "desktop", "/");
@ -548,5 +548,5 @@ _e_mod_zone_add(void *data, int type, void *event)
e_fwin_zone_new(zone, "desktop", buf);
}
}
return 1;
return ECORE_CALLBACK_PASS_ON;
}

16
src/modules/fileman_opinfo/e_mod_main.c
View File

@ -36,12 +36,12 @@ static const E_Gadcon_Client_Class _gadcon_class = {
/******************** PROTOS *******************************************/
static int _opinfo_op_registry_entry_add_cb (void *data, int type, void *event);
static int _opinfo_op_registry_entry_del_cb (void *data, int type, void *event);
static Eina_Bool _opinfo_op_registry_entry_add_cb (void *data, int type, void *event);
static Eina_Bool _opinfo_op_registry_entry_del_cb (void *data, int type, void *event);
static void _opinfo_op_registry_update_all (Instance *inst);
static void _opinfo_op_registry_listener (void *data, const E_Fm2_Op_Registry_Entry *ere);
static void _opinfo_op_registry_free_data (void *data);
static int _opinfo_op_registry_free_data_delayed(void *data);
static Eina_Bool _opinfo_op_registry_free_data_delayed(void *data);
static void _opinfo_op_registry_abort_cb (void *data, Evas_Object *obj, const char *emission, const char *source);
static void _opinfo_op_registry_summary_cb (void *data, Evas_Object *obj, const char *emission, const char *source);
static void _opinfo_op_registry_detailed_cb (void *data, Evas_Object *obj, const char *emission, const char *source);
@ -170,7 +170,7 @@ _opinfo_op_registry_free_data(void *data)
ecore_timer_add(5.0, _opinfo_op_registry_free_data_delayed, data);
}
static int
static Eina_Bool
_opinfo_op_registry_free_data_delayed(void *data)
{
Evas_Object *o = data;
@ -251,8 +251,8 @@ _opinfo_op_registry_window_jump_cb(void *data, Evas_Object *obj, const char *emi
e_border_pointer_warp_to_center(win->border);
}
static int
_opinfo_op_registry_entry_add_cb(void *data, int type, void *event)
static Eina_Bool
_opinfo_op_registry_entry_add_cb(void *data, __UNUSED__ int type, void *event)
{
E_Fm2_Op_Registry_Entry *ere = event;
Instance *inst = data;
@ -290,8 +290,8 @@ _opinfo_op_registry_entry_add_cb(void *data, int type, void *event)
return ECORE_CALLBACK_RENEW;
}
static int
_opinfo_op_registry_entry_del_cb(void *data, int type, void *event)
static Eina_Bool
_opinfo_op_registry_entry_del_cb(void *data, __UNUSED__ int type, __UNUSED__ void *event)
{
Instance *inst = data;

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