#include <stdio.h>
#include <stdlib.h>
#include <err.h>
+#include <errno.h>
#include <locale.h>
#include <unistd.h>
#include <time.h>
#include <pwd.h>
#include <sys/types.h>
+#include <sys/time.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/queue.h>
#include <sys/param.h>
+#include <sys/select.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
/* dialog windows */
double dialog_ratio = .6;
/* status bar */
+#define SWM_BAR_MAX (128)
+sig_atomic_t bar_alarm = 0;
int bar_enabled = 1;
+int bar_verbose = 1;
int bar_height = 0;
GC bar_gc;
XGCValues bar_gcv;
XFontStruct *bar_fs;
-char bar_text[128];
char *bar_fonts[] = {
"-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*",
"-*-times-medium-r-*-*-*-*-*-*-*-*-*-*",
unsigned long bar_font_color;
unsigned long color_focus; /* XXX should this be per ws? */
unsigned long color_unfocus;
+ char bar_text[SWM_BAR_MAX];
};
struct swm_screen *screens;
int num_screens;
}
void
-bar_print(struct swm_region *r)
+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;
struct tm tm;
-
+ struct swm_region *r;
+ int i;
+ char s[SWM_BAR_MAX];
+
if (bar_enabled == 0)
return;
- /* clear old text */
- XSetForeground(display, bar_gc, r->s->bar_color);
- XDrawString(display, r->bar_window,
- bar_gc, 4, bar_fs->ascent, bar_text, strlen(bar_text));
-
/* draw new text */
time(&tmt);
localtime_r(&tmt, &tm);
- strftime(bar_text, sizeof bar_text, "%a %b %d %R %Z %Y", &tm);
- XSetForeground(display, bar_gc, r->s->bar_font_color);
- XDrawString(display, r->bar_window, bar_gc, 4,
- bar_fs->ascent, bar_text, strlen(bar_text));
- XSync(display, False);
+ strftime(s, sizeof s, "%a %b %d %R %Z %Y", &tm);
+ for (i = 0; i < ScreenCount(display); i++)
+ TAILQ_FOREACH(r, &screens[i].rl, entry)
+ bar_print(r, s, 1);
+ XSync(display, False);
alarm(60);
}
void
bar_signal(int sig)
{
- /* XXX yeah yeah byte me */
- if (cur_focus)
- bar_print(cur_focus->ws->r);
+ bar_alarm = 1;
}
void
bar_toggle(struct swm_region *r, union arg *args)
{
- struct swm_region *tmpr;
- int i, j;
+ struct swm_region *tmpr;
+ int i, j;
DNPRINTF(SWM_D_MISC, "bar_toggle\n");
/* must be after stack */
for (i = 0; i < ScreenCount(display); i++)
TAILQ_FOREACH(tmpr, &screens[i].rl, entry)
- bar_print(tmpr);
+ bar_update();
}
void
bar_height = bar_fs->ascent + bar_fs->descent + 3;
r->bar_window = XCreateSimpleWindow(display,
- r->s->root, X(r), Y(r), WIDTH(r), bar_height - 2,
+ r->s->root, X(r), Y(r), WIDTH(r) - 2, bar_height - 2,
1, r->s->bar_border, r->s->bar_color);
bar_gc = XCreateGC(display, r->bar_window, 0, &bar_gcv);
XSetFont(display, bar_gc, bar_fs->fid);
if (signal(SIGALRM, bar_signal) == SIG_ERR)
err(1, "could not install bar_signal");
- bar_print(r);
+ bar_update();
}
void
{
DNPRINTF(SWM_D_MISC, "restart: %s\n", start_argv[0]);
+ /* disable alarm because the following code may not be interrupted */
+ alarm(0);
+ if (signal(SIGALRM, SIG_IGN) == SIG_ERR)
+ errx(1, "can't disable alarm");
+
XCloseDisplay(display);
execvp(start_argv[0], start_argv);
fprintf(stderr, "execvp failed\n");
return;
other_r = new_ws->r;
- fprintf(stderr, "switchws: other_r %p\n", other_r);
if (!other_r) {
/* if the other workspace is hidden, switch windows */
-
/* map new window first to prevent ugly blinking */
TAILQ_FOREACH(win, &new_ws->winlist, entry)
XMapRaised(display, win->id);
if (TAILQ_EMPTY(&screens[k].rl))
continue;
XUngrabKey(display, AnyKey, AnyModifier, screens[k].root);
- for(i = 0; i < LENGTH(keys); i++) {
- if((code = XKeysymToKeycode(display, keys[i].keysym)))
- for(j = 0; j < LENGTH(modifiers); j++)
+ for (i = 0; i < LENGTH(keys); i++) {
+ if ((code = XKeysymToKeycode(display, keys[i].keysym)))
+ for (j = 0; j < LENGTH(modifiers); j++)
XGrabKey(display, code,
keys[i].mod | modifiers[j],
screens[k].root, True,
set_win_state(win, WithdrawnState);
free(win);
}
-
stack();
}
DNPRINTF(SWM_D_EVENT, "enternotify: window: %lu\n", ev->window);
- if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) &&
+ if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) &&
ev->window != ev->root)
return;
if (ignore_enter) {
for (i = 0; i < ScreenCount(display); i++)
TAILQ_FOREACH(r, &screens[i].rl, entry)
if (e->xvisibility.window == r->bar_window)
- bar_print(r);
+ bar_update();
}
void (*handler[LASTEvent])(XEvent *) = {
char conf[PATH_MAX], *cfile = NULL;
struct stat sb;
XEvent e;
+ int xfd;
+ fd_set rd;
start_argv = argv;
fprintf(stderr, "Welcome to scrotwm V%s\n", SWM_VERSION);
grabkeys();
stack();
+ xfd = ConnectionNumber(display);
while (running) {
- XNextEvent(display, &e);
- if (handler[e.type])
- handler[e.type](&e);
+ FD_SET(xfd, &rd);
+ if (select(xfd + 1, &rd, NULL, NULL, NULL) == -1)
+ if (errno != EINTR)
+ errx(1, "select failed");
+ if (bar_alarm) {
+ bar_alarm = 0;
+ bar_update();
+ }
+ while(XPending(display)) {
+ XNextEvent(display, &e);
+ if (handler[e.type])
+ handler[e.type](&e);
+ }
}
XCloseDisplay(display);
Got questions, comments, patches, etc.? Contact Jason Woofenden