E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: module.desktop Log Message: Fix up module.desktop descriptions for new box width. === RCS file: /cvs/e/e_modules/mem/module.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- module.desktop 4 Nov 2007 15:37:34 - 1.3 +++ module.desktop 30 Dec 2007 19:49:24 - 1.4 @@ -2,5 +2,5 @@ Type=Link Name=Mem Icon=e-module-mem -Comment=hilightMem Gadget/hilightbrUsed to monitor memory utilization. -Comment[it]=hilightModulo Mem/hilightbrUsato per il monitoraggio delbrutilizzo della memoria. +Comment=hilightMem Gadget/hilightbrbrUsed to monitor memory utilization. +Comment[it]=hilightModulo Mem/hilightbrbrUsato per il monitoraggio del utilizzo della memoria. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fix for gadcon menu breakage.
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_mod_main.h31 Oct 2007 14:09:38 - 1.14
+++ e_mod_main.h25 Nov 2007 05:37:36 - 1.15
@@ -10,7 +10,6 @@
{
E_Module *module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_mod_main.c12 Nov 2007 04:15:52 - 1.48
+++ e_mod_main.c25 Nov 2007 05:37:36 - 1.49
@@ -36,7 +36,6 @@
static void _mem_cb_mouse_out (void *data, Evas * e, Evas_Object * obj,
void *event_info);
static void _mem_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi);
-static void _mem_menu_cb_post (void *data, E_Menu * m);
static Config_Item *_mem_config_item_get (const char *id);
static Mem *_mem_new (Evas * evas);
static void _mem_free (Mem * mem);
@@ -137,8 +136,7 @@
ecore_timer_del (inst-check_timer);
mem_config-instances = evas_list_remove (mem_config-instances, inst);
_mem_free (inst-mem);
- free (inst);
- inst = NULL;
+ E_FREE(inst);
}
static void
@@ -149,15 +147,13 @@
inst = data;
ev = event_info;
- if ((ev-button == 3) (!mem_config-menu))
+ if ((ev-button == 3) (!inst-gcc-menu))
{
E_Menu *mn;
E_Menu_Item *mi;
int x, y, w, h;
mn = e_menu_new ();
- e_menu_post_deactivate_callback_set (mn, _mem_menu_cb_post, inst);
- mem_config-menu = mn;
mi = e_menu_item_new (mn);
e_menu_item_label_set (mi, D_ (Configuration));
@@ -173,22 +169,13 @@
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);
+E_MENU_POP_DIRECTION_AUTO, ev-timestamp);
evas_event_feed_mouse_up (inst-gcc-gadcon-evas, ev-button,
EVAS_BUTTON_NONE, ev-timestamp, NULL);
}
}
static void
-_mem_menu_cb_post (void *data, E_Menu * m)
-{
- if (!mem_config-menu)
-return;
- e_object_del (E_OBJECT (mem_config-menu));
- mem_config-menu = NULL;
-}
-
-static void
_mem_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst;
@@ -335,12 +322,6 @@
if (mem_config-config_dialog)
e_object_del (E_OBJECT (mem_config-config_dialog));
- if (mem_config-menu)
-{
- e_menu_post_deactivate_callback_set (mem_config-menu, NULL, NULL);
- e_object_del (E_OBJECT (mem_config-menu));
- mem_config-menu = NULL;
-}
while (mem_config-items)
{
Config_Item *ci;
@@ -350,11 +331,9 @@
evas_list_remove_list (mem_config-items, mem_config-items);
if (ci-id)
evas_stringshare_del (ci-id);
- free (ci);
- ci = NULL;
+ E_FREE(ci);
}
- free (mem_config);
- mem_config = NULL;
+ E_FREE(mem_config);
E_CONFIG_DD_FREE (conf_item_edd);
E_CONFIG_DD_FREE (conf_edd);
return 1;
@@ -390,8 +369,7 @@
_mem_free (Mem * m)
{
evas_object_del (m-mem_obj);
- free (m);
- m = NULL;
+ E_FREE(m);
}
static void
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e-module-mem.edj e_mod_config.c e_mod_main.h Log Message: Update mem module for recent breakage. === RCS file: /cvs/e/e_modules/mem/e-module-mem.edj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsYFiTzW and /tmp/cvsqz3NfI differ === RCS file: /cvs/e/e_modules/mem/e_mod_config.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_mod_config.c 16 Sep 2007 01:46:50 - 1.14 +++ e_mod_config.c 31 Oct 2007 14:09:38 - 1.15 @@ -37,7 +37,7 @@ v-basic.apply_cfdata = _basic_apply_data; v-basic.create_widgets = _basic_create_widgets; - snprintf (buf, sizeof (buf), %s/module.edj, + snprintf (buf, sizeof (buf), %s/e-module-mail.edj, e_module_dir_get (mem_config-module)); con = e_container_current_get (e_manager_current_get ()); cfd = e_config_dialog_new (con, D_ (Mem Configuration), Mem, _e_modules_mem_config_dialog, buf, 0, v, ci); === RCS file: /cvs/e/e_modules/mem/e_mod_main.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_mod_main.h16 Sep 2007 01:46:50 - 1.13 +++ e_mod_main.h31 Oct 2007 14:09:38 - 1.14 @@ -30,7 +30,6 @@ 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_about(E_Module *m); void _mem_config_updated(Config_Item *ci); void _config_mem_module(Config_Item *ci); - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_config.c Log Message: Fix mem icon. === RCS file: /cvs/e/e_modules/mem/e_mod_config.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_mod_config.c 31 Oct 2007 14:09:38 - 1.15 +++ e_mod_config.c 31 Oct 2007 15:31:01 - 1.16 @@ -37,10 +37,11 @@ v-basic.apply_cfdata = _basic_apply_data; v-basic.create_widgets = _basic_create_widgets; - snprintf (buf, sizeof (buf), %s/e-module-mail.edj, + snprintf (buf, sizeof (buf), %s/e-module-mem.edj, e_module_dir_get (mem_config-module)); con = e_container_current_get (e_manager_current_get ()); - cfd = e_config_dialog_new (con, D_ (Mem Configuration), Mem, _e_modules_mem_config_dialog, buf, 0, v, ci); + cfd = e_config_dialog_new (con, D_ (Mem Configuration), Mem, +_e_modules_mem_config_dialog, buf, 0, v, ci); mem_config-config_dialog = cfd; } - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: configure.in Log Message: Pretty standard patch set from Lutin for recent pkg-config changes in EFL... committing in bulk. === RCS file: /cvs/e/e_modules/mem/configure.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- configure.in30 Mar 2007 20:30:34 - 1.15 +++ configure.in25 Apr 2007 09:22:07 - 1.16 @@ -122,22 +122,9 @@ #AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) #AC_SUBST(dlopen_libs) -AC_ARG_WITH(edje-config, -[ --with-edje-config=EDJE_CONFIG use edje-config specified ], -[ - EDJE_CONFIG=$withval; - echo using $EDJE_CONFIG for edje-config; -/ -],[ - PROG=edje-config; - AC_PATH_PROG(EDJE_CONFIG, $PROG, , $PATH) -]) -edje_cflags=`$EDJE_CONFIG --cflags` -edje_libs=`$EDJE_CONFIG --libs` -AC_SUBST(edje_cflags) -AC_SUBST(edje_libs) +PKG_CHECK_MODULES(EDJE, [edje = 0.5.0]) -edje_cc=`$EDJE_CONFIG --prefix`/bin/edje_cc +edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc AC_ARG_WITH(edje-cc, [ --with-edje-cc=PATH specify a specific path to edje_cc], [ @@ -145,7 +132,7 @@ edje_cc=$v echo Enlightenment edje_cc explicitly set to $edje_cc; ],[ - edje_cc=`$EDJE_CONFIG --prefix`/bin/edje_cc + edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc ]) AC_SUBST(edje_cc) - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Added Files: module.desktop Log Message: and add the actual module.desktop - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
mem.edc
Log Message:
Added color class for mem module.
===
RCS file: /cvs/e/e_modules/mem/mem.edc,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- mem.edc 4 Sep 2006 21:14:50 - 1.18
+++ mem.edc 11 Oct 2006 20:54:50 - 1.19
@@ -262,6 +262,7 @@
visible: 1;
color: 255 255 255 255;
color3: 0 0 0 42;
+ color_class: module_label;
}
}
part
@@ -419,6 +420,7 @@
visible: 1;
color: 255 255 255 255;
color3: 0 0 0 42;
+ color_class: module_label;
}
}
}
@@ -433,7 +435,6 @@
transition: SINUSOIDAL 0.5;
target: real_label;
target: swap_label;
- //after: go_passive2;
}
program
{
@@ -442,7 +443,6 @@
source: ;
action: ACTION_STOP;
target: go_active;
- //after: go_passive2;
}
program
{
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_main.c
Log Message:
Fixer-upper on the text jitteries.
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_mod_main.c9 Aug 2006 07:47:27 - 1.38
+++ e_mod_main.c14 Sep 2006 14:33:02 - 1.39
@@ -399,9 +399,12 @@
_mem_cb_mouse_in (void *data, Evas * e, Evas_Object * obj, void *event_info)
{
Instance *inst;
+ Config_Item *ci;
inst = data;
- edje_object_signal_emit (inst-mem_obj, label_active, );
+ ci = _mem_config_item_get (inst-gcc-id);
+ if (!ci-always_text)
+edje_object_signal_emit (inst-mem_obj, label_active, );
}
static void
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
mem.edc
Log Message:
Fix text clipping problem.
===
RCS file: /cvs/e/e_modules/mem/mem.edc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- mem.edc 9 Aug 2006 07:08:36 - 1.17
+++ mem.edc 4 Sep 2006 21:14:50 - 1.18
@@ -226,7 +226,6 @@
{
name: real_label;
type: TEXT;
- clip_to: fade_clip;
effect: SOFT_SHADOW;
description
{
@@ -384,7 +383,6 @@
{
name: swap_label;
type: TEXT;
- clip_to: fade_clip;
effect: SOFT_SHADOW;
description
{
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: Makefile.am Log Message: Added make uninstall rule === RCS file: /cvs/e/e_modules/mem/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- Makefile.am 14 Jul 2006 18:54:19 - 1.15 +++ Makefile.am 2 Sep 2006 12:39:24 - 1.16 @@ -75,4 +75,6 @@ clean-local: rm -rf *.edj *~ +uninstall: + rm -rf $(datadir) - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
configure.in
Log Message:
Fix minor oversight with x86_64 libdir. Thanks Sebastian
===
RCS file: /cvs/e/e_modules/mem/configure.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- configure.in25 Jul 2006 03:52:29 - 1.12
+++ configure.in25 Jul 2006 13:32:23 - 1.13
@@ -105,7 +105,7 @@
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ${HOME}/.e/e/modules/${PACKAGE},
Package installed data destination)
datadir=${HOME}/.e/e/modules/${PACKAGE}
else
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
${libdir}/lib/enlightenment/modules/${PACKAGE}, Package installed data
destination)
+AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
${libdir}/enlightenment/modules/${PACKAGE}, Package installed data
destination)
datadir=${libdir}/enlightenment/modules/${PACKAGE}
fi
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
configure.in
Log Message:
Bad Marcus, no cookie :) . Fixed x86_64 install patch.
===
RCS file: /cvs/e/e_modules/mem/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- configure.in25 Jul 2006 01:39:47 - 1.11
+++ configure.in25 Jul 2006 03:52:29 - 1.12
@@ -105,7 +105,7 @@
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ${HOME}/.e/e/modules/${PACKAGE},
Package installed data destination)
datadir=${HOME}/.e/e/modules/${PACKAGE}
else
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
${prefix}/lib/enlightenment/modules/${PACKAGE}, Package installed data
destination)
+AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
${libdir}/lib/enlightenment/modules/${PACKAGE}, Package installed data
destination)
datadir=${libdir}/enlightenment/modules/${PACKAGE}
fi
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_config.c e_mod_main.c machdep_freebsd.c machdep_linux.c
Log Message:
Indent
===
RCS file: /cvs/e/e_modules/mem/e_mod_config.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_config.c 17 Jul 2006 23:21:51 - 1.10
+++ e_mod_config.c 18 Jul 2006 00:00:05 - 1.11
@@ -3,125 +3,137 @@
struct _E_Config_Dialog_Data
{
- double poll_time;
- int always_text;
- int show_percent;
+ double poll_time;
+ int always_text;
+ int show_percent;
#ifdef __linux__
- int real_ignore_buffers;
- int real_ignore_cached;
+ int real_ignore_buffers;
+ int real_ignore_cached;
#endif
};
/* 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_mem_module(Config_Item *ci)
+_config_mem_module (Config_Item * ci)
{
- E_Config_Dialog *cfd;
- E_Config_Dialog_View *v;
- E_Container *con;
- char buf[4096];
-
- v = E_NEW(E_Config_Dialog_View, 1);
-
- 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(mem_config-module));
- con = e_container_current_get(e_manager_current_get());
- cfd = e_config_dialog_new(con, D_(Mem Configuration), buf, 0, v, ci);
- mem_config-config_dialog = cfd;
+ E_Config_Dialog *cfd;
+ E_Config_Dialog_View *v;
+ E_Container *con;
+ char buf[4096];
+
+ v = E_NEW (E_Config_Dialog_View, 1);
+
+ 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 (mem_config-module));
+ con = e_container_current_get (e_manager_current_get ());
+ cfd = e_config_dialog_new (con, D_ (Mem Configuration), buf, 0, v, ci);
+ mem_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)
{
- cfdata-poll_time = ci-poll_time;
+ cfdata-poll_time = ci-poll_time;
#ifdef __linux__
- cfdata-real_ignore_buffers = ci-real_ignore_buffers;
- cfdata-real_ignore_cached = ci-real_ignore_cached;
+ cfdata-real_ignore_buffers = ci-real_ignore_buffers;
+ cfdata-real_ignore_cached = ci-real_ignore_cached;
#endif
// cfdata-show_text = c-conf-show_text;
- cfdata-always_text = ci-always_text;
- cfdata-show_percent = ci-show_percent;
+ cfdata-always_text = ci-always_text;
+ cfdata-show_percent = ci-show_percent;
}
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;
- ci = cfd-data;
- cfdata = E_NEW(E_Config_Dialog_Data, 1);
+ ci = cfd-data;
+ cfdata = E_NEW (E_Config_Dialog_Data, 1);
- _fill_data(ci, cfdata);
- 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 (!mem_config)
- return;
- mem_config-config_dialog = NULL;
- free(cfdata);
- cfdata = NULL;
+ if (!mem_config)
+return;
+ mem_config-config_dialog = 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;
- E_Radio_Group *rg;
-
- o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, D_(General Settings), 0);
- rg = e_widget_radio_group_new((cfdata-always_text));
- ob = e_widget_radio_add(evas, D_(Always Show Text), 1, rg);
-
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
Makefile.am mem.edc
Removed Files:
mem.png
Log Message:
Mem module builds/installs correctly now:
-make distcheck works
-make install does not install needless pngs anymore.
===
RCS file: /cvs/e/e_modules/mem/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Makefile.am 10 Jul 2006 17:41:11 - 1.11
+++ Makefile.am 14 Jul 2006 18:05:07 - 1.12
@@ -1,6 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in e_modules-mem.spec
-
SUBDIRS = po
EDJE_CC = @edje_cc@
@@ -11,10 +10,12 @@
# data files for the module
filesdir = $(datadir)
-files_DATA = module_icon.png module.eap mem.edj mem.edc \
- DejaVuSansMono.ttf $(wildcard real*.png) $(wildcard swap*.png)
+files_DATA = module_icon.png \
+ module.eap \
+ mem.edj
-EXTRA_DIST=e_modules-mem.spec.in e_modules-mem.spec autogen.sh mem.png
module_icon.png $(files_DATA)
+EXTRA_DIST= e_modules-mem.spec \
+ $(files_DATA)
# the module .so file
INCLUDES = -I. \
@@ -43,12 +44,10 @@
module_la_LIBADD = @e_libs@ @machdep_libs@
module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
+module_la_DEPENDENCIES = $(top_builddir)/config.h $(top_builddir)/mem.edj
-mem.edj: Makefile mem.edc
-$(EDJE_CC) $(EDJE_FLAGS) \
-$(top_srcdir)/mem.edc \
-$(top_builddir)/mem.edj
+%.edj: %.edc
+ $(EDJE_CC) $(EDJE_FLAGS) $ $@
clean-local:
rm -rf *.edj *~
===
RCS file: /cvs/e/e_modules/mem/mem.edc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- mem.edc 14 Jun 2006 14:15:39 - 1.15
+++ mem.edc 14 Jul 2006 18:05:07 - 1.16
@@ -1,6 +1,6 @@
images
{
- image: mem.png COMP;
+ image: module_icon.png COMP;
image: real_00.png COMP;
image: real_01.png COMP;
image: real_02.png COMP;
@@ -101,7 +101,7 @@
}
image
{
- normal: mem.png;
+ normal: module_icon.png;
}
color: 255 255 255 192;
}
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: Makefile.am Log Message: Make distcheck now properly includes all the pngs and autogen.sh. === RCS file: /cvs/e/e_modules/mem/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- Makefile.am 14 Jul 2006 18:05:07 - 1.12 +++ Makefile.am 14 Jul 2006 18:37:05 - 1.13 @@ -15,7 +15,31 @@ mem.edj EXTRA_DIST= e_modules-mem.spec \ - $(files_DATA) + $(files_DATA) \ + mem.edc \ + autogen.sh \ + real_00.png \ + real_01.png \ + real_02.png \ + real_03.png \ + real_04.png \ + real_05.png \ + real_06.png \ + real_07.png \ + real_08.png \ + real_09.png \ + real_10.png \ + swap_00.png \ + swap_01.png \ + swap_02.png \ + swap_03.png \ + swap_04.png \ + swap_05.png \ + swap_06.png \ + swap_07.png \ + swap_08.png \ + swap_09.png \ + swap_10.png # the module .so file INCLUDES = -I. \ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: Makefile.am Log Message: Include the font for make distcheck. === RCS file: /cvs/e/e_modules/mem/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- Makefile.am 14 Jul 2006 18:37:05 - 1.13 +++ Makefile.am 14 Jul 2006 18:40:45 - 1.14 @@ -39,7 +39,8 @@ swap_07.png \ swap_08.png \ swap_09.png \ - swap_10.png + swap_10.png \ + DejaVuSansMono.ttf # the module .so file INCLUDES = -I. \ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: Makefile.am Log Message: Remove autogen.sh from make distcheck, thanks rephorm and dj2 :) === RCS file: /cvs/e/e_modules/mem/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- Makefile.am 14 Jul 2006 18:40:45 - 1.14 +++ Makefile.am 14 Jul 2006 18:54:19 - 1.15 @@ -17,7 +17,6 @@ EXTRA_DIST= e_modules-mem.spec \ $(files_DATA) \ mem.edc \ - autogen.sh \ real_00.png \ real_01.png \ real_02.png \ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: Makefile.am Log Message: Fix makefile.am for make distcheck. === RCS file: /cvs/e/e_modules/mem/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- Makefile.am 27 Jun 2006 02:19:37 - 1.8 +++ Makefile.am 10 Jul 2006 15:12:08 - 1.9 @@ -4,7 +4,8 @@ SUBDIRS = po EDJE_CC = @edje_cc@ -EDJE_FLAGS = -v +-id $(top_srcdir) \ +-fd $(top_srcdir) # data files for the module filesdir = $(datadir) @@ -52,8 +53,8 @@ mem.edj: Makefile mem.edc $(EDJE_CC) $(EDJE_FLAGS) \ -mem.edc \ -mem.edj +$(top_srcdir)/mem.edc \ +$(top_builddir)/mem.edj clean-local: rm -rf *.edj *~ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: Makefile.am Log Message: Remove netbsd stuff from Makefile.am as this file doesn't exist. === RCS file: /cvs/e/e_modules/mem/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Makefile.am 10 Jul 2006 15:12:08 - 1.9 +++ Makefile.am 10 Jul 2006 16:01:51 - 1.10 @@ -35,16 +35,9 @@ machdep_linux.c \ e_mod_config.c endif -if BUILD_NETBSD -module_la_SOURCES = e_mod_main.c \ - e_mod_main.h \ - machdep_netbsd.c \ - e_mod_config.c -endif EXTRA_module_la_SOURCES= machdep_linux.c \ - machdep_freebsd.c \ - machdep_netbsd.c + machdep_freebsd.c module_la_LIBADD = @e_libs@ @machdep_libs@ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: Makefile.am Log Message: Fix makefile.am properly. === RCS file: /cvs/e/e_modules/mem/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- Makefile.am 10 Jul 2006 16:01:51 - 1.10 +++ Makefile.am 10 Jul 2006 17:41:11 - 1.11 @@ -4,6 +4,7 @@ SUBDIRS = po EDJE_CC = @edje_cc@ +EDJE_FLAGS = -v \ -id $(top_srcdir) \ -fd $(top_srcdir) - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_config.c e_mod_main.c
Log Message:
Avoid dangling pointers after call to free.
===
RCS file: /cvs/e/e_modules/mem/e_mod_config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_config.c 3 Jul 2006 07:37:32 - 1.8
+++ e_mod_config.c 10 Jul 2006 17:52:40 - 1.9
@@ -74,6 +74,7 @@
return;
mem_config-config_dialog = NULL;
free(cfdata);
+ cfdata = NULL;
}
static Evas_Object *
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- e_mod_main.c2 Jul 2006 19:06:09 - 1.34
+++ e_mod_main.c10 Jul 2006 17:52:40 - 1.35
@@ -120,6 +120,7 @@
mem_config-instances = evas_list_remove(mem_config-instances, inst);
_mem_free(inst-mem);
free(inst);
+ inst = NULL;
}
static void
@@ -309,6 +310,7 @@
mem_config-items = evas_list_remove_list(mem_config-items,
mem_config-items);
if (ci-id) evas_stringshare_del(ci-id);
free(ci);
+ ci = NULL;
}
free(mem_config);
mem_config = NULL;
@@ -366,6 +368,7 @@
{
evas_object_del(m-mem_obj);
free(m);
+ m = NULL;
}
static void
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_main.c
Log Message:
Make all active e_modules work with the new e_module_dialog_show function
change(s). If you get errors building these, update e17/apps/e .
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_mod_main.c23 Jun 2006 06:37:29 - 1.33
+++ e_mod_main.c2 Jul 2006 19:06:09 - 1.34
@@ -339,7 +339,7 @@
EAPI int
e_modapi_about(E_Module *m)
{
- e_module_dialog_show(D_(Enlightenment Mem Monitor Module),
+ e_module_dialog_show(m, D_(Enlightenment Mem Monitor Module),
D_(This module is used to monitor memory.));
return 1;
}
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_config.c Log Message: Update some e_modules to use module icons in their config dialogs. === RCS file: /cvs/e/e_modules/mem/e_mod_config.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_config.c 14 Jun 2006 14:15:39 - 1.7 +++ e_mod_config.c 3 Jul 2006 07:37:32 - 1.8 @@ -26,6 +26,7 @@ E_Config_Dialog *cfd; E_Config_Dialog_View *v; E_Container *con; + char buf[4096]; v = E_NEW(E_Config_Dialog_View, 1); @@ -34,8 +35,9 @@ 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(mem_config-module)); con = e_container_current_get(e_manager_current_get()); - cfd = e_config_dialog_new(con, D_(Mem Configuration), NULL, 0, v, ci); + cfd = e_config_dialog_new(con, D_(Mem Configuration), buf, 0, v, ci); mem_config-config_dialog = cfd; } Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: Makefile.am Log Message: Do not need to link against math library. === RCS file: /cvs/e/e_modules/mem/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Makefile.am 14 Jun 2006 14:15:39 - 1.7 +++ Makefile.am 27 Jun 2006 02:19:37 - 1.8 @@ -46,7 +46,7 @@ machdep_netbsd.c -module_la_LIBADD = @e_libs@ -lm @machdep_libs@ +module_la_LIBADD = @e_libs@ @machdep_libs@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.c Log Message: Return 1, not 0, to keep timer going, thanks Zigs :) === RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- e_mod_main.c14 Jun 2006 19:42:07 - 1.32 +++ e_mod_main.c23 Jun 2006 06:37:29 - 1.33 @@ -428,5 +428,5 @@ msg.val = ts; edje_object_message_send(inst-mem_obj, EDJE_MESSAGE_FLOAT, 2, msg); - return 0; + return 1; } Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem/po Added Files: ru.po Log Message: Added russian translation from Stanislav Sedov. ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
Makefile.am configure.in e_mod_config.c e_mod_main.c
e_mod_main.h mem.edc
Added Files:
DejaVuSansMono.ttf machdep_freebsd.c machdep_linux.c
Log Message:
Added patch from Stanislav Sedov to allow mem module to run on freeBsd.
Great work, thanks :)
===
RCS file: /cvs/e/e_modules/mem/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 27 May 2006 20:02:48 - 1.6
+++ Makefile.am 14 Jun 2006 14:15:39 - 1.7
@@ -1,5 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in e_modules-mem.spec
+
SUBDIRS = po
EDJE_CC = @edje_cc@
@@ -9,7 +10,7 @@
filesdir = $(datadir)
files_DATA = module_icon.png module.eap mem.edj mem.edc \
- VeraMono.ttf $(wildcard real*.png) $(wildcard swap*.png)
+ DejaVuSansMono.ttf $(wildcard real*.png) $(wildcard swap*.png)
EXTRA_DIST=e_modules-mem.spec.in e_modules-mem.spec autogen.sh mem.png
module_icon.png $(files_DATA)
@@ -21,11 +22,31 @@
pkgdir = $(datadir)/$(MODULE_ARCH)
pkg_LTLIBRARIES= module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c
+if BUILD_FREEBSD
+module_la_SOURCES = e_mod_main.c \
+ e_mod_main.h \
+ machdep_freebsd.c \
+ e_mod_config.c
+endif
+if BUILD_LINUX
+module_la_SOURCES = e_mod_main.c \
+ e_mod_main.h \
+ machdep_linux.c \
+ e_mod_config.c
+endif
+if BUILD_NETBSD
+module_la_SOURCES = e_mod_main.c \
+ e_mod_main.h \
+ machdep_netbsd.c \
+ e_mod_config.c
+endif
+
+EXTRA_module_la_SOURCES= machdep_linux.c \
+ machdep_freebsd.c \
+ machdep_netbsd.c
+
-module_la_LIBADD = @e_libs@ -lm
+module_la_LIBADD = @e_libs@ -lm @machdep_libs@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h
===
RCS file: /cvs/e/e_modules/mem/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- configure.in10 Jun 2006 02:27:23 - 1.9
+++ configure.in14 Jun 2006 14:15:39 - 1.10
@@ -17,7 +17,7 @@
AM_ENABLE_SHARED
AM_PROG_LIBTOOL
-ALL_LINGUAS=eo fi it sv ja
+ALL_LINGUAS=eo fi it sv ja ru
AC_SUBST(ALL_LINGUAS)
AM_GNU_GETTEXT([external])
@@ -26,6 +26,25 @@
MODULE_ARCH=$host_os-$host_cpu
AC_SUBST(MODULE_ARCH)
AC_DEFINE_UNQUOTED(MODULE_ARCH, $MODULE_ARCH, Module architecture)
+
+uname=`uname`
+
+AM_CONDITIONAL(BUILD_LINUX, test x$uname = xLinux)
+AM_CONDITIONAL(BUILD_FREEBSD, test x$uname = xFreeBSD)
+AM_CONDITIONAL(BUILD_NETBSD, test x$uname = xNetBSD)
+
+case $uname in
+ FreeBSD*)
+ machdep_libs=
+ ;;
+ Linux*)
+ machdep_libs=
+ ;;
+ NetBSD*)
+ machdep_libs=-lkvm
+ ;;
+esac
+AC_SUBST(machdep_libs)
if test x${bindir} = 'x${exec_prefix}/bin'; then
if test x${exec_prefix} = xNONE; then
===
RCS file: /cvs/e/e_modules/mem/e_mod_config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_mod_config.c 25 May 2006 23:32:39 - 1.6
+++ e_mod_config.c 14 Jun 2006 14:15:39 - 1.7
@@ -6,8 +6,10 @@
double poll_time;
int always_text;
int show_percent;
+#ifdef __linux__
int real_ignore_buffers;
int real_ignore_cached;
+#endif
};
/* Protos */
@@ -41,8 +43,10 @@
_fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
{
cfdata-poll_time = ci-poll_time;
+#ifdef __linux__
cfdata-real_ignore_buffers = ci-real_ignore_buffers;
cfdata-real_ignore_cached = ci-real_ignore_cached;
+#endif
// cfdata-show_text = c-conf-show_text;
cfdata-always_text = ci-always_text;
cfdata-show_percent = ci-show_percent;
@@ -85,10 +89,12 @@
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, D_(Show Text As Percent),
(cfdata-show_percent));
e_widget_framelist_object_append(of, ob);
+#ifdef __linux__
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);
+#endif
ob = e_widget_label_add(evas,
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Removed Files: VeraMono.ttf Log Message: Remove VeraMono as it's not used now. ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fix e_modapi_init function to return void.
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_mod_main.h14 Jun 2006 14:15:39 - 1.11
+++ e_mod_main.h14 Jun 2006 19:42:07 - 1.12
@@ -27,15 +27,14 @@
EAPI extern E_Module_Api e_modapi;
-EAPI int 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_about(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_about(E_Module *m);
void _mem_config_updated(const char *id);
void _config_mem_module(Config_Item *ci);
-void _mem_get_values(Config_Item *ci, int *real, int *swap, int *total_real,
- int *total_swap);
+void _mem_get_values(Config_Item *ci, int *real, int *swap, int *total_real,
int *total_swap);
extern Config *mem_config;
#endif
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- e_mod_main.c14 Jun 2006 14:15:39 - 1.31
+++ e_mod_main.c14 Jun 2006 19:42:07 - 1.32
@@ -237,14 +237,13 @@
Mem
};
-EAPI int
+EAPI void *
e_modapi_init(E_Module *m)
{
bindtextdomain(PACKAGE, LOCALEDIR);
bind_textdomain_codeset(PACKAGE, UTF-8);
conf_item_edd = E_CONFIG_DD_NEW(Mem_Config_Item, Config_Item);
-
#undef T
#undef D
#define T Config_Item
@@ -259,7 +258,6 @@
#endif
conf_edd = E_CONFIG_DD_NEW(Mem_Config, Config);
-
#undef T
#undef D
#define T Config
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Change _gc_init to use const char and fix e_modapi_init function.
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_mod_main.c1 Jun 2006 21:28:24 - 1.27
+++ e_mod_main.c6 Jun 2006 08:43:00 - 1.28
@@ -19,7 +19,7 @@
};
/* Func Protos for Gadcon */
-static E_Gadcon_Client *_gc_init(E_Gadcon *gc, char *name, char *id, char
*style);
+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);
@@ -49,7 +49,7 @@
};
static E_Gadcon_Client *
-_gc_init(E_Gadcon *gc, char *name, char *id, char *style)
+_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
{
E_Gadcon_Client *gcc;
Evas_Object *o;
@@ -237,7 +237,7 @@
Mem
};
-EAPI void *
+EAPI int
e_modapi_init(E_Module *m)
{
bindtextdomain(PACKAGE, LOCALEDIR);
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_main.h1 Jun 2006 21:00:45 - 1.8
+++ e_mod_main.h6 Jun 2006 08:43:00 - 1.9
@@ -27,7 +27,7 @@
EAPI extern E_Module_Api e_modapi;
-EAPI void *e_modapi_init(E_Module *m);
+EAPI int 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_about(E_Module *m);
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_main.c mem.edc module.eap
Log Message:
Changed image to old mem.png (scales better).
Modified eap for new image.
Removed mouse_events from edc.
Delete evas_callbacks when shutdown.
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_mod_main.c6 Jun 2006 08:43:00 - 1.28
+++ e_mod_main.c6 Jun 2006 14:39:40 - 1.29
@@ -74,6 +74,7 @@
inst-mem_obj = o;
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_mem_cb_mouse_down, inst);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE,
_mem_cb_mouse_in, inst);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN, _mem_cb_mouse_in,
inst);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT,
_mem_cb_mouse_out, inst);
@@ -116,11 +117,20 @@
_gc_shutdown(E_Gadcon_Client *gcc)
{
Instance *inst;
+ Mem *mem;
inst = gcc-data;
+ mem = inst-mem;
+
if (inst-check_timer) ecore_timer_del(inst-check_timer);
mem_config-instances = evas_list_remove(mem_config-instances, inst);
- _mem_free(inst-mem);
+
+ evas_object_event_callback_del(mem-mem_obj, EVAS_CALLBACK_MOUSE_DOWN,
_mem_cb_mouse_down);
+ evas_object_event_callback_del(mem-mem_obj, EVAS_CALLBACK_MOUSE_MOVE,
_mem_cb_mouse_in);
+ evas_object_event_callback_del(mem-mem_obj, EVAS_CALLBACK_MOUSE_IN,
_mem_cb_mouse_in);
+ evas_object_event_callback_del(mem-mem_obj, EVAS_CALLBACK_MOUSE_OUT,
_mem_cb_mouse_out);
+
+ _mem_free(mem);
free(inst);
}
===
RCS file: /cvs/e/e_modules/mem/mem.edc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- mem.edc 25 May 2006 23:32:39 - 1.13
+++ mem.edc 6 Jun 2006 14:39:40 - 1.14
@@ -1,6 +1,6 @@
images
{
- image: module_icon.png COMP;
+ image: mem.png COMP;
image: real_00.png COMP;
image: real_01.png COMP;
image: real_02.png COMP;
@@ -64,7 +64,6 @@
{
name: fade_clip;
type: RECT;
- mouse_events: 1;
description
{
state: default 0.0;
@@ -85,7 +84,6 @@
{
name: mem;
type: IMAGE;
- mouse_events: 1;
clip_to: fade_clip;
description
{
@@ -103,7 +101,7 @@
}
image
{
- normal: module_icon.png;
+ normal: mem.png;
}
color: 255 255 255 192;
}
@@ -113,7 +111,6 @@
name: real_meter;
type: IMAGE;
clip_to: fade_clip;
- mouse_events: 1;
description
{
state: default 0.0;
@@ -272,7 +269,6 @@
name: swap_meter;
type: IMAGE;
clip_to: fade_clip;
- mouse_events: 1;
description
{
state: default 0.0;
===
RCS file: /cvs/e/e_modules/mem/module.eap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsH2pTa3 and /tmp/cvsHE9STT differ
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Revert back to void for e_modapi_init.
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- e_mod_main.c6 Jun 2006 14:39:40 - 1.29
+++ e_mod_main.c6 Jun 2006 15:29:19 - 1.30
@@ -247,7 +247,7 @@
Mem
};
-EAPI int
+EAPI void *
e_modapi_init(E_Module *m)
{
bindtextdomain(PACKAGE, LOCALEDIR);
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_mod_main.h6 Jun 2006 08:43:00 - 1.9
+++ e_mod_main.h6 Jun 2006 15:29:19 - 1.10
@@ -27,10 +27,10 @@
EAPI extern E_Module_Api e_modapi;
-EAPI int 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_about(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_about(E_Module *m);
void _mem_config_updated(const char *id);
void _config_mem_module(Config_Item *ci);
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Update for E module api changes. Remove commented section entirely and
remove e_modapi_info from the header file.
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.h25 May 2006 23:32:39 - 1.7
+++ e_mod_main.h1 Jun 2006 21:00:45 - 1.8
@@ -30,7 +30,6 @@
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);
void _mem_config_updated(const char *id);
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_mod_main.c1 Jun 2006 19:01:03 - 1.25
+++ e_mod_main.c1 Jun 2006 21:00:45 - 1.26
@@ -325,16 +325,6 @@
return 1;
}
-//EAPI int
-//e_modapi_info(E_Module *m)
-//{
-// char buf[4096];
-
-// snprintf(buf, sizeof(buf), %s/module_icon.png, e_module_dir_get(m));
-// m-icon_file = strdup(buf);
-// return 1;
-//}
-
EAPI int
e_modapi_save(E_Module *m)
{
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_main.c
Log Message:
Prefer single line for short if statements.
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_mod_main.c1 Jun 2006 21:00:45 - 1.26
+++ e_mod_main.c1 Jun 2006 21:28:24 - 1.27
@@ -61,8 +61,7 @@
inst = E_NEW(Instance, 1);
ci = _mem_config_item_get(id);
- if (!ci-id)
- ci-id = evas_stringshare_add(id);
+ if (!ci-id) ci-id = evas_stringshare_add(id);
mem = _mem_new(gc-evas);
mem-inst = inst;
@@ -119,8 +118,7 @@
Instance *inst;
inst = gcc-data;
- if (inst-check_timer)
- ecore_timer_del(inst-check_timer);
+ if (inst-check_timer) ecore_timer_del(inst-check_timer);
mem_config-instances = evas_list_remove(mem_config-instances, inst);
_mem_free(inst-mem);
free(inst);
@@ -164,8 +162,7 @@
static void
_mem_menu_cb_post(void *data, E_Menu *m)
{
- if (!mem_config-menu)
- return;
+ if (!mem_config-menu) return;
e_object_del(E_OBJECT(mem_config-menu));
mem_config-menu = NULL;
}
@@ -187,22 +184,18 @@
Evas_List *l;
Config_Item *ci;
- if (!mem_config)
- return;
-
+ if (!mem_config) return;
ci = _mem_config_item_get(id);
for (l = mem_config-instances; l; l = l-next)
{
Instance *inst;
inst = l-data;
-if (!inst-gcc-id)
- continue;
+if (!inst-gcc-id) continue;
if (!strcmp(inst-gcc-id, ci-id))
{
- if (inst-check_timer)
-ecore_timer_del(inst-check_timer);
+ if (inst-check_timer) ecore_timer_del(inst-check_timer);
inst-check_timer = ecore_timer_add((double)ci-poll_time,
_mem_cb_check, inst);
if (ci-always_text)
edje_object_signal_emit(inst-mem_obj, label_active, );
@@ -223,10 +216,8 @@
for (l = mem_config-items; l; l = l-next)
{
ci = l-data;
-if (!ci-id)
- continue;
-if (!strcmp(ci-id, id))
- return ci;
+if (!ci-id) continue;
+if (!strcmp(ci-id, id)) return ci;
}
ci = E_NEW(Config_Item, 1);
ci-id = evas_stringshare_add(id);
@@ -314,8 +305,7 @@
ci = mem_config-items-data;
mem_config-items = evas_list_remove_list(mem_config-items,
mem_config-items);
-if (ci-id)
- evas_stringshare_del(ci-id);
+if (ci-id) evas_stringshare_del(ci-id);
free(ci);
}
free(mem_config);
@@ -337,8 +327,7 @@
inst = l-data;
ci = _mem_config_item_get(inst-gcc-id);
-if (ci-id)
- evas_stringshare_del(ci-id);
+if (ci-id) evas_stringshare_del(ci-id);
ci-id = evas_stringshare_add(inst-gcc-id);
}
e_config_domain_save(module.mem, conf_edd, mem_config);
@@ -458,26 +447,21 @@
line = (char *)calloc(64, sizeof(char));
while (fscanf(pmeminfo, %c, c) != EOF)
{
-if (c != '\n')
- line[cursor++] = c;
+if (c != '\n') line[cursor++] = c;
else
{
field = (char *)malloc(strlen(line) * sizeof(char));
sscanf(line, %s %ld kB, field, value);
- if (!strcmp(field, MemTotal:))
- mtotal = value;
- else if (!strcmp(field, MemFree:))
- mfree = value;
+ if (!strcmp(field, MemTotal:)) mtotal = value;
+ else if (!strcmp(field, MemFree:)) mfree = value;
else if (ci-real_ignore_buffers (!strcmp(field, Buffers:)))
mfree += value;
else if (ci-real_ignore_cached (!strcmp(field, Cached:)))
mfree += value;
else if (ci-real_ignore_cached (!strcmp(field,
SwapCached:)))
sfree += value;
- else if (!strcmp(field, SwapTotal:))
- stotal = value;
- else if (!strcmp(field, SwapFree:))
- sfree = value;
+ else if (!strcmp(field, SwapTotal:)) stotal = value;
+ else if (!strcmp(field, SwapFree:)) sfree = value;
free(line);
free(field);
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
Makefile.am e_mod_config.c e_mod_main.c e_mod_main.h mem.edc
module_icon.png
Added Files:
module.eap real_00.png real_01.png real_02.png real_03.png
real_04.png real_05.png real_06.png real_07.png real_08.png
real_09.png real_10.png swap_00.png swap_01.png swap_02.png
swap_03.png swap_04.png swap_05.png swap_06.png swap_07.png
swap_08.png swap_09.png swap_10.png
Removed Files:
e_mod_config.h
Log Message:
Memory module into the shelf :)
Users should remove any old module.mem.cfg before running.
This will break themes and translations until they are fixed.
===
RCS file: /cvs/e/e_modules/mem/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 9 Mar 2006 11:37:42 - 1.4
+++ Makefile.am 25 May 2006 23:32:39 - 1.5
@@ -12,6 +12,7 @@
files_DATA = \
module_icon.png \
+module.eap \
mem.edj \
mem.edc \
VeraMono.ttf
@@ -26,8 +27,7 @@
pkg_LTLIBRARIES= module.la
module_la_SOURCES = e_mod_main.c \
e_mod_main.h \
- e_mod_config.c \
- e_mod_config.h
+ e_mod_config.c
module_la_LIBADD = @e_libs@ -lm
module_la_LDFLAGS = -module -avoid-version
===
RCS file: /cvs/e/e_modules/mem/e_mod_config.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_config.c 5 Apr 2006 17:48:49 - 1.5
+++ e_mod_config.c 25 May 2006 23:32:39 - 1.6
@@ -1,13 +1,10 @@
#include e.h
#include e_mod_main.h
-#include e_mod_config.h
-#include config.h
struct _E_Config_Dialog_Data
{
- int check_interval;
- int show_text;
- int show_graph;
+ double poll_time;
+ int always_text;
int show_percent;
int real_ignore_buffers;
int real_ignore_cached;
@@ -18,15 +15,16 @@
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 _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata);
/* Config Calls */
void
-_configure_mem_module(E_Container *con, Mem *c)
+_config_mem_module(Config_Item *ci)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
-
+ E_Container *con;
+
v = E_NEW(E_Config_Dialog_View, 1);
v-create_cfdata = _create_data;
@@ -34,41 +32,41 @@
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;
+ con = e_container_current_get(e_manager_current_get());
+ cfd = e_config_dialog_new(con, D_(Mem Configuration), NULL, 0, v, ci);
+ mem_config-config_dialog = cfd;
}
static void
-_fill_data(Mem *c, E_Config_Dialog_Data *cfdata)
+_fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
{
- 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;
- cfdata-show_percent = c-conf-show_percent;
+ cfdata-poll_time = ci-poll_time;
+ cfdata-real_ignore_buffers = ci-real_ignore_buffers;
+ cfdata-real_ignore_cached = ci-real_ignore_cached;
+// cfdata-show_text = c-conf-show_text;
+ cfdata-always_text = ci-always_text;
+ cfdata-show_percent = ci-show_percent;
}
static void *
_create_data(E_Config_Dialog *cfd)
{
E_Config_Dialog_Data *cfdata;
- Mem *c;
+ Config_Item *ci;
- c = cfd-data;
+ ci = cfd-data;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
- _fill_data(c, cfdata);
+ _fill_data(ci, cfdata);
return cfdata;
}
static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- Mem *c;
-
- c = cfd-data;
- c-cfd = NULL;
+ if (!mem_config)
+ return;
+ mem_config-config_dialog = NULL;
free(cfdata);
}
@@ -76,17 +74,16 @@
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
Evas_Object *o, *of, *ob;
- Mem *c;
-
- c = cfd-data;
-
+ E_Radio_Group *rg;
+
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));
+ of = e_widget_framelist_add(evas, D_(General Settings), 0);
+ rg = e_widget_radio_group_new((cfdata-always_text));
+ ob = e_widget_radio_add(evas, D_(Always Show
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: configure.in Log Message: Version bump. === RCS file: /cvs/e/e_modules/mem/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- configure.in9 Apr 2006 12:39:37 - 1.7 +++ configure.in25 May 2006 23:33:10 - 1.8 @@ -7,7 +7,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(mem, 0.0.1) +AM_INIT_AUTOMAKE(mem, 0.1.0) AM_CONFIG_HEADER(config.h) AC_ISC_POSIX AC_PROG_CC --- All the advantages of Linux Managed Hosting--Without the Cost and Risk! Fully trained technicians. The highest number of Red Hat certifications in the hosting industry. Fanatical Support. Click to learn more http://sel.as-us.falkag.net/sel?cmd=lnkkid=107521bid=248729dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_main.c
Log Message:
Freeze evas events when adding lines for the graph.
Unswallow removed lines.
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_mod_main.c2 Apr 2006 00:10:07 - 1.19
+++ e_mod_main.c3 Apr 2006 10:11:39 - 1.20
@@ -618,6 +618,8 @@
Evas_Object *last = NULL;
Evas_List *l;
int i, j = 0;
+
+ evas_event_freeze(mf-evas);
evas_object_geometry_get(mf-chart_obj, x, y, w, h);
@@ -637,7 +639,8 @@
evas_object_show(o);
}
- mf-old_real = evas_list_prepend(mf-old_real, o);
+ /* Add new value to list */
+ 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++)
{
@@ -653,6 +656,7 @@
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);
}
@@ -685,8 +689,11 @@
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);
}
+
+ evas_event_thaw(mf-evas);
}
static void
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_main.c
Log Message:
Freeze evas events when clearing.
Unswallow lines when clearing.
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_mod_main.c3 Apr 2006 10:11:39 - 1.20
+++ e_mod_main.c3 Apr 2006 10:19:32 - 1.21
@@ -701,10 +701,13 @@
{
Evas_List *l;
+ evas_event_freeze(mf-evas);
+
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_list_free(mf-old_real);
@@ -714,9 +717,12 @@
{
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;
+
+ evas_event_thaw(mf-evas);
}
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: configure.in Log Message: Removed eet, evas, esmart, and ecore checks from configure.in. Not Needed. === RCS file: /cvs/e/e_modules/mem/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- configure.in10 Mar 2006 15:11:21 - 1.5 +++ configure.in2 Apr 2006 21:11:35 - 1.6 @@ -103,48 +103,6 @@ #AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) #AC_SUBST(dlopen_libs) -AC_ARG_WITH(ecore-config, -[ --with-ecore-config=ECORE_CONFIG use ecore-config specified ], -[ - ECORE_CONFIG=$withval; - echo using $ECORE_CONFIG for ecore-config; -],[ - PROG=ecore-config; - AC_PATH_PROG(ECORE_CONFIG, $PROG, , $PATH) -]) -ecore_cflags=`$ECORE_CONFIG --cflags` -ecore_libs=`$ECORE_CONFIG --libs` -AC_SUBST(ecore_cflags) -AC_SUBST(ecore_libs) - -AC_ARG_WITH(evas-config, -[ --with-evas-config=EVAS_CONFIG use evas-config specified ], -[ - EVAS_CONFIG=$withval; - echo using $EVAS_CONFIG for evas-config; -],[ - PROG=evas-config; - AC_PATH_PROG(EVAS_CONFIG, $PROG, , $PATH) -]) -evas_cflags=`$EVAS_CONFIG --cflags` -evas_libs=`$EVAS_CONFIG --libs` -AC_SUBST(evas_cflags) -AC_SUBST(evas_libs) - -AC_ARG_WITH(esmart-config, -[ --with-esmart-config=ESMART_CONFIG use esmart-config specified ], -[ - ESMART_CONFIG=$withval; - echo using $ESMART_CONFIG for esmart-config; -],[ - PROG=esmart-config; - AC_PATH_PROG(ESMART_CONFIG, $PROG, , $PATH) -]) -esmart_cflags=`$ESMART_CONFIG --cflags` -esmart_libs=`$ESMART_CONFIG --libs` -AC_SUBST(esmart_cflags) -AC_SUBST(esmart_libs) - AC_ARG_WITH(edje-config, [ --with-edje-config=EDJE_CONFIG use edje-config specified ], [ @@ -171,20 +129,6 @@ edje_cc=`$EDJE_CONFIG --prefix`/bin/edje_cc ]) AC_SUBST(edje_cc) - -AC_ARG_WITH(eet-config, -[ --with-eet-config=EET_CONFIG use eet-config specified ], -[ - EET_CONFIG=$withval; - echo using $EET_CONFIG for eet-config; -],[ - PROG=eet-config; - AC_PATH_PROG(EET_CONFIG, $PROG, , $PATH) -]) -eet_cflags=`$EET_CONFIG --cflags` -eet_libs=`$EET_CONFIG --libs` -AC_SUBST(eet_cflags) -AC_SUBST(eet_libs) AC_ARG_WITH(enlightenment-config, [ --with-enlightenment-config=E_CONFIGuse enlightenment-config specified ], --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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.c1 Apr 2006 22:55:15 - 1.17 +++ e_mod_main.c1 Apr 2006 23:16:38 - 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))) --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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.c1 Apr 2006 23:16:38 - 1.18 +++ e_mod_main.c2 Apr 2006 00:10:07 - 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))) --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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.c1 Apr 2006 16:21:58 - 1.16
+++ e_mod_main.c1 Apr 2006 22:55:15 - 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;
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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.h9 Mar 2006 11:37:42 - 1.4 +++ e_mod_main.h20 Mar 2006 23:29:30 - 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; --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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 - 1.10
+++ mem.edc 3 Mar 2006 15:00:39 - 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;
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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 - 1.8
+++ mem.edc 1 Mar 2006 11:09:09 - 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;
}
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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 - 1.9
+++ mem.edc 1 Mar 2006 16:09:34 - 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.c28 Feb 2006 21:49:29 - 1.8
+++ e_mod_main.c1 Mar 2006 16:09:34 - 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);
}
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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.c1 Mar 2006 16:09:34 - 1.9
+++ e_mod_main.c1 Mar 2006 16:22:54 - 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);
}
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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.c1 Mar 2006 16:22:54 - 1.10 +++ e_mod_main.c1 Mar 2006 16:25:50 - 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); --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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.c1 Mar 2006 16:25:50 - 1.11
+++ e_mod_main.c1 Mar 2006 16:32:59 - 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);
}
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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.h28 Feb 2006 21:49:29 - 1.2
+++ e_mod_main.h1 Mar 2006 17:25:58 - 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.c1 Mar 2006 16:32:59 - 1.12
+++ e_mod_main.c1 Mar 2006 17:25:58 - 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 - 1.2
+++ e_mod_config.c 1 Mar 2006 17:25:58 - 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);
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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 - 1.7
+++ mem.edc 28 Feb 2006 21:49:29 - 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
E CVS: mem devilhorns
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 - 1.6
+++ mem.edc 27 Feb 2006 12:40:20 - 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.c26 Feb 2006 19:11:15 - 1.6
+++ e_mod_main.c27 Feb 2006 12:40:21 - 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);
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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 - 1.4
+++ mem.edc 26 Feb 2006 15:13:59 - 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;
}
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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 --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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.c22 Feb 2006 12:23:37 - 1.5
+++ e_mod_main.c26 Feb 2006 19:11:15 - 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 - 1.5
+++ mem.edc 26 Feb 2006 19:11:15 - 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;
+}
+ }
E CVS: mem devilhorns
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 - 1.3
+++ mem.edc 22 Feb 2006 10:43:37 - 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.c21 Feb 2006 12:36:08 - 1.3
+++ e_mod_main.c22 Feb 2006 10:43:37 - 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;
}
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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 - 1.1 +++ .cvsignore 22 Feb 2006 11:06:07 - 1.2 @@ -21,3 +21,4 @@ *.la *.spec *.tar.gz +*.edj --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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.c22 Feb 2006 10:43:37 - 1.4 +++ e_mod_main.c22 Feb 2006 12:23:37 - 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); --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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.c20 Feb 2006 18:23:28 - 1.2
+++ e_mod_main.c21 Feb 2006 12:36:08 - 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;
}
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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 - 1.2
+++ mem.edc 21 Feb 2006 13:16:59 - 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;
}
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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 --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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 --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
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.c20 Feb 2006 14:11:42 - 1.1 +++ e_mod_main.c20 Feb 2006 18:23:28 - 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); } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
