projects
/
monky
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xmms2 and audacious bars exist only under X
[monky]
/
src
/
specials.h
diff --git
a/src/specials.h
b/src/specials.h
index
24aa330
..
f529ee3
100644
(file)
--- a/
src/specials.h
+++ b/
src/specials.h
@@
-9,7
+9,7
@@
* Please see COPYING for details
*
* Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
* Please see COPYING for details
*
* Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
* (see AUTHORS)
* All rights reserved.
*
@@
-40,6
+40,7
@@
#define TEMPGRAD "-t"
enum special_types {
#define TEMPGRAD "-t"
enum special_types {
+ NONSPECIAL = 0,
HORIZONTAL_LINE = 1,
STIPPLED_HR,
BAR,
HORIZONTAL_LINE = 1,
STIPPLED_HR,
BAR,
@@
-86,12
+87,6
@@
extern int default_gauge_width;
extern int default_gauge_height;
#endif
extern int default_gauge_height;
#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; \
-}
-
/* forward declare to avoid mutual inclusion between specials.h and text_object.h */
struct text_object;
/* forward declare to avoid mutual inclusion between specials.h and text_object.h */
struct text_object;
@@
-100,22
+95,21
@@
extern int max_specials;
/* scanning special arguments */
const char *scan_bar(struct text_object *, const char *);
/* scanning special arguments */
const char *scan_bar(struct text_object *, const char *);
-#ifdef X11
const char *scan_gauge(struct text_object *, const char *);
const char *scan_gauge(struct text_object *, const char *);
+#ifdef X11
char *scan_font(const char *);
char *scan_font(const char *);
-char *scan_graph(struct text_object *, const char *);
+char *scan_graph(struct text_object *, const char *, int);
void scan_tab(struct text_object *, const char *);
void scan_stippled_hr(struct text_object *, const char*);
/* printing specials */
void scan_tab(struct text_object *, const char *);
void scan_stippled_hr(struct text_object *, const char*);
/* printing specials */
-void new_gauge(struct text_object *, char *, int);
-void new_bar(struct text_object *, char *, int);
void new_font(char *, char *);
void new_font(char *, char *);
-void new_graph(struct text_object *, char *, double);
+void new_graph(struct text_object *, char *, int, double);
void new_hr(char *, int);
void new_stippled_hr(struct text_object *, char *);
#endif
void new_hr(char *, int);
void new_stippled_hr(struct text_object *, char *);
#endif
-void new_bar_in_shell(struct text_object *, char *, int, double);
+void new_gauge(struct text_object *, char *, int, int);
+void new_bar(struct text_object *, char *, int, int);
void new_fg(char *, long);
void new_bg(char *, long);
void new_outline(char *, long);
void new_fg(char *, long);
void new_bg(char *, long);
void new_outline(char *, long);