Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-03 04:28:35 +00:00
Code Issues Releases Activity

Let cpubar work in shell

Browse Source
This commit is contained in:
Nikolas Garofil 2009-06-01 15:07:24 +02:00
parent 0b8b6ccbae
commit faa9086168
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/conky_no_x11.conf
View File

@ -40,7 +40,7 @@ Frequency (in MHz): $freq
Frequency (in GHz): $freq_g Frequency (in GHz): $freq_g
RAM Usage: $mem/$memmax - $memperc% ${membar 4} RAM Usage: $mem/$memmax - $memperc% ${membar 4}
Swap Usage: $swap/$swapmax - $swapperc% ${swapbar 4} Swap Usage: $swap/$swapmax - $swapperc% ${swapbar 4}
CPU Usage: $cpu% CPU Usage: $cpu% ${cpubar 4}
Processes: $processes Running: $running_processes Processes: $processes Running: $running_processes
File systems: File systems:
/ ${fs_used /}/${fs_size /} / ${fs_used /}/${fs_size /}

25
src/conky.c
View File

@ -1472,11 +1472,13 @@ static struct text_object *construct_text_object(const char *s,
SCAN_CPU(arg, obj->data.cpu_index); SCAN_CPU(arg, obj->data.cpu_index);
scan_gauge(arg, &obj->a, &obj->b); scan_gauge(arg, &obj->a, &obj->b);
DBGP2("Adding $cpugauge for CPU %d", obj->data.cpu_index); DBGP2("Adding $cpugauge for CPU %d", obj->data.cpu_index);
#endif /* X11 */
END OBJ(cpubar, INFO_CPU) END OBJ(cpubar, INFO_CPU)
SIZE_DEFAULTS(bar); SIZE_DEFAULTS(bar);
SCAN_CPU(arg, obj->data.cpu_index); SCAN_CPU(arg, obj->data.cpu_index);
scan_bar(arg, &obj->a, &obj->b); scan_bar(arg, &obj->a, &obj->b);
DBGP2("Adding $cpubar for CPU %d", obj->data.cpu_index); DBGP2("Adding $cpubar for CPU %d", obj->data.cpu_index);
#ifdef X11
END OBJ(cpugraph, INFO_CPU) END OBJ(cpugraph, INFO_CPU)
SIZE_DEFAULTS(graph); SIZE_DEFAULTS(graph);
SCAN_CPU(arg, obj->data.cpu_index); SCAN_CPU(arg, obj->data.cpu_index);
@ -3578,7 +3580,7 @@ static void generate_text_internal(char *p, int p_max_size,
OBJ(battery_bar) { OBJ(battery_bar) {
new_bar(p, obj->a, obj->b, get_battery_perct_bar(obj->data.s)); new_bar(p, obj->a, obj->b, get_battery_perct_bar(obj->data.s));
} }
#endif #endif /* X11 */
OBJ(battery_short) { OBJ(battery_short) {
get_battery_short_status(p, p_max_size, obj->data.s); get_battery_short_status(p, p_max_size, obj->data.s);
} }
@ -3603,10 +3605,21 @@ static void generate_text_internal(char *p, int p_max_size,
OBJ(cpugauge) OBJ(cpugauge)
new_gauge(p, obj->a, obj->b, new_gauge(p, obj->a, obj->b,
round_to_int(cur->cpu_usage[obj->data.cpu_index] * 255.0)); round_to_int(cur->cpu_usage[obj->data.cpu_index] * 255.0));
#endif /* X11 */
OBJ(cpubar) { OBJ(cpubar) {
new_bar(p, obj->a, obj->b, #ifdef X11
if(output_methods & TO_X) {
new_bar(p, obj->a, obj->b,
round_to_int(cur->cpu_usage[obj->data.cpu_index] * 255.0)); round_to_int(cur->cpu_usage[obj->data.cpu_index] * 255.0));
}else{
#endif /* X11 */
if(!obj->a) obj->a = DEFAULT_BAR_WIDTH_NO_X;
new_bar_in_shell(p, p_max_size, round_to_int(cur->cpu_usage[obj->data.cpu_index] * 100), obj->a);
#ifdef X11
}
#endif /* X11 */
} }
#ifdef X11
OBJ(cpugraph) { OBJ(cpugraph) {
new_graph(p, obj->a, obj->b, obj->c, obj->d, new_graph(p, obj->a, obj->b, obj->c, obj->d,
round_to_int(cur->cpu_usage[obj->data.cpu_index] * 100), round_to_int(cur->cpu_usage[obj->data.cpu_index] * 100),
@ -3649,7 +3662,7 @@ static void generate_text_internal(char *p, int p_max_size,
OBJ(color9) { OBJ(color9) {
new_fg(p, color9); new_fg(p, color9);
} }
#endif #endif /* X11 */
OBJ(conky_version) { OBJ(conky_version) {
snprintf(p, p_max_size, "%s", VERSION); snprintf(p, p_max_size, "%s", VERSION);
} }
@ -3808,7 +3821,7 @@ static void generate_text_internal(char *p, int p_max_size,
OBJ(font) { OBJ(font) {
new_font(p, obj->data.s); new_font(p, obj->data.s);
} }
#endif #endif /* X11 */
/* TODO: move this correction from kB to kB/s elsewhere /* TODO: move this correction from kB to kB/s elsewhere
* (or get rid of it??) */ * (or get rid of it??) */
OBJ(diskio) { OBJ(diskio) {
@ -3836,7 +3849,7 @@ static void generate_text_internal(char *p, int p_max_size,
new_graph(p, obj->a, obj->b, obj->c, obj->d, new_graph(p, obj->a, obj->b, obj->c, obj->d,
obj->data.diskio->current_write, obj->e, 1, obj->char_a, obj->char_b); obj->data.diskio->current_write, obj->e, 1, obj->char_a, obj->char_b);
} }
#endif #endif /* X11 */
OBJ(downspeed) { OBJ(downspeed) {
human_readable(obj->data.net->recv_speed, p, 255); human_readable(obj->data.net->recv_speed, p, 255);
} }
@ -3849,7 +3862,7 @@ static void generate_text_internal(char *p, int p_max_size,
new_graph(p, obj->a, obj->b, obj->c, obj->d, new_graph(p, obj->a, obj->b, obj->c, obj->d,
obj->data.net->recv_speed / 1024.0, obj->e, 1, obj->char_a, obj->char_b); obj->data.net->recv_speed / 1024.0, obj->e, 1, obj->char_a, obj->char_b);
} }
#endif #endif /* X11 */
OBJ(else) { OBJ(else) {
/* Since we see you, you're if has not jumped. /* Since we see you, you're if has not jumped.
* Do Ninja jump here: without leaving traces. * Do Ninja jump here: without leaving traces.

2
src/text_object.h
View File

@ -78,9 +78,9 @@ enum text_object_type {
OBJ_conky_build_arch, OBJ_conky_build_arch,
OBJ_font, OBJ_font,
OBJ_cpu, OBJ_cpu,
OBJ_cpubar,
#ifdef X11 #ifdef X11
OBJ_cpugauge, OBJ_cpugauge,
OBJ_cpubar,
OBJ_cpugraph, OBJ_cpugraph,
OBJ_loadgraph, OBJ_loadgraph,
#endif #endif