nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More granularity in verbosity

Browse Source
This commit is contained in:
Sascha Kruse 2011-11-15 11:14:27 +01:00
parent 91be3e1e4a
commit 822e5d2f8c
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config.def.h
View File

@ -25,7 +25,12 @@ char *key_string = "space"; /* set to NULL for no keybinging */
KeySym mask = ControlMask; KeySym mask = ControlMask;
/* KeySym mask = ControlMask || Mod4Mask */ /* KeySym mask = ControlMask || Mod4Mask */
int verbose = True; /* print info to stdout? */ /* 0 -> print nothing
* 1 -> print messages to stdout
* 2 -> print everything to stdout (Useful for finding rules
* 3 -> print everything above + debug info
*/
int verbosity = 0;
/* You can use shell-like wildcards to match <appname> <summary> <body> and <icon>. */ /* You can use shell-like wildcards to match <appname> <summary> <body> and <icon>. */
const rule_t rules[] = { const rule_t rules[] = {

17
dunst.c
View File

@ -25,6 +25,10 @@
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define FONT_HEIGHT_BORDER 2 #define FONT_HEIGHT_BORDER 2
#define MSG 1
#define INFO 2
#define DEBUG 3
/* structs */ /* structs */
typedef struct _screen_info { typedef struct _screen_info {
int scr; int scr;
@ -58,7 +62,7 @@ void check_timeouts(void);
void delete_all_msg(void); void delete_all_msg(void);
void delete_msg(msg_queue_t *elem); void delete_msg(msg_queue_t *elem);
void drawmsg(void); void drawmsg(void);
void dunst_printf(const char *fmt, ...); void dunst_printf(int level, const char *fmt, ...);
char *fix_markup(char *str); char *fix_markup(char *str);
void free_msgqueue_t(msg_queue_t *elem); void free_msgqueue_t(msg_queue_t *elem);
void handleXEvents(void); void handleXEvents(void);
@ -107,7 +111,10 @@ append(msg_queue_t *queue, msg_queue_t *new) {
new->timeout = new->timeout == -1 ? timeouts[new->urgency] : new->timeout; new->timeout = new->timeout == -1 ? timeouts[new->urgency] : new->timeout;
new->start = 0; new->start = 0;
dunst_printf("%s (timeout: %d, urgency: %d)\n", new->msg, new->timeout, new->urgency); dunst_printf(MSG, "%s\n", new->msg);
dunst_printf(INFO, "{\n appname: %s\n summary: %s\n body: %s\n icon: %s\n urgency: %d\n timeout: %d\n}",
new->appname, new->summary, new->body, new->icon, new->urgency, new->timeout);
new->next = NULL; new->next = NULL;
if(queue == NULL) { if(queue == NULL) {
return new; return new;
@ -307,10 +314,10 @@ drawmsg(void) {
} }
void void
dunst_printf(const char *fmt, ...) { dunst_printf(int level, const char *fmt, ...) {
va_list ap; va_list ap;
if(!verbose) { if(level > verbosity) {
return; return;
} }
va_start(ap, fmt); va_start(ap, fmt);
@ -649,7 +656,7 @@ main(int argc, char *argv[]) {
} }
break; break;
case 'v': case 'v':
verbose = True; verbosity++;
break; break;
default: default:
usage(EXIT_FAILURE); usage(EXIT_FAILURE);