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

Free config list. 

Use switch to check gadman change.
Cleanup naming.


SVN revision: 13398
This commit is contained in:
sebastid 2005-02-16 11:41:40 +00:00 committed by sebastid
parent fd3d7d588d
commit 95853f7587
2 changed files with 60 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/modules/pager/e_mod_main.c
View File

@ -10,8 +10,8 @@
*/ */
/* module private routines */ /* module private routines */
static Pager *_pager_init(); static Pager *_pager_new();
static void _pager_shutdown(Pager *pager); static void _pager_free(Pager *pager);
static void _pager_config_menu_new(Pager *pager); static void _pager_config_menu_new(Pager *pager);
static Pager_Face *_pager_face_new(E_Zone *zone); static Pager_Face *_pager_face_new(E_Zone *zone);
@ -81,7 +81,7 @@ init(E_Module *module)
return NULL; return NULL;
} }
/* actually init pager */ /* actually init pager */
pager = _pager_init(module); pager = _pager_new(module);
module->config_menu = pager->config_menu; module->config_menu = pager->config_menu;
return pager; return pager;
@ -97,7 +97,7 @@ shutdown(E_Module *module)
pager = module->data; pager = module->data;
if (pager) if (pager)
_pager_shutdown(pager); _pager_free(pager);
return 1; return 1;
} }
@ -134,7 +134,7 @@ about(E_Module *module)
/* module private routines */ /* module private routines */
static Pager * static Pager *
_pager_init() _pager_new()
{ {
Pager *pager; Pager *pager;
Pager_Face *face; Pager_Face *face;
@ -235,10 +235,13 @@ _pager_init()
} }
static void static void
_pager_shutdown(Pager *pager) _pager_free(Pager *pager)
{ {
Evas_List *list; Evas_List *list;
E_CONFIG_DD_FREE(_conf_edd);
E_CONFIG_DD_FREE(_conf_face_edd);
for (list = pager->faces; list; list = list->next) for (list = pager->faces; list; list = list->next)
_pager_face_free(list->data); _pager_face_free(list->data);
evas_list_free(pager->faces); evas_list_free(pager->faces);
@ -248,9 +251,7 @@ _pager_shutdown(Pager *pager)
evas_list_free(pager->menus); evas_list_free(pager->menus);
e_object_del(E_OBJECT(pager->config_menu)); e_object_del(E_OBJECT(pager->config_menu));
E_CONFIG_DD_FREE(_conf_edd); evas_list_free(pager->conf->faces);
E_CONFIG_DD_FREE(_conf_face_edd);
free(pager->conf); free(pager->conf);
free(pager); free(pager);
} }
@ -841,32 +842,39 @@ _pager_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change chan
face->fy = y; face->fy = y;
face->fw = deskw; face->fw = deskw;
face->fh = deskh; face->fh = deskh;
if (change == E_GADMAN_CHANGE_MOVE_RESIZE) switch (change)
{ {
_pager_face_draw(face); case E_GADMAN_CHANGE_MOVE_RESIZE:
} _pager_face_draw(face);
else if (change == E_GADMAN_CHANGE_RAISE) break;
{ case E_GADMAN_CHANGE_RAISE:
evas_object_raise(face->base); evas_object_raise(face->base);
desks = face->desks; desks = face->desks;
while (desks) while (desks)
{ {
desk = desks->data; desk = desks->data;
evas_object_raise(desk->obj); evas_object_raise(desk->obj);
wins = desk->wins; wins = desk->wins;
while (wins) while (wins)
{ {
win = wins->data; win = wins->data;
evas_object_raise(win->obj); evas_object_raise(win->obj);
wins = wins->next; wins = wins->next;
} }
desks = desks->next; desks = desks->next;
} }
evas_object_raise(face->screen); evas_object_raise(face->screen);
break;
case E_GADMAN_CHANGE_EDGE:
case E_GADMAN_CHANGE_ZONE:
/* FIXME
* Must we do something here?
*/
break;
} }
} }

36
src/modules/temperature/e_mod_main.c
View File

@ -11,7 +11,7 @@
/* module private routines */ /* module private routines */
static Temperature *_temperature_new(); static Temperature *_temperature_new();
static void _temperature_shutdown(Temperature *e); static void _temperature_free(Temperature *e);
static void _temperature_config_menu_new(Temperature *e); static void _temperature_config_menu_new(Temperature *e);
static int _temperature_cb_check(void *data); static int _temperature_cb_check(void *data);
@ -65,7 +65,7 @@ shutdown(E_Module *m)
e = m->data; e = m->data;
if (e) if (e)
_temperature_shutdown(e); _temperature_free(e);
return 1; return 1;
} }
@ -210,7 +210,7 @@ _temperature_new()
} }
static void static void
_temperature_shutdown(Temperature *e) _temperature_free(Temperature *e)
{ {
Evas_List *l; Evas_List *l;
@ -228,6 +228,7 @@ _temperature_shutdown(Temperature *e)
ecore_timer_del(e->temperature_check_timer); ecore_timer_del(e->temperature_check_timer);
evas_list_free(e->conf->faces);
free(e->conf); free(e->conf);
free(e); free(e);
} }
@ -729,18 +730,25 @@ _temperature_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Chang
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
ef = data; ef = data;
if (change == E_GADMAN_CHANGE_MOVE_RESIZE) switch (change)
{ {
e_gadman_client_geometry_get(ef->gmc, &x, &y, &w, &h); case E_GADMAN_CHANGE_MOVE_RESIZE:
evas_object_move(ef->temp_object, x, y); e_gadman_client_geometry_get(ef->gmc, &x, &y, &w, &h);
evas_object_move(ef->event_object, x, y); evas_object_move(ef->temp_object, x, y);
evas_object_resize(ef->temp_object, w, h); evas_object_move(ef->event_object, x, y);
evas_object_resize(ef->event_object, w, h); evas_object_resize(ef->temp_object, w, h);
} evas_object_resize(ef->event_object, w, h);
else if (change == E_GADMAN_CHANGE_RAISE) break;
{ case E_GADMAN_CHANGE_RAISE:
evas_object_raise(ef->temp_object); evas_object_raise(ef->temp_object);
evas_object_raise(ef->event_object); evas_object_raise(ef->event_object);
break;
case E_GADMAN_CHANGE_EDGE:
case E_GADMAN_CHANGE_ZONE:
/* FIXME
* Must we do something here?
*/
break;
} }
} }