hiro/spectrwm
1
0
Fork 0
mirror of https://github.com/vale981/spectrwm synced 2025-03-05 09:51:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify bar updates.

Browse source
This commit is contained in:
Marco Peereboom 2009-01-19 21:11:46 +00:00
parent 53ccf4e36d
commit 9b55b66ab5
1 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
scrotwm.c
View file

@ -137,6 +137,7 @@ double dialog_ratio = .6;
#define SWM_BAR_MAX (128) #define SWM_BAR_MAX (128)
sig_atomic_t bar_alarm = 0; sig_atomic_t bar_alarm = 0;
int bar_enabled = 1; int bar_enabled = 1;
int bar_verbose = 1;
int bar_height = 0; int bar_height = 0;
GC bar_gc; GC bar_gc;
XGCValues bar_gcv; XGCValues bar_gcv;
@ -389,40 +390,39 @@ bad:
} }
void void
bar_print(void) bar_print(struct swm_region *r, char *s, int erase)
{
if (erase) {
XSetForeground(display, bar_gc, r->s->bar_color);
XDrawString(display, r->bar_window, bar_gc, 4, bar_fs->ascent,
r->s->bar_text, strlen(r->s->bar_text));
}
strlcpy(r->s->bar_text, s, sizeof r->s->bar_text);
XSetForeground(display, bar_gc, r->s->bar_font_color);
XDrawString(display, r->bar_window, bar_gc, 4, bar_fs->ascent,
r->s->bar_text, strlen(r->s->bar_text));
}
void
bar_update(void)
{ {
time_t tmt; time_t tmt;
struct tm tm; struct tm tm;
struct swm_region *tmpr; struct swm_region *r;
int i; int i;
char tmp[SWM_BAR_MAX]; char s[SWM_BAR_MAX];
if (bar_enabled == 0) if (bar_enabled == 0)
return; return;
/* clear old text */
for (i = 0; i < ScreenCount(display); i++)
TAILQ_FOREACH(tmpr, &screens[i].rl, entry) {
XSetForeground(display, bar_gc, tmpr->s->bar_color);
XDrawString(display, tmpr->bar_window,
bar_gc, 4, bar_fs->ascent, tmpr->s->bar_text,
strlen(tmpr->s->bar_text));
}
/* draw new text */ /* draw new text */
time(&tmt); time(&tmt);
localtime_r(&tmt, &tm); localtime_r(&tmt, &tm);
strftime(tmp, sizeof tmp, "%a %b %d %R %Z %Y", &tm); strftime(s, sizeof s, "%a %b %d %R %Z %Y", &tm);
for (i = 0; i < ScreenCount(display); i++) for (i = 0; i < ScreenCount(display); i++)
TAILQ_FOREACH(tmpr, &screens[i].rl, entry) { TAILQ_FOREACH(r, &screens[i].rl, entry)
XSetForeground(display, bar_gc, bar_print(r, s, 1);
tmpr->s->bar_font_color);
snprintf(tmpr->s->bar_text, sizeof tmpr->s->bar_text,
"%s %d", tmp, i);
XDrawString(display, tmpr->bar_window, bar_gc, 4,
bar_fs->ascent, tmpr->s->bar_text,
strlen(tmpr->s->bar_text));
}
XSync(display, False); XSync(display, False);
alarm(60); alarm(60);
@ -461,7 +461,7 @@ bar_toggle(struct swm_region *r, union arg *args)
/* must be after stack */ /* must be after stack */
for (i = 0; i < ScreenCount(display); i++) for (i = 0; i < ScreenCount(display); i++)
TAILQ_FOREACH(tmpr, &screens[i].rl, entry) TAILQ_FOREACH(tmpr, &screens[i].rl, entry)
bar_print(); bar_update();
} }
void void
@ -490,7 +490,7 @@ bar_setup(struct swm_region *r)
if (signal(SIGALRM, bar_signal) == SIG_ERR) if (signal(SIGALRM, bar_signal) == SIG_ERR)
err(1, "could not install bar_signal"); err(1, "could not install bar_signal");
bar_print(); bar_update();
} }
void void
@ -683,7 +683,6 @@ switchws(struct swm_region *r, union arg *args)
other_r = new_ws->r; other_r = new_ws->r;
if (!other_r) { if (!other_r) {
/* if the other workspace is hidden, switch windows */ /* if the other workspace is hidden, switch windows */
/* map new window first to prevent ugly blinking */ /* map new window first to prevent ugly blinking */
TAILQ_FOREACH(win, &new_ws->winlist, entry) TAILQ_FOREACH(win, &new_ws->winlist, entry)
XMapRaised(display, win->id); XMapRaised(display, win->id);
@ -1588,7 +1587,7 @@ visibilitynotify(XEvent *e)
for (i = 0; i < ScreenCount(display); i++) for (i = 0; i < ScreenCount(display); i++)
TAILQ_FOREACH(r, &screens[i].rl, entry) TAILQ_FOREACH(r, &screens[i].rl, entry)
if (e->xvisibility.window == r->bar_window) if (e->xvisibility.window == r->bar_window)
bar_print(); bar_update();
} }
void (*handler[LASTEvent])(XEvent *) = { void (*handler[LASTEvent])(XEvent *) = {
@ -1875,7 +1874,7 @@ main(int argc, char *argv[])
errx(1, "select failed"); errx(1, "select failed");
if (bar_alarm) { if (bar_alarm) {
bar_alarm = 0; bar_alarm = 0;
bar_print(); bar_update();
} }
while(XPending(display)) { while(XPending(display)) {
XNextEvent(display, &e); XNextEvent(display, &e);