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

put colors into array

Browse Source 
This way, the color can be simple selected by colors[urgency]
This commit is contained in:
Sascha Kruse 2011-09-17 14:57:48 +02:00
parent 929f5d6740
commit f54975ba13
1 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dunst.c
View File

@ -19,6 +19,9 @@
#define MAX(a,b) ((a) > (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b))
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define FONT_HEIGHT_BORDER 2 #define FONT_HEIGHT_BORDER 2
#define LOW 0
#define NORM 1
#define CRIT 2
/* structs */ /* structs */
typedef struct _msg_queue_t { typedef struct _msg_queue_t {
@ -50,9 +53,8 @@ static const char *critbgcolor = "#ffaaaa";
static const char *critfgcolor = "#000000"; static const char *critfgcolor = "#000000";
static const char *lowbgcolor = "#aaaaff"; static const char *lowbgcolor = "#aaaaff";
static const char *lowfgcolor = "#000000"; static const char *lowfgcolor = "#000000";
static unsigned long normcol[ColLast]; /* index of colors fit to urgency level */
static unsigned long critcol[ColLast]; static unsigned long colors[3][ColLast];
static unsigned long lowcol[ColLast];
static Atom utf8; static Atom utf8;
static DC *dc; static DC *dc;
static Window win; static Window win;
@ -96,9 +98,9 @@ append(msg_queue_t *queue, char *msg, int to, int urgency) {
msg_queue_t *last; msg_queue_t *last;
new->msg = fix_markup(msg); new->msg = fix_markup(msg);
new->urgency = urgency; new->urgency = urgency;
new->urgency = new->urgency > CRIT ? CRIT : new->urgency;
if(to == -1) { if(to == -1) {
new->urgency = new->urgency > 2 ? 2 : new->urgency;
new->timeout = timeouts[urgency]; new->timeout = timeouts[urgency];
} else { } else {
new->timeout = to; new->timeout = to;
@ -276,30 +278,14 @@ drawmsg(void) {
resizedc(dc, width, height*font_h); resizedc(dc, width, height*font_h);
XResizeWindow(dc->dpy, win, width, height*font_h); XResizeWindow(dc->dpy, win, width, height*font_h);
drawrect(dc, 0, 0, width, height*font_h, True, BG(dc, normcol)); drawrect(dc, 0, 0, width, height*font_h, True, BG(dc, colors[NORM]));
for(i = 0; i < height; i++) { for(i = 0; i < height; i++) {
if(cur_msg->start == 0) if(cur_msg->start == 0)
cur_msg->start = now; cur_msg->start = now;
switch ( cur_msg->urgency ) { drawrect(dc, 0, dc->y, width, font_h, True, BG(dc, colors[cur_msg->urgency]));
case 0 : drawtext(dc, cur_msg->msg, colors[cur_msg->urgency]);
drawrect(dc, 0 , dc->y, width, font_h, True, BG(dc, lowcol));
drawtext(dc, cur_msg->msg, lowcol);
break;
case 1 :
drawrect(dc, 0, dc->y, width, font_h, True, BG(dc, normcol));
drawtext(dc, cur_msg->msg, normcol);
break;
case 2 :
drawrect(dc, 0, dc->y, width, font_h, True, BG(dc, critcol));
drawtext(dc, cur_msg->msg, critcol);
break;
default :
drawrect(dc, 0 ,dc->y, width, font_h, True, BG(dc, lowcol));
drawtext(dc, cur_msg->msg, normcol);
break;
}
dc->y += font_h; dc->y += font_h;
cur_msg = cur_msg->next; cur_msg = cur_msg->next;
@ -508,12 +494,12 @@ setup(void) {
} }
root = RootWindow(dc->dpy, DefaultScreen(dc->dpy)); root = RootWindow(dc->dpy, DefaultScreen(dc->dpy));
normcol[ColBG] = getcolor(dc, normbgcolor); colors[0][ColBG] = getcolor(dc, lowbgcolor);
normcol[ColFG] = getcolor(dc, normfgcolor); colors[0][ColFG] = getcolor(dc, lowfgcolor);
critcol[ColBG] = getcolor(dc, critbgcolor); colors[1][ColBG] = getcolor(dc, normbgcolor);
critcol[ColFG] = getcolor(dc, critfgcolor); colors[1][ColFG] = getcolor(dc, normfgcolor);
lowcol[ColBG] = getcolor(dc, lowbgcolor); colors[2][ColBG] = getcolor(dc, critbgcolor);
lowcol[ColFG] = getcolor(dc, lowfgcolor); colors[2][ColFG] = getcolor(dc, critfgcolor);
utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False); utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);