Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-09-30 05:59:07 +00:00
Code Issues Releases Activity

Let execibar work in shell

Browse Source
This commit is contained in:
Nikolas Garofil 2009-06-02 21:23:00 +02:00
parent 7807d369ad
commit abf515d901
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/conky.c
View File

@ -908,8 +908,8 @@ static void free_text_objects(struct text_object *root, int internal)
#endif /* !__OpenBSD__ */ #endif /* !__OpenBSD__ */
case OBJ_execpi: case OBJ_execpi:
case OBJ_execi: case OBJ_execi:
#ifdef X11
case OBJ_execibar: case OBJ_execibar:
#ifdef X11
case OBJ_execigraph: case OBJ_execigraph:
case OBJ_execigauge: case OBJ_execigauge:
#endif #endif
@ -1043,7 +1043,7 @@ static void free_text_objects(struct text_object *root, int internal)
case OBJ_apcupsd_loadbar: case OBJ_apcupsd_loadbar:
case OBJ_apcupsd_loadgraph: case OBJ_apcupsd_loadgraph:
case OBJ_apcupsd_loadgauge: case OBJ_apcupsd_loadgauge:
#endif #endif /* X11 */
case OBJ_apcupsd_charge: case OBJ_apcupsd_charge:
case OBJ_apcupsd_timeleft: case OBJ_apcupsd_timeleft:
case OBJ_apcupsd_temp: case OBJ_apcupsd_temp:
@ -1070,7 +1070,7 @@ void scan_mixer_bar(const char *arg, int *a, int *w, int *h)
scan_bar(arg, w, h); scan_bar(arg, w, h);
} }
} }
#endif #endif /* X11 */
/* strip a leading /dev/ if any, following symlinks first /* strip a leading /dev/ if any, following symlinks first
* *
@ -1612,6 +1612,7 @@ static struct text_object *construct_text_object(const char *s,
END OBJ(execgraph, 0) END OBJ(execgraph, 0)
SIZE_DEFAULTS(graph); SIZE_DEFAULTS(graph);
obj->data.s = strndup(arg ? arg : "", text_buffer_size); obj->data.s = strndup(arg ? arg : "", text_buffer_size);
#endif /* X11 */
END OBJ(execibar, 0) END OBJ(execibar, 0)
int n; int n;
SIZE_DEFAULTS(bar); SIZE_DEFAULTS(bar);
@ -1626,6 +1627,7 @@ static struct text_object *construct_text_object(const char *s,
} else { } else {
obj->data.execi.cmd = strndup(arg + n, text_buffer_size); obj->data.execi.cmd = strndup(arg + n, text_buffer_size);
} }
#ifdef X11
END OBJ(execigraph, 0) END OBJ(execigraph, 0)
int n; int n;
SIZE_DEFAULTS(graph); SIZE_DEFAULTS(graph);
@ -3999,6 +4001,7 @@ static void generate_text_internal(char *p, int p_max_size,
100, 1, showaslog, tempgrad); 100, 1, showaslog, tempgrad);
} }
} }
#endif /* X11 */
OBJ(execibar) { OBJ(execibar) {
if (current_update_time - obj->data.execi.last_update if (current_update_time - obj->data.execi.last_update
>= obj->data.execi.interval) { >= obj->data.execi.interval) {
@ -4008,12 +4011,22 @@ static void generate_text_internal(char *p, int p_max_size,
barnum = get_barnum(p); barnum = get_barnum(p);
if (barnum >= 0.0) { if (barnum >= 0.0) {
obj->f = 255 * barnum / 100.0; obj->f = barnum;
} }
obj->data.execi.last_update = current_update_time; obj->data.execi.last_update = current_update_time;
} }
new_bar(p, obj->a, obj->b, round_to_int(obj->f)); #ifdef X11
if(output_methods & TO_X) {
new_bar(p, obj->a, obj->b, round_to_int(obj->f * 2.55));
} else {
#endif /* X11 */
if(!obj->a) obj->a = DEFAULT_BAR_WIDTH_NO_X;
new_bar_in_shell(p, p_max_size, round_to_int(obj->f), obj->a);
#ifdef X11
} }
#endif /* X11 */
}
#ifdef X11
OBJ(execigraph) { OBJ(execigraph) {
if (current_update_time - obj->data.execi.last_update if (current_update_time - obj->data.execi.last_update
>= obj->data.execi.interval) { >= obj->data.execi.interval) {

2
src/text_object.h
View File

@ -103,10 +103,10 @@ enum text_object_type {
OBJ_execi, OBJ_execi,
OBJ_texeci, OBJ_texeci,
OBJ_execbar, OBJ_execbar,
OBJ_execibar,
#ifdef X11 #ifdef X11
OBJ_execgauge, OBJ_execgauge,
OBJ_execgraph, OBJ_execgraph,
OBJ_execibar,
OBJ_execigraph, OBJ_execigraph,
OBJ_execigauge, OBJ_execigauge,
#endif /* X11 */ #endif /* X11 */