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

Cleanup Illume 1 (I got tired of looking @ compiler warnings). 

- Cleanup use of UNUSED (place after the variable).
 - Add UNUSED where missing.
 - Use PATH_MAX.
 - Fix Formatting.
 - Remove some whitespace (and other instances of wasted space).



SVN revision: 54131
This commit is contained in:
Christopher Michael 2010-11-03 18:38:09 +00:00
parent bd0c639991
commit d7ad6cbfb2
23 changed files with 630 additions and 596 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/modules/illume/e_appwin.c
View File

@ -17,8 +17,8 @@ typedef struct _Win_Entry Win_Entry;
struct _Win_Entry
{
E_Appwin *appwin;
E_Border *border;
E_Appwin *appwin;
E_Border *border;
Evas_Object *icon;
};
@ -31,9 +31,9 @@ static void _e_appwin_free(E_Appwin *ess);
static Eina_Bool _e_appwin_cb_animate(void *data);
static void _e_appwin_slide(E_Appwin *ess, int out, double len);
static Eina_Bool _e_appwin_cb_mouse_up(void *data, int type, void *event);
static Eina_Bool _e_appwin_cb_zone_move_resize(void *data, int type, void *event);
static Eina_Bool _e_appwin_cb_zone_del(void *data, int type, void *event);
static void _e_appwin_event_simple_free(void *data, void *ev);
//static Eina_Bool _e_appwin_cb_zone_move_resize(void *data, int type, void *event);
//static Eina_Bool _e_appwin_cb_zone_del(void *data, int type, void *event);
//static void _e_appwin_event_simple_free(void *data, void *ev);
static void _e_appwin_object_del_attach(void *o);
static void _e_appwin_cb_item_sel(void *data);
@ -123,8 +123,7 @@ e_appwin_new(E_Zone *zone, const char *themedir)
EAPI void
e_appwin_show(E_Appwin *esw)
{
Evas_Object *o;
Evas_Coord mw, mh, vw, vh, w, h;
Evas_Coord mw, mh;
Eina_List *borders, *l;
Win_Entry *ent;
int i, selnum;
@ -311,7 +310,7 @@ _e_appwin_slide(E_Appwin *esw, int out, double len)
}
static Eina_Bool
_e_appwin_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
_e_appwin_cb_mouse_up(void *data, int type __UNUSED__, void *event)
{
Ecore_Event_Mouse_Button *ev;
E_Appwin *esw;
@ -326,8 +325,9 @@ _e_appwin_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
return ECORE_CALLBACK_PASS_ON;
}
/*
static Eina_Bool
_e_appwin_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
_e_appwin_cb_zone_move_resize(void *data, int type __UNUSED__, void *event)
{
E_Event_Zone_Move_Resize *ev;
E_Appwin *esw;
@ -336,13 +336,13 @@ _e_appwin_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
esw = data;
if (esw->zone == ev->zone)
{
/* FIXME: handle new size pants */
// FIXME: handle new size pants
}
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_e_appwin_cb_zone_del(void *data, __UNUSED__ int type, void *event)
_e_appwin_cb_zone_del(void *data, int type __UNUSED__, void *event)
{
E_Event_Zone_Del *ev;
E_Appwin *esw;
@ -357,20 +357,21 @@ _e_appwin_cb_zone_del(void *data, __UNUSED__ int type, void *event)
}
static void
_e_appwin_event_simple_free(void *data, void *ev)
_e_appwin_event_simple_free(void *data __UNUSED__, void *ev)
{
struct _E_Event_Appwin_Simple *e;
e = ev;
e_object_unref(E_OBJECT(e->appwin));
free(e);
}
*/
static void
_e_appwin_object_del_attach(void *o)
{
E_Appwin *esw;
E_Event_Appwin_Del *ev;
// E_Event_Appwin_Del *ev;
if (e_object_is_del(E_OBJECT(o))) return;
esw = o;
@ -424,4 +425,3 @@ _theme_obj_new(Evas *e, const char *custom_dir, const char *group)
}
return o;
}

12
src/modules/illume/e_busycover.c
View File

@ -11,7 +11,7 @@
E_Busycover *_e_busycover_new(E_Zone *zone, const char *themedir);
static void _e_busycover_free(E_Busycover *esw);
static Eina_Bool _e_busycover_cb_zone_move_resize(void *data, int type, void *event);
static void _e_busycover_cb_item_sel(void *data, void *data2);
//static void _e_busycover_cb_item_sel(void *data, void *data2);
static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *group);
@ -22,8 +22,7 @@ static void
_e_busycover_add_object(E_Busycover *esw)
{
int x, y, w, h;
Evas_Object *o;
esw->base_obj = _theme_obj_new(esw->zone->container->bg_evas,
esw->themedir,
"e/modules/busycover/default");
@ -126,7 +125,7 @@ _e_busycover_free(E_Busycover *esw)
}
static Eina_Bool
_e_busycover_cb_zone_move_resize(void *data, int type, void *event)
_e_busycover_cb_zone_move_resize(void *data, int type __UNUSED__, void *event)
{
E_Event_Zone_Move_Resize *ev;
E_Busycover *esw;
@ -144,11 +143,6 @@ _e_busycover_cb_zone_move_resize(void *data, int type, void *event)
return ECORE_CALLBACK_PASS_ON;
}
static Evas_Object *
_theme_obj_new(Evas *e, const char *custom_dir, const char *group)
{

30
src/modules/illume/e_busywin.c
View File

@ -10,7 +10,6 @@ static Eina_Bool _e_busywin_cb_animate(void *data);
static void _e_busywin_slide(E_Busywin *esw, int out, double len);
static Eina_Bool _e_busywin_cb_mouse_up(void *data, int type, void *event);
static Eina_Bool _e_busywin_cb_zone_move_resize(void *data, int type, void *event);
static void _e_busywin_cb_item_sel(void *data, void *data2);
static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *group);
@ -36,14 +35,13 @@ e_busywin_new(E_Zone *zone, const char *themedir)
E_Busywin *esw;
Evas_Coord mw, mh;
int x, y;
Evas_Object *o;
esw = E_OBJECT_ALLOC(E_Busywin, E_BUSYWIN_TYPE, _e_busywin_free);
if (!esw) return NULL;
esw->zone = zone;
if (themedir) esw->themedir = eina_stringshare_add(themedir);
esw->clickwin = ecore_x_window_input_new(zone->container->win,
zone->x, zone->y, zone->w, zone->h);
esw->popup = e_popup_new(esw->zone, -1, -1, 1, 1);
@ -53,36 +51,36 @@ e_busywin_new(E_Zone *zone, const char *themedir)
esw->popup->evas_win,
ECORE_X_WINDOW_STACK_BELOW);
e_popup_layer_set(esw->popup, 250);
esw->base_obj = _theme_obj_new(esw->popup->evas,
esw->themedir,
"e/modules/busywin/base/default");
edje_object_size_min_calc(esw->base_obj, &mw, &mh);
x = zone->x;
y = zone->y + zone->h;
mw = zone->w;
e_popup_move_resize(esw->popup, x, y, mw, mh);
evas_object_resize(esw->base_obj, esw->popup->w, esw->popup->h);
e_popup_edje_bg_object_set(esw->popup, esw->base_obj);
evas_object_show(esw->base_obj);
e_popup_show(esw->popup);
busywins = eina_list_append(busywins, esw);
esw->handlers = eina_list_append
(esw->handlers,
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP,
_e_busywin_cb_mouse_up, esw));
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP,
_e_busywin_cb_mouse_up, esw));
esw->handlers = eina_list_append
(esw->handlers,
ecore_event_handler_add(E_EVENT_ZONE_MOVE_RESIZE,
_e_busywin_cb_zone_move_resize, esw));
ecore_event_handler_add(E_EVENT_ZONE_MOVE_RESIZE,
_e_busywin_cb_zone_move_resize, esw));
return esw;
}
@ -217,7 +215,7 @@ _e_busywin_slide(E_Busywin *esw, int out, double len)
}
static Eina_Bool
_e_busywin_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
_e_busywin_cb_mouse_up(void *data, int type __UNUSED__, void *event)
{
Ecore_Event_Mouse_Button *ev;
E_Busywin *esw;
@ -233,7 +231,7 @@ _e_busywin_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_busywin_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
_e_busywin_cb_zone_move_resize(void *data, int type __UNUSED__, void *event)
{
E_Event_Zone_Move_Resize *ev;
E_Busywin *esw;

419
src/modules/illume/e_cfg.c
View File

File diff suppressed because it is too large Load Diff

12
src/modules/illume/e_flaunch.c
View File

@ -5,7 +5,7 @@
static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *group);
static void
_e_flaunch_cb_button_select(void *data, Evas_Object *obj, const char *emission, const char *source)
_e_flaunch_cb_button_select(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Flaunch_App *fla;
@ -93,7 +93,6 @@ _e_flaunch_apps_clear(E_Flaunch *fl)
static void
_e_flaunch_apps_populate(E_Flaunch *fl)
{
E_Flaunch_App *fla;
Eina_List *bar_desktops;
Eina_List *l;
int num = 0, max, count;
@ -145,7 +144,7 @@ _e_flaunch_apps_populate(E_Flaunch *fl)
}
static void
_e_fluanch_cb_home_button(void *data)
_e_fluanch_cb_home_button(void *data __UNUSED__)
{
printf("FIXME: this 'start' button has no defined behavior\n");
}
@ -167,7 +166,7 @@ _e_flaunch_free(E_Flaunch *fl)
}
static Eina_Bool
_e_flaunch_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
_e_flaunch_cb_zone_move_resize(void *data, int type __UNUSED__, void *event)
{
E_Event_Zone_Move_Resize *ev;
E_Flaunch *fl;
@ -195,13 +194,14 @@ _e_flaunch_cb_delayed_repopulate(void *data)
}
static Eina_Bool
_e_flaunch_cb_cache_update(void *data, __UNUSED__ int type, void *event)
_e_flaunch_cb_cache_update(void *data, int type __UNUSED__, void *event __UNUSED__)
{
E_Flaunch *fl;
fl = data;
if (fl->repopulate_timer) ecore_timer_del(fl->repopulate_timer);
fl->repopulate_timer = ecore_timer_add(0.5, _e_flaunch_cb_delayed_repopulate, fl);
fl->repopulate_timer =
ecore_timer_add(0.5, _e_flaunch_cb_delayed_repopulate, fl);
return ECORE_CALLBACK_PASS_ON;
}

82
src/modules/illume/e_kbd.c
View File

@ -17,8 +17,9 @@ static E_Module *mod = NULL;
//#define ICONIFY_TO_HIDE
static Ecore_Job *_e_kbd_apply_all_job = NULL;
static void
_e_kbd_cb_apply_all_job(void *data)
_e_kbd_cb_apply_all_job(void *data __UNUSED__)
{
_e_mod_layout_apply_all();
_e_kbd_apply_all_job = NULL;
@ -275,7 +276,7 @@ _e_kbd_all_toggle(void)
}
static Eina_Bool
_e_kbd_cb_client_message(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_kbd_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_X_Event_Client_Message *ev;
@ -292,7 +293,7 @@ _e_kbd_cb_client_message(__UNUSED__ void *data, __UNUSED__ int type, void *event
}
static Eina_Bool
_e_kbd_cb_border_remove(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_kbd_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Remove *ev;
E_Kbd *kbd;
@ -333,7 +334,7 @@ _e_kbd_cb_border_remove(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_kbd_cb_border_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_kbd_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Focus_In *ev;
@ -376,7 +377,7 @@ _e_kbd_cb_border_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *even
}
static Eina_Bool
_e_kbd_cb_border_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_kbd_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Focus_Out *ev;
@ -393,7 +394,7 @@ _e_kbd_cb_border_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *eve
}
static Eina_Bool
_e_kbd_cb_border_property(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_kbd_cb_border_property(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Property *ev;
@ -439,7 +440,7 @@ _e_kbd_cb_border_property(__UNUSED__ void *data, __UNUSED__ int type, void *even
}
static void
_e_kbd_cb_border_hook_pre_post_fetch(void *data, void *data2)
_e_kbd_cb_border_hook_pre_post_fetch(void *data __UNUSED__, void *data2)
{
E_Border *bd;
@ -497,7 +498,7 @@ _e_kbd_cb_border_hook_pre_post_fetch(void *data, void *data2)
}
static void
_e_kbd_cb_border_hook_post_fetch(void *data, void *data2)
_e_kbd_cb_border_hook_post_fetch(void *data __UNUSED__, void *data2)
{
E_Border *bd;
@ -507,7 +508,7 @@ _e_kbd_cb_border_hook_post_fetch(void *data, void *data2)
}
static void
_e_kbd_cb_border_hook_post_border_assign(void *data, void *data2)
_e_kbd_cb_border_hook_post_border_assign(void *data __UNUSED__, void *data2)
{
E_Border *bd;
E_Kbd *kbd;
@ -590,7 +591,7 @@ _e_kbd_cb_border_hook_post_border_assign(void *data, void *data2)
}
static void
_e_kbd_cb_border_hook_end(void *data, void *data2)
_e_kbd_cb_border_hook_end(void *data __UNUSED__, void *data2)
{
E_Kbd *kbd;
E_Border *bd;
@ -720,13 +721,13 @@ _e_kbd_dbus_keyboard_eval(void)
}
static void
_e_kbd_dbus_cb_dev_input_keyboard(void *user_data, void *reply_data, DBusError *error)
_e_kbd_dbus_cb_dev_input_keyboard(void *user_data __UNUSED__, void *reply_data, DBusError *error)
{
E_Hal_Manager_Find_Device_By_Capability_Return *ret = reply_data;
Eina_List *l;
char *device;
if (!ret || !ret->strings) return;
if ((!ret) || (!ret->strings)) return;
if (dbus_error_is_set(error))
{
@ -764,20 +765,21 @@ _e_kbd_dbus_cb_input_keyboard_is(void *user_data, void *reply_data, DBusError *e
}
static void
_e_kbd_dbus_cb_dev_add(void *data, DBusMessage *msg)
_e_kbd_dbus_cb_dev_add(void *data __UNUSED__, DBusMessage *msg)
{
DBusError err;
char *udi;
dbus_error_init(&err);
dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID);
e_hal_device_query_capability(_e_kbd_dbus_conn, eina_stringshare_add(udi), "input.keyboard",
_e_kbd_dbus_cb_input_keyboard_is,
(void*)eina_stringshare_add(udi));
e_hal_device_query_capability(_e_kbd_dbus_conn, eina_stringshare_add(udi),
"input.keyboard",
_e_kbd_dbus_cb_input_keyboard_is,
(void*)eina_stringshare_add(udi));
}
static void
_e_kbd_dbus_cb_dev_del(void *data, DBusMessage *msg)
_e_kbd_dbus_cb_dev_del(void *data __UNUSED__, DBusMessage *msg)
{
DBusError err;
char *udi;
@ -789,7 +791,7 @@ _e_kbd_dbus_cb_dev_del(void *data, DBusMessage *msg)
}
static void
_e_kbd_dbus_cb_cap_add(void *data, DBusMessage *msg)
_e_kbd_dbus_cb_cap_add(void *data __UNUSED__, DBusMessage *msg)
{
DBusError err;
char *udi, *capability;
@ -807,7 +809,7 @@ _e_kbd_dbus_cb_cap_add(void *data, DBusMessage *msg)
static void
_e_kbd_dbus_ignore_keyboards_file_load(const char *file)
{
char buf[4096];
char buf[PATH_MAX];
FILE *f;
f = fopen(file, "r");
@ -836,6 +838,7 @@ static void
_e_kbd_dbus_ignore_keyboards_load(void)
{
char buf[PATH_MAX];
e_user_dir_concat_static(buf, "keyboards/ignore_built_in_keyboards");
_e_kbd_dbus_ignore_keyboards_file_load(buf);
snprintf(buf, sizeof(buf), "%s/keyboards/ignore_built_in_keyboards", e_module_dir_get(mod));
@ -881,9 +884,12 @@ _e_kbd_dbus_real_kbd_shutdown(void)
if (_e_kbd_dbus_conn)
{
e_dbus_signal_handler_del(_e_kbd_dbus_conn, _e_kbd_dbus_handler_dev_add);
e_dbus_signal_handler_del(_e_kbd_dbus_conn, _e_kbd_dbus_handler_dev_del);
e_dbus_signal_handler_del(_e_kbd_dbus_conn, _e_kbd_dbus_handler_dev_chg);
e_dbus_signal_handler_del(_e_kbd_dbus_conn,
_e_kbd_dbus_handler_dev_add);
e_dbus_signal_handler_del(_e_kbd_dbus_conn,
_e_kbd_dbus_handler_dev_del);
e_dbus_signal_handler_del(_e_kbd_dbus_conn,
_e_kbd_dbus_handler_dev_chg);
}
EINA_LIST_FREE(_e_kbd_dbus_real_ignore, str)
eina_stringshare_del(str);
@ -903,43 +909,43 @@ e_kbd_init(E_Module *m)
handlers = eina_list_append(handlers,
ecore_event_handler_add
(ECORE_X_EVENT_CLIENT_MESSAGE,
_e_kbd_cb_client_message, NULL));
_e_kbd_cb_client_message, NULL));
handlers = eina_list_append(handlers,
ecore_event_handler_add
(E_EVENT_BORDER_REMOVE,
_e_kbd_cb_border_remove, NULL));
_e_kbd_cb_border_remove, NULL));
handlers = eina_list_append(handlers,
ecore_event_handler_add
(E_EVENT_BORDER_FOCUS_IN,
_e_kbd_cb_border_focus_in, NULL));
_e_kbd_cb_border_focus_in, NULL));
handlers = eina_list_append(handlers,
ecore_event_handler_add
(E_EVENT_BORDER_FOCUS_OUT,
_e_kbd_cb_border_focus_out, NULL));
_e_kbd_cb_border_focus_out, NULL));
handlers = eina_list_append(handlers,
ecore_event_handler_add
(E_EVENT_BORDER_PROPERTY,
_e_kbd_cb_border_property, NULL));
_e_kbd_cb_border_property, NULL));
border_hooks = eina_list_append(border_hooks,
e_border_hook_add
(E_BORDER_HOOK_EVAL_PRE_POST_FETCH,
_e_kbd_cb_border_hook_pre_post_fetch,
NULL));
_e_kbd_cb_border_hook_pre_post_fetch,
NULL));
border_hooks = eina_list_append(border_hooks,
e_border_hook_add
(E_BORDER_HOOK_EVAL_POST_FETCH,
_e_kbd_cb_border_hook_post_fetch,
NULL));
_e_kbd_cb_border_hook_post_fetch,
NULL));
border_hooks = eina_list_append(border_hooks,
e_border_hook_add
(E_BORDER_HOOK_EVAL_POST_BORDER_ASSIGN,
_e_kbd_cb_border_hook_post_border_assign,
NULL));
_e_kbd_cb_border_hook_post_border_assign,
NULL));
border_hooks = eina_list_append(border_hooks,
e_border_hook_add
(E_BORDER_HOOK_EVAL_END,
_e_kbd_cb_border_hook_end,
NULL));
_e_kbd_cb_border_hook_end,
NULL));
_e_kbd_dbus_real_kbd_init();
return 1;
}
@ -963,7 +969,7 @@ e_kbd_shutdown(void)
}
EAPI E_Kbd *
e_kbd_new(E_Zone *zone, const char *themedir, const char *syskbds, const char *sysdicts)
e_kbd_new(E_Zone *zone __UNUSED__, const char *themedir __UNUSED__, const char *syskbds __UNUSED__, const char *sysdicts __UNUSED__)
{
E_Kbd *kbd;
@ -1075,11 +1081,11 @@ e_kbd_safe_app_region_get(E_Zone *zone, int *x, int *y, int *w, int *h)
}
EAPI void
e_kbd_fullscreen_set(E_Zone *zone, int fullscreen)
e_kbd_fullscreen_set(E_Zone *zone __UNUSED__, int fullscreen)
{
Eina_List *l;
E_Kbd *kbd;
EINA_LIST_FOREACH(kbds, l, kbd)
if ((!!fullscreen) != kbd->fullscreen)
{

13
src/modules/illume/e_kbd_buf.c
View File

@ -57,7 +57,7 @@ _e_kbd_buf_actual_string_clear(E_Kbd_Buf *kb)
}
static E_Kbd_Buf_Key *
_e_kbd_buf_at_coord_get(E_Kbd_Buf *kb, E_Kbd_Buf_Layout *kbl, int x, int y)
_e_kbd_buf_at_coord_get(E_Kbd_Buf *kb __UNUSED__, E_Kbd_Buf_Layout *kbl, int x, int y)
{
Eina_List *l;
@ -77,7 +77,7 @@ _e_kbd_buf_at_coord_get(E_Kbd_Buf *kb, E_Kbd_Buf_Layout *kbl, int x, int y)
}
static E_Kbd_Buf_Key *
_e_kbd_buf_closest_get(E_Kbd_Buf *kb, E_Kbd_Buf_Layout *kbl, int x, int y)
_e_kbd_buf_closest_get(E_Kbd_Buf *kb __UNUSED__, E_Kbd_Buf_Layout *kbl, int x, int y)
{
Eina_List *l;
E_Kbd_Buf_Key *ky_closest = NULL;
@ -105,7 +105,7 @@ _e_kbd_buf_closest_get(E_Kbd_Buf *kb, E_Kbd_Buf_Layout *kbl, int x, int y)
}
static const char *
_e_kbd_buf_keystroke_key_string_get(E_Kbd_Buf *kb, E_Kbd_Buf_Keystroke *ks, E_Kbd_Buf_Key *ky)
_e_kbd_buf_keystroke_key_string_get(E_Kbd_Buf *kb __UNUSED__, E_Kbd_Buf_Keystroke *ks, E_Kbd_Buf_Key *ky)
{
const char *str = NULL;
@ -192,7 +192,6 @@ _e_kbd_buf_matches_find(Eina_List *matches, const char *s)
static void
_e_kbd_buf_matches_update(E_Kbd_Buf *kb)
{
Eina_List *matches = NULL;
const char *word;
int pri, i;
E_Kbd_Dict *dicts[3];
@ -234,7 +233,7 @@ _e_kbd_buf_cb_data_dict_reload(void *data)
}
static void
_e_kbd_buf_cb_data_dict_change(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path)
_e_kbd_buf_cb_data_dict_change(void *data, Ecore_File_Monitor *em __UNUSED__, Ecore_File_Event event __UNUSED__, const char *path __UNUSED__)
{
E_Kbd_Buf *kb;
@ -442,8 +441,8 @@ _e_kbd_buf_keystroke_point_add(E_Kbd_Buf *kb, E_Kbd_Buf_Keystroke *ks)
{
E_Kbd_Buf_Key *ky;
const char *str;
int px, py, dx, dy, d, fuzz;
int px, py, dx, dy, d;
ky = l->data;
px = ky->x + (ky->w / 2);
py = ky->y + (ky->h / 2);

25
src/modules/illume/e_kbd_dict.c
View File

@ -174,7 +174,7 @@ _e_kbd_dict_line_next(E_Kbd_Dict *kd, const char *p)
}
static char *
_e_kbd_dict_line_parse(E_Kbd_Dict *kd, const char *p, int *usage)
_e_kbd_dict_line_parse(E_Kbd_Dict *kd __UNUSED__, const char *p, int *usage)
{
const char *ps;
char *wd = NULL;
@ -194,12 +194,11 @@ _e_kbd_dict_line_parse(E_Kbd_Dict *kd, const char *p, int *usage)
}
static void
_e_kbd_dict_lookup_build_line(E_Kbd_Dict *kd, const char *p, const char *eol,
int *glyphs)
_e_kbd_dict_lookup_build_line(E_Kbd_Dict *kd __UNUSED__, const char *p, const char *eol, int *glyphs)
{
char *s;
int p2;
s = alloca(eol - p + 1);
strncpy(s, p, eol - p);
s[eol - p] = 0;
@ -691,17 +690,15 @@ e_kbd_dict_word_letter_delete(E_Kbd_Dict *kd)
}
static void
_e_kbd_dict_matches_lookup_iter(E_Kbd_Dict *kd, Eina_List *word,
Eina_List *more)
_e_kbd_dict_matches_lookup_iter(E_Kbd_Dict *kd, Eina_List *word, Eina_List *more)
{
Eina_List *l, *l2, *list;
const char *p, *pn;
Eina_List *l, *list;
const char *p;
char *base, *buf, *wd, *bufapp;
E_Kbd_Dict_Letter *kl;
int len, dist = 0, d, baselen, maxdist = 0, md;
static int level = 0, lv;
static int level = 0;
len = 0;
level++;
for (l = word; l; l = l->next)
@ -759,7 +756,7 @@ _e_kbd_dict_matches_lookup_iter(E_Kbd_Dict *kd, Eina_List *word,
{
E_Kbd_Dict_Word *kw;
int usage = 0;
wd = _e_kbd_dict_line_parse(kd, p, &usage);
if (!wd) break;
if (_e_kbd_dict_normalized_strcmp(wd, buf))
@ -771,8 +768,8 @@ _e_kbd_dict_matches_lookup_iter(E_Kbd_Dict *kd, Eina_List *word,
if (kw)
{
int accuracy;
int w, b, w2, b2, wc, bc, upper;
int w, b, w2, b2, wc, bc;
// match any capitalisation
for (w = 0, b = 0; wd[w] && buf[b];)
{

90
src/modules/illume/e_kbd_int.c
View File

@ -5,12 +5,13 @@
#include "e_cfg.h"
#include "e_slipshelf.h"
enum {
NORMAL = 0,
SHIFT = (1 << 0),
enum
{
NORMAL = 0,
SHIFT = (1 << 0),
CAPSLOCK = (1 << 1),
CTRL = (1 << 2),
ALT = (1 << 3)
CTRL = (1 << 2),
ALT = (1 << 3)
};
static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *group);
@ -228,7 +229,7 @@ _e_kbd_int_buf_send(E_Kbd_Int *ki)
static void
_e_kbd_int_cb_match_select(void *data, Evas_Object *obj, const char *emission, const char *source)
_e_kbd_int_cb_match_select(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Kbd_Int_Match *km;
@ -510,9 +511,9 @@ _e_kbd_int_zoomkey_up(E_Kbd_Int *ki)
{
const Eina_List *l;
Evas_Object *o, *o2;
Evas_Coord w, h, mw, mh, vw, vh;
Evas_Coord mw, mh, vw, vh;
int sx, sy, sw, sh;
if (ki->zoomkey.popup) return;
ki->zoomkey.popup = e_popup_new(ki->win->border->zone, -1, -1, 1, 1);
e_popup_layer_set(ki->zoomkey.popup, 190);
@ -674,7 +675,7 @@ _e_kbd_int_cb_hold_timeout(void *data)
}
static void
_e_kbd_int_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
_e_kbd_int_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Evas_Event_Mouse_Down *ev;
E_Kbd_Int *ki;
@ -719,7 +720,7 @@ _e_kbd_int_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_i
}
static void
_e_kbd_int_cb_mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_info)
_e_kbd_int_cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Evas_Event_Mouse_Move *ev;
E_Kbd_Int *ki;
@ -762,11 +763,10 @@ _e_kbd_int_cb_mouse_move(void *data, Evas *evas, Evas_Object *obj, void *event_i
}
static void
_e_kbd_int_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
_e_kbd_int_cb_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Evas_Event_Mouse_Up *ev;
E_Kbd_Int *ki;
Evas_Coord x, y;
E_Kbd_Int_Key *ky;
int dir = 0;
@ -845,24 +845,24 @@ _e_kbd_int_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_inf
static E_Kbd_Int_Layout *
_e_kbd_int_layouts_list_default_get(E_Kbd_Int *ki)
{
E_Kbd_Int_Layout *kil;
E_Kbd_Int_Layout *kil;
Eina_List *l;
EINA_LIST_FOREACH(ki->layouts, l, kil)
if ((!strcmp(ecore_file_file_get(kil->path), "Default.kbd")))
return kil;
if ((!strcmp(ecore_file_file_get(kil->path), "Default.kbd")))
return kil;
return NULL;
}
static E_Kbd_Int_Layout *
_e_kbd_int_layouts_type_get(E_Kbd_Int *ki, int type)
{
E_Kbd_Int_Layout *kil;
E_Kbd_Int_Layout *kil;
Eina_List *l;
EINA_LIST_FOREACH(ki->layouts, l, kil)
if (kil->type == type)
return kil;
if (kil->type == type)
return kil;
return NULL;
}
@ -876,9 +876,9 @@ _e_kbd_int_layout_free(E_Kbd_Int *ki)
ki->layout.directory = NULL;
ki->layout.file = NULL;
EINA_LIST_FREE(ki->layout.keys, ky)
{
E_Kbd_Int_Key_State *st;
{
E_Kbd_Int_Key_State *st;
EINA_LIST_FREE(ky->states, st)
{
if (st->label) eina_stringshare_del(st->label);
@ -898,7 +898,7 @@ static void
_e_kbd_int_layout_parse(E_Kbd_Int *ki, const char *layout)
{
FILE *f;
char buf[4096];
char buf[PATH_MAX];
int isok = 0;
E_Kbd_Int_Key *ky = NULL;
E_Kbd_Int_Key_State *st = NULL;
@ -914,8 +914,8 @@ _e_kbd_int_layout_parse(E_Kbd_Int *ki, const char *layout)
while (fgets(buf, sizeof(buf), f))
{
int len;
char str[4096];
char str[PATH_MAX];
if (!isok)
{
if (!strcmp(buf, "##KBDCONF-1.0\n")) isok = 1;
@ -967,9 +967,8 @@ _e_kbd_int_layout_parse(E_Kbd_Int *ki, const char *layout)
(!strcmp(str, "capslock")))
{
char *p;
char label[4096];
int xx;
char label[PATH_MAX];
if (sscanf(buf, "%*s %4000s", label) != 1) continue;
st = calloc(1, sizeof(E_Kbd_Int_Key_State));
if (!st) continue;
@ -1074,8 +1073,8 @@ _e_kbd_int_layout_build(E_Kbd_Int *ki)
static void
_e_kbd_int_layouts_free(E_Kbd_Int *ki)
{
E_Kbd_Int_Layout *kil;
E_Kbd_Int_Layout *kil;
EINA_LIST_FREE(ki->layouts, kil)
{
eina_stringshare_del(kil->path);
@ -1182,12 +1181,12 @@ _e_kbd_int_layouts_list_update(E_Kbd_Int *ki)
if (f)
{
int isok = 0;
while (fgets(buf, sizeof(buf), f))
{
int len;
char str[4096];
char str[PATH_MAX];
if (!isok)
{
if (!strcmp(buf, "##KBDCONF-1.0\n")) isok = 1;
@ -1268,15 +1267,14 @@ static void
_e_kbd_int_layout_next(E_Kbd_Int *ki)
{
Eina_List *l, *ln = NULL;
const char *nextlay = NULL;
E_Kbd_Int_Layout *kil;
EINA_LIST_FOREACH(ki->layouts, l, kil)
if (!strcmp(kil->path, ki->layout.file))
{
ln = l->next;
break;
}
if (!strcmp(kil->path, ki->layout.file))
{
ln = l->next;
break;
}
if (!ln) ln = ki->layouts;
if (!ln) return;
kil = ln->data;
@ -1284,7 +1282,7 @@ _e_kbd_int_layout_next(E_Kbd_Int *ki)
}
static Eina_Bool
_e_kbd_int_cb_client_message(void *data, __UNUSED__ int type, void *event)
_e_kbd_int_cb_client_message(void *data, int type __UNUSED__, void *event)
{
Ecore_X_Event_Client_Message *ev;
E_Kbd_Int *ki;
@ -1388,7 +1386,7 @@ static void
_e_kbd_int_dictlist_up(E_Kbd_Int *ki)
{
Evas_Object *o;
Evas_Coord w, h, mw, mh, vw, vh;
Evas_Coord mw, mh;
int sx, sy, sw, sh;
Eina_List *files;
Eina_List *l;
@ -1545,9 +1543,9 @@ _e_kbd_int_matchlist_up(E_Kbd_Int *ki)
{
const Eina_List *l;
Evas_Object *o;
Evas_Coord w, h, mw, mh, vw, vh;
Evas_Coord mw, mh;
int sx, sy, sw, sh;
if (!e_kbd_buf_string_matches_get(ki->kbuf)) return;
if (ki->matchlist.popup) return;
ki->matchlist.popup = e_popup_new(ki->win->border->zone, -1, -1, 1, 1);
@ -1615,7 +1613,7 @@ _e_kbd_int_matchlist_up(E_Kbd_Int *ki)
}
static void
_e_kbd_int_cb_matches(void *data, Evas_Object *obj, const char *emission, const char *source)
_e_kbd_int_cb_matches(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Kbd_Int *ki;
@ -1632,7 +1630,7 @@ _e_kbd_int_cb_matches(void *data, Evas_Object *obj, const char *emission, const
}
static void
_e_kbd_int_cb_dicts(void *data, Evas_Object *obj, const char *emission, const char *source)
_e_kbd_int_cb_dicts(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Kbd_Int *ki;
@ -1741,7 +1739,7 @@ _e_kbd_int_layoutlist_up(E_Kbd_Int *ki)
}
static void
_e_kbd_int_cb_layouts(void *data, Evas_Object *obj, const char *emission, const char *source)
_e_kbd_int_cb_layouts(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Kbd_Int *ki;
@ -1754,10 +1752,8 @@ EAPI E_Kbd_Int *
e_kbd_int_new(const char *themedir, const char *syskbds, const char *sysdicts)
{
E_Kbd_Int *ki;
unsigned int one = 1;
Evas_Object *o;
Evas_Coord mw, mh;
const char *deflay;
E_Zone *zone;
E_Kbd_Int_Layout *kil;
Ecore_X_Window_State states[2];

57
src/modules/illume/e_mod_gad_bluetooth.c
View File

@ -105,7 +105,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
{
Instance *inst;
Evas_Coord mw, mh, mxw, mxh;
@ -124,18 +124,18 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
}
static char *
_gc_label(E_Gadcon_Client_Class *client_class)
_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
{
return "Bluetooth (Illume)";
}
static Evas_Object *
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas __UNUSED__)
{
/* FIXME: need icon
Evas_Object *o;
char buf[4096];
char buf[PATH_MAX];
o = edje_object_add(evas);
snprintf(buf, sizeof(buf), "%s/e-module-clock.edj",
e_module_dir_get(clock_module));
@ -146,7 +146,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
}
static const char *
_gc_id_new(E_Gadcon_Client_Class *client_class)
_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
{
return _gadcon_class.name;
}
@ -159,31 +159,30 @@ _find_interface_class(int iclass)
devs = ecore_file_ls("/sys/bus/usb/devices");
EINA_LIST_FREE(devs, name)
{
char buf[PATH_MAX];
FILE *f;
{
char buf[PATH_MAX];
FILE *f;
snprintf(buf, sizeof(buf), "%s/%s/%s",
"/sys/bus/usb/devices", name, "bInterfaceClass");
f = fopen(buf, "r");
if (f)
{
if (fgets(buf, sizeof(buf), f))
{
int id = -1;
sscanf(buf, "%x", &id);
if (iclass == id)
{
EINA_LIST_FREE(devs, name)
free(name);
fclose(f);
return 1;
}
}
fclose(f);
}
snprintf(buf, sizeof(buf), "%s/%s/%s",
"/sys/bus/usb/devices", name, "bInterfaceClass");
f = fopen(buf, "r");
if (f)
{
if (fgets(buf, sizeof(buf), f))
{
int id = -1;
sscanf(buf, "%x", &id);
if (iclass == id)
{
EINA_LIST_FREE(devs, name)
free(name);
fclose(f);
return 1;
}
}
fclose(f);
}
free(name);
}
return 0;

24
src/modules/illume/e_mod_gad_gsm.c
View File

@ -200,7 +200,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
{
Instance *inst;
Evas_Coord mw, mh, mxw, mxh;
@ -219,17 +219,17 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
}
static char *
_gc_label(E_Gadcon_Client_Class *client_class)
_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
{
return "GSM (Illume)";
}
static Evas_Object *
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas __UNUSED__)
{
/* FIXME: need icon
Evas_Object *o;
char buf[4096];
char buf[PATH_MAX];
o = edje_object_add(evas);
snprintf(buf, sizeof(buf), "%s/e-module-clock.edj",
@ -241,7 +241,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
}
static const char *
_gc_id_new(E_Gadcon_Client_Class *client_class)
_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
{
return _gadcon_class.name;
}
@ -295,7 +295,7 @@ update_signal(int sig, void *data)
static void *
signal_unmarhsall(DBusMessage *msg, DBusError *err)
signal_unmarhsall(DBusMessage *msg, DBusError *err __UNUSED__)
{
dbus_int32_t val = -1;
@ -314,7 +314,7 @@ signal_unmarhsall(DBusMessage *msg, DBusError *err)
}
static void *
operator_unmarhsall(DBusMessage *msg, DBusError *err)
operator_unmarhsall(DBusMessage *msg, DBusError *err __UNUSED__)
{
const char *str;
@ -375,13 +375,13 @@ _fso_operator_unmarhsall(DBusMessage *msg)
}
static void *
fso_operator_unmarhsall(DBusMessage *msg, DBusError *err)
fso_operator_unmarhsall(DBusMessage *msg, DBusError *err __UNUSED__)
{
return _fso_operator_unmarhsall(msg);
}
static void
signal_callback_qtopia(void *data, void *ret, DBusError *err)
signal_callback_qtopia(void *data, void *ret, DBusError *err __UNUSED__)
{
// printf("GSM-gadget: Qtopia signal callback called\n");
if (ret)
@ -412,7 +412,7 @@ signal_callback_qtopia(void *data, void *ret, DBusError *err)
}
static void
signal_callback_fso(void *data, void *ret, DBusError *err)
signal_callback_fso(void *data, void *ret, DBusError *err __UNUSED__)
{
// printf("GSM-gadget: FSO signal callback called\n");
if (ret)
@ -443,7 +443,7 @@ signal_callback_fso(void *data, void *ret, DBusError *err)
}
static void
operator_callback_qtopia(void *data, void *ret, DBusError *err)
operator_callback_qtopia(void *data, void *ret, DBusError *err __UNUSED__)
{
// printf("GSM-gadget: Qtopia operator callback called\n");
if (ret)
@ -471,7 +471,7 @@ operator_callback_qtopia(void *data, void *ret, DBusError *err)
}
static void
operator_callback_fso(void *data, void *ret, DBusError *err)
operator_callback_fso(void *data, void *ret, DBusError *err __UNUSED__)
{
// printf("GSM-gadget: FSO operator callback called\n");
if (ret)

12
src/modules/illume/e_mod_gad_usb.c
View File

@ -105,7 +105,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
{
Instance *inst;
Evas_Coord mw, mh, mxw, mxh;
@ -124,18 +124,18 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
}
static char *
_gc_label(E_Gadcon_Client_Class *client_class)
_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
{
return "USB (Illume)";
}
static Evas_Object *
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas __UNUSED__)
{
/* FIXME: need icon
Evas_Object *o;
char buf[4096];
char buf[PATH_MAX];
o = edje_object_add(evas);
snprintf(buf, sizeof(buf), "%s/e-module-clock.edj",
e_module_dir_get(clock_module));
@ -146,7 +146,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
}
static const char *
_gc_id_new(E_Gadcon_Client_Class *client_class)
_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
{
return _gadcon_class.name;
}

38
src/modules/illume/e_mod_gad_wifi.c
View File

@ -1,6 +1,5 @@
#include "e.h"
/***************************************************************************/
typedef struct _Instance Instance;
struct _Instance
@ -13,8 +12,6 @@ struct _Instance
int strength;
};
/***************************************************************************/
/**/
/* gadcon requirements */
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
@ -34,8 +31,6 @@ static const E_Gadcon_Client_Class _gadcon_class =
E_GADCON_CLIENT_STYLE_PLAIN
};
static E_Module *mod = NULL;
/**/
/***************************************************************************/
static void _wifiget_spawn(Instance *inst);
static void _wifiget_kill(Instance *inst);
@ -115,7 +110,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
}
static void
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
{
Instance *inst;
Evas_Coord mw, mh, mxw, mxh;
@ -134,18 +129,18 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
}
static char *
_gc_label(E_Gadcon_Client_Class *client_class)
_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
{
return "Wifi (Illume)";
}
static Evas_Object *
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
_gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas __UNUSED__)
{
/* FIXME: need icon
Evas_Object *o;
char buf[4096];
char buf[PATH_MAX];
o = edje_object_add(evas);
snprintf(buf, sizeof(buf), "%s/e-module-clock.edj",
e_module_dir_get(clock_module));
@ -156,7 +151,7 @@ _gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
}
static const char *
_gc_id_new(E_Gadcon_Client_Class *client_class)
_gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
{
return _gadcon_class.name;
}
@ -164,25 +159,20 @@ _gc_id_new(E_Gadcon_Client_Class *client_class)
static void
_wifiget_spawn(Instance *inst)
{
char buf[4096];
char buf[PATH_MAX];
if (inst->wifiget_exe) return;
snprintf(buf, sizeof(buf),
"%s/%s/wifiget %i",
e_module_dir_get(mod), MODULE_ARCH,
8);
snprintf(buf, sizeof(buf), "%s/%s/wifiget %i",
e_module_dir_get(mod), MODULE_ARCH, 8);
inst->wifiget_exe = ecore_exe_pipe_run(buf,
ECORE_EXE_PIPE_READ |
ECORE_EXE_PIPE_READ_LINE_BUFFERED |
ECORE_EXE_NOT_LEADER,
inst);
inst->wifiget_data_handler =
ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _wifiget_cb_exe_data,
inst);
ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _wifiget_cb_exe_data, inst);
inst->wifiget_del_handler =
ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
_wifiget_cb_exe_del,
inst);
ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _wifiget_cb_exe_del, inst);
}
@ -200,7 +190,7 @@ _wifiget_kill(Instance *inst)
}
static Eina_Bool
_wifiget_cb_exe_data(void *data, __UNUSED__ int type, void *event)
_wifiget_cb_exe_data(void *data, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Data *ev;
Instance *inst;
@ -238,7 +228,7 @@ _wifiget_cb_exe_data(void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_wifiget_cb_exe_del(void *data, __UNUSED__ int type, void *event)
_wifiget_cb_exe_del(void *data, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Del *ev;
Instance *inst;

76
src/modules/illume/e_mod_layout.c
View File

@ -46,14 +46,12 @@ static Eina_List *handlers = NULL;
static Eina_List *effects = NULL;
/* mainwin is the main big window currently focused/visible */
static E_Border *mainwin = NULL;
static E_Border *focuswin = NULL;
static E_Border *dockwin = NULL;
static int dockwin_use = 0;
/* called from the module core */
void
_e_mod_layout_init(E_Module *m)
_e_mod_layout_init(E_Module *m __UNUSED__)
{
hook1 = e_border_hook_add(E_BORDER_HOOK_EVAL_POST_FETCH,
_e_mod_layout_cb_hook_post_fetch, NULL);
@ -61,27 +59,26 @@ _e_mod_layout_init(E_Module *m)
_e_mod_layout_cb_hook_post_border_assign, NULL);
hook3 = e_border_hook_add(E_BORDER_HOOK_EVAL_END,
_e_mod_layout_cb_hook_end, NULL);
handlers = eina_list_append
(handlers, ecore_event_handler_add
(E_EVENT_BORDER_ADD, _cb_event_border_add, NULL));
handlers = eina_list_append
(handlers, ecore_event_handler_add
(E_EVENT_BORDER_REMOVE, _cb_event_border_remove, NULL));
handlers = eina_list_append
(handlers, ecore_event_handler_add
(E_EVENT_BORDER_FOCUS_IN, _cb_event_border_focus_in, NULL));
handlers = eina_list_append
(handlers, ecore_event_handler_add
(E_EVENT_BORDER_FOCUS_OUT, _cb_event_border_focus_out, NULL));
handlers = eina_list_append
(handlers, ecore_event_handler_add
(E_EVENT_BORDER_SHOW, _cb_event_border_show, NULL));
handlers = eina_list_append
(handlers, ecore_event_handler_add
(E_EVENT_BORDER_HIDE, _cb_event_border_hide, NULL));
handlers = eina_list_append
(handlers, ecore_event_handler_add
(E_EVENT_ZONE_MOVE_RESIZE, _cb_event_zone_move_resize, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add
(E_EVENT_BORDER_ADD, _cb_event_border_add, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add
(E_EVENT_BORDER_REMOVE,
_cb_event_border_remove, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add
(E_EVENT_BORDER_FOCUS_IN,
_cb_event_border_focus_in, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add
(E_EVENT_BORDER_FOCUS_OUT,
_cb_event_border_focus_out, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add
(E_EVENT_BORDER_SHOW,
_cb_event_border_show, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add
(E_EVENT_BORDER_HIDE,
_cb_event_border_hide, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add
(E_EVENT_ZONE_MOVE_RESIZE,
_cb_event_zone_move_resize, NULL));
{
E_Zone *zone;
@ -314,7 +311,7 @@ _e_mod_layout_effect_slide_in(E_Border *bd, double in, int post)
static Ecore_Timer *_dockwin_hide_timer = NULL;
static Eina_Bool
_e_mod_layout_cb_docwin_hide(void *data)
_e_mod_layout_cb_docwin_hide(void *data __UNUSED__)
{
_dockwin_hide_timer = NULL;
if (!dockwin) return ECORE_CALLBACK_CANCEL;
@ -379,7 +376,7 @@ _is_dialog(E_Border *bd)
}
static void
_e_mod_layout_cb_hook_post_fetch(void *data, void *data2)
_e_mod_layout_cb_hook_post_fetch(void *data __UNUSED__, void *data2)
{
E_Border *bd;
@ -673,7 +670,7 @@ _e_mod_layout_post_border_assign(E_Border *bd, int not_new)
}
static void
_e_mod_layout_cb_hook_post_border_assign(void *data, void *data2)
_e_mod_layout_cb_hook_post_border_assign(void *data __UNUSED__, void *data2)
{
E_Border *bd;
@ -682,7 +679,7 @@ _e_mod_layout_cb_hook_post_border_assign(void *data, void *data2)
}
static void
_e_mod_layout_cb_hook_end(void *data, void *data2)
_e_mod_layout_cb_hook_end(void *data __UNUSED__, void *data2)
{
E_Border *bd;
@ -693,7 +690,7 @@ _e_mod_layout_cb_hook_end(void *data, void *data2)
}
static Eina_Bool
_cb_event_border_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_cb_event_border_add(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Add *ev;
@ -703,7 +700,7 @@ _cb_event_border_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_cb_event_border_remove(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_cb_event_border_remove(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Remove *ev;
Eina_List *l, *pl;
@ -746,7 +743,7 @@ _cb_event_border_remove(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_cb_event_border_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_cb_event_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Focus_In *ev;
E_Border *bd;
@ -758,12 +755,14 @@ _cb_event_border_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *even
{
if (bd->client.qtopia.soft_menus)
{
if ((dockwin) && (!dockwin_use) && (dockwin->client.qtopia.soft_menu))
if ((dockwin) && (!dockwin_use) &&
(dockwin->client.qtopia.soft_menu))
_e_mod_layout_dockwin_show();
}
else
{
if ((dockwin) && (dockwin_use) && (dockwin->client.qtopia.soft_menu))
if ((dockwin) && (dockwin_use) &&
(dockwin->client.qtopia.soft_menu))
_e_mod_layout_dockwin_hide();
}
}
@ -771,7 +770,7 @@ _cb_event_border_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *even
}
static Eina_Bool
_cb_event_border_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_cb_event_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Focus_Out *ev;
E_Border *bd;
@ -783,7 +782,8 @@ _cb_event_border_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *eve
{
if (bd->client.qtopia.soft_menus)
{
if ((dockwin) && (dockwin_use) && (dockwin->client.qtopia.soft_menu))
if ((dockwin) && (dockwin_use) &&
(dockwin->client.qtopia.soft_menu))
_e_mod_layout_dockwin_hide();
}
}
@ -791,7 +791,7 @@ _cb_event_border_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *eve
}
static Eina_Bool
_cb_event_border_show(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_cb_event_border_show(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Show *ev;
@ -801,7 +801,7 @@ _cb_event_border_show(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_cb_event_border_hide(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_cb_event_border_hide(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Hide *ev;
@ -811,7 +811,7 @@ _cb_event_border_hide(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_cb_event_zone_move_resize(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_cb_event_zone_move_resize(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
_e_mod_layout_apply_all();
return ECORE_CALLBACK_PASS_ON;

4
src/modules/illume/e_mod_main.c
View File

@ -63,7 +63,7 @@ e_modapi_init(E_Module *m)
/* called on module shutdown - should clean up EVERYTHING or we leak */
EAPI int
e_modapi_shutdown(E_Module *m)
e_modapi_shutdown(E_Module *m __UNUSED__)
{
_e_mod_gad_bluetooth_shutdown();
_e_mod_gad_usb_shutdown();
@ -87,7 +87,7 @@ e_modapi_shutdown(E_Module *m)
/* called by E when it thinks this module should go save any config it has */
EAPI int
e_modapi_save(E_Module *m)
e_modapi_save(E_Module *m __UNUSED__)
{
return e_cfg_save(); /* 1 for success, 0 for failure */
}

57
src/modules/illume/e_mod_win.c
View File

@ -62,7 +62,7 @@ static void _e_illume_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
static void _e_illume_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
static void _e_illume_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
static void _e_illume_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
static void _e_illume_pan_scroll_update(void);
//static void _e_illume_pan_scroll_update(void);
/* state */
/* public for cfg */
@ -228,11 +228,11 @@ _e_mod_win_shutdown(void)
ecore_event_handler_del(handle);
}
static Ecore_Exe *_kbd_exe = NULL;
static Ecore_Exe *_kbd_exe = NULL;
static Ecore_Event_Handler *_kbd_exe_exit_handler = NULL;
static Eina_Bool
_e_mod_win_win_cfg_kbd_cb_exit(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_mod_win_win_cfg_kbd_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Del *ev;
@ -244,8 +244,6 @@ _e_mod_win_win_cfg_kbd_cb_exit(__UNUSED__ void *data, __UNUSED__ int type, void
void
e_mod_win_cfg_kbd_start(void)
{
Eina_List *l;
if (illume_cfg->kbd.use_internal)
{
vkbd_int = e_kbd_int_new(e_module_dir_get(mod),
@ -546,7 +544,7 @@ _app_close(E_Border *bd)
/////////
static Eina_Bool
_cb_zone_move_resize(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
_cb_zone_move_resize(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
_cb_resize();
return ECORE_CALLBACK_PASS_ON;
@ -592,7 +590,7 @@ struct _Instance
static Eina_List *instances = NULL;
static void
_cb_cfg_exec(const void *data, E_Container *con, const char *params, Efreet_Desktop *desktop)
_cb_cfg_exec(const void *data __UNUSED__, E_Container *con __UNUSED__, const char *params __UNUSED__, Efreet_Desktop *desktop)
{
_desktop_run(desktop);
}
@ -699,7 +697,7 @@ _cb_run(void *data)
}
static Eina_Bool
_cb_event_border_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_cb_event_border_add(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Add *ev;
Instance *ins;
@ -736,7 +734,7 @@ _cb_event_border_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_cb_event_border_remove(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_cb_event_border_remove(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Remove *ev;
Instance *ins;
@ -766,7 +764,7 @@ _cb_event_border_remove(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_cb_event_border_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_cb_event_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Focus_In *ev;
@ -780,7 +778,7 @@ _cb_event_border_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *even
}
static Eina_Bool
_cb_event_border_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_cb_event_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Focus_Out *ev;
@ -794,7 +792,7 @@ _cb_event_border_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *eve
}
static Eina_Bool
_cb_event_exe_del(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_cb_event_exe_del(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Del *ev;
Instance *ins;
@ -862,13 +860,13 @@ _have_borders(void)
}
static void
_cb_slipshelf_home(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action)
_cb_slipshelf_home(const void *data __UNUSED__, E_Slipshelf *ess __UNUSED__, E_Slipshelf_Action action __UNUSED__)
{
_app_home();
}
static void
_cb_slipshelf_close(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action)
_cb_slipshelf_close(const void *data __UNUSED__, E_Slipshelf *ess __UNUSED__, E_Slipshelf_Action action __UNUSED__)
{
E_Border *bd;
@ -886,45 +884,45 @@ _cb_slipshelf_close(const void *data, E_Slipshelf *ess, E_Slipshelf_Action actio
}
static void
_cb_slipshelf_apps(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action)
_cb_slipshelf_apps(const void *data __UNUSED__, E_Slipshelf *ess __UNUSED__, E_Slipshelf_Action action __UNUSED__)
{
if (!_have_borders()) return;
e_slipwin_show(slipwin);
}
static void
_cb_slipshelf_keyboard(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action)
_cb_slipshelf_keyboard(const void *data __UNUSED__, E_Slipshelf *ess __UNUSED__, E_Slipshelf_Action action __UNUSED__)
{
if (vkbd->visible) e_kbd_hide(vkbd);
else e_kbd_show(vkbd);
}
static void
_cb_slipshelf_app_next(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action)
_cb_slipshelf_app_next(const void *data __UNUSED__, E_Slipshelf *ess __UNUSED__, E_Slipshelf_Action action __UNUSED__)
{
_app_next();
}
static void
_cb_slipshelf_app_prev(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action)
_cb_slipshelf_app_prev(const void *data __UNUSED__, E_Slipshelf *ess __UNUSED__, E_Slipshelf_Action action __UNUSED__)
{
_app_prev();
}
static void
_cb_slipwin_border_select(void *data, E_Slipwin *esw, E_Border *bd)
_cb_slipwin_border_select(void *data __UNUSED__, E_Slipwin *esw __UNUSED__, E_Border *bd)
{
if (bd) _e_mod_layout_border_show(bd);
}
static void
_cb_slipshelf_border_select(void *data, E_Slipshelf *ess, E_Border *bd)
_cb_slipshelf_border_select(void *data __UNUSED__, E_Slipshelf *ess __UNUSED__, E_Border *bd)
{
if (bd) _e_mod_layout_border_show(bd);
}
static void
_cb_slipshelf_border_home2(void *data, E_Slipshelf *ess, E_Border *pbd)
_cb_slipshelf_border_home2(void *data __UNUSED__, E_Slipshelf *ess __UNUSED__, E_Border *pbd __UNUSED__)
{
Eina_List *l;
E_Border *bd;
@ -944,7 +942,6 @@ static void
_apps_unpopulate(void)
{
char buf[PATH_MAX];
Efreet_Desktop *desktop;
Evas_Object *obj;
Eina_List *files;
char *file;
@ -1184,7 +1181,7 @@ _apps_populate(void)
}
static void
_cb_selected(void *data, Evas_Object *obj, void *event_info)
_cb_selected(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
Eina_List *selected;
E_Fm2_Icon_Info *ici;
@ -1205,12 +1202,12 @@ _cb_selected(void *data, Evas_Object *obj, void *event_info)
}
static Eina_Bool
_cb_efreet_cache_update(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_cb_efreet_cache_update(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
Efreet_Desktop *desktop;
EINA_LIST_FREE(desks, desktop)
efreet_desktop_free(desktop);
efreet_desktop_free(desktop);
if (defer) ecore_timer_del(defer);
defer = ecore_timer_add(1.0, _cb_update_deferred, NULL);
@ -1218,7 +1215,7 @@ _cb_efreet_cache_update(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_cb_update_deferred(void *data)
_cb_update_deferred(void *data __UNUSED__)
{
_apps_unpopulate();
_apps_populate();
@ -1229,7 +1226,7 @@ _cb_update_deferred(void *data)
}
static void
_cb_sys_con_close(void *data)
_cb_sys_con_close(void *data __UNUSED__)
{
E_Border *bd;
@ -1238,7 +1235,7 @@ _cb_sys_con_close(void *data)
}
static void
_cb_sys_con_home(void *data)
_cb_sys_con_home(void *data __UNUSED__)
{
_app_home();
}
@ -1295,10 +1292,10 @@ _e_illume_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
// _e_illume_pan_scroll_update(fwin);
}
/*
static void
_e_illume_pan_scroll_update(void)
{
/*
Edje_Message_Int_Set *msg;
if ((fwin->fm_pan.x == fwin->fm_pan_last.x) &&
@ -1328,5 +1325,5 @@ _e_illume_pan_scroll_update(void)
fwin->fm_pan_last.max_y = fwin->fm_pan.max_y;
fwin->fm_pan_last.w = fwin->fm_pan.w;
fwin->fm_pan_last.h = fwin->fm_pan.h;
*/
}
*/

4
src/modules/illume/e_pwr.c
View File

@ -123,7 +123,7 @@ _system_unreq_state(void)
/* internal calls */
static Eina_Bool
_cb_suspend(void *data)
_cb_suspend(void *data __UNUSED__)
{
suspended = 1;
@ -139,7 +139,7 @@ _cb_suspend(void *data)
}
static Eina_Bool
_cb_saver(void *data, int ev_type, void *ev)
_cb_saver(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
Ecore_X_Event_Screensaver_Notify *event;

35
src/modules/illume/e_simplelock.c
View File

@ -2,14 +2,14 @@
#include "e_simplelock.h"
/**************************** private data ******************************/
typedef struct _E_Simplelock_Data E_Simplelock_Data;
typedef struct _E_Simplelock_Data E_Simplelock_Data;
struct _E_Simplelock_Data
{
E_Popup *popup;
Evas_Object *base_obj;
Ecore_X_Window win;
E_Zone *zone;
E_Popup *popup;
Evas_Object *base_obj;
Ecore_X_Window win;
E_Zone *zone;
};
static void _e_action_simplelock_cb(E_Object *obj, const char *params);
@ -18,15 +18,14 @@ static Eina_Bool _e_simplelock_cb_key_up(void *data, int type, void *event);
static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *group);
static E_Module *mod = NULL;
static E_Module *mod = NULL;
static Eina_List *locks = NULL;
static Ecore_X_Window grab_win;
static Eina_List *handlers = NULL;
static Eina_List *locks = NULL;
static Ecore_X_Window grab_win;
static Eina_List *handlers = NULL;
/***********************************************************************/
static void
_e_action_simplelock_cb(E_Object *obj, const char *params)
_e_action_simplelock_cb(E_Object *obj __UNUSED__, const char *params __UNUSED__)
{
if (locks)
e_simplelock_hide();
@ -35,7 +34,7 @@ _e_action_simplelock_cb(E_Object *obj, const char *params)
}
static Eina_Bool
_e_simplelock_cb_key_down(void *data, int type, void *event)
_e_simplelock_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Event_Key *ev;
E_Action *act;
@ -71,7 +70,7 @@ _e_simplelock_cb_key_down(void *data, int type, void *event)
}
static Eina_Bool
_e_simplelock_cb_key_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_simplelock_cb_key_up(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Event_Key *ev;
@ -81,7 +80,7 @@ _e_simplelock_cb_key_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_simplelock_cb_zone_move_resize(__UNUSED__ void *data, __UNUSED__ int type, void *event)
_e_simplelock_cb_zone_move_resize(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Zone_Move_Resize *ev;
Eina_List *l;
@ -146,7 +145,7 @@ e_simplelock_shutdown(void)
EAPI int
e_simplelock_show(void)
{
Eina_List *managers, *l, *l2, *l3;
Eina_List *l, *l2, *l3;
if (locks) return 1;
for (l = e_manager_list(); l; l = l->next)
@ -208,13 +207,13 @@ e_simplelock_show(void)
}
handlers = eina_list_append
(handlers, ecore_event_handler_add
(ECORE_EVENT_KEY_DOWN, _e_simplelock_cb_key_down, NULL));
(ECORE_EVENT_KEY_DOWN, _e_simplelock_cb_key_down, NULL));
handlers = eina_list_append
(handlers, ecore_event_handler_add
(ECORE_EVENT_KEY_UP, _e_simplelock_cb_key_up, NULL));
(ECORE_EVENT_KEY_UP, _e_simplelock_cb_key_up, NULL));
handlers = eina_list_append
(handlers, ecore_event_handler_add
(E_EVENT_ZONE_MOVE_RESIZE, _e_simplelock_cb_zone_move_resize, NULL));
(E_EVENT_ZONE_MOVE_RESIZE, _e_simplelock_cb_zone_move_resize, NULL));
return 1;
}

28
src/modules/illume/e_slipshelf.c
View File

@ -467,7 +467,7 @@ _e_slipshelf_free(E_Slipshelf *ess)
}
static void
_e_slipshelf_cb_toggle(void *data, Evas_Object *obj, const char *emission, const char *source)
_e_slipshelf_cb_toggle(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Slipshelf *ess;
@ -479,7 +479,7 @@ _e_slipshelf_cb_toggle(void *data, Evas_Object *obj, const char *emission, const
}
static void
_e_slipshelf_cb_home(void *data, Evas_Object *obj, const char *emission, const char *source)
_e_slipshelf_cb_home(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Slipshelf *ess;
@ -492,7 +492,7 @@ _e_slipshelf_cb_home(void *data, Evas_Object *obj, const char *emission, const c
}
static void
_e_slipshelf_cb_close(void *data, Evas_Object *obj, const char *emission, const char *source)
_e_slipshelf_cb_close(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Slipshelf *ess;
@ -505,7 +505,7 @@ _e_slipshelf_cb_close(void *data, Evas_Object *obj, const char *emission, const
}
static void
_e_slipshelf_cb_apps(void *data, Evas_Object *obj, const char *emission, const char *source)
_e_slipshelf_cb_apps(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Slipshelf *ess;
@ -518,7 +518,7 @@ _e_slipshelf_cb_apps(void *data, Evas_Object *obj, const char *emission, const c
}
static void
_e_slipshelf_cb_keyboard(void *data, Evas_Object *obj, const char *emission, const char *source)
_e_slipshelf_cb_keyboard(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Slipshelf *ess;
@ -531,7 +531,7 @@ _e_slipshelf_cb_keyboard(void *data, Evas_Object *obj, const char *emission, con
}
static void
_e_slipshelf_cb_app_next(void *data, Evas_Object *obj, const char *emission, const char *source)
_e_slipshelf_cb_app_next(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Slipshelf *ess;
@ -544,7 +544,7 @@ _e_slipshelf_cb_app_next(void *data, Evas_Object *obj, const char *emission, con
}
static void
_e_slipshelf_cb_app_prev(void *data, Evas_Object *obj, const char *emission, const char *source)
_e_slipshelf_cb_app_prev(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
{
E_Slipshelf *ess;
@ -734,7 +734,7 @@ _e_slipshelf_slide(E_Slipshelf *ess, int out, double len)
}
static Eina_Bool
_e_slipshelf_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
_e_slipshelf_cb_mouse_up(void *data, int type __UNUSED__, void *event)
{
Ecore_Event_Mouse_Button *ev;
E_Slipshelf *ess;
@ -752,7 +752,7 @@ _e_slipshelf_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_slipshelf_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
_e_slipshelf_cb_zone_move_resize(void *data, int type __UNUSED__, void *event)
{
E_Event_Zone_Move_Resize *ev;
E_Slipshelf *ess;
@ -774,7 +774,7 @@ _e_slipshelf_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
}
static void
_e_slipshelf_event_simple_free(__UNUSED__ void *data, void *ev)
_e_slipshelf_event_simple_free(void *data __UNUSED__, void *ev)
{
struct _E_Event_Slipshelf_Simple *e;
@ -799,7 +799,7 @@ _e_slipshelf_object_del_attach(void *o)
}
static Eina_Bool
_e_slipshelf_cb_border_focus_in(void *data, __UNUSED__ int type, void *event)
_e_slipshelf_cb_border_focus_in(void *data, int type __UNUSED__, void *event)
{
E_Event_Border_Focus_In *ev;
E_Slipshelf *ess;
@ -812,7 +812,7 @@ _e_slipshelf_cb_border_focus_in(void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_slipshelf_cb_border_focus_out(void *data, __UNUSED__ int type, void *event)
_e_slipshelf_cb_border_focus_out(void *data, int type __UNUSED__, void *event)
{
E_Event_Border_Focus_Out *ev;
E_Slipshelf *ess;
@ -826,7 +826,7 @@ _e_slipshelf_cb_border_focus_out(void *data, __UNUSED__ int type, void *event)
}
static Eina_Bool
_e_slipshelf_cb_border_property(void *data, __UNUSED__ int type, void *event)
_e_slipshelf_cb_border_property(void *data, int type __UNUSED__, void *event)
{
E_Event_Border_Property *ev;
E_Slipshelf *ess;
@ -898,7 +898,7 @@ _e_slipshelf_cb_gadcon_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w,
}
static Evas_Object *
_e_slipshelf_cb_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *style)
_e_slipshelf_cb_gadcon_frame_request(void *data __UNUSED__, E_Gadcon_Client *gcc __UNUSED__, const char *style __UNUSED__)
{
/* FIXME: provide an inset look edje thing */
return NULL;

30
src/modules/illume/e_slipwin.c
View File

@ -5,8 +5,8 @@ typedef struct _Win_Entry Win_Entry;
struct _Win_Entry
{
E_Slipwin *slipwin;
E_Border *border;
E_Slipwin *slipwin;
E_Border *border;
Evas_Object *icon;
};
@ -19,9 +19,9 @@ static void _e_slipwin_free(E_Slipwin *ess);
static Eina_Bool _e_slipwin_cb_animate(void *data);
static void _e_slipwin_slide(E_Slipwin *ess, int out, double len);
static Eina_Bool _e_slipwin_cb_mouse_up(void *data, int type, void *event);
static Eina_Bool _e_slipwin_cb_zone_move_resize(void *data, int type, void *event);
static Eina_Bool _e_slipwin_cb_zone_del(void *data, int type, void *event);
static void _e_slipwin_event_simple_free(void *data, void *ev);
//static Eina_Bool _e_slipwin_cb_zone_move_resize(void *data, int type, void *event);
//static Eina_Bool _e_slipwin_cb_zone_del(void *data, int type, void *event);
//static void _e_slipwin_event_simple_free(void *data, void *ev);
static void _e_slipwin_object_del_attach(void *o);
static void _e_slipwin_cb_item_sel(void *data);
@ -111,8 +111,7 @@ e_slipwin_new(E_Zone *zone, const char *themedir)
EAPI void
e_slipwin_show(E_Slipwin *esw)
{
Evas_Object *o;
Evas_Coord mw, mh, vw, vh, w, h;
Evas_Coord mw, mh;
Eina_List *borders, *l;
Win_Entry *ent;
int i, selnum;
@ -177,7 +176,6 @@ e_slipwin_show(E_Slipwin *esw)
edje_extern_object_min_size_set(esw->ilist_obj, 0, 0);
edje_object_part_swallow(esw->base_obj, "e.swallow.content", esw->ilist_obj);
mw = esw->zone->w;
@ -299,7 +297,7 @@ _e_slipwin_slide(E_Slipwin *esw, int out, double len)
}
static Eina_Bool
_e_slipwin_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
_e_slipwin_cb_mouse_up(void *data, int type __UNUSED__, void *event)
{
Ecore_Event_Mouse_Button *ev;
E_Slipwin *esw;
@ -314,8 +312,9 @@ _e_slipwin_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
return ECORE_CALLBACK_PASS_ON;
}
/*
static Eina_Bool
_e_slipwin_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
_e_slipwin_cb_zone_move_resize(void *data, int type __UNUSED__, void *event)
{
E_Event_Zone_Move_Resize *ev;
E_Slipwin *esw;
@ -324,13 +323,13 @@ _e_slipwin_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
esw = data;
if (esw->zone == ev->zone)
{
/* FIXME: handle new size pants */
// FIXME: handle new size pants
}
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_e_slipwin_cb_zone_del(void *data, __UNUSED__ int type, void *event)
_e_slipwin_cb_zone_del(void *data, int type __UNUSED__, void *event)
{
E_Event_Zone_Del *ev;
E_Slipwin *esw;
@ -343,9 +342,9 @@ _e_slipwin_cb_zone_del(void *data, __UNUSED__ int type, void *event)
}
return ECORE_CALLBACK_PASS_ON;
}
static void
_e_slipwin_event_simple_free(void *data, void *ev)
_e_slipwin_event_simple_free(void *data __UNUSED__, void *ev)
{
struct _E_Event_Slipwin_Simple *e;
@ -353,12 +352,13 @@ _e_slipwin_event_simple_free(void *data, void *ev)
e_object_unref(E_OBJECT(e->slipwin));
free(e);
}
*/
static void
_e_slipwin_object_del_attach(void *o)
{
E_Slipwin *esw;
E_Event_Slipwin_Del *ev;
// E_Event_Slipwin_Del *ev;
if (e_object_is_del(E_OBJECT(o))) return;
esw = o;

27
src/modules/illume/e_syswin.c
View File

@ -5,8 +5,8 @@ typedef struct _Win_Entry Win_Entry;
struct _Win_Entry
{
E_Syswin *syswin;
E_Border *border;
E_Syswin *syswin;
E_Border *border;
Evas_Object *icon;
};
@ -19,9 +19,9 @@ static void _e_syswin_free(E_Syswin *ess);
static Eina_Bool _e_syswin_cb_animate(void *data);
static void _e_syswin_slide(E_Syswin *ess, int out, double len);
static Eina_Bool _e_syswin_cb_mouse_up(void *data, int type, void *event);
static Eina_Bool _e_syswin_cb_zone_move_resize(void *data, int type, void *event);
static Eina_Bool _e_syswin_cb_zone_del(void *data, int type, void *event);
static void _e_syswin_event_simple_free(void *data, void *ev);
//static Eina_Bool _e_syswin_cb_zone_move_resize(void *data, int type, void *event);
//static Eina_Bool _e_syswin_cb_zone_del(void *data, int type, void *event);
//static void _e_syswin_event_simple_free(void *data, void *ev);
static void _e_syswin_object_del_attach(void *o);
static void _e_syswin_cb_item_sel(void *data);
@ -111,8 +111,7 @@ e_syswin_new(E_Zone *zone, const char *themedir)
EAPI void
e_syswin_show(E_Syswin *esw)
{
Evas_Object *o;
Evas_Coord mw, mh, vw, vh, w, h;
Evas_Coord mw, mh;
Eina_List *borders, *l;
Win_Entry *ent;
int i, selnum;
@ -299,7 +298,7 @@ _e_syswin_slide(E_Syswin *esw, int out, double len)
}
static Eina_Bool
_e_syswin_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
_e_syswin_cb_mouse_up(void *data, int type __UNUSED__, void *event)
{
Ecore_Event_Mouse_Button *ev;
E_Syswin *esw;
@ -314,8 +313,9 @@ _e_syswin_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
return ECORE_CALLBACK_PASS_ON;
}
/*
static Eina_Bool
_e_syswin_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
_e_syswin_cb_zone_move_resize(void *data, int type __UNUSED__, void *event)
{
E_Event_Zone_Move_Resize *ev;
E_Syswin *esw;
@ -324,13 +324,13 @@ _e_syswin_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
esw = data;
if (esw->zone == ev->zone)
{
/* FIXME: handle new size pants */
// FIXME: handle new size pants
}
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_e_syswin_cb_zone_del(void *data, __UNUSED__ int type, void *event)
_e_syswin_cb_zone_del(void *data, int type __UNUSED__, void *event)
{
E_Event_Zone_Del *ev;
E_Syswin *esw;
@ -345,7 +345,7 @@ _e_syswin_cb_zone_del(void *data, __UNUSED__ int type, void *event)
}
static void
_e_syswin_event_simple_free(void *data, void *ev)
_e_syswin_event_simple_free(void *data __UNUSED__, void *ev)
{
struct _E_Event_Syswin_Simple *e;
@ -353,12 +353,13 @@ _e_syswin_event_simple_free(void *data, void *ev)
e_object_unref(E_OBJECT(e->syswin));
free(e);
}
*/
static void
_e_syswin_object_del_attach(void *o)
{
E_Syswin *esw;
E_Event_Syswin_Del *ev;
// E_Event_Syswin_Del *ev;
if (e_object_is_del(E_OBJECT(o))) return;
esw = o;

119
src/modules/illume/e_winilist.c
View File

@ -9,18 +9,21 @@ struct _Data
{
Evas_Object *o_frame;
Evas_Object *o_ilist;
struct {
void (*func) (void *data, E_Border *bd);
void *data;
} select;
struct {
Eina_List *prepend;
Eina_List *append;
unsigned char changed : 1;
} special;
struct {
Evas_Coord w, h;
} optimal_size;
struct
{
void (*func) (void *data, E_Border *bd);
void *data;
} select;
struct
{
Eina_List *prepend;
Eina_List *append;
unsigned char changed : 1;
} special;
struct
{
Evas_Coord w, h;
} optimal_size;
Eina_List *borders;
Eina_List *labels;
};
@ -57,12 +60,30 @@ static Eina_List *winilists = NULL;
EAPI int
e_winilist_init(void)
{
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_ADD, _cb_border_add, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_REMOVE, _cb_border_remove, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_SHOW, _cb_border_show, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_HIDE, _cb_border_hide, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_BORDER_PROPERTY, _cb_border_property, NULL));
handlers = eina_list_append(handlers, ecore_event_handler_add(E_EVENT_DESK_SHOW, _cb_desk_show, NULL));
handlers =
eina_list_append(handlers,
ecore_event_handler_add(E_EVENT_BORDER_ADD,
_cb_border_add, NULL));
handlers =
eina_list_append(handlers,
ecore_event_handler_add(E_EVENT_BORDER_REMOVE,
_cb_border_remove, NULL));
handlers =
eina_list_append(handlers,
ecore_event_handler_add(E_EVENT_BORDER_SHOW,
_cb_border_show, NULL));
handlers =
eina_list_append(handlers,
ecore_event_handler_add(E_EVENT_BORDER_HIDE,
_cb_border_hide, NULL));
handlers =
eina_list_append(handlers,
ecore_event_handler_add(E_EVENT_BORDER_PROPERTY,
_cb_border_property, NULL));
handlers =
eina_list_append(handlers,
ecore_event_handler_add(E_EVENT_DESK_SHOW,
_cb_desk_show, NULL));
return 1;
}
@ -91,9 +112,11 @@ e_winilist_add(Evas *e)
evas_object_show(d->o_ilist);
winilists = eina_list_append(winilists, d);
evas_object_event_callback_add(d->o_frame, EVAS_CALLBACK_DEL, _cb_object_del, NULL);
evas_object_event_callback_add(d->o_frame, EVAS_CALLBACK_RESIZE, _cb_object_resize, NULL);
evas_object_event_callback_add(d->o_frame, EVAS_CALLBACK_DEL,
_cb_object_del, NULL);
evas_object_event_callback_add(d->o_frame, EVAS_CALLBACK_RESIZE,
_cb_object_resize, NULL);
_refill(d);
return d->o_frame;
@ -183,7 +206,7 @@ _cb_item_sel(void *data, void *data2)
}
static void
_cb_special_sel(void *data, void *data2)
_cb_special_sel(void *data, void *data2 __UNUSED__)
{
Special *s;
@ -195,7 +218,7 @@ _cb_special_sel(void *data, void *data2)
}
static void
_cb_object_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
_cb_object_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
Data *d;
@ -256,7 +279,7 @@ _cb_object_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
}
static void
_cb_object_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
_cb_object_resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
Data *d;
Evas_Coord lw, lh, vw, vh;
@ -275,21 +298,21 @@ _refill(Data *d)
{
Evas_Coord w, h, lw, lh, vw, vh;
Eina_List *borders, *l, *l2, *l3;
borders = e_border_client_list();
if (!d->special.changed)
{
int changed = 0;
if ((borders) && (d->borders))
{
Eina_List *tmp = NULL;
changed = 0;
for (l = borders; l; l = l->next)
{
E_Border *bd;
bd = l->data;
if (e_object_is_del(E_OBJECT(bd))) continue;
if ((!bd->client.icccm.accepts_focus) &&
@ -319,7 +342,7 @@ _refill(Data *d)
{
E_Border *bd, *bd2;
const char *title;
bd = l->data;
bd2 = l2->data;
if (bd != bd2)
@ -356,13 +379,13 @@ _refill(Data *d)
eina_stringshare_del(d->labels->data);
d->labels = eina_list_remove_list(d->labels, d->labels);
}
e_ilist_freeze(d->o_ilist);
e_ilist_clear(d->o_ilist);
for (l = d->special.prepend; l; l = l->next)
{
Special *s;
s = l->data;
e_ilist_append(d->o_ilist, s->icon, NULL, s->label, 0, _cb_special_sel, NULL,
s, NULL);
@ -371,7 +394,7 @@ _refill(Data *d)
{
E_Border *bd;
const char *title;
bd = l->data;
if (e_object_is_del(E_OBJECT(bd))) continue;
if ((!bd->client.icccm.accepts_focus) &&
@ -380,7 +403,7 @@ _refill(Data *d)
if (bd->user_skip_winlist) continue;
if ((!bd->sticky) &&
(bd->desk != e_desk_current_get(bd->zone))) continue;
title = "???";
if (bd->client.netwm.name) title = bd->client.netwm.name;
else if (bd->client.icccm.title) title = bd->client.icccm.title;
@ -399,13 +422,13 @@ _refill(Data *d)
e_ilist_append(d->o_ilist, s->icon, NULL, s->label, 0, _cb_special_sel, NULL,
s, NULL);
}
e_ilist_thaw(d->o_ilist);
/* FIXME: figure out optimal size */
e_ilist_size_min_get(d->o_ilist, &lw, &lh);
if (lh < (120 * e_scale)) lh = 120 * e_scale;
printf("%i\n", lh);
// printf("%i\n", lh);
e_scrollframe_child_viewport_size_get(d->o_frame, &vw, &vh);
evas_object_geometry_get(d->o_frame, NULL, NULL, &w, &h);
evas_object_resize(d->o_ilist, vw, lh);
@ -415,55 +438,55 @@ _refill(Data *d)
}
static Eina_Bool
_cb_border_add(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *event)
_cb_border_add(void *data __UNUSED__, int ev_type __UNUSED__, void *event __UNUSED__)
{
Eina_List *l;
for (l = winilists; l; l = l->next) _refill(l->data);
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_cb_border_remove(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *event)
_cb_border_remove(void *data __UNUSED__, int ev_type __UNUSED__, void *event __UNUSED__)
{
Eina_List *l;
for (l = winilists; l; l = l->next) _refill(l->data);
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_cb_border_show(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *event)
_cb_border_show(void *data __UNUSED__, int ev_type __UNUSED__, void *event __UNUSED__)
{
Eina_List *l;
for (l = winilists; l; l = l->next) _refill(l->data);
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_cb_border_hide(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *event)
_cb_border_hide(void *data __UNUSED__, int ev_type __UNUSED__, void *event __UNUSED__)
{
Eina_List *l;
for (l = winilists; l; l = l->next) _refill(l->data);
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_cb_border_property(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *event)
_cb_border_property(void *data __UNUSED__, int ev_type __UNUSED__, void *event __UNUSED__)
{
Eina_List *l;
for (l = winilists; l; l = l->next) _refill(l->data);
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_cb_desk_show(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *event)
_cb_desk_show(void *data __UNUSED__, int ev_type __UNUSED__, void *event __UNUSED__)
{
Eina_List *l;
for (l = winilists; l; l = l->next) _refill(l->data);
return ECORE_CALLBACK_PASS_ON;
}

2
src/modules/illume/wifiget.c
View File

@ -105,6 +105,7 @@ link_quality(void)
return -1;
}
/*
static void
link_end(void)
{
@ -113,7 +114,6 @@ link_end(void)
link_fd = -1;
}
/*
static int
_wifi_signal_get(void)
{