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

fixed tab<->spaces

Browse Source
This commit is contained in:
Sascha Kruse 2011-10-25 22:22:10 +02:00
parent fa302a31a9
commit 349493c196
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
dunst.c
View File

@ -106,12 +106,12 @@ append(msg_queue_t *queue, char *msg, int to, int urgency, const char *fg, const
new->urgency = urgency; new->urgency = urgency;
new->urgency = new->urgency > CRIT ? CRIT : new->urgency; new->urgency = new->urgency > CRIT ? CRIT : new->urgency;
if(fg == NULL || !XAllocNamedColor(dc->dpy, cmap, fg, &color, &color)) { if(fg == NULL || !XAllocNamedColor(dc->dpy, cmap, fg, &color, &color)) {
new->colors[ColFG] = colors[new->urgency][ColFG]; new->colors[ColFG] = colors[new->urgency][ColFG];
} else { } else {
new->colors[ColFG] = color.pixel; new->colors[ColFG] = color.pixel;
} }
if(bg == NULL || !XAllocNamedColor(dc->dpy, cmap, bg, &color, &color)) { if(bg == NULL || !XAllocNamedColor(dc->dpy, cmap, bg, &color, &color)) {
new->colors[ColBG] = colors[new->urgency][ColBG]; new->colors[ColBG] = colors[new->urgency][ColBG];
} else { } else {
new->colors[ColBG] = color.pixel; new->colors[ColBG] = color.pixel;
@ -305,14 +305,14 @@ drawmsg(void) {
void void
dunst_printf(const char *fmt, ...) { dunst_printf(const char *fmt, ...) {
va_list ap; va_list ap;
if(!verbose) { if(!verbose) {
return; return;
} }
va_start(ap, fmt); va_start(ap, fmt);
vfprintf(stderr, fmt, ap); vfprintf(stderr, fmt, ap);
va_end(ap); va_end(ap);
} }
char char
@ -363,7 +363,7 @@ char
void void
handleXEvents(void) { handleXEvents(void) {
XEvent ev; XEvent ev;
while(XPending(dc->dpy) > 0) { while(XPending(dc->dpy) > 0) {
XNextEvent(dc->dpy, &ev); XNextEvent(dc->dpy, &ev);
switch(ev.type) { switch(ev.type) {
@ -434,12 +434,12 @@ run(void) {
void void
setup(void) { setup(void) {
Window root; Window root;
XSetWindowAttributes wa; XSetWindowAttributes wa;
KeyCode code; KeyCode code;
#ifdef XINERAMA #ifdef XINERAMA
int n; int n;
XineramaScreenInfo *info; XineramaScreenInfo *info;
#endif #endif
if(scr.scr < 0) { if(scr.scr < 0) {
scr.scr = DefaultScreen(dc->dpy); scr.scr = DefaultScreen(dc->dpy);
@ -453,38 +453,38 @@ setup(void) {
colors[2][ColBG] = getcolor(dc, critbgcolor); colors[2][ColBG] = getcolor(dc, critbgcolor);
colors[2][ColFG] = getcolor(dc, critfgcolor); colors[2][ColFG] = getcolor(dc, critfgcolor);
utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False); utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
/* menu geometry */ /* menu geometry */
font_h = dc->font.height + FONT_HEIGHT_BORDER; font_h = dc->font.height + FONT_HEIGHT_BORDER;
#ifdef XINERAMA #ifdef XINERAMA
if((info = XineramaQueryScreens(dc->dpy, &n))) { if((info = XineramaQueryScreens(dc->dpy, &n))) {
if(scr.scr >= n) { if(scr.scr >= n) {
fprintf(stderr, "Monitor %d not found\n", scr.scr); fprintf(stderr, "Monitor %d not found\n", scr.scr);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
scr.dim.x = info[scr.scr].x_org; scr.dim.x = info[scr.scr].x_org;
scr.dim.y = info[scr.scr].y_org; scr.dim.y = info[scr.scr].y_org;
scr.dim.h = info[scr.scr].height; scr.dim.h = info[scr.scr].height;
scr.dim.w = info[scr.scr].width; scr.dim.w = info[scr.scr].width;
XFree(info); XFree(info);
} }
else else
#endif #endif
{ {
scr.dim.x = 0; scr.dim.x = 0;
scr.dim.y = 0; scr.dim.y = 0;
scr.dim.w = DisplayWidth(dc->dpy, scr.scr); scr.dim.w = DisplayWidth(dc->dpy, scr.scr);
scr.dim.h = DisplayHeight(dc->dpy, scr.scr); scr.dim.h = DisplayHeight(dc->dpy, scr.scr);
} }
/* menu window */ /* menu window */
wa.override_redirect = True; wa.override_redirect = True;
wa.background_pixmap = ParentRelative; wa.background_pixmap = ParentRelative;
wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask | ButtonPressMask; wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask | ButtonPressMask;
win = XCreateWindow(dc->dpy, root, scr.dim.x, scr.dim.y, scr.dim.w, font_h, 0, win = XCreateWindow(dc->dpy, root, scr.dim.x, scr.dim.y, scr.dim.w, font_h, 0,
DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)), CopyFromParent, DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)), CopyFromParent,
DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)), DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
/* grab keys */ /* grab keys */
if(key != NoSymbol) { if(key != NoSymbol) {