equal
deleted
inserted
replaced
324 XSync(dpy, False); |
324 XSync(dpy, False); |
325 XSetErrorHandler(NULL); |
325 XSetErrorHandler(NULL); |
326 xerrorxlib = XSetErrorHandler(xerror); |
326 xerrorxlib = XSetErrorHandler(xerror); |
327 XSync(dpy, False); |
327 XSync(dpy, False); |
328 setup(); |
328 setup(); |
329 drawstatus(); |
329 drawbar(); |
330 scan(); |
330 scan(); |
331 |
331 |
332 /* main event loop, also reads status text from stdin */ |
332 /* main event loop, also reads status text from stdin */ |
333 XSync(dpy, False); |
333 XSync(dpy, False); |
334 readin = True; |
334 readin = True; |
357 for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0'); |
357 for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0'); |
358 for(; p >= stext && *p != '\n'; --p); |
358 for(; p >= stext && *p != '\n'; --p); |
359 if(p > stext) |
359 if(p > stext) |
360 strncpy(stext, p + 1, sizeof stext); |
360 strncpy(stext, p + 1, sizeof stext); |
361 } |
361 } |
362 drawstatus(); |
362 drawbar(); |
363 } |
363 } |
364 while(XPending(dpy)) { |
364 while(XPending(dpy)) { |
365 XNextEvent(dpy, &ev); |
365 XNextEvent(dpy, &ev); |
366 if(handler[ev.type]) |
366 if(handler[ev.type]) |
367 (handler[ev.type])(&ev); /* call handler */ |
367 (handler[ev.type])(&ev); /* call handler */ |