From: <enl...@li...> - 2006-03-22 01:58:50
|
Enlightenment CVS committal Author : mej Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_modules-mem.spec.in Log Message: Tue Mar 21 20:57:43 2006 Michael Jennings (mej) Module fixes. Quan and onefang have both been sacked. ---------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_modules-mem.spec.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_modules-mem.spec.in 12 Mar 2006 04:48:16 -0000 1.2 +++ e_modules-mem.spec.in 22 Mar 2006 01:58:15 -0000 1.3 @@ -28,6 +28,7 @@ %install %{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install +%{find_lang} %{module_name} || true > %{module_name}.lang %clean test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT @@ -38,9 +39,9 @@ %postun /sbin/ldconfig -%files +%files -f %{module_name}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog COPYING* INSTALL NEWS README %{_libdir}/enlightenment/modules/%{module_name} -%{_datadir}/locale/* + %changelog |
From: Enlightenment C. <no...@cv...> - 2006-04-05 17:49:47
|
Enlightenment CVS committal Author : mej Project : e_modules Module : mem Dir : e_modules/mem 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/mem/e_mod_config.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_config.c 9 Mar 2006 11:37:42 -0000 1.4 +++ e_mod_config.c 5 Apr 2006 17:48:49 -0000 1.5 @@ -14,11 +14,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 (Mem *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(Mem *c, E_Config_Dialog_Data *cfdata); /* Config Calls */ void @@ -33,7 +33,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_("Mem Configuration"), NULL, 0, v, c); c->cfd = cfd; } @@ -41,7 +41,7 @@ static void _fill_data(Mem *c, E_Config_Dialog_Data *cfdata) { - cfdata->check_interval = c->conf->check_interval; + cfdata->check_interval = c->conf->check_interval; cfdata->real_ignore_buffers = c->conf->real_ignore_buffers; cfdata->real_ignore_cached = c->conf->real_ignore_cached; cfdata->show_text = c->conf->show_text; @@ -57,6 +57,7 @@ c = cfd->data; cfdata = E_NEW(E_Config_Dialog_Data, 1); + _fill_data(c, cfdata); return cfdata; } @@ -76,9 +77,9 @@ { Evas_Object *o, *of, *ob; Mem *c; - + c = cfd->data; - + o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, D_("Mem Settings"), 0); ob = e_widget_check_add(evas, D_("Show Text"), &(cfdata->show_text)); @@ -86,11 +87,11 @@ ob = e_widget_check_add(evas, D_("Show Text As Percent"), &(cfdata->show_percent)); e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, D_("Show Graph"), &(cfdata->show_graph)); - e_widget_framelist_object_append(of, ob); + e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, D_("Ignore Buffers"), &(cfdata->real_ignore_buffers)); e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, D_("Ignore Cached"), &(cfdata->real_ignore_cached)); - 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_slider_add(evas, 1, 0, _("%1.0f seconds"), 1, 60, 1, 0, NULL, &(cfdata->check_interval), 150); @@ -113,9 +114,9 @@ c->conf->show_text = cfdata->show_text; c->conf->show_graph = cfdata->show_graph; c->conf->show_percent = cfdata->show_percent; - 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/mem/e_mod_main.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- e_mod_main.c 4 Apr 2006 10:22:04 -0000 1.22 +++ e_mod_main.c 5 Apr 2006 17:48:49 -0000 1.23 @@ -3,32 +3,31 @@ #include "e_mod_config.h" #include "config.h" -static Mem *_mem_init (E_Module *m); -static void _mem_shutdown (Mem *n); -static void _mem_config_menu_new (Mem *n); -static int _mem_face_init (Mem_Face *cf); -static void _mem_face_menu_new (Mem_Face *cf); -static void _mem_face_enable (Mem_Face *cf); -static void _mem_face_disable (Mem_Face *cf); -static void _mem_face_free (Mem_Face *cf); -static void _mem_face_cb_gmc_change (void *data, E_Gadman_Client *gmc, E_Gadman_Change change); -static void _mem_face_cb_mouse_down (void *data, Evas *evas, Evas_Object *obj, void *event_info); -static void _mem_face_cb_menu_edit (void *data, E_Menu *mn, E_Menu_Item *mi); -static void _mem_face_cb_menu_configure (void *data, E_Menu *mn, E_Menu_Item *mi); -static int _mem_face_update_values (void *data); -static void _mem_face_get_mem_values (Mem_Face *cf, int *real, int *swap, int *total_real, int *total_swap); -static void _mem_face_graph_values (Mem_Face *mf, int rval, int sval); -static void _mem_face_graph_clear (Mem_Face *mf); +static Mem *_mem_init(E_Module *m); +static void _mem_shutdown(Mem *n); +static void _mem_config_menu_new(Mem *n); +static int _mem_face_init(Mem_Face *cf); +static void _mem_face_menu_new(Mem_Face *cf); +static void _mem_face_enable(Mem_Face *cf); +static void _mem_face_disable(Mem_Face *cf); +static void _mem_face_free(Mem_Face *cf); +static void _mem_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change); +static void _mem_face_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info); +static void _mem_face_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi); +static void _mem_face_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi); +static int _mem_face_update_values(void *data); +static void _mem_face_get_mem_values(Mem_Face *cf, int *real, int *swap, int *total_real, int *total_swap); +static void _mem_face_graph_values(Mem_Face *mf, int rval, int sval); +static void _mem_face_graph_clear(Mem_Face *mf); static int mem_count; -EAPI E_Module_Api e_modapi = -{ +EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, - "Mem" + "Mem" }; EAPI void * -e_modapi_init(E_Module *m) +e_modapi_init(E_Module *m) { Mem *c; @@ -38,211 +37,215 @@ c = _mem_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) { Mem *c; - + c = m->data; if (!c) - return 0; - - if (m->config_menu) - { - e_menu_deactivate(m->config_menu); - e_object_del(E_OBJECT(m->config_menu)); - m->config_menu = NULL; + return 0; + + if (m->config_menu) + { + 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; } _mem_shutdown(c); return 1; } EAPI int -e_modapi_save(E_Module *m) +e_modapi_save(E_Module *m) { Mem *c; - + c = m->data; if (!c) - return 0; + return 0; e_config_domain_save("module.mem", 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 Mem Monitor Module"), - D_("This module is used to monitor memory.")); + e_module_dialog_show(D_("Enlightenment Mem Monitor Module"), D_("This module is used to monitor memory.")); return 1; } EAPI int -e_modapi_config(E_Module *m) +e_modapi_config(E_Module *m) { Mem *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_mem_module(con, c); - + _configure_mem_module(con, c); + return 1; } static Mem * -_mem_init(E_Module *m) +_mem_init(E_Module *m) { Mem *c; E_Menu_Item *mi; Evas_List *mans, *l, *l2; - + c = E_NEW(Mem, 1); + if (!c) - return NULL; - + return NULL; + c->conf_edd = E_CONFIG_DD_NEW("Mem_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); E_CONFIG_VAL(D, T, show_text, INT); - E_CONFIG_VAL(D, T, show_percent, INT); - E_CONFIG_VAL(D, T, show_graph, INT); + E_CONFIG_VAL(D, T, show_percent, INT); + E_CONFIG_VAL(D, T, show_graph, INT); E_CONFIG_VAL(D, T, real_ignore_buffers, UCHAR); E_CONFIG_VAL(D, T, real_ignore_cached, UCHAR); - + c->conf = e_config_domain_load("module.mem", c->conf_edd); - if (!c->conf) + if (!c->conf) { - c->conf = E_NEW(Config, 1); - c->conf->check_interval = 1; - c->conf->show_text = 1; - c->conf->show_graph = 1; - c->conf->show_percent = 1; - c->conf->real_ignore_buffers = 0; - c->conf->real_ignore_cached = 0; + c->conf = E_NEW(Config, 1); + + c->conf->check_interval = 1; + c->conf->show_text = 1; + c->conf->show_graph = 1; + c->conf->show_percent = 1; + c->conf->real_ignore_buffers = 0; + c->conf->real_ignore_cached = 0; } E_CONFIG_LIMIT(c->conf->check_interval, 0, 60); E_CONFIG_LIMIT(c->conf->show_text, 0, 1); E_CONFIG_LIMIT(c->conf->show_graph, 0, 1); E_CONFIG_LIMIT(c->conf->show_percent, 0, 1); - + _mem_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; - Mem_Face *cf; - - con = l2->data; - cf = E_NEW(Mem_Face, 1); - if (cf) - { - cf->conf_face_edd = E_CONFIG_DD_NEW("Mem_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->mem = c; - cf->con = con; - cf->evas = con->bg_evas; - - cf->conf = E_NEW(Config_Face, 1); - cf->conf->enabled = 1; - - if (!_mem_face_init(cf)) - return NULL; - - _mem_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, _mem_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) - _mem_face_disable(cf); - else - _mem_face_enable(cf); - } - } + E_Manager *man; + + man = l->data; + for (l2 = man->containers; l2; l2 = l2->next) + { + E_Container *con; + Mem_Face *cf; + + con = l2->data; + cf = E_NEW(Mem_Face, 1); + + if (cf) + { + cf->conf_face_edd = E_CONFIG_DD_NEW("Mem_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->mem = c; + cf->con = con; + cf->evas = con->bg_evas; + + cf->conf = E_NEW(Config_Face, 1); + + cf->conf->enabled = 1; + + if (!_mem_face_init(cf)) + return NULL; + + _mem_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, _mem_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) + _mem_face_disable(cf); + else + _mem_face_enable(cf); + } + } } return c; } static void -_mem_shutdown(Mem *c) +_mem_shutdown(Mem *c) { _mem_face_free(c->face); - + E_FREE(c->conf); E_CONFIG_DD_FREE(c->conf_edd); E_FREE(c); } static void -_mem_config_menu_new(Mem *c) +_mem_config_menu_new(Mem *c) { E_Menu *mn; - + mn = e_menu_new(); c->config_menu = mn; } static int -_mem_face_init(Mem_Face *cf) +_mem_face_init(Mem_Face *cf) { Evas_Object *o; char buf[4096]; - + evas_event_freeze(cf->evas); - + o = edje_object_add(cf->evas); cf->mem_obj = o; - - if (!e_theme_edje_object_set(o, "base/theme/modules/mem", "modules/mem/main")) + + if (!e_theme_edje_object_set(o, "base/theme/modules/mem", "modules/mem/main")) { - snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR"/mem.edj"); - edje_object_file_set(o, buf, "modules/mem/main"); - } + snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR "/mem.edj"); + edje_object_file_set(o, buf, "modules/mem/main"); + } evas_object_show(o); o = edje_object_add(cf->evas); @@ -252,13 +255,13 @@ evas_object_color_set(o, 255, 255, 255, 255); evas_object_pass_events_set(o, 1); evas_object_show(o); - + o = edje_object_add(cf->evas); cf->rtxt_obj = o; - if (!e_theme_edje_object_set(o, "base/theme/modules/mem", "modules/mem/real_text")) + if (!e_theme_edje_object_set(o, "base/theme/modules/mem", "modules/mem/real_text")) { - snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR"/mem.edj"); - edje_object_file_set(o, buf, "modules/mem/real_text"); + snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR "/mem.edj"); + edje_object_file_set(o, buf, "modules/mem/real_text"); } evas_object_layer_set(o, 2); evas_object_repeat_events_set(o, 0); @@ -268,17 +271,17 @@ o = edje_object_add(cf->evas); cf->stxt_obj = o; - if (!e_theme_edje_object_set(o, "base/theme/modules/mem", "modules/mem/swap_text")) + if (!e_theme_edje_object_set(o, "base/theme/modules/mem", "modules/mem/swap_text")) { - snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR"/mem.edj"); - edje_object_file_set(o, buf, "modules/mem/swap_text"); + snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR "/mem.edj"); + edje_object_file_set(o, buf, "modules/mem/swap_text"); } evas_object_layer_set(o, 2); evas_object_repeat_events_set(o, 0); evas_object_color_set(o, 255, 255, 255, 255); evas_object_pass_events_set(o, 1); evas_object_show(o); - + o = evas_object_rectangle_add(cf->evas); cf->event_obj = o; evas_object_layer_set(o, 3); @@ -286,15 +289,12 @@ evas_object_color_set(o, 0, 0, 0, 0); evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _mem_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.mem", mem_count++); e_gadman_client_policy_set(cf->gmc, - E_GADMAN_POLICY_ANYWHERE | - E_GADMAN_POLICY_HMOVE | - E_GADMAN_POLICY_HSIZE | - E_GADMAN_POLICY_VMOVE | - E_GADMAN_POLICY_VSIZE); + E_GADMAN_POLICY_ANYWHERE | + E_GADMAN_POLICY_HMOVE | E_GADMAN_POLICY_HSIZE | E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_VSIZE); 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, 40, 40); @@ -307,143 +307,142 @@ } static void -_mem_face_menu_new(Mem_Face *cf) +_mem_face_menu_new(Mem_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, _mem_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, _mem_face_cb_menu_edit, cf); } static void -_mem_face_enable(Mem_Face *cf) +_mem_face_enable(Mem_Face *cf) { cf->conf->enabled = 1; e_config_save_queue(); evas_object_show(cf->mem_obj); - evas_object_show(cf->chart_obj); + evas_object_show(cf->chart_obj); evas_object_show(cf->event_obj); evas_object_show(cf->rtxt_obj); - evas_object_show(cf->stxt_obj); + evas_object_show(cf->stxt_obj); } static void -_mem_face_disable(Mem_Face *cf) +_mem_face_disable(Mem_Face *cf) { cf->conf->enabled = 0; e_config_save_queue(); evas_object_hide(cf->event_obj); - evas_object_hide(cf->chart_obj); + evas_object_hide(cf->chart_obj); evas_object_hide(cf->mem_obj); evas_object_hide(cf->rtxt_obj); evas_object_hide(cf->stxt_obj); } -static void -_mem_face_free(Mem_Face *cf) +static void +_mem_face_free(Mem_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->mem_obj) - evas_object_del(cf->mem_obj); + evas_object_del(cf->mem_obj); if (cf->chart_obj) - evas_object_del(cf->chart_obj); + evas_object_del(cf->chart_obj); if (cf->rtxt_obj) - evas_object_del(cf->rtxt_obj); + evas_object_del(cf->rtxt_obj); if (cf->stxt_obj) - evas_object_del(cf->stxt_obj); + evas_object_del(cf->stxt_obj); if (cf->old_real || cf->old_swap) - _mem_face_graph_clear(cf); - - if (cf->gmc) + _mem_face_graph_clear(cf); + + 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); mem_count--; } -static void -_mem_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change) +static void +_mem_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change) { Mem_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->mem_obj, x, y); - evas_object_move(cf->chart_obj, x, y); - evas_object_move(cf->event_obj, x, y); - evas_object_move(cf->rtxt_obj, x, y); - evas_object_move(cf->stxt_obj, x, y); - evas_object_resize(cf->mem_obj, w, h); - evas_object_resize(cf->chart_obj, w, h); - evas_object_resize(cf->event_obj, w, h); - evas_object_resize(cf->rtxt_obj, w, h); - evas_object_resize(cf->stxt_obj, w, h); - _mem_face_graph_clear(cf); - break; - case E_GADMAN_CHANGE_RAISE: - evas_object_raise(cf->mem_obj); - evas_object_raise(cf->chart_obj); - evas_object_raise(cf->event_obj); - evas_object_raise(cf->rtxt_obj); - evas_object_raise(cf->stxt_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->mem_obj, x, y); + evas_object_move(cf->chart_obj, x, y); + evas_object_move(cf->event_obj, x, y); + evas_object_move(cf->rtxt_obj, x, y); + evas_object_move(cf->stxt_obj, x, y); + evas_object_resize(cf->mem_obj, w, h); + evas_object_resize(cf->chart_obj, w, h); + evas_object_resize(cf->event_obj, w, h); + evas_object_resize(cf->rtxt_obj, w, h); + evas_object_resize(cf->stxt_obj, w, h); + _mem_face_graph_clear(cf); + break; + case E_GADMAN_CHANGE_RAISE: + evas_object_raise(cf->mem_obj); + evas_object_raise(cf->chart_obj); + evas_object_raise(cf->event_obj); + evas_object_raise(cf->rtxt_obj); + evas_object_raise(cf->stxt_obj); + break; + default: + break; + } } -static void -_mem_face_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) +static void +_mem_face_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) { Mem_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 -_mem_face_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi) +static void +_mem_face_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi) { Mem_Face *cf; - + cf = data; e_gadman_mode_set(cf->gmc->gadman, E_GADMAN_MODE_EDIT); } -static void -_mem_face_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi) +static void +_mem_face_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi) { Mem_Face *cf; @@ -451,61 +450,63 @@ _configure_mem_module(cf->con, cf->mem); } -static int -_mem_face_update_values(void *data) +static int +_mem_face_update_values(void *data) { Mem_Face *cf; int real, swap, total_real, total_swap; char real_str[100]; char swap_str[100]; Edje_Message_Float msg; - + cf = data; _mem_face_get_mem_values(cf, &real, &swap, &total_real, &total_swap); - if (cf->mem->conf->show_text) + if (cf->mem->conf->show_text) { - if (!cf->mem->conf->show_percent) - { - snprintf(real_str, sizeof(real_str), "%d/%d MB", (real / 1024), (total_real / 1024)); - snprintf(swap_str, sizeof(swap_str), "%d/%d MB", (swap / 1024), (total_swap / 1024)); - } - else - { - double tr; - tr = (((double)real / (double)total_real) * 100); - snprintf(real_str, sizeof(real_str), "%1.2f%%", tr); - tr = (((double)swap / (double)total_swap) * 100); - snprintf(swap_str, sizeof(swap_str), "%1.2f%%", tr); - } - edje_object_part_text_set(cf->rtxt_obj, "real-text", real_str); - edje_object_part_text_set(cf->stxt_obj, "swap-text", swap_str); + if (!cf->mem->conf->show_percent) + { + snprintf(real_str, sizeof(real_str), "%d/%d MB", (real / 1024), (total_real / 1024)); + snprintf(swap_str, sizeof(swap_str), "%d/%d MB", (swap / 1024), (total_swap / 1024)); + } + else + { + double tr; + + tr = (((double)real / (double)total_real) * 100); + snprintf(real_str, sizeof(real_str), "%1.2f%%", tr); + tr = (((double)swap / (double)total_swap) * 100); + snprintf(swap_str, sizeof(swap_str), "%1.2f%%", tr); + } + edje_object_part_text_set(cf->rtxt_obj, "real-text", real_str); + edje_object_part_text_set(cf->stxt_obj, "swap-text", swap_str); } else { - edje_object_part_text_set(cf->rtxt_obj, "real-text", ""); - edje_object_part_text_set(cf->stxt_obj, "swap-text", ""); + edje_object_part_text_set(cf->rtxt_obj, "real-text", ""); + edje_object_part_text_set(cf->stxt_obj, "swap-text", ""); } double tr = ((double)real / (double)total_real); + msg.val = tr; edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 9, &msg); - double ts = ((double)swap / (double)total_swap); + double ts = ((double)swap / (double)total_swap); + msg.val = ts; edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 10, &msg); - if ((cf->mem->conf->show_graph) && - (edje_object_part_exists (cf->mem_obj,"lines"))) - _mem_face_graph_values(cf, (tr * 100), (ts * 100)); + if ((cf->mem->conf->show_graph) && (edje_object_part_exists(cf->mem_obj, "lines"))) + _mem_face_graph_values(cf, (tr * 100), (ts * 100)); else - _mem_face_graph_clear(cf); - + _mem_face_graph_clear(cf); + return 1; } static void -_mem_face_get_mem_values(Mem_Face *cf, int *real, int *swap, int *total_real, int *total_swap) +_mem_face_get_mem_values(Mem_Face *cf, int *real, int *swap, int *total_real, int *total_swap) { FILE *pmeminfo = NULL; int cursor = 0; @@ -515,7 +516,7 @@ ldiv_t ldresult; long int liresult; Edje_Message_Float msg; - + /* open /proc/meminfo */ if (!(pmeminfo = fopen("/proc/meminfo", "r"))) { @@ -528,53 +529,53 @@ while (fscanf(pmeminfo, "%c", &c) != EOF) { if (c != '\n') - line[cursor++] = c; + line[cursor++] = c; else { field = (char *)malloc(strlen(line) * sizeof(char)); sscanf(line, "%s %ld kB", field, &value); - if (!strcmp(field, "MemTotal:")) - { - mtotal = value; - msg.val = value; - edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 0, &msg); - } + if (!strcmp(field, "MemTotal:")) + { + mtotal = value; + msg.val = value; + edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 0, &msg); + } else if (!strcmp(field, "MemFree:")) - { - mfree = value; - msg.val = value; - edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 1, &msg); - } + { + mfree = value; + msg.val = value; + edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 1, &msg); + } else if (cf->mem->conf->real_ignore_buffers && (!strcmp(field, "Buffers:"))) - { - mfree += value; - msg.val = value; - edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 2, &msg); - } + { + mfree += value; + msg.val = value; + edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 2, &msg); + } else if (cf->mem->conf->real_ignore_cached && (!strcmp(field, "Cached:"))) - { - mfree += value; - msg.val = value; - edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 3, &msg); - } - else if (cf->mem->conf->real_ignore_cached && (!strcmp(field, "SwapCached:"))) - { - sfree += value; - msg.val = value; - edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 4, &msg); - } - else if (!strcmp(field, "SwapTotal:")) - { - stotal = value; - msg.val = stotal; - edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 5, &msg); - } - else if (!strcmp(field, "SwapFree:")) - { - sfree = value; - msg.val = sfree; - edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 6, &msg); - } + { + mfree += value; + msg.val = value; + edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 3, &msg); + } + else if (cf->mem->conf->real_ignore_cached && (!strcmp(field, "SwapCached:"))) + { + sfree += value; + msg.val = value; + edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 4, &msg); + } + else if (!strcmp(field, "SwapTotal:")) + { + stotal = value; + msg.val = stotal; + edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 5, &msg); + } + else if (!strcmp(field, "SwapFree:")) + { + sfree = value; + msg.val = sfree; + edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 6, &msg); + } free(line); free(field); cursor = 0; @@ -590,28 +591,28 @@ liresult = ldresult.quot; ldresult = ldiv((stotal - sfree), liresult); } - + /* calculate memory usage in percent */ /* FIXME : figure out a better way to do this */ ldresult = ldiv(mtotal, 100); liresult = ldresult.quot; ldresult = ldiv((mtotal - mfree), liresult); - + *real = (mtotal - mfree); msg.val = *real; edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 7, &msg); - + *swap = (stotal - sfree); msg.val = *swap; edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 8, &msg); *total_real = mtotal; - *total_swap = stotal; + *total_swap = stotal; return; } -static void -_mem_face_graph_values(Mem_Face *mf, int rval, int sval) +static void +_mem_face_graph_values(Mem_Face *mf, int rval, int sval) { int x, y, w, h; Evas_Object *o; @@ -620,45 +621,45 @@ int i, j = 0; evas_event_freeze(mf->evas); - + evas_object_geometry_get(mf->chart_obj, &x, &y, &w, &h); - - rval = (int)(((double)rval) * (((double)h) / ((double)100))); - sval = (int)(((double)sval) * (((double)h) / ((double)100))); + + rval = (int)(((double)rval) * (((double)h) / ((double)100))); + sval = (int)(((double)sval) * (((double)h) / ((double)100))); o = evas_object_line_add(mf->evas); edje_object_part_swallow(mf->chart_obj, "lines", o); evas_object_layer_set(o, 1); if (rval == 0) - evas_object_hide(o); - else + evas_object_hide(o); + else { - evas_object_line_xy_set(o, (x + w), y, (x + w), (y + rval)); - evas_object_color_set(o, 213, 91, 91, 125); - evas_object_pass_events_set(o, 1); - evas_object_show(o); + evas_object_line_xy_set(o, (x + w), y, (x + w), (y + rval)); + evas_object_color_set(o, 213, 91, 91, 125); + evas_object_pass_events_set(o, 1); + evas_object_show(o); } - + /* Add new value to list */ - mf->old_real = evas_list_prepend(mf->old_real, o); + mf->old_real = evas_list_prepend(mf->old_real, o); l = mf->old_real; - for (i = (x + w); l && ((j -2) < w); l = l->next, j++) + for (i = (x + w); l && ((j - 2) < w); l = l->next, j++) { - Evas_Coord oy; - Evas_Object *lo; - - lo = (Evas_Object *)evas_list_data(l); - evas_object_geometry_get(lo, NULL, &oy, NULL, NULL); - evas_object_move(lo, i--, oy); - last = lo; - } - - if ((j - 2) >= w) - { - mf->old_real = evas_list_remove(mf->old_real, last); - edje_object_part_unswallow(mf->chart_obj, last); - evas_object_del(last); - } + Evas_Coord oy; + Evas_Object *lo; + + lo = (Evas_Object *)evas_list_data(l); + evas_object_geometry_get(lo, NULL, &oy, NULL, NULL); + evas_object_move(lo, i--, oy); + last = lo; + } + + if ((j - 2) >= w) + { + mf->old_real = evas_list_remove(mf->old_real, last); + edje_object_part_unswallow(mf->chart_obj, last); + evas_object_del(last); + } j = 0; last = NULL; @@ -666,65 +667,66 @@ edje_object_part_swallow(mf->chart_obj, "lines", o); evas_object_layer_set(o, 1); if (sval == 0) - evas_object_hide(o); - else + evas_object_hide(o); + else { - evas_object_line_xy_set(o, (x + w), (y + h), (x + w), (y + h - sval)); - evas_object_color_set(o, 218, 195, 35, 125); - evas_object_pass_events_set(o, 1); - evas_object_show(o); + evas_object_line_xy_set(o, (x + w), (y + h), (x + w), (y + h - sval)); + evas_object_color_set(o, 218, 195, 35, 125); + evas_object_pass_events_set(o, 1); + evas_object_show(o); } mf->old_swap = evas_list_prepend(mf->old_swap, o); l = mf->old_swap; - for (i = (x + w); l && ((j -2) < w); l = l->next, j++) + for (i = (x + w); l && ((j - 2) < w); l = l->next, j++) + { + Evas_Coord oy; + Evas_Object *lo; + + lo = (Evas_Object *)evas_list_data(l); + evas_object_geometry_get(lo, NULL, &oy, NULL, NULL); + evas_object_move(lo, i--, oy); + last = lo; + } + + if ((j - 2) >= w) { - Evas_Coord oy; - Evas_Object *lo; - - lo = (Evas_Object *)evas_list_data(l); - evas_object_geometry_get(lo, NULL, &oy, NULL, NULL); - evas_object_move(lo, i--, oy); - last = lo; - } - - if ((j - 2) >= w) - { - mf->old_swap = evas_list_remove(mf->old_swap, last); - edje_object_part_unswallow(mf->chart_obj, last); - evas_object_del(last); - } + mf->old_swap = evas_list_remove(mf->old_swap, last); + edje_object_part_unswallow(mf->chart_obj, last); + evas_object_del(last); + } evas_event_thaw(mf->evas); } -static void -_mem_face_graph_clear(Mem_Face *mf) +static void +_mem_face_graph_clear(Mem_Face *mf) { Evas_List *l; evas_event_freeze(mf->evas); - - for (l = mf->old_real; l; l = l->next) + + for (l = mf->old_real; l; l = l->next) { - Evas_Object *o; - o = evas_list_data(l); - edje_object_part_unswallow(mf->chart_obj, o); - evas_object_del(o); + Evas_Object *o; + + o = evas_list_data(l); + edje_object_part_unswallow(mf->chart_obj, o); + evas_object_del(o); } evas_list_free(mf->old_real); - mf->old_real = NULL; + mf->old_real = NULL; - for (l = mf->old_swap; l; l = l->next) + for (l = mf->old_swap; l; l = l->next) { - Evas_Object *o; - o = evas_list_data(l); - edje_object_part_unswallow(mf->chart_obj, o); - evas_object_del(o); + Evas_Object *o; + + o = evas_list_data(l); + edje_object_part_unswallow(mf->chart_obj, o); + evas_object_del(o); } evas_list_free(mf->old_swap); - mf->old_swap = NULL; + mf->old_swap = NULL; evas_event_thaw(mf->evas); } - =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_main.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_main.h 20 Mar 2006 23:29:30 -0000 1.5 +++ e_mod_main.h 5 Apr 2006 17:48:49 -0000 1.6 @@ -8,7 +8,7 @@ typedef struct _Mem Mem; typedef struct _Mem_Face Mem_Face; -struct _Config +struct _Config { int check_interval; int show_text; @@ -18,50 +18,50 @@ unsigned char real_ignore_cached; }; -struct _Config_Face +struct _Config_Face { unsigned char enabled; }; -struct _Mem +struct _Mem { E_Menu *config_menu; Mem_Face *face; Config *conf; - + E_Config_DD *conf_edd; E_Config_Dialog *cfd; }; -struct _Mem_Face +struct _Mem_Face { Evas *evas; E_Container *con; E_Menu *menu; Mem *mem; Evas_List *old_real, *old_swap; - + Config_Face *conf; E_Config_DD *conf_face_edd; - + Evas_Object *mem_obj; Evas_Object *event_obj; Evas_Object *chart_obj; Evas_Object *rtxt_obj; Evas_Object *stxt_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 |
From: Enlightenment C. <no...@cv...> - 2006-05-27 04:59:28
|
Enlightenment CVS committal Author : mej Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_modules-mem.spec.in Log Message: Fri May 26 23:58:45 2006 Michael Jennings (mej) Add dependency on edje-bin to pull in edje_cc. Do not allow a broken module to prevent autogen.sh from executing on all modules. ---------------------------------------------------------------------- =================================================================== RCS file: /cvs/e/e_modules/mem/e_modules-mem.spec.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_modules-mem.spec.in 22 Mar 2006 01:58:15 -0000 1.3 +++ e_modules-mem.spec.in 27 May 2006 04:57:19 -0000 1.4 @@ -11,7 +11,7 @@ Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <me...@et...>} Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)} Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} -BuildRequires: ecore-devel, evas-devel, esmart-devel +BuildRequires: ecore-devel, evas-devel, esmart-devel, edje-bin BuildRequires: edje-devel, eet-devel, enlightenment-devel >= 0.16.999 Requires: enlightenment >= 0.16.999 BuildRoot: %{_tmppath}/%{name}-%{version}-root |
From: Enlightenment C. <no...@cv...> - 2006-05-27 20:04:28
|
Enlightenment CVS committal Author : mej Project : e_modules Module : mem Dir : e_modules/mem Modified Files: Makefile.am Log Message: Sat May 27 15:04:18 2006 Michael Jennings (mej) Pass distcheck please. ---------------------------------------------------------------------- =================================================================== RCS file: /cvs/e/e_modules/mem/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 25 May 2006 23:32:39 -0000 1.5 +++ Makefile.am 27 May 2006 20:02:48 -0000 1.6 @@ -8,14 +8,10 @@ # data files for the module filesdir = $(datadir) -EXTRA_DIST=e_modules-mem.spec.in e_modules-mem.spec autogen.sh mem.png module_icon.png $(files_DATA) +files_DATA = module_icon.png module.eap mem.edj mem.edc \ + VeraMono.ttf $(wildcard real*.png) $(wildcard swap*.png) -files_DATA = \ -module_icon.png \ -module.eap \ -mem.edj \ -mem.edc \ -VeraMono.ttf +EXTRA_DIST=e_modules-mem.spec.in e_modules-mem.spec autogen.sh mem.png module_icon.png $(files_DATA) # the module .so file INCLUDES = -I. \ |
From: Enlightenment C. <no...@cv...> - 2006-05-27 23:42:52
|
Enlightenment CVS committal Author : mej Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_modules-mem.spec.in Log Message: Sat May 27 18:41:24 2006 Michael Jennings (mej) The emu module kinda threw everything for a loop by having a separate binary, so I had to add some spec-fu to make an exception for it. ---------------------------------------------------------------------- =================================================================== RCS file: /cvs/e/e_modules/mem/e_modules-mem.spec.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_modules-mem.spec.in 27 May 2006 04:57:19 -0000 1.4 +++ e_modules-mem.spec.in 27 May 2006 23:40:42 -0000 1.5 @@ -42,6 +42,9 @@ %files -f %{module_name}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog COPYING* INSTALL NEWS README -%{_libdir}/enlightenment/modules/%{module_name} +%if "%{module_name}" == "emu" +%{_bindir}/%{module_name}* +%endif +%{_libdir}/enlightenment/modules/%{module_name}* %changelog |
From: Enlightenment C. <no...@cv...> - 2007-04-19 00:33:18
|
Enlightenment CVS committal Author : mej Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.c Log Message: Wed Apr 18 20:32:05 2007 Michael Jennings (mej) Patches from Richard Kolkovich <sar...@si...> and Christian Wiese <mo...@op...>. ---------------------------------------------------------------------- =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- e_mod_main.c 30 Mar 2007 20:30:34 -0000 1.43 +++ e_mod_main.c 19 Apr 2007 00:32:46 -0000 1.44 @@ -437,8 +437,10 @@ { snprintf (real_str, sizeof (real_str), "Real: %d/%d MB", (real / 1024), (total_real / 1024)); - snprintf (swap_str, sizeof (swap_str), "Swap: %d/%d MB", (swap / 1024), - (total_swap / 1024)); + if ( total_swap ) { + snprintf (swap_str, sizeof (swap_str), "Swap: %d/%d MB", (swap / 1024), + (total_swap / 1024)); + } } else { @@ -446,19 +448,27 @@ tr = (((double) real / (double) total_real) * 100); snprintf (real_str, sizeof (real_str), "Real: %1.2f%%", tr); - tr = (((double) swap / (double) total_swap) * 100); - snprintf (swap_str, sizeof (swap_str), "Swap: %1.2f%%", tr); + if ( total_swap ) { + tr = (((double) swap / (double) total_swap) * 100); + snprintf (swap_str, sizeof (swap_str), "Swap: %1.2f%%", tr); + } } edje_object_part_text_set (inst->mem_obj, "real_label", real_str); - edje_object_part_text_set (inst->mem_obj, "swap_label", swap_str); + if ( total_swap ) { + edje_object_part_text_set (inst->mem_obj, "swap_label", swap_str); + } else { + edje_object_part_text_set (inst->mem_obj, "swap_label", ""); + } double tr = ((double) real / (double) total_real); msg.val = tr; edje_object_message_send (inst->mem_obj, EDJE_MESSAGE_FLOAT, 1, &msg); - double ts = ((double) swap / (double) total_swap); - msg.val = ts; - edje_object_message_send (inst->mem_obj, EDJE_MESSAGE_FLOAT, 2, &msg); + if ( total_swap ) { + double ts = ((double) swap / (double) total_swap); + msg.val = ts; + edje_object_message_send (inst->mem_obj, EDJE_MESSAGE_FLOAT, 2, &msg); + } return 1; } |