Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : cpu
Dir : e_modules/cpu
Modified Files:
Makefile.am cpu.edc e_mod_main.h
Removed Files:
e_mod_config.c
Log Message:
Revert recent graph-ness. There is a much better way todo this type of stuff.
===================================================================
RCS file: /cvs/e/e_modules/cpu/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- Makefile.am 26 Aug 2007 11:32:08 -0000 1.18
+++ Makefile.am 26 Aug 2007 15:10:16 -0000 1.19
@@ -13,7 +13,6 @@
EXTRA_DIST = $(files_DATA) \
cpu.edc \
VeraMono.ttf \
-VeraBd.ttf \
cpu.png \
e_modules-cpu.spec
@@ -29,8 +28,7 @@
pkgdir = $(datadir)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c
+ e_mod_main.h
module_la_LIBADD = @e_libs@
module_la_LDFLAGS = -module -avoid-version
===================================================================
RCS file: /cvs/e/e_modules/cpu/cpu.edc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- cpu.edc 26 Aug 2007 14:42:37 -0000 1.19
+++ cpu.edc 26 Aug 2007 15:10:16 -0000 1.20
@@ -6,31 +6,29 @@
fonts
{
font: "VeraMono.ttf" "VeraMono";
- font: "VeraBd.ttf" "VeraBold";
}
styles
{
- style
- {
- name: "cpu_style";
- base: "font=VeraMono font_size=10 text_class=tb_plain align=center
color=#fff style=outline_soft_shadow shadow_color=#00000032 wrap=word";
- tag: "br" "\n";
- }
+ style {
+ name: "cpu_style";
+ base: "font=VeraMono font_size=10 text_class=tb_plain align=center
color=#fff style=outline_soft_shadow shadow_color=#00000032 wrap=word";
+ tag: "br" "\n";
+ }
}
collections
{
group
{
- name: "modules/cpu/main";
- parts
+ name: "modules/cpu/main";
+ parts
{
part
{
- name: "fade_clip";
- type: RECT;
- mouse_events: 0;
+ name: "fade_clip";
+ type: RECT;
+ mouse_events: 0;
description
{
state: "default" 0.0;
@@ -47,786 +45,45 @@
aspect: 1.0 1.0;
aspect_preference: BOTH;
align: 0.5 0.5;
- image.normal: "cpu.png";
- }
- }
- part
- {
- name: "load";
- type: TEXTBLOCK;
- effect: SOFT_SHADOW;
- mouse_events: 0;
- clip_to: "fade_clip";
- description
- {
- state: "default" 0.0;
- align: 0.5 0.5;
- rel1.to: "cpu";
- rel2.to: "cpu";
- text
- {
- style: "cpu_style";
- min: 0 1;
- }
- }
- }
- }
- }
- group
- {
- name: "modules/cpu/popup";
- data
- {
- item: "chart_color1" "0 59 179 170";
- item: "chart_color2" "4 179 0 170";
- item: "chart_color3" "180 0 0 170";
- item: "chart_color4" "179 55 0 170";
- }
- parts
- {
- part
- {
- name: "bg";
- type: RECT;
- description
- {
- state: "default" 0.0;
- min: 100 100;
- color: 0 0 0 0;
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- min: 200 100;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- min: 150 100;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- min: 150 150;
- }
- }
- part
- {
- name: "chart1";
- type: SWALLOW;
- description
- {
- state: "default" 0.0;
- rel1.relative: 0.04 0.04;
- rel2.relative: 0.96 0.96;
- color: 255 255 255 255;
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.04 0.04;
- rel2.relative: 0.48 0.96;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.04 0.04;
- rel2.relative: 0.6 0.96;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.04 0.04;
- rel2.relative: 0.48 0.48;
- }
- }
- part
- {
- name: "chart2";
- type: SWALLOW;
- description
- {
- state: "default" 0.0;
- visible: 0;
- color: 255 255 255 255;
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.52 0.04;
- rel2.relative: 0.96 0.96;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.62 0.04;
- rel2.relative: 0.96 0.48;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.52 0.04;
- rel2.relative: 0.96 0.48;
- }
- }
- part
- {
- name: "chart3";
- type: SWALLOW;
- description
- {
- state: "default" 0.0;
- visible: 0;
- color: 255 255 255 255;
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.62 0.52;
- rel2.relative: 0.96 0.96;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.04 0.52;
- rel2.relative: 0.48 0.96;
- }
- }
- part
- {
- name: "chart4";
- type: SWALLOW;
- description
- {
- state: "default" 0.0;
- visible: 0;
- color: 255 255 255 255;
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.52 0.52;
- rel2.relative: 0.96 0.96;
- }
- }
- part
- {
- name: "num1";
- type: TEXT;
- effect: SOFT_SHADOW;
- description
- {
- state: "default" 0.0;
- fixed: 1 1;
- rel1.relative: 0.5 0.5;
- rel2.relative: 0.5 0.5;
- color: 255 255 255 255;
- color3: 0 0 0 42;
- text
- {
- text: "1";
- min: 1 1;
- size: 30;
- font: "VeraBold";
- align: 0.5 0.5;
- }
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.25 0.5;
- rel2.relative: 0.25 0.5;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.33333 0.5;
- rel2.relative: 0.33333 0.5;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.25 0.25;
- rel2.relative: 0.25 0.25;
- text.size: 20;
- }
- }
- part
- {
- name: "num2";
- type: TEXT;
- effect: SOFT_SHADOW;
- description
- {
- state: "default" 0.0;
- fixed: 1 1;
- visible: 0;
- color: 255 255 255 255;
- color3: 0 0 0 42;
- text
- {
- text: "2";
- min: 1 1;
- size: 30;
- font: "VeraBold";
- align: 0.5 0.5;
- }
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.75 0.5;
- rel2.relative: 0.75 0.5;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.833333 0.25;
- rel2.relative: 0.833333 0.25;
- text.size: 20;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.75 0.25;
- rel2.relative: 0.75 0.25;
- text.size: 20;
- }
- }
- part
- {
- name: "num3";
- type: TEXT;
- effect: SOFT_SHADOW;
- description
- {
- state: "default" 0.0;
- fixed: 1 1;
- color: 255 255 255 255;
- color3: 0 0 0 42;
- visible: 0;
- text
- {
- text: "3";
- min: 1 1;
- size: 30;
- font: "VeraBold";
- align: 0.5 0.5;
- }
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.833333 0.75;
- rel2.relative: 0.833333 0.75;
- text.size: 20;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.25 0.75;
- rel2.relative: 0.25 0.75;
- text.size: 20;
- }
- }
- part
- {
- name: "num4";
- type: TEXT;
- effect: SOFT_SHADOW;
- description
- {
- state: "default" 0.0;
- fixed: 1 1;
- color: 255 255 255 255;
- color3: 0 0 0 42;
- visible: 0;
- text
- {
- text: "4";
- min: 1 1;
- size: 30;
- font: "VeraBold";
- align: 0.5 0.5;
- }
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.75 0.75;
- rel2.relative: 0.75 0.75;
- text.size: 20;
- }
- }
- part
- {
- name: "y1";
- type: RECT;
- description
- {
- state: "default" 0.0;
- min: 1 1;
- max: 1 9999;
- fixed: 1 1;
rel1
{
- relative: 0.04 0.04;
- offset: -1 -4;
+ relative: 0.0 0.0;
}
rel2
{
- relative: 0.04 0.96;
- offset: -1 2;
+ relative: 1.0 1.0;
+ }
+ image
+ {
+ normal: "cpu.png";
}
- color: 0 0 0 255;
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.04 0.04;
- rel2.relative: 0.04 0.96;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.04 0.04;
- rel2.relative: 0.04 0.96;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.04 0.04;
- rel2.relative: 0.04 0.48;
- }
- }
- part
- {
- name: "y2";
- type: RECT;
- description
- {
- state: "default" 0.0;
- min: 1 1;
- max: 1 9999;
- fixed: 1 1;
- visible: 0;
- rel1.offset: -1 -4;
- rel2.offset: -1 2;
- color: 0 0 0 255;
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.52 0.04;
- rel2.relative: 0.52 0.96;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.62 0.04;
- rel2.relative: 0.62 0.48;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.52 0.04;
- rel2.relative: 0.52 0.48;
- }
- }
- part
- {
- name: "y3";
- type: RECT;
- description
- {
- state: "default" 0.0;
- min: 1 1;
- max: 1 9999;
- fixed: 1 1;
- visible: 0;
- rel1.offset: -1 -4;
- rel2.offset: -1 2;
- color: 0 0 0 255;
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.62 0.52;
- rel2.relative: 0.62 0.96;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.04 0.52;
- rel2.relative: 0.04 0.96;
- }
- }
- part
- {
- name: "y4";
- type: RECT;
- description
- {
- state: "default" 0.0;
- min: 1 1;
- max: 1 9999;
- fixed: 1 1;
- visible: 0;
- rel1.offset: -1 -4;
- rel2.offset: -1 2;
- color: 0 0 0 255;
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.52 0.52;
- rel2.relative: 0.52 0.96;
}
}
part
{
- name: "x1";
- type: RECT;
+ name: "load";
+ type: TEXTBLOCK;
+ effect: SOFT_SHADOW;
+ mouse_events: 0;
+ clip_to: "fade_clip";
description
{
state: "default" 0.0;
- min: 1 1;
- max: 9999 1;
- fixed: 1 1;
+ align: 0.5 0.5;
rel1
{
- relative: 0.04 0.96;
- offset: -4 0;
+ relative: 0.0 0.0;
+ to: "cpu";
}
rel2
{
- relative: 0.96 0.96;
- offset: 2 0;
+ relative: 1.0 1.0;
+ to: "cpu";
}
- color: 0 0 0 255;
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- rel2.relative: 0.48 0.96;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- rel2.relative: 0.6 0.96;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- rel1.relative: 0.04 0.48;
- rel2.relative: 0.48 0.48;
- }
- }
- part
- {
- name: "x2";
- type: RECT;
- description
- {
- state: "default" 0.0;
- min: 1 1;
- max: 9999 1;
- fixed: 1 1;
- visible: 0;
- rel1.offset: -4 0;
- rel2.offset: 2 0;
- color: 0 0 0 255;
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.52 0.96;
- rel2.relative: 0.96 0.96;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.62 0.48;
- rel2.relative: 0.96 0.48;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.52 0.48;
- rel2.relative: 0.96 0.48;
- }
- }
- part
- {
- name: "x3";
- type: RECT;
- description
- {
- state: "default" 0.0;
- min: 1 1;
- max: 9999 1;
- fixed: 1 1;
- visible: 0;
- rel1.offset: -4 0;
- rel2.offset: 2 0;
- color: 0 0 0 255;
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.62 0.96;
- rel2.relative: 0.96 0.96;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.04 0.96;
- rel2.relative: 0.48 0.96;
- }
- }
- part
- {
- name: "x4";
- type: RECT;
- description
- {
- state: "default" 0.0;
- min: 1 1;
- max: 9999 1;
- fixed: 1 1;
- visible: 0;
- rel1.offset: -4 0;
- rel2.offset: 2 0;
- color: 0 0 0 255;
- }
- description
- {
- state: "cpu_count_2" 0.0;
- inherit: "default" 0.0;
- }
- description
- {
- state: "cpu_count_3" 0.0;
- inherit: "default" 0.0;
- }
- description
- {
- state: "cpu_count_4" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1.relative: 0.52 0.96;
- rel2.relative: 0.96 0.96;
- }
- }
- }
- programs
- {
- program
- {
- name: "1_cpu";
- signal: "e,state,orientation,1";
- source: "e";
- action: STATE_SET "default" 0.0;
- target: "bg";
- target: "chart1";
- target: "chart2";
- target: "chart3";
- target: "chart4";
- target: "num1";
- target: "num2";
- target: "num3";
- target: "num4";
- target: "x1";
- target: "x2";
- target: "x3";
- target: "x4";
- target: "y1";
- target: "y2";
- target: "y3";
- target: "y4";
- }
- program
- {
- name: "2_cpu";
- signal: "e,state,orientation,2";
- source: "e";
- action: STATE_SET "cpu_count_2" 0.0;
- target: "bg";
- target: "chart1";
- target: "chart2";
- target: "chart3";
- target: "chart4";
- target: "num1";
- target: "num2";
- target: "num3";
- target: "num4";
- target: "x1";
- target: "x2";
- target: "x3";
- target: "x4";
- target: "y1";
- target: "y2";
- target: "y3";
- target: "y4";
- }
- program
- {
- name: "3_cpu";
- signal: "e,state,orientation,3";
- source: "e";
- action: STATE_SET "cpu_count_3" 0.0;
- target: "bg";
- target: "chart1";
- target: "chart2";
- target: "chart3";
- target: "chart4";
- target: "num1";
- target: "num2";
- target: "num3";
- target: "num4";
- target: "x1";
- target: "x2";
- target: "x3";
- target: "x4";
- target: "y1";
- target: "y2";
- target: "y3";
- target: "y4";
- }
- program
- {
- name: "4_cpu";
- signal: "e,state,orientation,4";
- source: "e";
- action: STATE_SET "cpu_count_4" 0.0;
- target: "bg";
- target: "chart1";
- target: "chart2";
- target: "chart3";
- target: "chart4";
- target: "num1";
- target: "num2";
- target: "num3";
- target: "num4";
- target: "x1";
- target: "x2";
- target: "x3";
- target: "x4";
- target: "y1";
- target: "y2";
- target: "y3";
- target: "y4";
+ text {
+ style: "cpu_style";
+ min: 0 1;
+ }
}
}
}
===================================================================
RCS file: /cvs/e/e_modules/cpu/e_mod_main.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_mod_main.h 26 Aug 2007 11:32:08 -0000 1.12
+++ e_mod_main.h 26 Aug 2007 15:10:16 -0000 1.13
@@ -16,9 +16,7 @@
struct _Config_Item
{
const char *id;
- double poll_time;
- int show_popup;
- int max_points;
+ double interval;
};
EAPI extern E_Module_Api e_modapi;
@@ -28,8 +26,7 @@
EAPI int e_modapi_save (E_Module *m);
EAPI int e_modapi_about (E_Module *m);
-void _cpu_config_updated (const char *id);
-void _config_cpu_module (Config_Item *ci, int max);
+//void _config_cpu_module (Config_Item *ci);
extern Config *cpu_conf;
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs