Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : uptime
Dir : e_modules/uptime
Modified Files:
e_mod_config.c e_mod_main.c
Log Message:
Indent.
===================================================================
RCS file: /cvs/e/e_modules/uptime/e_mod_config.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_mod_config.c 10 Jul 2006 18:01:02 -0000 1.11
+++ e_mod_config.c 18 Jul 2006 00:02:23 -0000 1.12
@@ -9,124 +9,132 @@
struct _E_Config_Dialog_Data
{
- double check_interval;
- double update_interval;
+ double check_interval;
+ double update_interval;
};
/* 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(Config_Item *ci, 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 (Config_Item * ci, E_Config_Dialog_Data * cfdata);
/* Config Calls */
void
-_config_ut_module(Config_Item *ci)
+_config_ut_module (Config_Item * ci)
{
- E_Config_Dialog *cfd;
- E_Config_Dialog_View *v;
- E_Container *con;
- char buf[4096];
-
- if (!ut_config) return;
-
- v = E_NEW(E_Config_Dialog_View, 1);
- if (v == NULL)
- {
- warn("malloc()");
- return;
- }
-
- v->create_cfdata = _create_data;
- v->free_cfdata = _free_data;
- v->basic.apply_cfdata = _basic_apply_data;
- v->basic.create_widgets = _basic_create_widgets;
-
- snprintf(buf, sizeof(buf), "%s/module.eap",
e_module_dir_get(ut_config->module));
- con = e_container_current_get(e_manager_current_get());
- cfd = e_config_dialog_new(con, D_("Uptime Configuration"), buf, 0, v, ci);
- ut_config->config_dialog = cfd;
+ E_Config_Dialog *cfd;
+ E_Config_Dialog_View *v;
+ E_Container *con;
+ char buf[4096];
+
+ if (!ut_config)
+ return;
+
+ v = E_NEW (E_Config_Dialog_View, 1);
+ if (v == NULL)
+ {
+ warn ("malloc()");
+ return;
+ }
+
+ v->create_cfdata = _create_data;
+ v->free_cfdata = _free_data;
+ v->basic.apply_cfdata = _basic_apply_data;
+ v->basic.create_widgets = _basic_create_widgets;
+
+ snprintf (buf, sizeof (buf), "%s/module.eap",
+ e_module_dir_get (ut_config->module));
+ con = e_container_current_get (e_manager_current_get ());
+ cfd = e_config_dialog_new (con, D_ ("Uptime Configuration"), buf, 0, v, ci);
+ ut_config->config_dialog = cfd;
}
static void
-_fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
+_fill_data (Config_Item * ci, E_Config_Dialog_Data * cfdata)
{
- if (!cfdata) return;
- cfdata->check_interval = ci->check_interval;
- cfdata->update_interval = ci->update_interval;
+ if (!cfdata)
+ return;
+ cfdata->check_interval = ci->check_interval;
+ cfdata->update_interval = ci->update_interval;
}
static void *
-_create_data(E_Config_Dialog *cfd)
+_create_data (E_Config_Dialog * cfd)
{
- E_Config_Dialog_Data *cfdata;
- Config_Item *ci;
+ E_Config_Dialog_Data *cfdata;
+ Config_Item *ci;
- if (!cfd) return NULL;
-
- ci = cfd->data;
- cfdata = E_NEW(E_Config_Dialog_Data, 1);
- if (cfdata == NULL)
- {
- warn("malloc()");
- return NULL;
- }
+ if (!cfd)
+ return NULL;
- _fill_data(ci, cfdata);
+ ci = cfd->data;
+ cfdata = E_NEW (E_Config_Dialog_Data, 1);
+ if (cfdata == NULL)
+ {
+ warn ("malloc()");
+ return NULL;
+ }
- return cfdata;
+ _fill_data (ci, cfdata);
+
+ return cfdata;
}
static void
-_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+_free_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata)
{
- if (ut_config == NULL)
- return;
- ut_config->config_dialog = NULL;
+ if (ut_config == NULL)
+ return;
+ ut_config->config_dialog = NULL;
- free(cfdata);
- cfdata = NULL;
+ free (cfdata);
+ cfdata = NULL;
}
static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
+_basic_create_widgets (E_Config_Dialog * cfd, Evas * evas,
+ E_Config_Dialog_Data * cfdata)
{
- Evas_Object *o, *of, *ob;
+ Evas_Object *o, *of, *ob;
- o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, D_("Uptime Settings"), 0);
+ 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_("Update Interval:"));
- e_widget_framelist_object_append(of, ob);
+ ob = e_widget_label_add (evas, D_ ("Update Interval:"));
+ e_widget_framelist_object_append (of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 1.0, 60.0,
+ ob = e_widget_slider_add (evas, 1, 0, _("%1.0f seconds"), 1.0, 60.0,
1.0, 0, &(cfdata->update_interval), NULL, 100);
- e_widget_framelist_object_append(of, ob);
+ e_widget_framelist_object_append (of, ob);
- ob = e_widget_label_add(evas, D_("Check Interval:"));
- e_widget_framelist_object_append(of, ob);
+ ob = e_widget_label_add (evas, D_ ("Check Interval:"));
+ e_widget_framelist_object_append (of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 1.0, 60.0,
+ ob = e_widget_slider_add (evas, 1, 0, _("%1.0f seconds"), 1.0, 60.0,
1.0, 0, &(cfdata->check_interval), NULL, 100);
- e_widget_framelist_object_append(of, ob);
+ e_widget_framelist_object_append (of, ob);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
+ e_widget_list_object_append (o, of, 1, 1, 0.5);
- return o;
+ return o;
}
static int
-_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
+_basic_apply_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata)
{
- Config_Item *ci;
+ Config_Item *ci;
- if (!cfd) return 0;
- ci = cfd->data;
- ci->check_interval = cfdata->check_interval;
- ci->update_interval = cfdata->update_interval;
- e_config_save_queue();
- _ut_config_updated(ci->id);
+ if (!cfd)
+ return 0;
+ ci = cfd->data;
+ ci->check_interval = cfdata->check_interval;
+ ci->update_interval = cfdata->update_interval;
+ e_config_save_queue ();
+ _ut_config_updated (ci->id);
- return 1;
+ return 1;
}
===================================================================
RCS file: /cvs/e/e_modules/uptime/e_mod_main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_mod_main.c 17 Jul 2006 23:37:54 -0000 1.18
+++ e_mod_main.c 18 Jul 2006 00:02:23 -0000 1.19
@@ -36,544 +36,557 @@
struct _Instance
{
- E_Gadcon_Client *gcc;
- Evas_Object *ut_obj;
- Uptime *ut;
- Ecore_Timer *monitor;
- time_t uptime;
- time_t counter;
- int nusers;
- double la[3];
+ E_Gadcon_Client *gcc;
+ Evas_Object *ut_obj;
+ Uptime *ut;
+ Ecore_Timer *monitor;
+ time_t uptime;
+ time_t counter;
+ int nusers;
+ double la[3];
};
struct _Uptime
{
- Instance *inst;
- Evas_Object *ut_obj;
+ Instance *inst;
+ Evas_Object *ut_obj;
};
-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);
-static void _gc_orient(E_Gadcon_Client *gcc);
-static char *_gc_label(void);
-static Evas_Object *_gc_icon(Evas *evas);
-
-static void _ut_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info);
-static void _ut_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _ut_menu_cb_post(void *data, E_Menu *m);
-static Config_Item *_ut_config_item_get(const char *id);
-static Uptime *_ut_new(Evas *evas);
-static void _ut_free(Uptime *ut);
-static int _ut_cb_check(void *data);
-static void update_counters(Instance *inst);
+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);
+static void _gc_orient (E_Gadcon_Client * gcc);
+static char *_gc_label (void);
+static Evas_Object *_gc_icon (Evas * evas);
+
+static void _ut_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
+ void *event_info);
+static void _ut_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi);
+static void _ut_menu_cb_post (void *data, E_Menu * m);
+static Config_Item *_ut_config_item_get (const char *id);
+static Uptime *_ut_new (Evas * evas);
+static void _ut_free (Uptime * ut);
+static int _ut_cb_check (void *data);
+static void update_counters (Instance * inst);
static E_Config_DD *conf_edd = NULL;
static E_Config_DD *conf_item_edd = NULL;
Config *ut_config = NULL;
-static const E_Gadcon_Client_Class _gc_class =
-{
- GADCON_CLIENT_CLASS_VERSION,
- "uptime", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon}
+static const E_Gadcon_Client_Class _gc_class = {
+ GADCON_CLIENT_CLASS_VERSION,
+ "uptime", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon}
};
static E_Gadcon_Client *
-_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
+_gc_init (E_Gadcon * gc, const char *name, const char *id, const char *style)
{
- Evas_Object *o;
- E_Gadcon_Client *gcc;
- Instance *inst;
- Config_Item *ci;
- Uptime *ut;
+ Evas_Object *o;
+ E_Gadcon_Client *gcc;
+ Instance *inst;
+ Config_Item *ci;
+ Uptime *ut;
- inst = E_NEW(Instance, 1);
- ci = _ut_config_item_get(id);
+ inst = E_NEW (Instance, 1);
+ ci = _ut_config_item_get (id);
#ifdef UPTIME_DEBUG
- syslog(LOG_EMERG, "ii id= %s, ci->update_interval = %d, ci = %d\n",
+ syslog (LOG_EMERG, "ii id= %s, ci->update_interval = %d, ci = %d\n",
ci->id, ci->update_interval, ci->check_interval);
#endif
- ut = _ut_new(gc->evas);
- ut->inst = inst;
- inst->ut = ut;
-
- o = ut->ut_obj;
- gcc = e_gadcon_client_new(gc, name, id, style, o);
- gcc->data = inst;
- inst->gcc = gcc;
- inst->ut_obj = o;
-
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_ut_cb_mouse_down, inst);
- ut_config->instances = evas_list_append(ut_config->instances, inst);
+ ut = _ut_new (gc->evas);
+ ut->inst = inst;
+ inst->ut = ut;
+
+ o = ut->ut_obj;
+ gcc = e_gadcon_client_new (gc, name, id, style, o);
+ gcc->data = inst;
+ inst->gcc = gcc;
+ inst->ut_obj = o;
+
+ evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_DOWN,
+ _ut_cb_mouse_down, inst);
+ ut_config->instances = evas_list_append (ut_config->instances, inst);
- (void)update_counters(inst);
- inst->counter = 0;
+ (void) update_counters (inst);
+ inst->counter = 0;
- if (!inst->monitor)
- inst->monitor = ecore_timer_add(ci->update_interval, _ut_cb_check, inst);
+ if (!inst->monitor)
+ inst->monitor = ecore_timer_add (ci->update_interval, _ut_cb_check, inst);
- return gcc;
+ return gcc;
}
static void
-_gc_shutdown(E_Gadcon_Client *gcc)
+_gc_shutdown (E_Gadcon_Client * gcc)
{
- Instance *inst;
- Uptime *ut;
+ Instance *inst;
+ Uptime *ut;
- if (!gcc) return;
- if (!gcc->data) return;
-
- inst = gcc->data;
- ut = inst->ut;
- if (!ut) return;
-
- if (inst->monitor != NULL)
- ecore_timer_del(inst->monitor);
-
- ut_config->instances = evas_list_remove(ut_config->instances, inst);
- evas_object_event_callback_del(ut->ut_obj, EVAS_CALLBACK_MOUSE_DOWN,
_ut_cb_mouse_down);
-
- _ut_free(ut);
- free(inst);
- inst = NULL;
+ if (!gcc)
+ return;
+ if (!gcc->data)
+ return;
+
+ inst = gcc->data;
+ ut = inst->ut;
+ if (!ut)
+ return;
+
+ if (inst->monitor != NULL)
+ ecore_timer_del (inst->monitor);
+
+ ut_config->instances = evas_list_remove (ut_config->instances, inst);
+ evas_object_event_callback_del (ut->ut_obj, EVAS_CALLBACK_MOUSE_DOWN,
+ _ut_cb_mouse_down);
+
+ _ut_free (ut);
+ free (inst);
+ inst = NULL;
}
static void
-_gc_orient(E_Gadcon_Client *gcc)
+_gc_orient (E_Gadcon_Client * gcc)
{
- e_gadcon_client_aspect_set(gcc, 16, 16);
- e_gadcon_client_min_size_set(gcc, 16, 16);
+ e_gadcon_client_aspect_set (gcc, 16, 16);
+ e_gadcon_client_min_size_set (gcc, 16, 16);
}
static char *
-_gc_label(void)
+_gc_label (void)
{
- return D_("Uptime");
+ return D_ ("Uptime");
}
static Evas_Object *
-_gc_icon(Evas *evas)
+_gc_icon (Evas * evas)
{
- Evas_Object *o;
- char buf[4096];
+ Evas_Object *o;
+ char buf[4096];
- o = edje_object_add(evas);
- snprintf(buf, sizeof(buf), "%s/module.eap",
e_module_dir_get(ut_config->module));
- edje_object_file_set(o, buf, "icon");
+ o = edje_object_add (evas);
+ snprintf (buf, sizeof (buf), "%s/module.eap",
+ e_module_dir_get (ut_config->module));
+ edje_object_file_set (o, buf, "icon");
- return o;
+ return o;
}
static void
-_ut_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_ut_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, void *event_info)
{
- Instance *inst;
- Evas_Event_Mouse_Down *ev;
+ Instance *inst;
+ Evas_Event_Mouse_Down *ev;
- if (ut_config->menu != NULL)
- return;
+ if (ut_config->menu != NULL)
+ return;
- inst = data;
- ev = event_info;
-
- if (ev->button == 3)
- {
- E_Menu *mn;
- E_Menu_Item *mi;
- int x, y, w, h;
-
- mn = e_menu_new();
- e_menu_post_deactivate_callback_set(mn, _ut_menu_cb_post, inst);
- ut_config->menu = mn;
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, D_("Configuration"));
- e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
- e_menu_item_callback_set(mi, _ut_menu_cb_configure, inst);
-
- mi = e_menu_item_new(mn);
- e_menu_item_separator_set(mi, 1);
-
- e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
- e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y,
- &w, &h);
- e_menu_activate_mouse(mn,
- e_util_zone_current_get(e_manager_current_get()),
- x + ev->output.x, y + ev->output.y, 1, 1,
- E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
- EVAS_BUTTON_NONE, ev->timestamp, NULL);
- }
+ inst = data;
+ ev = event_info;
+
+ if (ev->button == 3)
+ {
+ E_Menu *mn;
+ E_Menu_Item *mi;
+ int x, y, w, h;
+
+ mn = e_menu_new ();
+ e_menu_post_deactivate_callback_set (mn, _ut_menu_cb_post, inst);
+ ut_config->menu = mn;
+
+ mi = e_menu_item_new (mn);
+ e_menu_item_label_set (mi, D_ ("Configuration"));
+ e_util_menu_item_edje_icon_set (mi, "enlightenment/configuration");
+ e_menu_item_callback_set (mi, _ut_menu_cb_configure, inst);
+
+ mi = e_menu_item_new (mn);
+ e_menu_item_separator_set (mi, 1);
+
+ e_gadcon_client_util_menu_items_append (inst->gcc, mn, 0);
+ e_gadcon_canvas_zone_geometry_get (inst->gcc->gadcon, &x, &y, &w, &h);
+ e_menu_activate_mouse (mn,
+ e_util_zone_current_get (e_manager_current_get
+ ()), x + ev->output.x,
+ y + ev->output.y, 1, 1,
+ E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+ evas_event_feed_mouse_up (inst->gcc->gadcon->evas, ev->button,
+ EVAS_BUTTON_NONE, ev->timestamp, NULL);
+ }
}
static void
-_ut_menu_cb_post(void *data, E_Menu *m)
+_ut_menu_cb_post (void *data, E_Menu * m)
{
- if (ut_config->menu == NULL)
- return;
- e_object_del(E_OBJECT(ut_config->menu));
- ut_config->menu = NULL;
+ if (ut_config->menu == NULL)
+ return;
+ e_object_del (E_OBJECT (ut_config->menu));
+ ut_config->menu = NULL;
}
static void
-_ut_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
+_ut_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
- Instance *inst;
- Config_Item *ci;
+ Instance *inst;
+ Config_Item *ci;
- inst = data;
- ci = _ut_config_item_get(inst->gcc->id);
- _config_ut_module(ci);
+ inst = data;
+ ci = _ut_config_item_get (inst->gcc->id);
+ _config_ut_module (ci);
}
static Config_Item *
-_ut_config_item_get(const char *id)
+_ut_config_item_get (const char *id)
{
- Evas_List *l;
- Config_Item *ci;
+ Evas_List *l;
+ Config_Item *ci;
- for (l = ut_config->items; l; l = l->next)
- {
- ci = l->data;
- if (ci->id == NULL)
- continue;
- if (strcmp(ci->id, id) == 0)
- return ci;
- }
-
- ci = E_NEW(Config_Item, 1);
- ci->id = evas_stringshare_add(id);
- ci->check_interval = 60.0;
- ci->update_interval = 60.0;
+ for (l = ut_config->items; l; l = l->next)
+ {
+ ci = l->data;
+ if (ci->id == NULL)
+ continue;
+ if (strcmp (ci->id, id) == 0)
+ return ci;
+ }
+
+ ci = E_NEW (Config_Item, 1);
+ ci->id = evas_stringshare_add (id);
+ ci->check_interval = 60.0;
+ ci->update_interval = 60.0;
- ut_config->items = evas_list_append(ut_config->items, ci);
+ ut_config->items = evas_list_append (ut_config->items, ci);
- return ci;
+ return ci;
}
void
-_ut_config_updated(const char *id)
+_ut_config_updated (const char *id)
{
- Evas_List *l;
- Config_Item *ci;
-
- if (ut_config == NULL)
- return;
+ Evas_List *l;
+ Config_Item *ci;
- ci = _ut_config_item_get(id);
+ if (ut_config == NULL)
+ return;
- for (l = ut_config->instances; l; l = l->next)
- {
- Instance *inst;
-
- inst = l->data;
- if (inst->gcc->id == NULL)
- continue;
- if (strcmp(inst->gcc->id, ci->id) == 0)
- {
- if (inst->monitor != NULL)
- ecore_timer_del(inst->monitor);
- inst->monitor = ecore_timer_add(ci->update_interval, _ut_cb_check,
inst);
- break;
- }
- }
-}
-
-EAPI E_Module_Api e_modapi =
-{
- E_MODULE_API_VERSION,
- "Uptime"
+ ci = _ut_config_item_get (id);
+
+ for (l = ut_config->instances; l; l = l->next)
+ {
+ Instance *inst;
+
+ inst = l->data;
+ if (inst->gcc->id == NULL)
+ continue;
+ if (strcmp (inst->gcc->id, ci->id) == 0)
+ {
+ if (inst->monitor != NULL)
+ ecore_timer_del (inst->monitor);
+ inst->monitor =
+ ecore_timer_add (ci->update_interval, _ut_cb_check, inst);
+ break;
+ }
+ }
+}
+
+EAPI E_Module_Api e_modapi = {
+ E_MODULE_API_VERSION,
+ "Uptime"
};
EAPI void *
-e_modapi_init(E_Module *m)
+e_modapi_init (E_Module * m)
{
- bindtextdomain(PACKAGE, LOCALEDIR);
- bind_textdomain_codeset(PACKAGE, "UTF-8");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset (PACKAGE, "UTF-8");
- conf_item_edd = E_CONFIG_DD_NEW("Uptime_Config_Item", Config_Item);
+ conf_item_edd = E_CONFIG_DD_NEW ("Uptime_Config_Item", Config_Item);
#undef T
#undef D
#define T Config_Item
#define D conf_item_edd
- E_CONFIG_VAL(D, T, id, STR);
- E_CONFIG_VAL(D, T, check_interval, INT);
- E_CONFIG_VAL(D, T, update_interval, INT);
+ E_CONFIG_VAL (D, T, id, STR);
+ E_CONFIG_VAL (D, T, check_interval, INT);
+ E_CONFIG_VAL (D, T, update_interval, INT);
- conf_edd = E_CONFIG_DD_NEW("Uptime_Config", Config);
+ conf_edd = E_CONFIG_DD_NEW ("Uptime_Config", Config);
#undef T
#undef D
#define T Config
#define D conf_edd
- E_CONFIG_LIST(D, T, items, conf_item_edd);
+ E_CONFIG_LIST (D, T, items, conf_item_edd);
- ut_config = e_config_domain_load("module.uptime", conf_edd);
- if (ut_config == NULL)
- {
- Config_Item *ci;
-
- ut_config = E_NEW(Config, 1);
- ci = E_NEW(Config_Item, 1);
- ci->id = evas_stringshare_add("0");
- ci->check_interval = 60.0;
- ci->update_interval = 60.0;
- ut_config->items = evas_list_append(ut_config->items, ci);
- }
- ut_config->module = m;
- e_gadcon_provider_register(&_gc_class);
+ ut_config = e_config_domain_load ("module.uptime", conf_edd);
+ if (ut_config == NULL)
+ {
+ Config_Item *ci;
+
+ ut_config = E_NEW (Config, 1);
+ ci = E_NEW (Config_Item, 1);
+ ci->id = evas_stringshare_add ("0");
+ ci->check_interval = 60.0;
+ ci->update_interval = 60.0;
+ ut_config->items = evas_list_append (ut_config->items, ci);
+ }
+ ut_config->module = m;
+ e_gadcon_provider_register (&_gc_class);
- return m;
+ return m;
}
EAPI int
-e_modapi_shutdown(E_Module *m)
+e_modapi_shutdown (E_Module * m)
{
- ut_config->module = NULL;
- e_gadcon_provider_unregister(&_gc_class);
+ ut_config->module = NULL;
+ e_gadcon_provider_unregister (&_gc_class);
+
+ if (ut_config->config_dialog != NULL)
+ e_object_del (E_OBJECT (ut_config->config_dialog));
- if (ut_config->config_dialog != NULL)
- e_object_del(E_OBJECT(ut_config->config_dialog));
-
- if (ut_config->menu)
- {
- e_menu_post_deactivate_callback_set(ut_config->menu, NULL, NULL);
- e_object_del(E_OBJECT(ut_config->menu));
- ut_config->menu = NULL;
- }
- while (ut_config->items)
- {
- Config_Item *ci;
-
- ci = ut_config->items->data;
- ut_config->items = evas_list_remove_list(ut_config->items,
ut_config->items);
-
- if (ci->id != NULL)
- evas_stringshare_del(ci->id);
-
- free(ci);
- ci = NULL;
- }
-
- free(ut_config);
- ut_config = NULL;
- E_CONFIG_DD_FREE(conf_item_edd);
- E_CONFIG_DD_FREE(conf_edd);
+ if (ut_config->menu)
+ {
+ e_menu_post_deactivate_callback_set (ut_config->menu, NULL, NULL);
+ e_object_del (E_OBJECT (ut_config->menu));
+ ut_config->menu = NULL;
+ }
+ while (ut_config->items)
+ {
+ Config_Item *ci;
+
+ ci = ut_config->items->data;
+ ut_config->items =
+ evas_list_remove_list (ut_config->items, ut_config->items);
+
+ if (ci->id != NULL)
+ evas_stringshare_del (ci->id);
+
+ free (ci);
+ ci = NULL;
+ }
+
+ free (ut_config);
+ ut_config = NULL;
+ E_CONFIG_DD_FREE (conf_item_edd);
+ E_CONFIG_DD_FREE (conf_edd);
- return 1;
+ return 1;
}
EAPI int
-e_modapi_save(E_Module *m)
+e_modapi_save (E_Module * m)
{
- Evas_List *l;
+ Evas_List *l;
- for (l = ut_config->instances; l; l = l->next)
- {
- Instance *inst;
- Config_Item *ci;
+ for (l = ut_config->instances; l; l = l->next)
+ {
+ Instance *inst;
+ Config_Item *ci;
- inst = l->data;
- ci = _ut_config_item_get(inst->gcc->id);
- if (ci->id != NULL)
- evas_stringshare_del(ci->id);
- ci->id = evas_stringshare_add(inst->gcc->id);
- }
+ inst = l->data;
+ ci = _ut_config_item_get (inst->gcc->id);
+ if (ci->id != NULL)
+ evas_stringshare_del (ci->id);
+ ci->id = evas_stringshare_add (inst->gcc->id);
+ }
- e_config_domain_save("module.uptime", conf_edd, ut_config);
+ e_config_domain_save ("module.uptime", conf_edd, ut_config);
- return 1;
+ return 1;
}
EAPI int
-e_modapi_about(E_Module *m)
+e_modapi_about (E_Module * m)
{
- e_module_dialog_show(m, D_("Enlightenment Uptime Monitor Module"),
- D_("This module is used to monitor uptime."));
- return 1;
+ e_module_dialog_show (m, D_ ("Enlightenment Uptime Monitor Module"),
+ D_ ("This module is used to monitor uptime."));
+ return 1;
}
static Uptime *
-_ut_new(Evas *evas)
+_ut_new (Evas * evas)
{
- Uptime *ut;
- char buf[4096];
+ Uptime *ut;
+ char buf[4096];
- ut = E_NEW(Uptime, 1);
- snprintf(buf, sizeof(buf), "%s/uptime.edj",
e_module_dir_get(ut_config->module));
+ ut = E_NEW (Uptime, 1);
+ snprintf (buf, sizeof (buf), "%s/uptime.edj",
+ e_module_dir_get (ut_config->module));
+
+ ut->ut_obj = edje_object_add (evas);
+ if (!e_theme_edje_object_set
+ (ut->ut_obj, "base/theme/modules/uptime", "modules/uptime/main"))
+ edje_object_file_set (ut->ut_obj, buf, "modules/uptime/main");
- ut->ut_obj = edje_object_add(evas);
- if (!e_theme_edje_object_set(ut->ut_obj, "base/theme/modules/uptime",
"modules/uptime/main"))
- edje_object_file_set(ut->ut_obj, buf, "modules/uptime/main");
-
- evas_object_show(ut->ut_obj);
- return ut;
+ evas_object_show (ut->ut_obj);
+ return ut;
}
static void
-_ut_free(Uptime *ut)
+_ut_free (Uptime * ut)
{
- evas_object_del(ut->ut_obj);
- free(ut);
- ut = NULL;
+ evas_object_del (ut->ut_obj);
+ free (ut);
+ ut = NULL;
}
static void
-update_counters(Instance *inst)
+update_counters (Instance * inst)
{
- int ret;
+ int ret;
#ifdef __linux__
- struct sysinfo s_info;
- struct utmp *utmpstruct;
+ struct sysinfo s_info;
+ struct utmp *utmpstruct;
#elif defined(__FreeBSD__)
- int mib[2];
- size_t size;
- time_t uptime;
- int days, hrs, i, mins, secs;
- struct timeval boottime;
- time_t now;
-
- FILE *utmp;
- struct timespec tp;
- struct utmp ut;
- char ttybuf[MAXPATHLEN];
- struct stat st;
+ int mib[2];
+ size_t size;
+ time_t uptime;
+ int days, hrs, i, mins, secs;
+ struct timeval boottime;
+ time_t now;
+
+ FILE *utmp;
+ struct timespec tp;
+ struct utmp ut;
+ char ttybuf[MAXPATHLEN];
+ struct stat st;
#endif
- if (!inst)
- return;
+ if (!inst)
+ return;
#ifdef __linux__
- sysinfo(&s_info);
- inst->uptime = s_info.uptime;
- inst->la[0] = -1;
+ sysinfo (&s_info);
+ inst->uptime = s_info.uptime;
+ inst->la[0] = -1;
# ifdef HAVE_GETLOADAVG
- ret = getloadavg(inst->la, sizeof(inst->la)/sizeof(inst->la[0]));
- if (ret < 0)
- inst->la[0] = -1;
+ ret = getloadavg (inst->la, sizeof (inst->la) / sizeof (inst->la[0]));
+ if (ret < 0)
+ inst->la[0] = -1;
# endif
- inst->nusers = 0;
- setutent();
- while ((utmpstruct = getutent()))
- {
- if ((utmpstruct->ut_type == USER_PROCESS) &&
- (utmpstruct->ut_name[0] != '\0'))
- inst->nusers++;
- }
- endutent();
+ inst->nusers = 0;
+ setutent ();
+ while ((utmpstruct = getutent ()))
+ {
+ if ((utmpstruct->ut_type == USER_PROCESS) &&
+ (utmpstruct->ut_name[0] != '\0'))
+ inst->nusers++;
+ }
+ endutent ();
#elif defined(__FreeBSD__)
- /* retrive uptime info */
- (void)time(&now);
- mib[0] = CTL_KERN;
- mib[1] = KERN_BOOTTIME;
- size = sizeof(boottime);
-
- if (sysctl(mib, 2, &boottime, &size, NULL, 0) != -1 &&
- boottime.tv_sec != 0) {
+ /* retrive uptime info */
+ (void) time (&now);
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_BOOTTIME;
+ size = sizeof (boottime);
+
+ if (sysctl (mib, 2, &boottime, &size, NULL, 0) != -1 &&
+ boottime.tv_sec != 0)
+ {
uptime = now - boottime.tv_sec;
if (uptime > 60)
uptime += 30;
inst->uptime = uptime;
- }
- else
- inst->uptime = -1;
-
- /* retrive load averages */
- inst->la[0] = -1;
+ }
+ else
+ inst->uptime = -1;
+
+ /* retrive load averages */
+ inst->la[0] = -1;
# ifdef HAVE_GETLOADAVG
- ret = getloadavg(inst->la, sizeof(inst->la)/sizeof(inst->la[0]));
- if (ret < 0)
- warn("getloadavg()");
+ ret = getloadavg (inst->la, sizeof (inst->la) / sizeof (inst->la[0]));
+ if (ret < 0)
+ warn ("getloadavg()");
# endif
-
- /* retrive number of active users */
- utmp = fopen(_PATH_UTMP, "r");
- if (utmp == NULL)
- inst->nusers = -1;
- else
- {
- for (inst->nusers = 0; fread(&ut, sizeof(ut), 1, utmp);)
- {
- if (ut.ut_name[0] == '\0')
- continue;
- (void)snprintf(ttybuf, sizeof(ttybuf), "%s%.*s", _PATH_DEV,
UT_LINESIZE, ut.ut_line);
- if (stat(ttybuf, &st) != 0)
- continue; /* broken record */
-
- inst->nusers++;
- }
- fclose(utmp);
- }
+
+ /* retrive number of active users */
+ utmp = fopen (_PATH_UTMP, "r");
+ if (utmp == NULL)
+ inst->nusers = -1;
+ else
+ {
+ for (inst->nusers = 0; fread (&ut, sizeof (ut), 1, utmp);)
+ {
+ if (ut.ut_name[0] == '\0')
+ continue;
+ (void) snprintf (ttybuf, sizeof (ttybuf), "%s%.*s", _PATH_DEV,
+ UT_LINESIZE, ut.ut_line);
+ if (stat (ttybuf, &st) != 0)
+ continue; /* broken record */
+
+ inst->nusers++;
+ }
+ fclose (utmp);
+ }
#else /* unsupported */
- inst->uptime = -1;
- inst->nusers = -1;
- inst->la[0] = -1;
+ inst->uptime = -1;
+ inst->nusers = -1;
+ inst->la[0] = -1;
#endif
}
static int
-_ut_cb_check(void *data)
+_ut_cb_check (void *data)
{
- Instance *inst;
- Config_Item *ci;
- int days, hours, minutes;
- char u_date_time[256] = "up: N/A";
- char load_avg[256] = "la: N/A";
- char users[256] = "users: N/A";
- time_t uptime;
-
- inst = data;
- if (!inst)
- return 0;
-
- ci = _ut_config_item_get(inst->gcc->id);
- if (!ci)
- return 0;
+ Instance *inst;
+ Config_Item *ci;
+ int days, hours, minutes;
+ char u_date_time[256] = "up: N/A";
+ char load_avg[256] = "la: N/A";
+ char users[256] = "users: N/A";
+ time_t uptime;
+
+ inst = data;
+ if (!inst)
+ return 0;
+
+ ci = _ut_config_item_get (inst->gcc->id);
+ if (!ci)
+ return 0;
#ifdef UPTIME_DEBUG
- syslog(LOG_EMERG, "counter = %d update = %d\n", inst->counter,
ci->check_interval);
+ syslog (LOG_EMERG, "counter = %d update = %d\n", inst->counter,
+ ci->check_interval);
#endif
- inst->counter += ci->update_interval;
- if (inst->counter >= ci->check_interval)
- {
- inst->counter = 0;
- (void)update_counters(inst);
- }
-
- uptime = inst->uptime + inst->counter;
-
- if (uptime != -1)
- {
- days = uptime / (24 * 3600);
- uptime %= 24 * 3600;
-
- hours = uptime / 3600;
- uptime %= 3600;
-
- minutes = uptime / 60;
- uptime %= 60;
-
- snprintf(u_date_time, sizeof(u_date_time),
- D_("up: %d days, %d:%02d:%02ld"),
- days, hours, minutes, uptime);
- }
-
- if (inst->la[0] != -1)
- {
- snprintf(load_avg, sizeof(load_avg),
- D_("la: %.2f %.2f %.2f"),
- inst->la[0], inst->la[1], inst->la[2]);
- }
-
- if (inst->nusers != -1)
- snprintf(users, sizeof(users), D_("users: %d"), inst->nusers);
-
- edje_object_part_text_set(inst->ut->ut_obj, "uptime", u_date_time);
- edje_object_part_text_set(inst->ut->ut_obj, "load_average", load_avg);
- edje_object_part_text_set(inst->ut->ut_obj, "nusers", users);
+ inst->counter += ci->update_interval;
+ if (inst->counter >= ci->check_interval)
+ {
+ inst->counter = 0;
+ (void) update_counters (inst);
+ }
+
+ uptime = inst->uptime + inst->counter;
+
+ if (uptime != -1)
+ {
+ days = uptime / (24 * 3600);
+ uptime %= 24 * 3600;
+
+ hours = uptime / 3600;
+ uptime %= 3600;
+
+ minutes = uptime / 60;
+ uptime %= 60;
+
+ snprintf (u_date_time, sizeof (u_date_time),
+ D_ ("up: %d days, %d:%02d:%02ld"),
+ days, hours, minutes, uptime);
+ }
+
+ if (inst->la[0] != -1)
+ {
+ snprintf (load_avg, sizeof (load_avg),
+ D_ ("la: %.2f %.2f %.2f"),
+ inst->la[0], inst->la[1], inst->la[2]);
+ }
+
+ if (inst->nusers != -1)
+ snprintf (users, sizeof (users), D_ ("users: %d"), inst->nusers);
+
+ edje_object_part_text_set (inst->ut->ut_obj, "uptime", u_date_time);
+ edje_object_part_text_set (inst->ut->ut_obj, "load_average", load_avg);
+ edje_object_part_text_set (inst->ut->ut_obj, "nusers", users);
- return 1;
+ return 1;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
