Enlightenment CVS committal Author : mej Project : e_modules Module : uptime
Dir : e_modules/uptime Modified Files: e_mod_config.c e_mod_main.c e_mod_main.h Log Message: Wed Apr 5 13:48:36 2006 Michael Jennings (mej) Indent! ---------------------------------------------------------------------- =================================================================== RCS file: /cvs/e/e_modules/uptime/e_mod_config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_config.c 9 Mar 2006 11:40:41 -0000 1.2 +++ e_mod_config.c 5 Apr 2006 17:48:50 -0000 1.3 @@ -9,11 +9,11 @@ }; /* Protos */ -static void *_create_data (E_Config_Dialog *cfd); -static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static void _fill_data (Uptime *c, E_Config_Dialog_Data *cfdata); +static void *_create_data(E_Config_Dialog *cfd); +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void _fill_data(Uptime *c, E_Config_Dialog_Data *cfdata); /* Config Calls */ void @@ -28,7 +28,7 @@ v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - + cfd = e_config_dialog_new(con, D_("Uptime Configuration"), NULL, 0, v, c); c->cfd = cfd; } @@ -36,7 +36,7 @@ static void _fill_data(Uptime *c, E_Config_Dialog_Data *cfdata) { - cfdata->check_interval = c->conf->check_interval; + cfdata->check_interval = c->conf->check_interval; } static void * @@ -47,6 +47,7 @@ c = cfd->data; cfdata = E_NEW(E_Config_Dialog_Data, 1); + _fill_data(c, cfdata); return cfdata; } @@ -66,9 +67,9 @@ { Evas_Object *o, *of, *ob; Uptime *c; - + c = cfd->data; - + o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, D_("Uptime Settings"), 0); ob = e_widget_label_add(evas, D_("Check Interval:")); @@ -88,9 +89,9 @@ c = cfd->data; c->conf->check_interval = cfdata->check_interval; - e_config_save_queue (); + e_config_save_queue(); if (c->face->monitor) - ecore_timer_interval_set(c->face->monitor, (double)cfdata->check_interval); + ecore_timer_interval_set(c->face->monitor, (double)cfdata->check_interval); return 1; } =================================================================== RCS file: /cvs/e/e_modules/uptime/e_mod_main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_main.c 9 Mar 2006 11:40:41 -0000 1.6 +++ e_mod_main.c 5 Apr 2006 17:48:50 -0000 1.7 @@ -4,30 +4,29 @@ #include "e_mod_config.h" #include "config.h" -static Uptime *_uptime_init (E_Module *m); -static void _uptime_shutdown (Uptime *n); -static void _uptime_config_menu_new (Uptime *n); -static int _uptime_face_init (Uptime_Face *cf); -static void _uptime_face_menu_new (Uptime_Face *cf); -static void _uptime_face_enable (Uptime_Face *cf); -static void _uptime_face_disable (Uptime_Face *cf); -static void _uptime_face_free (Uptime_Face *cf); -static void _uptime_face_cb_gmc_change (void *data, E_Gadman_Client *gmc, E_Gadman_Change change); -static void _uptime_face_cb_mouse_down (void *data, Evas *evas, Evas_Object *obj, void *event_info); -static void _uptime_face_cb_menu_edit (void *data, E_Menu *mn, E_Menu_Item *mi); -static void _uptime_face_cb_menu_configure (void *data, E_Menu *mn, E_Menu_Item *mi); -static int _uptime_face_update_values (void *data); +static Uptime *_uptime_init(E_Module *m); +static void _uptime_shutdown(Uptime *n); +static void _uptime_config_menu_new(Uptime *n); +static int _uptime_face_init(Uptime_Face *cf); +static void _uptime_face_menu_new(Uptime_Face *cf); +static void _uptime_face_enable(Uptime_Face *cf); +static void _uptime_face_disable(Uptime_Face *cf); +static void _uptime_face_free(Uptime_Face *cf); +static void _uptime_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change); +static void _uptime_face_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info); +static void _uptime_face_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi); +static void _uptime_face_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi); +static int _uptime_face_update_values(void *data); static int uptime_count; -EAPI E_Module_Api e_modapi = -{ +EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, - "Uptime" + "Uptime" }; EAPI void * -e_modapi_init(E_Module *m) +e_modapi_init(E_Module *m) { Uptime *c; @@ -37,200 +36,203 @@ c = _uptime_init(m); if (!c) - return NULL; - + return NULL; + m->config_menu = c->config_menu; return c; } EAPI int -e_modapi_shutdown(E_Module *m) +e_modapi_shutdown(E_Module *m) { Uptime *c; - + c = m->data; if (!c) - return 0; - - if (m->config_menu) + return 0; + + if (m->config_menu) { - e_menu_deactivate(m->config_menu); - e_object_del(E_OBJECT(m->config_menu)); - m->config_menu = NULL; + e_menu_deactivate(m->config_menu); + e_object_del(E_OBJECT(m->config_menu)); + m->config_menu = NULL; } - if (c->cfd) + if (c->cfd) { - e_object_del(E_OBJECT(c->cfd)); - c->cfd = NULL; + e_object_del(E_OBJECT(c->cfd)); + c->cfd = NULL; } _uptime_shutdown(c); return 1; } EAPI int -e_modapi_save(E_Module *m) +e_modapi_save(E_Module *m) { Uptime *c; - + c = m->data; if (!c) - return 0; + return 0; e_config_domain_save("module.uptime", c->conf_edd, c->conf); return 1; } EAPI int -e_modapi_info(E_Module *m) +e_modapi_info(E_Module *m) { - m->icon_file = strdup(PACKAGE_DATA_DIR"/module_icon.png"); + m->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png"); return 1; } EAPI int -e_modapi_about(E_Module *m) +e_modapi_about(E_Module *m) { - e_module_dialog_show(D_("Enlightenment Uptime Monitor Module"), - D_("This module is used to monitor uptime.")); + e_module_dialog_show(D_("Enlightenment Uptime Monitor Module"), D_("This module is used to monitor uptime.")); return 1; } EAPI int -e_modapi_config(E_Module *m) +e_modapi_config(E_Module *m) { Uptime *c; E_Container *con; - + c = m->data; if (!c) - return 0; + return 0; if (!c->face) - return 0; - + return 0; + con = e_container_current_get(e_manager_current_get()); if (c->face->con == con) - _configure_uptime_module(con, c); - + _configure_uptime_module(con, c); + return 1; } static Uptime * -_uptime_init(E_Module *m) +_uptime_init(E_Module *m) { Uptime *c; E_Menu_Item *mi; Evas_List *mans, *l, *l2; - + c = E_NEW(Uptime, 1); + if (!c) - return NULL; - + return NULL; + c->conf_edd = E_CONFIG_DD_NEW("Uptime_Config", Config); - #undef T - #undef D - #define T Config - #define D c->conf_edd +#undef T +#undef D +#define T Config +#define D c->conf_edd E_CONFIG_VAL(D, T, check_interval, INT); - + c->conf = e_config_domain_load("module.uptime", c->conf_edd); - if (!c->conf) + if (!c->conf) { - c->conf = E_NEW(Config, 1); - c->conf->check_interval = 1; + c->conf = E_NEW(Config, 1); + + c->conf->check_interval = 1; } E_CONFIG_LIMIT(c->conf->check_interval, 0, 60); - + _uptime_config_menu_new(c); - + mans = e_manager_list(); - for (l = mans; l; l = l->next) + for (l = mans; l; l = l->next) { - E_Manager *man; - - man = l->data; - for (l2 = man->containers; l2; l2 = l2->next) - { - E_Container *con; - Uptime_Face *cf; - - con = l2->data; - cf = E_NEW(Uptime_Face, 1); - if (cf) - { - cf->conf_face_edd = E_CONFIG_DD_NEW("Uptime_Face_Config", Config_Face); - #undef T - #undef D - #define T Config_Face - #define D cf->conf_face_edd - E_CONFIG_VAL(D, T, enabled, UCHAR); - - c->face = cf; - cf->uptime = c; - cf->con = con; - cf->evas = con->bg_evas; - - cf->conf = E_NEW(Config_Face, 1); - cf->conf->enabled = 1; - - if (!_uptime_face_init(cf)) - return NULL; - - _uptime_face_menu_new(cf); - - mi = e_menu_item_new(c->config_menu); - e_menu_item_label_set(mi, _("Configuration")); - e_menu_item_callback_set(mi, _uptime_face_cb_menu_configure, cf); - - mi = e_menu_item_new(c->config_menu); - e_menu_item_label_set(mi, con->name); - e_menu_item_submenu_set(mi, cf->menu); - - if (!cf->conf->enabled) - _uptime_face_disable(cf); - else - _uptime_face_enable(cf); - } - } + E_Manager *man; + + man = l->data; + for (l2 = man->containers; l2; l2 = l2->next) + { + E_Container *con; + Uptime_Face *cf; + + con = l2->data; + cf = E_NEW(Uptime_Face, 1); + + if (cf) + { + cf->conf_face_edd = E_CONFIG_DD_NEW("Uptime_Face_Config", Config_Face); + +#undef T +#undef D +#define T Config_Face +#define D cf->conf_face_edd + E_CONFIG_VAL(D, T, enabled, UCHAR); + + c->face = cf; + cf->uptime = c; + cf->con = con; + cf->evas = con->bg_evas; + + cf->conf = E_NEW(Config_Face, 1); + + cf->conf->enabled = 1; + + if (!_uptime_face_init(cf)) + return NULL; + + _uptime_face_menu_new(cf); + + mi = e_menu_item_new(c->config_menu); + e_menu_item_label_set(mi, _("Configuration")); + e_menu_item_callback_set(mi, _uptime_face_cb_menu_configure, cf); + + mi = e_menu_item_new(c->config_menu); + e_menu_item_label_set(mi, con->name); + e_menu_item_submenu_set(mi, cf->menu); + + if (!cf->conf->enabled) + _uptime_face_disable(cf); + else + _uptime_face_enable(cf); + } + } } return c; } static void -_uptime_shutdown(Uptime *c) +_uptime_shutdown(Uptime *c) { _uptime_face_free(c->face); - + E_FREE(c->conf); E_CONFIG_DD_FREE(c->conf_edd); E_FREE(c); } static void -_uptime_config_menu_new(Uptime *c) +_uptime_config_menu_new(Uptime *c) { E_Menu *mn; - + mn = e_menu_new(); c->config_menu = mn; } static int -_uptime_face_init(Uptime_Face *cf) +_uptime_face_init(Uptime_Face *cf) { Evas_Object *o; char buf[4096]; - + evas_event_freeze(cf->evas); - + o = edje_object_add(cf->evas); cf->uptime_obj = o; - - if (!e_theme_edje_object_set(o, "base/theme/modules/uptime", - "modules/uptime/main")) + + if (!e_theme_edje_object_set(o, "base/theme/modules/uptime", "modules/uptime/main")) { - snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR"/uptime.edj"); - edje_object_file_set(o, buf, "modules/uptime/main"); + snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR "/uptime.edj"); + edje_object_file_set(o, buf, "modules/uptime/main"); } - + evas_object_show(o); o = evas_object_rectangle_add(cf->evas); @@ -238,18 +240,14 @@ evas_object_layer_set(o, 2); evas_object_repeat_events_set(o, 1); evas_object_color_set(o, 0, 0, 0, 0); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, - _uptime_face_cb_mouse_down, cf); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _uptime_face_cb_mouse_down, cf); evas_object_show(o); - + cf->gmc = e_gadman_client_new(cf->con->gadman); e_gadman_client_domain_set(cf->gmc, "module.uptime", uptime_count++); e_gadman_client_policy_set(cf->gmc, - E_GADMAN_POLICY_ANYWHERE | - E_GADMAN_POLICY_HMOVE | - E_GADMAN_POLICY_HSIZE | - E_GADMAN_POLICY_VSIZE | - E_GADMAN_POLICY_VMOVE); + E_GADMAN_POLICY_ANYWHERE | + E_GADMAN_POLICY_HMOVE | E_GADMAN_POLICY_HSIZE | E_GADMAN_POLICY_VSIZE | E_GADMAN_POLICY_VMOVE); e_gadman_client_auto_size_set(cf->gmc, 40, 40); e_gadman_client_align_set(cf->gmc, 1.0, 1.0); e_gadman_client_resize(cf->gmc, 160, 20); @@ -262,27 +260,27 @@ } static void -_uptime_face_menu_new(Uptime_Face *cf) +_uptime_face_menu_new(Uptime_Face *cf) { E_Menu *mn; E_Menu_Item *mi; - + mn = e_menu_new(); cf->menu = mn; - + mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Configuration")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); + e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); e_menu_item_callback_set(mi, _uptime_face_cb_menu_configure, cf); - + mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Edit Mode")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/gadgets"); + e_util_menu_item_edje_icon_set(mi, "enlightenment/gadgets"); e_menu_item_callback_set(mi, _uptime_face_cb_menu_edit, cf); } static void -_uptime_face_enable(Uptime_Face *cf) +_uptime_face_enable(Uptime_Face *cf) { cf->conf->enabled = 1; e_config_save_queue(); @@ -292,7 +290,7 @@ } static void -_uptime_face_disable(Uptime_Face *cf) +_uptime_face_disable(Uptime_Face *cf) { cf->conf->enabled = 0; e_config_save_queue(); @@ -301,90 +299,89 @@ evas_object_hide(cf->uptime_obj); } -static void -_uptime_face_free(Uptime_Face *cf) +static void +_uptime_face_free(Uptime_Face *cf) { if (cf->monitor) - ecore_timer_del(cf->monitor); + ecore_timer_del(cf->monitor); if (cf->menu) - e_object_del(E_OBJECT(cf->menu)); + e_object_del(E_OBJECT(cf->menu)); if (cf->event_obj) - evas_object_del(cf->event_obj); + evas_object_del(cf->event_obj); if (cf->uptime_obj) - evas_object_del(cf->uptime_obj); + evas_object_del(cf->uptime_obj); /* - if (cf->chart_obj) - evas_object_del(cf->chart_obj); + * if (cf->chart_obj) + * evas_object_del(cf->chart_obj); */ - - if (cf->gmc) + + if (cf->gmc) { - e_gadman_client_save(cf->gmc); - e_object_del(E_OBJECT(cf->gmc)); + e_gadman_client_save(cf->gmc); + e_object_del(E_OBJECT(cf->gmc)); } - + E_FREE(cf->conf); E_FREE(cf); uptime_count--; } -static void -_uptime_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change) +static void +_uptime_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change) { Uptime_Face *cf; Evas_Coord x, y, w, h; - + cf = data; - switch (change) + switch (change) { - case E_GADMAN_CHANGE_MOVE_RESIZE: - e_gadman_client_geometry_get(cf->gmc, &x, &y, &w, &h); - evas_object_move(cf->uptime_obj, x, y); - /* evas_object_move(cf->chart_obj, x, y); */ - evas_object_move(cf->event_obj, x, y); - evas_object_resize(cf->uptime_obj, w, h); - /* evas_object_resize(cf->chart_obj, w, h); */ - evas_object_resize(cf->event_obj, w, h); - break; - case E_GADMAN_CHANGE_RAISE: - evas_object_raise(cf->uptime_obj); - /* evas_object_raise(cf->chart_obj); */ - evas_object_raise(cf->event_obj); - break; - default: - break; - } + case E_GADMAN_CHANGE_MOVE_RESIZE: + e_gadman_client_geometry_get(cf->gmc, &x, &y, &w, &h); + evas_object_move(cf->uptime_obj, x, y); + /* evas_object_move(cf->chart_obj, x, y); */ + evas_object_move(cf->event_obj, x, y); + evas_object_resize(cf->uptime_obj, w, h); + /* evas_object_resize(cf->chart_obj, w, h); */ + evas_object_resize(cf->event_obj, w, h); + break; + case E_GADMAN_CHANGE_RAISE: + evas_object_raise(cf->uptime_obj); + /* evas_object_raise(cf->chart_obj); */ + evas_object_raise(cf->event_obj); + break; + default: + break; + } } -static void -_uptime_face_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) +static void +_uptime_face_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) { Uptime_Face *cf; Evas_Event_Mouse_Down *ev; - + ev = event_info; cf = data; - if (ev->button == 3) + if (ev->button == 3) { - e_menu_activate_mouse(cf->menu, e_zone_current_get(cf->con), - ev->output.x, ev->output.y, 1, 1, - E_MENU_POP_DIRECTION_DOWN, ev->timestamp); - e_util_container_fake_mouse_up_all_later(cf->con); + e_menu_activate_mouse(cf->menu, e_zone_current_get(cf->con), + ev->output.x, ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); + e_util_container_fake_mouse_up_all_later(cf->con); } } -static void -_uptime_face_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi) +static void +_uptime_face_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi) { Uptime_Face *cf; - + cf = data; e_gadman_mode_set(cf->gmc->gadman, E_GADMAN_MODE_EDIT); } -static void -_uptime_face_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi) +static void +_uptime_face_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi) { Uptime_Face *cf; @@ -392,8 +389,8 @@ _configure_uptime_module(cf->con, cf->uptime); } -static int -_uptime_face_update_values(void *data) +static int +_uptime_face_update_values(void *data) { Uptime_Face *cf; char u_date_time[256]; @@ -401,12 +398,11 @@ long minute = 60; long hour = minute * 60; long day = hour * 24; - + cf = data; sysinfo(&s_info); sprintf(u_date_time, D_("uptime: %ld days, %ld:%02ld:%02ld"), - s_info.uptime / day, (s_info.uptime % day) / hour, - (s_info.uptime % hour) / minute, s_info.uptime % minute); - edje_object_part_text_set(cf->uptime_obj, "uptime", u_date_time); + s_info.uptime / day, (s_info.uptime % day) / hour, (s_info.uptime % hour) / minute, s_info.uptime % minute); + edje_object_part_text_set(cf->uptime_obj, "uptime", u_date_time); return 1; } =================================================================== RCS file: /cvs/e/e_modules/uptime/e_mod_main.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.h 9 Mar 2006 11:40:41 -0000 1.2 +++ e_mod_main.h 5 Apr 2006 17:48:50 -0000 1.3 @@ -8,28 +8,28 @@ typedef struct _Uptime Uptime; typedef struct _Uptime_Face Uptime_Face; -struct _Config +struct _Config { unsigned char hostname; int check_interval; }; -struct _Config_Face +struct _Config_Face { unsigned char enabled; }; -struct _Uptime +struct _Uptime { E_Menu *config_menu; Uptime_Face *face; Config *conf; - + E_Config_DD *conf_edd; E_Config_Dialog *cfd; }; -struct _Uptime_Face +struct _Uptime_Face { Evas *evas; E_Container *con; @@ -38,22 +38,22 @@ Config_Face *conf; E_Config_DD *conf_face_edd; - + Evas_Object *uptime_obj; Evas_Object *event_obj; - + Ecore_Timer *monitor; - + E_Gadman_Client *gmc; }; EAPI extern E_Module_Api e_modapi; -EAPI void *e_modapi_init (E_Module *m); -EAPI int e_modapi_shutdown (E_Module *m); -EAPI int e_modapi_save (E_Module *m); -EAPI int e_modapi_info (E_Module *m); -EAPI int e_modapi_about (E_Module *m); -EAPI int e_modapi_config (E_Module *m); +EAPI void *e_modapi_init(E_Module *m); +EAPI int e_modapi_shutdown(E_Module *m); +EAPI int e_modapi_save(E_Module *m); +EAPI int e_modapi_info(E_Module *m); +EAPI int e_modapi_about(E_Module *m); +EAPI int e_modapi_config(E_Module *m); #endif ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs