From: <enl...@li...> - 2006-02-20 14:09:51
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Log Message: Directory /cvsroot/enlightenment/e_modules/mem added to the repository |
From: <enl...@li...> - 2006-02-20 14:11:45
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Added Files: .cvsignore AUTHORS COPYING COPYING-PLAIN ChangeLog INSTALL Makefile.am NEWS README VeraMono.ttf autogen.sh configure.in e_mod_config.c e_mod_config.h e_mod_main.c e_mod_main.h mem.edc mem.png module_icon.png Log Message: Added mem module. -TODO: graph |
From: <enl...@li...> - 2006-02-20 18:23:30
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.c Log Message: Nicer menus...shhh ! :) =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.c 20 Feb 2006 14:11:42 -0000 1.1 +++ e_mod_main.c 20 Feb 2006 18:23:28 -0000 1.2 @@ -284,10 +284,12 @@ mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("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_menu_item_callback_set(mi, _mem_face_cb_menu_edit, cf); } |
From: <enl...@li...> - 2006-02-21 12:36:10
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.c Log Message: At morlenxus's request, Add total memory/used memory =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.c 20 Feb 2006 18:23:28 -0000 1.2 +++ e_mod_main.c 21 Feb 2006 12:36:08 -0000 1.3 @@ -16,7 +16,7 @@ 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); +static void _mem_face_get_mem_values (Mem_Face *cf, int *real, int *swap, int *total_real, int *total_swap); static int mem_count; @@ -408,19 +408,19 @@ _mem_face_update_values(void *data) { Mem_Face *cf; - int real, swap; + int real, swap, total_real, total_swap; Edje_Message_String_Set *msg; char real_str[100]; char swap_str[100]; cf = data; - _mem_face_get_mem_values(cf, &real, &swap); + _mem_face_get_mem_values(cf, &real, &swap, &total_real, &total_swap); real = real / 1024; swap = swap / 1024; - snprintf(real_str, sizeof(real_str), "%d MB", real); - snprintf(swap_str, sizeof(swap_str), "%d MB", swap); + snprintf(real_str, sizeof(real_str), "%d/%d MB", total_real, real); + snprintf(swap_str, sizeof(swap_str), "%d/%d MB", total_swap, swap); msg = malloc(sizeof(Edje_Message_String_Set) - sizeof(char *) + (1 + sizeof(char *))); msg->count = 2; @@ -433,7 +433,7 @@ } static void -_mem_face_get_mem_values(Mem_Face *cf, int *real, int *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; @@ -506,5 +506,7 @@ *real = mtotal - mfree; *swap = stotal - sfree; + *total_real = mtotal / 1024; + *total_swap = stotal / 1024; return; } |
From: <enl...@li...> - 2006-02-21 12:47:21
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: mem.edc Log Message: Remove default text =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/mem.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- mem.edc 20 Feb 2006 14:11:42 -0000 1.1 +++ mem.edc 21 Feb 2006 12:47:20 -0000 1.2 @@ -21,7 +21,6 @@ getsarg(2, real_str, sizeof(real_str)); getsarg(3, swap_str, sizeof(swap_str)); - set_text(PART:"real-text", real_str); set_text(PART:"swap-text", swap_str); } @@ -70,7 +69,7 @@ color: 255 255 255 255; color3: 0 0 0 100; text { - text: "real"; + text: ""; font: "VeraMono"; size: 10; min: 1 1; @@ -99,7 +98,7 @@ color: 213 91 91 255; color3: 0 0 0 100; text { - text: "swap"; + text: ""; font: "VeraMono"; size: 10; min: 1 1; |
From: <enl...@li...> - 2006-02-21 13:17:01
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: mem.edc Log Message: Clip the text to not allow displaying outside the gadget. =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/mem.edc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- mem.edc 21 Feb 2006 12:47:20 -0000 1.2 +++ mem.edc 21 Feb 2006 13:16:59 -0000 1.3 @@ -29,7 +29,17 @@ parts{ part { + name: "base"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "mem"; + clip_to: "base"; mouse_events: 0; description { state: "default" 0.0; @@ -53,6 +63,7 @@ { name: "real-text"; type: TEXT; + clip_to: "base"; effect: SOFT_SHADOW; mouse_events: 0; description { @@ -71,7 +82,7 @@ text { text: ""; font: "VeraMono"; - size: 10; + size: 8; min: 1 1; align: 1.0 0.0; } @@ -82,6 +93,7 @@ { name: "swap-text"; type: TEXT; + clip_to: "base"; effect: SOFT_SHADOW; mouse_events: 0; description { @@ -100,7 +112,7 @@ text { text: ""; font: "VeraMono"; - size: 10; + size: 8; min: 1 1; align: 1.0 0.0; } |
From: <enl...@li...> - 2006-02-22 10:43:42
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: mem.edc e_mod_main.c Log Message: More edje_object_part_text_set work =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/mem.edc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- mem.edc 21 Feb 2006 13:16:59 -0000 1.3 +++ mem.edc 22 Feb 2006 10:43:37 -0000 1.4 @@ -12,21 +12,7 @@ { group { - name: "modules/mem/main"; - script { - public message(Msg_Type:type, id, ...) { - if (type == MSG_STRING_SET) { - new real_str[100]; - new swap_str[100]; - - getsarg(2, real_str, sizeof(real_str)); - getsarg(3, swap_str, sizeof(swap_str)); - set_text(PART:"real-text", real_str); - set_text(PART:"swap-text", swap_str); - } - } - } - + name: "modules/mem/main"; parts{ part { name: "base"; @@ -38,18 +24,35 @@ } } part { + name: "mem_clip"; + type: RECT; + clip_to: "base"; + mouse_events: 0; + description { + state: "default" 0.0; + color: 255 255 255 255; + rel1 { + to_x: "base"; + } + rel2 { + to: "base"; + } + } + } + + part { name: "mem"; - clip_to: "base"; + clip_to: "mem_clip"; mouse_events: 0; description { state: "default" 0.0; color: 255 255 255 200; aspect: 1.0 1.0; - rel1 { - offset: 0 6; + rel1 { + to: "base"; } rel2 { - offset: -1 -6; + to: "base"; } image { normal: "mem.png"; @@ -63,7 +66,7 @@ { name: "real-text"; type: TEXT; - clip_to: "base"; + clip_to: "mem_clip"; effect: SOFT_SHADOW; mouse_events: 0; description { @@ -72,7 +75,7 @@ rel1 { relative: 1.0 0.0; to_x: "mem"; - offset: -2 1; + offset: -2 10; } rel2 { relative: 1.0 0.0; @@ -93,7 +96,7 @@ { name: "swap-text"; type: TEXT; - clip_to: "base"; + clip_to: "mem_clip"; effect: SOFT_SHADOW; mouse_events: 0; description { @@ -101,7 +104,7 @@ align: 1.0 0.0; rel1 { relative: 1.0 1.0; - to_x: "mem"; + to_x: "mem"; offset: -2 -10; } rel2 { =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_main.c 21 Feb 2006 12:36:08 -0000 1.3 +++ e_mod_main.c 22 Feb 2006 10:43:37 -0000 1.4 @@ -409,7 +409,6 @@ { Mem_Face *cf; int real, swap, total_real, total_swap; - Edje_Message_String_Set *msg; char real_str[100]; char swap_str[100]; @@ -421,13 +420,8 @@ snprintf(real_str, sizeof(real_str), "%d/%d MB", total_real, real); snprintf(swap_str, sizeof(swap_str), "%d/%d MB", total_swap, swap); - - msg = malloc(sizeof(Edje_Message_String_Set) - sizeof(char *) + (1 + sizeof(char *))); - msg->count = 2; - msg->str[0] = real_str; - msg->str[1] = swap_str; - edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_STRING_SET, 1, msg); - free(msg); + edje_object_part_text_set(cf->mem_obj, "real-text", real_str); + edje_object_part_text_set(cf->mem_obj, "swap-text", swap_str); return 1; } |
From: <enl...@li...> - 2006-02-22 11:06:18
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: .cvsignore Log Message: Update cvsignore =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 20 Feb 2006 14:11:42 -0000 1.1 +++ .cvsignore 22 Feb 2006 11:06:07 -0000 1.2 @@ -21,3 +21,4 @@ *.la *.spec *.tar.gz +*.edj |
From: <enl...@li...> - 2006-02-22 12:23:40
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.c Log Message: Remove size restrictions for Gulivert :) =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_main.c 22 Feb 2006 10:43:37 -0000 1.4 +++ e_mod_main.c 22 Feb 2006 12:23:37 -0000 1.5 @@ -263,7 +263,7 @@ e_gadman_client_max_size_set(cf->gmc, 128, 128); e_gadman_client_auto_size_set(cf->gmc, 40, 40); e_gadman_client_align_set(cf->gmc, 1.0, 1.0); - e_gadman_client_aspect_set(cf->gmc, 1.0, 1.0); + //e_gadman_client_aspect_set(cf->gmc, 1.0, 1.0); e_gadman_client_resize(cf->gmc, 40, 40); e_gadman_client_change_func_set(cf->gmc, _mem_face_cb_gmc_change, cf); e_gadman_client_load(cf->gmc); |
From: <enl...@li...> - 2006-02-26 15:14:04
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: mem.png mem.edc Log Message: More realistic memory image. Big 'Thank You' to kingrayray for his artistic talents in creating the image :) =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/mem.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsNkrt4f and /tmp/cvsIc9jCF differ =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/mem.edc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- mem.edc 22 Feb 2006 10:43:37 -0000 1.4 +++ mem.edc 26 Feb 2006 15:13:59 -0000 1.5 @@ -47,7 +47,7 @@ description { state: "default" 0.0; color: 255 255 255 200; - aspect: 1.0 1.0; + aspect: 0.5 2.25; rel1 { to: "base"; } @@ -80,12 +80,12 @@ rel2 { relative: 1.0 0.0; } - color: 255 255 255 255; + color: 218 195 35 255; //255 255 255 255; color3: 0 0 0 100; text { text: ""; font: "VeraMono"; - size: 8; + size: 10; min: 1 1; align: 1.0 0.0; } @@ -105,17 +105,17 @@ rel1 { relative: 1.0 1.0; to_x: "mem"; - offset: -2 -10; + offset: -2 -20; } rel2 { relative: 1.0 1.0; - } + } color: 213 91 91 255; color3: 0 0 0 100; text { text: ""; font: "VeraMono"; - size: 8; + size: 10; min: 1 1; align: 1.0 0.0; } |
From: <enl...@li...> - 2006-02-26 15:15:08
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: module_icon.png Log Message: Update the module_icon to match =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/module_icon.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvs9oQL2X and /tmp/cvswkrjVB differ |
From: <enl...@li...> - 2006-02-26 19:11:15
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.c mem.edc Log Message: Some edc cleanup. Some better max size values =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_main.c 22 Feb 2006 12:23:37 -0000 1.5 +++ e_mod_main.c 26 Feb 2006 19:11:15 -0000 1.6 @@ -232,15 +232,6 @@ } evas_object_show(o); - - /* - o = evas_object_rectangle_add(cf->evas); - cf->chart_obj = o; - evas_object_layer_set(o, 2); - evas_object_repeat_events_set(o, 0); - evas_object_color_set(o, 0, 0, 0, 255); - evas_object_show(o); - */ o = evas_object_rectangle_add(cf->evas); cf->event_obj = o; @@ -259,11 +250,9 @@ E_GADMAN_POLICY_HSIZE | E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_VSIZE); - e_gadman_client_min_size_set(cf->gmc, 4, 4); - e_gadman_client_max_size_set(cf->gmc, 128, 128); + e_gadman_client_max_size_set(cf->gmc, 256, 128); e_gadman_client_auto_size_set(cf->gmc, 40, 40); e_gadman_client_align_set(cf->gmc, 1.0, 1.0); - //e_gadman_client_aspect_set(cf->gmc, 1.0, 1.0); e_gadman_client_resize(cf->gmc, 40, 40); e_gadman_client_change_func_set(cf->gmc, _mem_face_cb_gmc_change, cf); e_gadman_client_load(cf->gmc); =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/mem.edc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- mem.edc 26 Feb 2006 15:13:59 -0000 1.5 +++ mem.edc 26 Feb 2006 19:11:15 -0000 1.6 @@ -15,32 +15,6 @@ name: "modules/mem/main"; parts{ part { - name: "base"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - color: 255 255 255 255; - } - } - part { - name: "mem_clip"; - type: RECT; - clip_to: "base"; - mouse_events: 0; - description { - state: "default" 0.0; - color: 255 255 255 255; - rel1 { - to_x: "base"; - } - rel2 { - to: "base"; - } - } - } - - part { name: "mem"; clip_to: "mem_clip"; mouse_events: 0; @@ -49,10 +23,10 @@ color: 255 255 255 200; aspect: 0.5 2.25; rel1 { - to: "base"; + relative: 0.0 0.0; } rel2 { - to: "base"; + relative: 1.0 1.0; } image { normal: "mem.png"; @@ -62,8 +36,7 @@ } } } - part - { + part { name: "real-text"; type: TEXT; clip_to: "mem_clip"; @@ -74,8 +47,6 @@ align: 1.0 0.0; rel1 { relative: 1.0 0.0; - to_x: "mem"; - offset: -2 10; } rel2 { relative: 1.0 0.0; @@ -85,15 +56,14 @@ text { text: ""; font: "VeraMono"; - size: 10; + size: 8; min: 1 1; align: 1.0 0.0; } } } - part - { + part { name: "swap-text"; type: TEXT; clip_to: "mem_clip"; @@ -101,11 +71,9 @@ mouse_events: 0; description { state: "default" 0.0; - align: 1.0 0.0; + align: 1.0 1.0; rel1 { relative: 1.0 1.0; - to_x: "mem"; - offset: -2 -20; } rel2 { relative: 1.0 1.0; @@ -115,13 +83,25 @@ text { text: ""; font: "VeraMono"; - size: 10; + size: 8; min: 1 1; - align: 1.0 0.0; + align: 1.0 1.0; } } } - + part { + name: "mem_clip"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "faded" 0.0; + color: 255 255 255 128; + } + } } }//close group net |
From: <enl...@li...> - 2006-02-27 12:40:23
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: mem.edc e_mod_main.c Log Message: Better aspect on the mem module. Image doesn't look stretched anymore when sizing =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/mem.edc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- mem.edc 26 Feb 2006 19:11:15 -0000 1.6 +++ mem.edc 27 Feb 2006 12:40:20 -0000 1.7 @@ -21,7 +21,7 @@ description { state: "default" 0.0; color: 255 255 255 200; - aspect: 0.5 2.25; + //aspect: 0.25 2.25; rel1 { relative: 0.0 0.0; } =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_main.c 26 Feb 2006 19:11:15 -0000 1.6 +++ e_mod_main.c 27 Feb 2006 12:40:21 -0000 1.7 @@ -253,6 +253,7 @@ e_gadman_client_max_size_set(cf->gmc, 256, 128); e_gadman_client_auto_size_set(cf->gmc, 40, 40); e_gadman_client_align_set(cf->gmc, 1.0, 1.0); + e_gadman_client_aspect_set(cf->gmc, 3.25, 3.25); e_gadman_client_resize(cf->gmc, 40, 40); e_gadman_client_change_func_set(cf->gmc, _mem_face_cb_gmc_change, cf); e_gadman_client_load(cf->gmc); |
From: <enl...@li...> - 2006-02-28 21:49:31
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: mem.edc e_mod_main.h e_mod_main.c e_mod_config.c Log Message: Memory Module has a graph now :) =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/mem.edc,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- mem.edc 27 Feb 2006 12:40:20 -0000 1.7 +++ mem.edc 28 Feb 2006 21:49:29 -0000 1.8 @@ -1,109 +1,155 @@ images { - image: "mem.png" COMP; + image: "mem.png" COMP; } fonts { - font: "VeraMono.ttf" "VeraMono"; + font: "VeraMono.ttf" "VeraMono"; } collections { -group - { - name: "modules/mem/main"; - parts{ - part { - name: "mem"; - clip_to: "mem_clip"; - mouse_events: 0; - description { - state: "default" 0.0; - color: 255 255 255 200; - //aspect: 0.25 2.25; - rel1 { - relative: 0.0 0.0; - } - rel2 { - relative: 1.0 1.0; - } - image { - normal: "mem.png"; - } - fill { - smooth: 0; - } - } - } - part { - name: "real-text"; - type: TEXT; - clip_to: "mem_clip"; - effect: SOFT_SHADOW; - mouse_events: 0; - description { - state: "default" 0.0; - align: 1.0 0.0; - rel1 { - relative: 1.0 0.0; - } - rel2 { - relative: 1.0 0.0; - } - color: 218 195 35 255; //255 255 255 255; - color3: 0 0 0 100; - text { - text: ""; - font: "VeraMono"; - size: 8; - min: 1 1; - align: 1.0 0.0; - } - } + group + { + name: "modules/mem/main"; + parts + { + part + { + name: "mem_clip"; + type: RECT; + mouse_events: 0; + description + { + state: "default" 0.0; + color: 255 255 255 255; + } + } + part + { + name: "mem"; + clip_to: "mem_clip"; + mouse_events: 0; + description + { + state: "default" 0.0; + color: 255 255 255 255; + rel1 + { + relative: 0.0 0.0; + } + rel2 + { + relative: 1.0 1.0; + } + image + { + normal: "mem.png"; + } + fill + { + smooth: 0; + } + } + } + part + { + name: "lines"; + mouse_events: 0; + type: SWALLOW; + clip_to: "mem_clip"; + description + { + state: "default" 0.0; + color: 0 0 0 0; + rel1 + { + relative: 0.0 0.0; + } + rel2 + { + relative: 1.0 1.0; + } + } + } + } + } + group + { + name: "modules/mem/real_text"; + parts + { + part + { + name: "real-text"; + type: TEXT; + effect: SOFT_SHADOW; + mouse_events: 0; + description + { + state: "default" 0.0; + align: 1.0 0.0; + rel1 + { + relative: 0.0 0.0; + } + rel2 + { + relative: 1.0 0.0; + } + color: 218 195 35 255; + color3: 0 0 0 100; + text + { + text: "real"; + font: "VeraMono"; + size: 8; + min: 1 1; + align: 1.0 0.0; + } + } + } + } + } + group + { + name: "modules/mem/swap_text"; + parts + { + part + { + name: "swap-text"; + type: TEXT; + effect: SOFT_SHADOW; + mouse_events: 0; + description + { + state: "default" 0.0; + align: 1.0 1.0; + rel1 + { + relative: 0.0 0.0; + } + rel2 + { + relative: 1.0 1.0; + } + color: 213 91 91 255; + color3: 0 0 0 100; + text + { + text: "swap"; + font: "VeraMono"; + size: 8; + min: 1 1; + align: 1.0 1.0; + } + } + } - part { - name: "swap-text"; - type: TEXT; - clip_to: "mem_clip"; - effect: SOFT_SHADOW; - mouse_events: 0; - description { - state: "default" 0.0; - align: 1.0 1.0; - rel1 { - relative: 1.0 1.0; - } - rel2 { - relative: 1.0 1.0; - } - color: 213 91 91 255; - color3: 0 0 0 100; - text { - text: ""; - font: "VeraMono"; - size: 8; - min: 1 1; - align: 1.0 1.0; - } - } - } - part { - name: "mem_clip"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - color: 255 255 255 255; - } - description { - state: "faded" 0.0; - color: 255 255 255 128; - } - } - - } - }//close group net + } + } } =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.h 20 Feb 2006 14:11:42 -0000 1.1 +++ e_mod_main.h 28 Feb 2006 21:49:29 -0000 1.2 @@ -9,6 +9,8 @@ struct _Config { int check_interval; + int show_text; + int show_graph; unsigned char real_ignore_buffers; unsigned char real_ignore_cached; }; @@ -34,12 +36,16 @@ E_Container *con; E_Menu *menu; Mem *mem; - + Evas_List *old_real; + 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; =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_main.c 27 Feb 2006 12:40:21 -0000 1.7 +++ e_mod_main.c 28 Feb 2006 21:49:29 -0000 1.8 @@ -17,7 +17,8 @@ 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 val); +static void _mem_face_graph_clear (Mem_Face *mf); static int mem_count; EAPI E_Module_Api e_modapi = @@ -126,6 +127,8 @@ #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_graph, INT); E_CONFIG_VAL(D, T, real_ignore_buffers, UCHAR); E_CONFIG_VAL(D, T, real_ignore_cached, UCHAR); @@ -134,10 +137,14 @@ { c->conf = E_NEW(Config, 1); c->conf->check_interval = 1; + c->conf->show_text = 1; + c->conf->show_graph = 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); _mem_config_menu_new(c); @@ -224,22 +231,53 @@ 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"); - } - + } + evas_object_show(o); + + o = edje_object_add(cf->evas); + cf->chart_obj = o; + evas_object_layer_set(o, 1); + evas_object_repeat_events_set(o, 1); + 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")) + { + 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); + 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->stxt_obj = o; + 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"); + } + 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, 2); + evas_object_layer_set(o, 3); 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, - _mem_face_cb_mouse_down, cf); + 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); @@ -289,8 +327,10 @@ 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); } static void @@ -299,8 +339,10 @@ 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 @@ -314,11 +356,14 @@ evas_object_del(cf->event_obj); if (cf->mem_obj) evas_object_del(cf->mem_obj); - - /* if (cf->chart_obj) evas_object_del(cf->chart_obj); - */ + if (cf->rtxt_obj) + evas_object_del(cf->rtxt_obj); + if (cf->stxt_obj) + evas_object_del(cf->stxt_obj); + if (cf->old_real) + _mem_face_graph_clear(cf); if (cf->gmc) { @@ -343,16 +388,23 @@ 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->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->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->chart_obj); evas_object_raise(cf->event_obj); + evas_object_raise(cf->rtxt_obj); + evas_object_raise(cf->stxt_obj); break; default: break; @@ -405,13 +457,24 @@ cf = data; _mem_face_get_mem_values(cf, &real, &swap, &total_real, &total_swap); - real = real / 1024; - swap = swap / 1024; - - snprintf(real_str, sizeof(real_str), "%d/%d MB", total_real, real); - snprintf(swap_str, sizeof(swap_str), "%d/%d MB", total_swap, swap); - edje_object_part_text_set(cf->mem_obj, "real-text", real_str); - edje_object_part_text_set(cf->mem_obj, "swap-text", swap_str); + if (cf->mem->conf->show_text) + { + snprintf(real_str, sizeof(real_str), "%d/%d MB", (total_real / 1024), (real / 1024)); + snprintf(swap_str, sizeof(swap_str), "%d/%d MB", (total_swap / 1024), (swap / 1024)); + 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", ""); + } + + double tr = ((double)real / (double)total_real); + if (cf->mem->conf->show_graph) + _mem_face_graph_values(cf, (tr * 100)); + else + _mem_face_graph_clear(cf); return 1; } @@ -439,26 +502,24 @@ 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:") == 0) + if (!strcmp(field, "MemTotal:")) mtotal = value; - else if (strcmp(field, "MemFree:") == 0) + else if (!strcmp(field, "MemFree:")) mfree = value; - else if (cf->mem->conf->real_ignore_buffers && strcmp(field, "Buffers:") == 0) + else if (cf->mem->conf->real_ignore_buffers && (!strcmp(field, "Buffers:"))) mfree += value; - else if (cf->mem->conf->real_ignore_cached && strcmp(field, "Cached:") == 0) + else if (cf->mem->conf->real_ignore_cached && (!strcmp(field, "Cached:"))) mfree += value; - else if (cf->mem->conf->real_ignore_cached && strcmp(field, "SwapCached:") == 0) + else if (cf->mem->conf->real_ignore_cached && (!strcmp(field, "SwapCached:"))) sfree += value; - else if (strcmp(field, "SwapTotal:") == 0) + else if (!strcmp(field, "SwapTotal:")) stotal = value; - else if (strcmp(field, "SwapFree:") == 0) + else if (!strcmp(field, "SwapFree:")) sfree = value; free(line); free(field); @@ -468,29 +529,85 @@ } fclose(pmeminfo); + /* calculate swap usage in percent */ + if (stotal >= 1) + { + ldresult = ldiv(stotal, 100); + 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); - //mem_real_usage = ldresult.quot; + + *real = (mtotal - mfree); + *swap = (stotal - sfree); + *total_real = mtotal; + *total_swap = stotal; + return; +} - /* calculate swap usage in percent */ - if (stotal < 1) +static void +_mem_face_graph_values(Mem_Face *mf, int val) +{ + int x, y, w, h; + Evas_Object *o; + Evas_Object *last = NULL; + Evas_List *l; + int i, j = 0; + + evas_object_geometry_get(mf->chart_obj, &x, &y, &w, &h); + + val = (int)(((double)val) * (((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 (val == 0) + evas_object_hide(o); + else { - //mem_swap_usage = 0; + evas_object_line_xy_set(o, (x + w), (y + h), (x + w), ((y + h) - val)); + evas_object_color_set(o, 218, 195, 35, 200); + evas_object_pass_events_set(o, 1); + evas_object_show(o); } - else + + 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++) { - ldresult = ldiv(stotal, 100); - liresult = ldresult.quot; - ldresult = ldiv((stotal - sfree), liresult); - //mem_swap_usage = ldresult.quot; + 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); + evas_object_del(last); + } +} - *real = mtotal - mfree; - *swap = stotal - sfree; - *total_real = mtotal / 1024; - *total_swap = stotal / 1024; - return; +static void +_mem_face_graph_clear(Mem_Face *mf) +{ + Evas_List *l; + + for (l = mf->old_real; l; l = l->next) + { + Evas_Object *o; + o = evas_list_data(l); + evas_object_del(o); + } + evas_list_free(mf->old_real); + mf->old_real = NULL; } + =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.c 20 Feb 2006 14:11:42 -0000 1.1 +++ e_mod_config.c 28 Feb 2006 21:49:29 -0000 1.2 @@ -6,6 +6,8 @@ struct _E_Config_Dialog_Data { int check_interval; + int show_text; + int show_graph; int real_ignore_buffers; int real_ignore_cached; }; @@ -41,6 +43,8 @@ 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; + cfdata->show_graph = c->conf->show_graph; } static void * @@ -75,6 +79,10 @@ o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, _("Mem Settings"), 0); + ob = e_widget_check_add(evas, _("Show Text"), &(cfdata->show_text)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Show Graph"), &(cfdata->show_graph)); + e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, _("Ignore Buffers"), &(cfdata->real_ignore_buffers)); e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, _("Ignore Cached"), &(cfdata->real_ignore_cached)); @@ -98,6 +106,8 @@ c->conf->check_interval = cfdata->check_interval; c->conf->real_ignore_buffers = cfdata->real_ignore_buffers; c->conf->real_ignore_cached = cfdata->real_ignore_cached; + c->conf->show_text = cfdata->show_text; + c->conf->show_graph = cfdata->show_graph; e_config_save_queue (); if (c->face->monitor) ecore_timer_interval_set(c->face->monitor, (double)cfdata->check_interval); |
From: <enl...@li...> - 2006-03-01 11:09:16
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: mem.edc Log Message: Make font size match cpu module. =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/mem.edc,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- mem.edc 28 Feb 2006 21:49:29 -0000 1.8 +++ mem.edc 1 Mar 2006 11:09:09 -0000 1.9 @@ -105,7 +105,7 @@ { text: "real"; font: "VeraMono"; - size: 8; + size: 10; min: 1 1; align: 1.0 0.0; } @@ -142,7 +142,7 @@ { text: "swap"; font: "VeraMono"; - size: 8; + size: 10; min: 1 1; align: 1.0 1.0; } |
From: <enl...@li...> - 2006-03-01 16:09:40
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: mem.png module_icon.png mem.edc e_mod_main.c Log Message: Change mem image (again). Revertted to old-yeller. Remove size restraints. =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/mem.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsGxM6p9 and /tmp/cvsThQZ4o differ =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/module_icon.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvs80kL0D and /tmp/cvs87odjV differ =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/mem.edc,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- mem.edc 1 Mar 2006 11:09:09 -0000 1.9 +++ mem.edc 1 Mar 2006 16:09:34 -0000 1.10 @@ -99,7 +99,7 @@ { relative: 1.0 0.0; } - color: 218 195 35 255; + color: 213 91 91 255; color3: 0 0 0 100; text { @@ -136,7 +136,8 @@ { relative: 1.0 1.0; } - color: 213 91 91 255; + + color: 218 195 35 255; color3: 0 0 0 100; text { =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_mod_main.c 28 Feb 2006 21:49:29 -0000 1.8 +++ e_mod_main.c 1 Mar 2006 16:09:34 -0000 1.9 @@ -288,10 +288,10 @@ E_GADMAN_POLICY_HSIZE | E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_VSIZE); - e_gadman_client_max_size_set(cf->gmc, 256, 128); + e_gadman_client_max_size_set(cf->gmc, 128, 128); e_gadman_client_auto_size_set(cf->gmc, 40, 40); e_gadman_client_align_set(cf->gmc, 1.0, 1.0); - e_gadman_client_aspect_set(cf->gmc, 3.25, 3.25); + //e_gadman_client_aspect_set(cf->gmc, 3.25, 3.25); e_gadman_client_resize(cf->gmc, 40, 40); e_gadman_client_change_func_set(cf->gmc, _mem_face_cb_gmc_change, cf); e_gadman_client_load(cf->gmc); @@ -571,7 +571,7 @@ else { evas_object_line_xy_set(o, (x + w), (y + h), (x + w), ((y + h) - val)); - evas_object_color_set(o, 218, 195, 35, 200); + evas_object_color_set(o, 255, 0, 0, 200); evas_object_pass_events_set(o, 1); evas_object_show(o); } |
From: <enl...@li...> - 2006-03-01 16:22:58
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.c Log Message: Slightly better alpha value =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_mod_main.c 1 Mar 2006 16:09:34 -0000 1.9 +++ e_mod_main.c 1 Mar 2006 16:22:54 -0000 1.10 @@ -291,7 +291,6 @@ e_gadman_client_max_size_set(cf->gmc, 128, 128); e_gadman_client_auto_size_set(cf->gmc, 40, 40); e_gadman_client_align_set(cf->gmc, 1.0, 1.0); - //e_gadman_client_aspect_set(cf->gmc, 3.25, 3.25); e_gadman_client_resize(cf->gmc, 40, 40); e_gadman_client_change_func_set(cf->gmc, _mem_face_cb_gmc_change, cf); e_gadman_client_load(cf->gmc); @@ -571,7 +570,7 @@ else { evas_object_line_xy_set(o, (x + w), (y + h), (x + w), ((y + h) - val)); - evas_object_color_set(o, 255, 0, 0, 200); + evas_object_color_set(o, 255, 0, 0, 125); evas_object_pass_events_set(o, 1); evas_object_show(o); } |
From: <enl...@li...> - 2006-03-01 16:25:51
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.c Log Message: Remove size constraint =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_mod_main.c 1 Mar 2006 16:22:54 -0000 1.10 +++ e_mod_main.c 1 Mar 2006 16:25:50 -0000 1.11 @@ -288,7 +288,6 @@ E_GADMAN_POLICY_HSIZE | E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_VSIZE); - e_gadman_client_max_size_set(cf->gmc, 128, 128); 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); |
From: <enl...@li...> - 2006-03-01 16:33:12
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.c Log Message: -total/used +used/total =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_main.c 1 Mar 2006 16:25:50 -0000 1.11 +++ e_mod_main.c 1 Mar 2006 16:32:59 -0000 1.12 @@ -457,8 +457,8 @@ if (cf->mem->conf->show_text) { - snprintf(real_str, sizeof(real_str), "%d/%d MB", (total_real / 1024), (real / 1024)); - snprintf(swap_str, sizeof(swap_str), "%d/%d MB", (total_swap / 1024), (swap / 1024)); + 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)); edje_object_part_text_set(cf->rtxt_obj, "real-text", real_str); edje_object_part_text_set(cf->stxt_obj, "swap-text", swap_str); } |
From: <enl...@li...> - 2006-03-01 17:26:11
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.h e_mod_main.c e_mod_config.c Log Message: Added Option to show text as percent. =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.h 28 Feb 2006 21:49:29 -0000 1.2 +++ e_mod_main.h 1 Mar 2006 17:25:58 -0000 1.3 @@ -11,6 +11,7 @@ int check_interval; int show_text; int show_graph; + int show_percent; unsigned char real_ignore_buffers; unsigned char real_ignore_cached; }; =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_mod_main.c 1 Mar 2006 16:32:59 -0000 1.12 +++ e_mod_main.c 1 Mar 2006 17:25:58 -0000 1.13 @@ -128,6 +128,7 @@ #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, real_ignore_buffers, UCHAR); E_CONFIG_VAL(D, T, real_ignore_cached, UCHAR); @@ -139,12 +140,14 @@ 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); @@ -457,8 +460,19 @@ if (cf->mem->conf->show_text) { - 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)); + 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); } =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_config.c 28 Feb 2006 21:49:29 -0000 1.2 +++ e_mod_config.c 1 Mar 2006 17:25:58 -0000 1.3 @@ -8,6 +8,7 @@ int check_interval; int show_text; int show_graph; + int show_percent; int real_ignore_buffers; int real_ignore_cached; }; @@ -45,6 +46,7 @@ cfdata->real_ignore_cached = c->conf->real_ignore_cached; cfdata->show_text = c->conf->show_text; cfdata->show_graph = c->conf->show_graph; + cfdata->show_percent = c->conf->show_percent; } static void * @@ -81,6 +83,8 @@ of = e_widget_framelist_add(evas, _("Mem Settings"), 0); ob = e_widget_check_add(evas, _("Show Text"), &(cfdata->show_text)); e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Show Text As Percent"), &(cfdata->show_percent)); + e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, _("Show Graph"), &(cfdata->show_graph)); e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, _("Ignore Buffers"), &(cfdata->real_ignore_buffers)); @@ -108,6 +112,7 @@ c->conf->real_ignore_cached = cfdata->real_ignore_cached; 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 (); if (c->face->monitor) ecore_timer_interval_set(c->face->monitor, (double)cfdata->check_interval); |
From: <enl...@li...> - 2006-03-03 15:00:42
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: mem.edc Log Message: Fix text going outside of gadget. =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/mem.edc,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- mem.edc 1 Mar 2006 16:09:34 -0000 1.10 +++ mem.edc 3 Mar 2006 15:00:39 -0000 1.11 @@ -83,10 +83,32 @@ { part { + name: "text_clip"; + type: RECT; + mouse_events: 0; + description + { + state: "default" 0.0; + color: 255 255 255 255; + rel1 + { + relative: 0.0 0.0; + offset: 0 0; + } + rel2 + { + relative: 1.0 1.0; + offset: -1 -1; + } + } + } + part + { name: "real-text"; type: TEXT; effect: SOFT_SHADOW; mouse_events: 0; + clip_to: "text_clip"; description { state: "default" 0.0; @@ -120,10 +142,32 @@ { part { + name: "text_clip"; + type: RECT; + mouse_events: 0; + description + { + state: "default" 0.0; + color: 255 255 255 255; + rel1 + { + relative: 0.0 0.0; + offset: 0 0; + } + rel2 + { + relative: 1.0 1.0; + offset: -1 -1; + } + } + } + part + { name: "swap-text"; type: TEXT; effect: SOFT_SHADOW; mouse_events: 0; + clip_to: "text_clip"; description { state: "default" 0.0; |
From: <enl...@li...> - 2006-03-20 23:29:37
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.h Log Message: Forgot to commit this. Thanks onefang. =================================================================== RCS file: /cvsroot/enlightenment/e_modules/mem/e_mod_main.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_main.h 9 Mar 2006 11:37:42 -0000 1.4 +++ e_mod_main.h 20 Mar 2006 23:29:30 -0000 1.5 @@ -39,7 +39,7 @@ E_Container *con; E_Menu *menu; Mem *mem; - Evas_List *old_real; + Evas_List *old_real, *old_swap; Config_Face *conf; E_Config_DD *conf_face_edd; |
From: Enlightenment C. <no...@cv...> - 2006-04-01 22:55:25
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.c Log Message: Fix b0rked format. Please keep to original format when making changes. =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- e_mod_main.c 1 Apr 2006 16:21:58 -0000 1.16 +++ e_mod_main.c 1 Apr 2006 22:55:15 -0000 1.17 @@ -496,7 +496,8 @@ 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")) ) + 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); @@ -533,47 +534,48 @@ { 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); - } + { + 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); - } + { + 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); - } + { + 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); - } + { + sfree = value; + msg.val = sfree; + edje_object_message_send(cf->mem_obj, EDJE_MESSAGE_FLOAT, 6, &msg); + } free(line); free(field); cursor = 0; |
From: Enlightenment C. <no...@cv...> - 2006-04-01 23:16:47
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.c Log Message: Disable Edje_Message_Float until it's handled in the edc as this does nothing right now. =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- e_mod_main.c 1 Apr 2006 22:55:15 -0000 1.17 +++ e_mod_main.c 1 Apr 2006 23:16:38 -0000 1.18 @@ -458,8 +458,7 @@ int real, swap, total_real, total_swap; char real_str[100]; char swap_str[100]; - Edje_Message_Float msg; - +// Edje_Message_Float msg; cf = data; _mem_face_get_mem_values(cf, &real, &swap, &total_real, &total_swap); @@ -488,6 +487,7 @@ 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); @@ -495,6 +495,7 @@ 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"))) |
From: Enlightenment C. <no...@cv...> - 2006-04-02 00:10:19
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.c Log Message: Reenabled Edje_Message_Float for nasa. =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- e_mod_main.c 1 Apr 2006 23:16:38 -0000 1.18 +++ e_mod_main.c 2 Apr 2006 00:10:07 -0000 1.19 @@ -458,7 +458,7 @@ int real, swap, total_real, total_swap; char real_str[100]; char swap_str[100]; -// Edje_Message_Float msg; + Edje_Message_Float msg; cf = data; _mem_face_get_mem_values(cf, &real, &swap, &total_real, &total_swap); @@ -487,7 +487,6 @@ 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); @@ -495,7 +494,6 @@ 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"))) |