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

Shed some much needed light on 'illume' and fix all the compiler warnings. 

Now compiles clean and silent :)



SVN revision: 44711
This commit is contained in:
Christopher Michael 2009-12-24 03:03:42 +00:00
parent 71af0a18f1
commit a4add1cd96
15 changed files with 133 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,7 +211,7 @@ e_appwin_hide(E_Appwin *esw)
}
EAPI void
e_appwin_border_select_callback_set(E_Appwin *esw, void (*func) (void *data, E_Appwin *ess, E_Border *bd), const void *data)
e_appwin_border_select_callback_set(E_Appwin *esw, void (*func) (void *data, E_Appwin *ess, E_Border *bd), void *data)
{
E_OBJECT_CHECK(esw);
E_OBJECT_TYPE_CHECK(esw, E_APPWIN_TYPE);
@ -403,11 +403,6 @@ _e_appwin_cb_item_sel(void *data)
e_appwin_hide(ent->appwin);
}
static Evas_Object *
_theme_obj_new(Evas *e, const char *custom_dir, const char *group)
{

4
src/modules/illume/e_appwin.h
View File

@ -19,7 +19,7 @@ struct _E_Appwin
Eina_List *borders;
struct {
void (*func) (void *data, E_Appwin *ess, E_Border *bd);
const void *data;
void *data;
} callback;
const char *themedir;
Ecore_Animator *animator;
@ -41,7 +41,7 @@ EAPI int e_appwin_shutdown(void);
EAPI E_Appwin *e_appwin_new(E_Zone *zone, const char *themedir);
EAPI void e_appwin_show(E_Appwin *esw);
EAPI void e_appwin_hide(E_Appwin *esw);
EAPI void e_appwin_border_select_callback_set(E_Appwin *esw, void (*func) (void *data, E_Appwin *ess, E_Border *bd), const void *data);
EAPI void e_appwin_border_select_callback_set(E_Appwin *esw, void (*func) (void *data, E_Appwin *ess, E_Border *bd), void *data);
extern EAPI int E_EVENT_APPWIN_DEL;

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

@ -1974,7 +1974,7 @@ _dbcb_keyboard_get(E_DBus_Object *obj, DBusMessage *msg)
else if ((illume_cfg->kbd.use_internal) && (!illume_cfg->kbd.run_keyboard))
s = "internal";
else if (illume_cfg->kbd.run_keyboard)
s = illume_cfg->kbd.run_keyboard;
s = (char *)illume_cfg->kbd.run_keyboard;
dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &(s));
return reply;
}

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

@ -202,7 +202,7 @@ static int
_e_kbd_cb_delayed_hide(void *data)
{
E_Kbd *kbd;
kbd = data;
_e_kbd_hide(kbd);
kbd->delay_hide = NULL;
@ -213,61 +213,63 @@ static void
_e_kbd_all_enable(void)
{
Eina_List *l;
E_Kbd *kbd;
E_Kbd *kbd;
EINA_LIST_FOREACH(kbds, l, kbd)
e_kbd_enable(kbd);
e_kbd_enable(kbd);
}
static void
_e_kbd_all_disable(void)
{
Eina_List *l;
E_Kbd *kbd;
E_Kbd *kbd;
EINA_LIST_FOREACH(kbds, l, kbd)
e_kbd_disable(kbd);
e_kbd_disable(kbd);
}
static void
_e_kbd_all_show(void)
{
Eina_List *l;
E_Kbd *kbd;
E_Kbd *kbd;
EINA_LIST_FOREACH(kbds, l, kbd)
e_kbd_show(kbd);
e_kbd_show(kbd);
}
static void
_e_kbd_all_layout_set(E_Kbd_Layout layout)
{
Eina_List *l;
E_Kbd *kbd;
E_Kbd *kbd;
EINA_LIST_FOREACH(kbds, l, kbd)
e_kbd_layout_set(kbd, layout);
e_kbd_layout_set(kbd, layout);
}
static void
_e_kbd_all_hide(void)
{
Eina_List *l;
E_Kbd *kbd;
E_Kbd *kbd;
EINA_LIST_FOREACH(kbds, l, kbd)
e_kbd_hide(kbd);
e_kbd_hide(kbd);
}
static void
_e_kbd_all_toggle(void)
{
Eina_List *l;
E_Kbd *kbd;
EINA_LIST_FOREACH(kbds, l, kbd)
if (kbd->visible) e_kbd_hide(kbd);
else e_kbd_show(kbd);
E_Kbd *kbd;
EINA_LIST_FOREACH(kbds, l, kbd)
{
if (kbd->visible) e_kbd_hide(kbd);
else e_kbd_show(kbd);
}
}
static int
@ -444,9 +446,12 @@ _e_kbd_cb_border_property(void *data, int type, void *event)
return 1;
}
static void
_e_kbd_cb_border_hook_pre_post_fetch(void *data, E_Border *bd)
static void
_e_kbd_cb_border_hook_pre_post_fetch(void *data, void *data2)
{
E_Border *bd;
if (!(bd = data2)) return;
// check if bd has special kbd properites - if so, store in created kbd
if (!bd->new_client) return;
if (_e_kbd_by_border_get(bd)) return;
@ -500,18 +505,23 @@ _e_kbd_cb_border_hook_pre_post_fetch(void *data, E_Border *bd)
}
static void
_e_kbd_cb_border_hook_post_fetch(void *data, E_Border *bd)
_e_kbd_cb_border_hook_post_fetch(void *data, void *data2)
{
E_Border *bd;
if (!(bd = data2)) return;
// nothing - all done in _e_kbd_cb_border_hook_pre_post_fetch()
if (!_e_kbd_by_border_get(bd)) return;
}
static void
_e_kbd_cb_border_hook_post_border_assign(void *data, E_Border *bd)
_e_kbd_cb_border_hook_post_border_assign(void *data, void *data2)
{
E_Border *bd;
E_Kbd *kbd;
int pbx, pby, pbw, pbh;
if (!(bd = data2)) return;
kbd = _e_kbd_by_border_get(bd);
if (!kbd) return;
@ -588,10 +598,12 @@ _e_kbd_cb_border_hook_post_border_assign(void *data, E_Border *bd)
}
static void
_e_kbd_cb_border_hook_end(void *data, E_Border *bd)
_e_kbd_cb_border_hook_end(void *data, void *data2)
{
E_Kbd *kbd;
E_Border *bd;
if (!(bd = data2)) return;
kbd = _e_kbd_by_border_get(bd);
if (!kbd) return;
if (kbd->border == bd)

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

@ -540,7 +540,7 @@ static int
_e_kbd_buf_cb_faket(void *data)
{
E_Kbd_Buf *kb;
kb = data;
kb->lookup.faket = NULL;
kb->lookup.func(kb->lookup.data);
@ -550,7 +550,7 @@ _e_kbd_buf_cb_faket(void *data)
}
EAPI void
e_kbd_buf_lookup(E_Kbd_Buf *kb, void (*func) (void *data), const void *data)
e_kbd_buf_lookup(E_Kbd_Buf *kb, void (*func) (void *data), void *data)
{
e_kbd_buf_lookup_cancel(kb);

4
src/modules/illume/e_kbd_buf.h
View File

@ -17,7 +17,7 @@ struct _E_Kbd_Buf
E_Kbd_Buf_Layout *layout;
struct {
void (*func) (void *data);
const void *data;
void *data;
// FIXME: just faking delayed lookup with timer
Ecore_Timer *faket;
} lookup;
@ -65,7 +65,7 @@ EAPI void e_kbd_buf_pressed_point_add(E_Kbd_Buf *kb, int x, int y, int shift, in
EAPI const char *e_kbd_buf_actual_string_get(E_Kbd_Buf *kb);
EAPI const Eina_List *e_kbd_buf_string_matches_get(E_Kbd_Buf *kb);
EAPI void e_kbd_buf_backspace(E_Kbd_Buf *kb);
EAPI void e_kbd_buf_lookup(E_Kbd_Buf *kb, void (*func) (void *data), const void *data);
EAPI void e_kbd_buf_lookup(E_Kbd_Buf *kb, void (*func) (void *data), void *data);
EAPI void e_kbd_buf_lookup_cancel(E_Kbd_Buf *kb);
EAPI void e_kbd_buf_word_use(E_Kbd_Buf *kb, const char *word);

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

@ -19,7 +19,7 @@ static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *
static void _e_kbd_int_layout_next(E_Kbd_Int *ki);
static void _e_kbd_int_zoomkey_down(E_Kbd_Int *ki);
static void _e_kbd_int_matches_update(E_Kbd_Int *ki);
static void _e_kbd_int_matches_update(void *data);
static void _e_kbd_int_dictlist_down(E_Kbd_Int *ki);
static void _e_kbd_int_matchlist_down(E_Kbd_Int *ki);
static void _e_kbd_int_layoutlist_down(E_Kbd_Int *ki);
@ -288,12 +288,14 @@ _e_kbd_int_matches_free(E_Kbd_Int *ki)
}
static void
_e_kbd_int_matches_update(E_Kbd_Int *ki)
_e_kbd_int_matches_update(void *data)
{
E_Kbd_Int *ki;
const Eina_List *l, *matches;
const char *actual;
Evas_Coord mw, mh, vw, vh;
ki = data;
evas_event_freeze(ki->win->evas);
e_box_freeze(ki->box_obj);
_e_kbd_int_matches_free(ki);

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

@ -26,10 +26,10 @@ struct _Effect
static int _e_mod_layout_cb_effect_animator(void *data);
static void _e_mod_layout_effect_slide_out(E_Border *bd, double in, int post);
static void _e_mod_layout_effect_slide_in(E_Border *bd, double in, int post);
static void _e_mod_layout_cb_hook_post_fetch(void *data, E_Border *bd);
static void _e_mod_layout_cb_hook_post_fetch(void *data, void *data2);
static void _e_mod_layout_post_border_assign(E_Border *bd, int not_new);
static void _e_mod_layout_cb_hook_post_border_assign(void *data, E_Border *bd);
static void _e_mod_layout_cb_hook_end(void *data, E_Border *bd);
static void _e_mod_layout_cb_hook_post_border_assign(void *data, void *data2);
static void _e_mod_layout_cb_hook_end(void *data, void *data2);
static int _cb_event_border_add(void *data, int type, void *event);
static int _cb_event_border_remove(void *data, int type, void *event);
static int _cb_event_border_focus_in(void *data, int type, void *event);
@ -379,8 +379,11 @@ _is_dialog(E_Border *bd)
}
static void
_e_mod_layout_cb_hook_post_fetch(void *data, E_Border *bd)
_e_mod_layout_cb_hook_post_fetch(void *data, void *data2)
{
E_Border *bd;
if (!(bd = data2)) return;
if (bd->stolen) return;
if (bd->new_client)
{
@ -677,14 +680,20 @@ _e_mod_layout_post_border_assign(E_Border *bd, int not_new)
}
static void
_e_mod_layout_cb_hook_post_border_assign(void *data, E_Border *bd)
_e_mod_layout_cb_hook_post_border_assign(void *data, void *data2)
{
E_Border *bd;
if (!(bd = data2)) return;
_e_mod_layout_post_border_assign(bd, 0);
}
static void
_e_mod_layout_cb_hook_end(void *data, E_Border *bd)
_e_mod_layout_cb_hook_end(void *data, void *data2)
{
E_Border *bd;
if (!(bd = data2)) return;
if (bd->stolen) return;
if ((bd == dockwin) && (!dockwin_use) && (dockwin->visible))
_e_mod_layout_dockwin_hide();

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

@ -47,9 +47,10 @@ static void _cb_slipshelf_apps(const void *data, E_Slipshelf *ess, E_Slipshelf_A
static void _cb_slipshelf_keyboard(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action);
static void _cb_slipshelf_app_next(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action);
static void _cb_slipshelf_app_prev(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action);
static void _cb_slipwin_select(const void *data, E_Slipwin *esw, E_Border *bd);
static void _cb_slipshelf_select(const void *data, E_Slipshelf *ess, E_Border *bd);
static void _cb_slipshelf_home2(const void *data, E_Slipshelf *ess, E_Border *bd);
static void _cb_slipwin_border_select(void *data, E_Slipwin *esw, E_Border *bd);
static void _cb_slipshelf_select(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action);
static void _cb_slipshelf_border_select(void *data, E_Slipshelf *ess, E_Border *bd);
static void _cb_slipshelf_border_home2(void *data, E_Slipshelf *ess, E_Border *pbd);
static void _cb_selected(void *data, Evas_Object *obj, void *event_info);
static int _cb_efreet_desktop_list_change(void *data, int type, void *event);
static int _cb_efreet_desktop_change(void *data, int type, void *event);
@ -121,11 +122,11 @@ _e_mod_win_init(E_Module *m)
_cb_slipshelf_app_next, NULL);
e_slipshelf_action_callback_set(slipshelf, E_SLIPSHELF_ACTION_APP_PREV,
_cb_slipshelf_app_prev, NULL);
e_slipshelf_border_select_callback_set(slipshelf, _cb_slipshelf_select, NULL);
e_slipshelf_border_home_callback_set(slipshelf, _cb_slipshelf_home2, NULL);
e_slipshelf_border_select_callback_set(slipshelf, _cb_slipshelf_border_select, NULL);
e_slipshelf_border_home_callback_set(slipshelf, _cb_slipshelf_border_home2, NULL);
slipwin = e_slipwin_new(zone, e_module_dir_get(m));
e_slipwin_border_select_callback_set(slipwin, _cb_slipwin_select, NULL);
e_slipwin_border_select_callback_set(slipwin, _cb_slipwin_border_select, NULL);
appwin = e_appwin_new(zone, e_module_dir_get(m));
syswin = e_syswin_new(zone, e_module_dir_get(m));
@ -351,9 +352,9 @@ _e_mod_win_slipshelf_cfg_update(void)
_cb_slipshelf_app_next, NULL);
e_slipshelf_action_callback_set(slipshelf, E_SLIPSHELF_ACTION_APP_PREV,
_cb_slipshelf_app_prev, NULL);
e_slipshelf_border_select_callback_set(slipshelf, _cb_slipshelf_select, NULL);
e_slipshelf_border_home_callback_set(slipshelf, _cb_slipshelf_home2, NULL);
e_slipshelf_border_select_callback_set(slipshelf, _cb_slipshelf_border_select, NULL);
e_slipshelf_border_home_callback_set(slipshelf, _cb_slipshelf_border_home2, NULL);
_cb_resize();
_e_mod_layout_apply_all();
}
@ -911,24 +912,24 @@ _cb_slipshelf_app_prev(const void *data, E_Slipshelf *ess, E_Slipshelf_Action ac
_app_prev();
}
static void
_cb_slipwin_select(const void *data, E_Slipwin *esw, E_Border *bd)
static void
_cb_slipwin_border_select(void *data, E_Slipwin *esw, E_Border *bd)
{
if (bd) _e_mod_layout_border_show(bd);
}
static void
_cb_slipshelf_select(const void *data, E_Slipshelf *ess, E_Border *bd)
_cb_slipshelf_border_select(void *data, E_Slipshelf *ess, E_Border *bd)
{
if (bd) _e_mod_layout_border_show(bd);
}
static void
_cb_slipshelf_home2(const void *data, E_Slipshelf *ess, E_Border *pbd)
_cb_slipshelf_border_home2(void *data, E_Slipshelf *ess, E_Border *pbd)
{
Eina_List *l;
E_Border *bd;
E_Border *bd;
EINA_LIST_FOREACH(e_border_client_list(), l, bd)
{
if (e_object_is_del(E_OBJECT(bd))) continue;

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

@ -18,7 +18,7 @@ static void _e_slipshelf_cb_apps(void *data, Evas_Object *obj, const char *emiss
static void _e_slipshelf_cb_keyboard(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _e_slipshelf_cb_app_next(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _e_slipshelf_cb_app_prev(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _e_slipshelf_cb_item_sel(void *data, void *data2);
static void _e_slipshelf_cb_item_sel(void *data, E_Border *bd);
static int _e_slipshelf_cb_animate(void *data);
static void _e_slipshelf_slide(E_Slipshelf *ess, int out, double len);
static int _e_slipshelf_cb_mouse_up(void *data, int type, void *event);
@ -33,6 +33,7 @@ static void _e_slipshelf_title_update(E_Slipshelf *ess);
static void _e_slipshelf_cb_gadcon_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
static void _e_slipshelf_cb_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
static Evas_Object *_e_slipshelf_cb_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *style);
static void _e_winilist_cb_item_sel(void *data, void *data2);
static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *group);
@ -183,7 +184,7 @@ e_slipshelf_new(E_Zone *zone, const char *themedir)
_e_slipshelf_cb_item_sel,
ess);
e_winilist_special_append(o, NULL, "Home",
_e_slipshelf_cb_item_sel,
_e_winilist_cb_item_sel,
ess, NULL);
evas_object_show(o);
}
@ -434,7 +435,7 @@ e_slipshelf_default_title_set(E_Slipshelf *ess, const char *title)
}
EAPI void
e_slipshelf_border_select_callback_set(E_Slipshelf *ess, void (*func) (void *data, E_Slipshelf *ess, E_Border *bd), const void *data)
e_slipshelf_border_select_callback_set(E_Slipshelf *ess, void (*func) (void *data, E_Slipshelf *ess, E_Border *bd), void *data)
{
E_OBJECT_CHECK(ess);
E_OBJECT_TYPE_CHECK(ess, E_SLIPSHELF_TYPE);
@ -443,7 +444,7 @@ e_slipshelf_border_select_callback_set(E_Slipshelf *ess, void (*func) (void *dat
}
EAPI void
e_slipshelf_border_home_callback_set(E_Slipshelf *ess, void (*func) (void *data, E_Slipshelf *ess, E_Border *bd), const void *data)
e_slipshelf_border_home_callback_set(E_Slipshelf *ess, void (*func) (void *data, E_Slipshelf *ess, E_Border *bd), void *data)
{
E_OBJECT_CHECK(ess);
E_OBJECT_TYPE_CHECK(ess, E_SLIPSHELF_TYPE);
@ -573,13 +574,11 @@ _e_slipshelf_cb_slide_down_delay(void *data)
}
static void
_e_slipshelf_cb_item_sel(void *data, void *data2)
_e_slipshelf_cb_item_sel(void *data, E_Border *bd)
{
E_Slipshelf *ess;
E_Border *bd;
ess = data;
bd = data2;
ess->bsel = bd;
if (bd)
{
@ -923,6 +922,39 @@ _e_slipshelf_cb_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const cha
return NULL;
}
static void
_e_winilist_cb_item_sel(void *data, void *data2)
{
E_Slipshelf *ess;
E_Border *bd;
ess = data;
bd = data2;
ess->bsel = bd;
if (bd)
{
if (e_border_focused_get() == bd)
{
if (ess->slide_down_timer) ecore_timer_del(ess->slide_down_timer);
ess->slide_down_timer = ecore_timer_add(0.5, _e_slipshelf_cb_slide_down_delay, ess);
// _e_slipshelf_slide(ess, 0, (double)illume_cfg->sliding.slipshelf.duration / 1000.0);
return;
}
if (ess->callback_border_select.func)
ess->callback_border_select.func(ess->callback_border_select.data, ess, bd);
if (ess->slide_down_timer) ecore_timer_del(ess->slide_down_timer);
ess->slide_down_timer = ecore_timer_add(0.5, _e_slipshelf_cb_slide_down_delay, ess);
// _e_slipshelf_slide(ess, 0, (double)illume_cfg->sliding.slipshelf.duration / 1000.0);
}
else
{
if (ess->callback_border_home.func)
ess->callback_border_home.func(ess->callback_border_home.data, ess, bd);
if (ess->slide_down_timer) ecore_timer_del(ess->slide_down_timer);
ess->slide_down_timer = ecore_timer_add(0.5, _e_slipshelf_cb_slide_down_delay, ess);
// _e_slipshelf_slide(ess, 0, (double)illume_cfg->sliding.slipshelf.duration / 1000.0);
}
}
static Evas_Object *
_theme_obj_new(Evas *e, const char *custom_dir, const char *group)

7
src/modules/illume/e_slipshelf.h
View File

@ -57,7 +57,7 @@ struct _E_Slipshelf
} control;
struct {
void (*func) (void *data, E_Slipshelf *ess, E_Border *bd);
const void *data;
void *data;
} callback_border_select, callback_border_home;
double start;
@ -79,9 +79,8 @@ EAPI void e_slipshelf_action_callback_set(E_Slipshelf *ess, E_Slipshelf_Action a
EAPI void e_slipshelf_safe_app_region_get(E_Zone *zone, int *x, int *y, int *w, int *h);
EAPI void e_slipshelf_default_title_set(E_Slipshelf *ess, const char *title);
EAPI void e_slipshelf_border_select_callback_set(E_Slipshelf *ess, void (*func) (void *data, E_Slipshelf *ess, E_Border *bd), const void *data);
EAPI void e_slipshelf_border_home_callback_set(E_Slipshelf *ess, void (*func) (void *data, E_Slipshelf *ess, E_Border *bd), const void *data);
EAPI void e_slipshelf_border_select_callback_set(E_Slipshelf *ess, void (*func) (void *data, E_Slipshelf *ess, E_Border *bd), void *data);
EAPI void e_slipshelf_border_home_callback_set(E_Slipshelf *ess, void (*func) (void *data, E_Slipshelf *ess, E_Border *bd), void *data);
extern EAPI int E_EVENT_SLIPSHELF_ADD;
extern EAPI int E_EVENT_SLIPSHELF_DEL;

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

@ -199,7 +199,7 @@ e_slipwin_hide(E_Slipwin *esw)
}
EAPI void
e_slipwin_border_select_callback_set(E_Slipwin *esw, void (*func) (void *data, E_Slipwin *ess, E_Border *bd), const void *data)
e_slipwin_border_select_callback_set(E_Slipwin *esw, void (*func) (void *data, E_Slipwin *ess, E_Border *bd), void *data)
{
E_OBJECT_CHECK(esw);
E_OBJECT_TYPE_CHECK(esw, E_SLIPWIN_TYPE);
@ -391,11 +391,6 @@ _e_slipwin_cb_item_sel(void *data)
e_slipwin_hide(ent->slipwin);
}
static Evas_Object *
_theme_obj_new(Evas *e, const char *custom_dir, const char *group)
{

4
src/modules/illume/e_slipwin.h
View File

@ -19,7 +19,7 @@ struct _E_Slipwin
Eina_List *borders;
struct {
void (*func) (void *data, E_Slipwin *ess, E_Border *bd);
const void *data;
void *data;
} callback;
const char *themedir;
Ecore_Animator *animator;
@ -41,7 +41,7 @@ EAPI int e_slipwin_shutdown(void);
EAPI E_Slipwin *e_slipwin_new(E_Zone *zone, const char *themedir);
EAPI void e_slipwin_show(E_Slipwin *esw);
EAPI void e_slipwin_hide(E_Slipwin *esw);
EAPI void e_slipwin_border_select_callback_set(E_Slipwin *esw, void (*func) (void *data, E_Slipwin *ess, E_Border *bd), const void *data);
EAPI void e_slipwin_border_select_callback_set(E_Slipwin *esw, void (*func) (void *data, E_Slipwin *ess, E_Border *bd), void *data);
extern EAPI int E_EVENT_SLIPWIN_DEL;

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

@ -199,7 +199,7 @@ e_syswin_hide(E_Syswin *esw)
}
EAPI void
e_syswin_border_select_callback_set(E_Syswin *esw, void (*func) (void *data, E_Syswin *ess, E_Border *bd), const void *data)
e_syswin_border_select_callback_set(E_Syswin *esw, void (*func) (void *data, E_Syswin *ess, E_Border *bd), void *data)
{
E_OBJECT_CHECK(esw);
E_OBJECT_TYPE_CHECK(esw, E_SYSWIN_TYPE);

4
src/modules/illume/e_syswin.h
View File

@ -19,7 +19,7 @@ struct _E_Syswin
Eina_List *borders;
struct {
void (*func) (void *data, E_Syswin *ess, E_Border *bd);
const void *data;
void *data;
} callback;
const char *themedir;
Ecore_Animator *animator;
@ -41,7 +41,7 @@ EAPI int e_syswin_shutdown(void);
EAPI E_Syswin *e_syswin_new(E_Zone *zone, const char *themedir);
EAPI void e_syswin_show(E_Syswin *esw);
EAPI void e_syswin_hide(E_Syswin *esw);
EAPI void e_syswin_border_select_callback_set(E_Syswin *esw, void (*func) (void *data, E_Syswin *ess, E_Border *bd), const void *data);
EAPI void e_syswin_border_select_callback_set(E_Syswin *esw, void (*func) (void *data, E_Syswin *ess, E_Border *bd), void *data);
extern EAPI int E_EVENT_SYSWIN_DEL;