Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-26 08:38:26 +00:00
Code Issues Releases Activity

move the SIZE_DEFAULTS() macro to where it belongs to

Browse Source
This commit is contained in:
Phil Sutter 2009-10-01 01:25:24 +02:00
parent 584d05d2ad
commit e3e77ce75e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core.c
View File

@ -232,11 +232,6 @@ struct text_object *construct_text_object(const char *s, const char *arg, long
#define OBJ_IF_ARG(a, n, ...) __OBJ_HEAD(a, n) __OBJ_ARG(__VA_ARGS__) __OBJ_IF; { #define OBJ_IF_ARG(a, n, ...) __OBJ_HEAD(a, n) __OBJ_ARG(__VA_ARGS__) __OBJ_IF; {
#define END } } else #define END } } else
#define SIZE_DEFAULTS(arg) { \
obj->a = default_##arg##_width; \
obj->b = default_##arg##_height; \
}
#ifdef X11 #ifdef X11
if (s[0] == '#') { if (s[0] == '#') {
obj->type = OBJ_color; obj->type = OBJ_color;

6
src/specials.h
View File

@ -86,6 +86,12 @@ extern int default_gauge_width;
extern int default_gauge_height; extern int default_gauge_height;
#endif #endif
/* set the obj's default width and height (FIXME: referencing the global obj is evil) */
#define SIZE_DEFAULTS(arg) { \
obj->a = default_##arg##_width; \
obj->b = default_##arg##_height; \
}
/* max number of specials allowed (TODO: use linked list instead) */ /* max number of specials allowed (TODO: use linked list instead) */
extern int max_specials; extern int max_specials;