Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
desktops.c dialog.c ecompmgr.c focus.c pager.c timers.c
timers.h
Log Message:
Idler/Animator cleanups.
===================================================================
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -3 -r1.286 -r1.287
--- desktops.c 10 May 2008 23:08:38 -0000 1.286
+++ desktops.c 10 May 2008 23:15:32 -0000 1.287
@@ -2159,7 +2159,7 @@
case ESIGNAL_START:
/* Draw all the buttons that belong on the desktop */
DeskShowButtons();
- IdlerAdd(50, _DesksIdler, NULL);
+ IdlerAdd(_DesksIdler, NULL);
break;
}
}
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -3 -r1.200 -r1.201
--- dialog.c 30 Mar 2008 12:13:15 -0000 1.200
+++ dialog.c 10 May 2008 23:15:32 -0000 1.201
@@ -1759,7 +1759,7 @@
void
DialogsInit(void)
{
- IdlerAdd(50, _DialogsCheckUpdate, NULL);
+ IdlerAdd(_DialogsCheckUpdate, NULL);
}
static void
===================================================================
RCS file: /cvs/e/e16/e/src/ecompmgr.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -3 -r1.175 -r1.176
--- ecompmgr.c 29 Mar 2008 17:18:58 -0000 1.175
+++ ecompmgr.c 10 May 2008 23:15:32 -0000 1.176
@@ -2843,7 +2843,7 @@
ECompMgrInit();
if (Conf_compmgr.enable)
ECompMgrStart();
- IdlerAdd(50, _ECompMgrIdler, NULL);
+ IdlerAdd(_ECompMgrIdler, NULL);
break;
}
}
===================================================================
RCS file: /cvs/e/e16/e/src/focus.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -3 -r1.173 -r1.174
--- focus.c 24 Mar 2008 11:12:40 -0000 1.173
+++ focus.c 10 May 2008 23:15:32 -0000 1.174
@@ -886,7 +886,7 @@
{
case ESIGNAL_START:
/* Delay focusing a bit to allow things to settle down */
- IdlerAdd(50, _FocusIdler, NULL);
+ IdlerAdd(_FocusIdler, NULL);
DoIn("FOCUS_INIT_TIMEOUT", 0.5, FocusInitTimeout, 0, NULL);
break;
===================================================================
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -3 -r1.266 -r1.267
--- pager.c 30 Mar 2008 12:13:16 -0000 1.266
+++ pager.c 10 May 2008 23:15:32 -0000 1.267
@@ -1729,7 +1729,7 @@
for (i = 0; i < DesksGetNumber(); i++)
PagersForDesktopEnable(DeskGet(i));
UpdatePagerSel();
- Mode_pagers.idler = IdlerAdd(50, _PagersIdler, NULL);
+ Mode_pagers.idler = IdlerAdd(_PagersIdler, NULL);
}
else if (!enable && Conf_pagers.enable)
{
===================================================================
RCS file: /cvs/e/e16/e/src/timers.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- timers.c 23 Mar 2008 11:54:24 -0000 1.36
+++ timers.c 10 May 2008 23:15:32 -0000 1.37
@@ -179,13 +179,12 @@
typedef void (IdlerFunc) (void *data);
struct _idler {
- int order;
IdlerFunc *func;
void *data;
};
Idler *
-IdlerAdd(int order, IdlerFunc * func, void *data)
+IdlerAdd(IdlerFunc * func, void *data)
{
Idler *id;
@@ -193,7 +192,6 @@
if (!id)
return NULL;
- id->order = order; /* Not used atm. */
id->func = func;
id->data = data;
@@ -238,7 +236,6 @@
typedef int (AnimatorFunc) (void *data);
struct _animator {
- char *name;
AnimatorFunc *func;
void *data;
};
@@ -278,7 +275,6 @@
#if DEBUG_ANIMATORS
Eprintf("AnimatorAdd %p func=%p data=%p\n", an, func, data);
#endif
- an->name = NULL;
an->func = func;
an->data = data;
@@ -306,7 +302,6 @@
#endif
ecore_list_node_remove(animator_list, an);
- Efree(an->name);
Efree(an);
if (ecore_list_count(animator_list) == 0)
@@ -315,11 +310,3 @@
RemoveTimerEvent("Anim");
}
}
-
-#if 0 /* Unused */
-void *
-AnimatorGetData(Animator * an)
-{
- return an->data;
-}
-#endif
===================================================================
RCS file: /cvs/e/e16/e/src/timers.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- timers.h 29 Jan 2007 01:26:12 -0000 1.4
+++ timers.h 10 May 2008 23:15:32 -0000 1.5
@@ -34,13 +34,12 @@
double TimersRun(double t);
typedef struct _idler Idler;
-Idler *IdlerAdd(int order, void (*func) (void *data), void *data);
+Idler *IdlerAdd(void (*func) (void *data), void *data);
void IdlerDel(Idler * id);
void IdlersRun(void);
typedef struct _animator Animator;
Animator *AnimatorAdd(int (*func) (void *data), void *data);
void AnimatorDel(Animator * an);
-void *AnimatorGetData(Animator * an);
#endif /* _TIMERS_H_ */
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
