X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=3387f6f6ddf6157c95e1548f196b2f1f352a0da8;hb=7d11bca214584f4b24501d494b59760e0a75cab1;hp=d160c47e5c3bf23d6320bcdedf98e6e4f26c0dbb;hpb=45ef141d5c94019c82cc1ea17b89c081b0037c91;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index d160c47..3387f6f 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -60,12 +61,15 @@ #include #include #include +#include #include +#include #include #include #include #include +#include #include #include @@ -85,7 +89,6 @@ #endif #endif -#define SWM_DEBUG /* #define SWM_DEBUG */ #ifdef SWM_DEBUG #define DPRINTF(x...) do { if (swm_debug) fprintf(stderr, x); } while(0) @@ -132,12 +135,14 @@ Display *display; /* 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-*-*-*-*-*-*-*-*-*-*", @@ -185,31 +190,26 @@ TAILQ_HEAD(ws_win_list, ws_win); /* layout handlers */ void stack(void); -void vertical_init(struct workspace *); -void vertical_resize(struct workspace *, int); +void vertical_config(struct workspace *, int); void vertical_stack(struct workspace *, struct swm_geometry *); -void horizontal_init(struct workspace *); -void horizontal_resize(struct workspace *, int); +void horizontal_config(struct workspace *, int); void horizontal_stack(struct workspace *, struct swm_geometry *); -void max_init(struct workspace *); void max_stack(struct workspace *, struct swm_geometry *); struct layout { - void (*l_init)(struct workspace *); /* init/reset */ void (*l_stack)(struct workspace *, struct swm_geometry *); - void (*l_resize)(struct workspace *, int); + void (*l_config)(struct workspace *, int); } layouts[] = { - /* init stack, resize */ - { vertical_init, vertical_stack, vertical_resize}, - { horizontal_init, horizontal_stack, horizontal_resize}, - { NULL, max_stack, NULL}, - { NULL, NULL, NULL}, + /* stack, configure */ + { vertical_stack, vertical_config}, + { horizontal_stack, horizontal_config}, + { max_stack, NULL}, + { NULL, NULL}, }; #define SWM_H_SLICE (32) #define SWM_V_SLICE (32) - /* define work spaces */ struct workspace { int idx; /* workspace index */ @@ -222,7 +222,9 @@ struct workspace { /* stacker state */ struct { int horizontal_msize; + int horizontal_mwin; int vertical_msize; + int vertical_mwin; } l_state; }; @@ -259,6 +261,10 @@ union arg { #define SWM_ARG_ID_SWAPMAIN (5) #define SWM_ARG_ID_MASTERSHRINK (6) #define SWM_ARG_ID_MASTERGROW (7) +#define SWM_ARG_ID_MASTERADD (8) +#define SWM_ARG_ID_MASTERDEL (9) +#define SWM_ARG_ID_STACKRESET (10) +#define SWM_ARG_ID_STACKINIT (11) char **argv; }; @@ -287,6 +293,32 @@ name_to_color(char *colorname) return (result); } +int +varmatch(char *var, char *name, int *index) +{ + char *p, buf[5]; + int i; + + i = strncmp(var, name, 255); + if (index == NULL) + return (i); + + *index = -1; + if (i <= 0) + return (i); + p = var + strlen(name); + if (*p++ != '[') + return (i); + bzero(buf, sizeof buf); + i = 0; + while (isdigit(*p) && i < sizeof buf) + buf[i++] = *p++; + if (i == 0 || i >= sizeof buf || *p != ']') + return (1); + *index = strtonum(buf, 0, 99, NULL); + return (0); +} + /* conf file stuff */ #define SWM_CONF_WS "\n= \t" #define SWM_CONF_FILE "scrotwm.conf" @@ -296,7 +328,7 @@ conf_load(char *filename) FILE *config; char *line, *cp, *var, *val; size_t len, lineno = 0; - int i; + int i, sc; DNPRINTF(SWM_D_MISC, "conf_load: filename %s\n", filename); @@ -306,7 +338,7 @@ conf_load(char *filename) if ((config = fopen(filename, "r")) == NULL) return (1); - for (;;) { + for (sc = ScreenCount(display);;) { if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL) if (feof(config)) break; @@ -328,18 +360,37 @@ conf_load(char *filename) case 'b': if (!strncmp(var, "bar_enabled", strlen("bar_enabled"))) bar_enabled = atoi(val); - else if (!strncmp(var, "bar_border", - strlen("bar_border"))) - for (i = 0; i < ScreenCount(display); i++) - screens[i].bar_border = name_to_color(val); - else if (!strncmp(var, "bar_color", - strlen("bar_color"))) - for (i = 0; i < ScreenCount(display); i++) - screens[i].bar_color = name_to_color(val); - else if (!strncmp(var, "bar_font_color", - strlen("bar_font_color"))) - for (i = 0; i < ScreenCount(display); i++) - screens[i].bar_font_color = name_to_color(val); + else if (!varmatch(var, "bar_border", &i)) + if (i > 0 && i <= sc) + screens[i - 1].bar_border = + name_to_color(val); + else if (i == -1) + for (i = 0; i < sc; i++) + screens[i].bar_border = + name_to_color(val); + else + goto badidx; + else if (!varmatch(var, "bar_color", &i)) + if (i > 0 && i <= sc) + screens[i - 1].bar_color = + name_to_color(val); + else if (i == -1) + for (i = 0; i < sc; i++) + screens[i].bar_color = + name_to_color(val); + else + goto badidx; + else if (!varmatch(var, "bar_font_color", &i)) + if (i > 0 && i <= sc) + screens[i - 1].bar_font_color = + name_to_color(val); + else if (i == -1) + for (i = 0; i < sc; i++) + screens[i].bar_font_color = + name_to_color(val); + else + goto badidx; + else if (!strncmp(var, "bar_font", strlen("bar_font"))) asprintf(&bar_fonts[0], "%s", val); else @@ -347,13 +398,26 @@ conf_load(char *filename) break; case 'c': - if (!strncmp(var, "color_focus", strlen("color_focus"))) - for (i = 0; i < ScreenCount(display); i++) - screens[i].color_focus = name_to_color(val); - else if (!strncmp(var, "color_unfocus", - strlen("color_unfocus"))) - for (i = 0; i < ScreenCount(display); i++) - screens[i].color_unfocus = name_to_color(val); + if (!varmatch(var, "color_focus", &i)) + if (i > 0 && i <= sc) + screens[i - 1].color_focus = + name_to_color(val); + else if (i == -1) + for (i = 0; i < sc; i++) + screens[i].color_focus = + name_to_color(val); + else + goto badidx; + else if (!varmatch(var, "color_unfocus", &i)) + if (i > 0 && i <= sc) + screens[i - 1].color_unfocus = + name_to_color(val); + else if (i == -1) + for (i = 0; i < sc; i++) + screens[i].color_unfocus = + name_to_color(val); + else + goto badidx; else goto bad; break; @@ -382,70 +446,81 @@ conf_load(char *filename) return (0); bad: errx(1, "invalid conf file entry: %s=%s", var, val); +badidx: + errx(1, "invalid screen index: %s out of bounds", var); } void -bar_print(struct swm_region *r) +bar_print(struct swm_region *r, char *s) +{ + XClearWindow(display, r->bar_window); + XSetForeground(display, bar_gc, r->s->bar_font_color); + XDrawString(display, r->bar_window, bar_gc, 4, bar_fs->ascent, s, + strlen(s)); +} + +void +bar_update(void) { time_t tmt; struct tm tm; - + struct swm_region *r; + int i, x; + char s[SWM_BAR_MAX]; + char e[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)); + strftime(s, sizeof s, "%a %b %d %R %Z %Y", &tm); + for (i = 0; i < ScreenCount(display); i++) { + x = 1; + TAILQ_FOREACH(r, &screens[i].rl, entry) { + snprintf(e, sizeof e, "%s %d:%d", + s, x++, r->ws->idx + 1); + bar_print(r, e); + } + } 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, sc = ScreenCount(display); DNPRINTF(SWM_D_MISC, "bar_toggle\n"); if (bar_enabled) { - for (i = 0; i < ScreenCount(display); i++) + for (i = 0; i < sc; i++) TAILQ_FOREACH(tmpr, &screens[i].rl, entry) XUnmapWindow(display, tmpr->bar_window); } else { - for (i = 0; i < ScreenCount(display); i++) + for (i = 0; i < sc; i++) TAILQ_FOREACH(tmpr, &screens[i].rl, entry) XMapRaised(display, tmpr->bar_window); } bar_enabled = !bar_enabled; XSync(display, False); - for (i = 0; i < ScreenCount(display); i++) + for (i = 0; i < sc; i++) for (j = 0; j < SWM_WS_MAX; j++) screens[i].ws[j].restack = 1; stack(); /* must be after stack */ - for (i = 0; i < ScreenCount(display); i++) + for (i = 0; i < sc; i++) TAILQ_FOREACH(tmpr, &screens[i].rl, entry) - bar_print(tmpr); + bar_update(); } void @@ -463,7 +538,7 @@ bar_setup(struct swm_region *r) 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); @@ -474,7 +549,25 @@ bar_setup(struct swm_region *r) if (signal(SIGALRM, bar_signal) == SIG_ERR) err(1, "could not install bar_signal"); - bar_print(r); + bar_update(); +} + +void +bar_refresh(void) +{ + XSetWindowAttributes wa; + struct swm_region *r; + int i; + + bzero(&wa, sizeof wa); + for (i = 0; i < ScreenCount(display); i++) + TAILQ_FOREACH(r, &screens[i].rl, entry) { + wa.border_pixel = screens[i].bar_border; + wa.background_pixel = screens[i].bar_color; + XChangeWindowAttributes(display, r->bar_window, + CWBackPixel | CWBorderPixel, &wa); + } + bar_update(); } void @@ -528,6 +621,11 @@ restart(struct swm_region *r, union arg *args) { 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"); @@ -660,10 +758,8 @@ switchws(struct swm_region *r, union arg *args) 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); @@ -685,6 +781,7 @@ switchws(struct swm_region *r, union arg *args) if (new_ws->focus) focus_win(new_ws->focus); stack(); + bar_update(); } void @@ -795,28 +892,18 @@ cycle_layout(struct swm_region *r, union arg *args) } void -resize_master(struct swm_region *r, union arg *args) +stack_config(struct swm_region *r, union arg *args) { struct workspace *ws = r->ws; - DNPRINTF(SWM_D_STACK, "resize_master for workspace %d (id %d\n", + DNPRINTF(SWM_D_STACK, "stack_config for workspace %d (id %d\n", args->id, ws->idx); - if (ws->cur_layout->l_resize != NULL) - ws->cur_layout->l_resize(ws, args->id); -} + if (ws->cur_layout->l_config != NULL) + ws->cur_layout->l_config(ws, args->id); -void -stack_reset(struct swm_region *r, union arg *args) -{ - struct workspace *ws = r->ws; - - DNPRINTF(SWM_D_STACK, "stack_reset: ws %d\n", ws->idx); - - if (ws->cur_layout->l_init != NULL) { - ws->cur_layout->l_init(ws); + if (args->id != SWM_ARG_ID_STACKINIT); stack(); - } } void @@ -873,36 +960,36 @@ stack_floater(struct ws_win *win, struct swm_region *r) XConfigureWindow(display, win->id, mask, &wc); } -int vertical_msize[SWM_WS_MAX]; void -vertical_init(struct workspace *ws) -{ - DNPRINTF(SWM_D_MISC, "vertical_init: workspace: %d\n", ws->idx); - - ws->l_state.vertical_msize = SWM_V_SLICE / 2; -} - -void -vertical_resize(struct workspace *ws, int id) +vertical_config(struct workspace *ws, int id) { DNPRINTF(SWM_D_STACK, "vertical_resize: workspace: %d\n", ws->idx); switch (id) { + case SWM_ARG_ID_STACKRESET: + case SWM_ARG_ID_STACKINIT: + ws->l_state.vertical_msize = SWM_V_SLICE / 2; + ws->l_state.vertical_mwin = 1; + break; case SWM_ARG_ID_MASTERSHRINK: - ws->l_state.vertical_msize--; - if (ws->l_state.vertical_msize < 1) - ws->l_state.vertical_msize = 1; + if (ws->l_state.vertical_msize > 1) + ws->l_state.vertical_msize--; break; case SWM_ARG_ID_MASTERGROW: - ws->l_state.vertical_msize++; - if (ws->l_state.vertical_msize > SWM_V_SLICE - 1) - ws->l_state.vertical_msize = SWM_V_SLICE - 1; + if (ws->l_state.vertical_msize < SWM_V_SLICE - 1) + ws->l_state.vertical_msize++; + break; + case SWM_ARG_ID_MASTERADD: + ws->l_state.vertical_mwin++; + break; + case SWM_ARG_ID_MASTERDEL: + if (ws->l_state.vertical_mwin > 0) + ws->l_state.vertical_mwin--; break; default: return; } - stack(); } void @@ -910,7 +997,7 @@ vertical_stack(struct workspace *ws, struct swm_geometry *g) { XWindowChanges wc; struct swm_geometry gg = *g; struct ws_win *win, *winfocus; - int i, hrh, winno, main_width; + int i, j, split, colno, hrh, winno, main_width; unsigned int mask; DNPRINTF(SWM_D_STACK, "vertical_stack: workspace: %d\n", ws->idx); @@ -922,35 +1009,38 @@ vertical_stack(struct workspace *ws, struct swm_geometry *g) { ws->focus = TAILQ_FIRST(&ws->winlist); winfocus = cur_focus ? cur_focus : ws->focus; - if (winno > 1) { + if (ws->l_state.vertical_mwin && + winno > ws->l_state.vertical_mwin) { + split = ws->l_state.vertical_mwin; + colno = split; main_width = (g->w / SWM_V_SLICE) * ws->l_state.vertical_msize; gg.w = main_width; + } else { + colno = winno; + split = 0; } + hrh = g->h / colno; + gg.h = hrh - 2; - if (winno > 2) - hrh = g->h / (winno - 1); - else - hrh = 0; - - i = 0; + i = j = 0; TAILQ_FOREACH(win, &ws->winlist, entry) { - if (i == 1) { + if (split && i == split) { + colno = winno - split; + hrh = (g->h / colno); gg.x += main_width + 2; gg.w = g->w - (main_width + 2); + gg.h = hrh - 2; + j = 0; } - if (i != 0 && hrh != 0) { - /* correct the last window for lost pixels */ - if (win == TAILQ_LAST(&ws->winlist, ws_win_list)) { - gg.h = hrh + (g->h - (i * hrh)); - gg.y += hrh; - } else { - gg.h = hrh - 2; - /* leave first right hand window at y = 0 */ - if (i > 1) - gg.y += gg.h + 2; - } - } + if (j == colno - 1) + gg.h = (hrh + (g->h - (colno * hrh))); + + if (j == 0) + gg.y = g->y; + else + gg.y += hrh; + if (win->transient != 0 || win->floating != 0) stack_floater(win, ws->r); @@ -967,6 +1057,7 @@ vertical_stack(struct workspace *ws, struct swm_geometry *g) { XMapRaised(display, win->id); i++; + j++; } if (winfocus) @@ -975,33 +1066,34 @@ vertical_stack(struct workspace *ws, struct swm_geometry *g) { void -horizontal_init(struct workspace *ws) +horizontal_config(struct workspace *ws, int id) { - DNPRINTF(SWM_D_STACK, "horizontal_init: workspace: %d\n", ws->idx); - - ws->l_state.horizontal_msize = SWM_H_SLICE / 2; -} - -void -horizontal_resize(struct workspace *ws, int id) -{ - DNPRINTF(SWM_D_STACK, "horizontal_resize: workspace: %d\n", ws->idx); + DNPRINTF(SWM_D_STACK, "horizontal_config: workspace: %d\n", ws->idx); switch (id) { + case SWM_ARG_ID_STACKRESET: + case SWM_ARG_ID_STACKINIT: + ws->l_state.horizontal_mwin = 1; + ws->l_state.horizontal_msize = SWM_H_SLICE / 2; + break; case SWM_ARG_ID_MASTERSHRINK: - ws->l_state.horizontal_msize--; - if (ws->l_state.horizontal_msize < 1) - ws->l_state.horizontal_msize = 1; + if (ws->l_state.horizontal_msize > 1) + ws->l_state.horizontal_msize--; break; case SWM_ARG_ID_MASTERGROW: - ws->l_state.horizontal_msize++; - if (ws->l_state.horizontal_msize > SWM_H_SLICE - 1) - ws->l_state.horizontal_msize = SWM_H_SLICE - 1; + if (ws->l_state.horizontal_msize < SWM_H_SLICE - 1) + ws->l_state.horizontal_msize++; + break; + case SWM_ARG_ID_MASTERADD: + ws->l_state.horizontal_mwin++; + break; + case SWM_ARG_ID_MASTERDEL: + if (ws->l_state.horizontal_mwin > 0) + ws->l_state.horizontal_mwin--; break; default: return; } - stack(); } void @@ -1009,7 +1101,7 @@ horizontal_stack(struct workspace *ws, struct swm_geometry *g) { XWindowChanges wc; struct swm_geometry gg = *g; struct ws_win *win, *winfocus; - int i, hrw, winno, main_height; + int i, j, split, rowno, hrw, winno, main_height; unsigned int mask; DNPRINTF(SWM_D_STACK, "horizontal_stack: workspace: %d\n", ws->idx); @@ -1021,35 +1113,37 @@ horizontal_stack(struct workspace *ws, struct swm_geometry *g) { ws->focus = TAILQ_FIRST(&ws->winlist); winfocus = cur_focus ? cur_focus : ws->focus; - if (winno > 1) { - main_height = (g->h / SWM_H_SLICE) * - ws->l_state.horizontal_msize; + if (ws->l_state.horizontal_mwin && + winno > ws->l_state.horizontal_mwin) { + split = ws->l_state.horizontal_mwin; + rowno = split; + main_height = (g->h / SWM_V_SLICE) * + ws->l_state.horizontal_msize; gg.h = main_height; + } else { + rowno = winno; + split = 0; } + hrw = g->w / rowno; + gg.w = hrw - 2; - if (winno > 2) - hrw = g->w / (winno - 1); - else - hrw = 0; - - i = 0; + i = j = 0; TAILQ_FOREACH(win, &ws->winlist, entry) { - if (i == 1) { + if (split && i == split) { + rowno = winno - split; + hrw = (g->w / rowno); gg.y += main_height + 2; gg.h = g->h - (main_height + 2); + gg.w = hrw - 2; + j = 0; } - if (i != 0 && hrw != 0) { - /* correct the last window for lost pixels */ - if (win == TAILQ_LAST(&ws->winlist, ws_win_list)) { - gg.w = hrw + (g->w - (i * hrw)); - gg.x += hrw; - } else { - gg.w = hrw - 2; - /* leave first bottom window at x = 0 */ - if (i > 1) - gg.x += gg.w + 2; - } - } + if (j == rowno - 1) + gg.w = (hrw + (g->w - (rowno * hrw))); + + if (j == 0) + gg.x = g->x; + else + gg.x += hrw; if (win->transient != 0 || win->floating != 0) stack_floater(win, ws->r); @@ -1065,6 +1159,7 @@ horizontal_stack(struct workspace *ws, struct swm_geometry *g) { } XMapRaised(display, win->id); + j++; i++; } @@ -1161,9 +1256,11 @@ struct key { } keys[] = { /* modifier key function argument */ { MODKEY, XK_space, cycle_layout, {0} }, - { MODKEY | ShiftMask, XK_space, stack_reset, {0} }, - { MODKEY, XK_h, resize_master, {.id = SWM_ARG_ID_MASTERSHRINK} }, - { MODKEY, XK_l, resize_master, {.id = SWM_ARG_ID_MASTERGROW} }, + { MODKEY | ShiftMask, XK_space, stack_config, {.id = SWM_ARG_ID_STACKRESET} }, + { MODKEY, XK_h, stack_config, {.id = SWM_ARG_ID_MASTERSHRINK} }, + { MODKEY, XK_l, stack_config, {.id = SWM_ARG_ID_MASTERGROW} }, + { MODKEY, XK_comma, stack_config, {.id = SWM_ARG_ID_MASTERADD} }, + { MODKEY, XK_period, stack_config, {.id = SWM_ARG_ID_MASTERDEL} }, { MODKEY, XK_Return, swapwin, {.id = SWM_ARG_ID_SWAPMAIN} }, { MODKEY, XK_j, focus, {.id = SWM_ARG_ID_FOCUSNEXT} }, { MODKEY, XK_k, focus, {.id = SWM_ARG_ID_FOCUSPREV} }, @@ -1232,9 +1329,9 @@ grabkeys(void) 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, @@ -1461,7 +1558,6 @@ destroynotify(XEvent *e) set_win_state(win, WithdrawnState); free(win); } - stack(); } @@ -1474,7 +1570,7 @@ enternotify(XEvent *e) 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) { @@ -1569,7 +1665,7 @@ visibilitynotify(XEvent *e) 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 *) = { @@ -1667,16 +1763,16 @@ void setup_screens(void) { #ifdef SWM_XRR_HAS_CRTC - XRRCrtcInfo *crtc_info; - XRRScreenResources *res; + XRRCrtcInfo *ci; + XRRScreenResources *sr; int c; #endif /* SWM_XRR_HAS_CRTC */ Window d1, d2, *wins = NULL; XWindowAttributes wa; struct swm_region *r; - unsigned int num; + unsigned int no; int errorbase, major, minor; - int ncrtc, w = 0; + int ncrtc = 0, w = 0; int i, j, k; struct workspace *ws; @@ -1710,10 +1806,10 @@ setup_screens(void) ws->r = NULL; TAILQ_INIT(&ws->winlist); - for (k = 0; layouts[k].l_stack != NULL; k++) { - if (layouts[k].l_init != NULL) - layouts[k].l_init(ws); - } + for (k = 0; layouts[k].l_stack != NULL; k++) + if (layouts[k].l_config != NULL) + layouts[k].l_config(ws, + SWM_ARG_ID_STACKINIT); ws->cur_layout = &layouts[0]; } @@ -1733,41 +1829,37 @@ setup_screens(void) #endif /* grab existing windows (before we build the bars)*/ - if (!XQueryTree(display, screens[i].root, - &d1, &d2, &wins, &num)) { - if (wins) /* not sure if this is necessary */ - XFree(wins); + if (!XQueryTree(display, screens[i].root, &d1, &d2, &wins, &no)) continue; - } #ifdef SWM_XRR_HAS_CRTC - res = XRRGetScreenResources(display, screens[i].root); - if (res == NULL) { - ncrtc = 0; + sr = XRRGetScreenResources(display, screens[i].root); + if (sr == NULL) new_region(&screens[i], &screens[i].ws[w], 0, 0, DisplayWidth(display, i), DisplayHeight(display, i)); - } else - ncrtc = res->ncrtc; + else + ncrtc = sr->ncrtc; for (c = 0; c < ncrtc; c++) { - crtc_info = XRRGetCrtcInfo(display, res, res->crtcs[c]); - if (crtc_info->noutput == 0) + ci = XRRGetCrtcInfo(display, sr, sr->crtcs[c]); + if (ci->noutput == 0) continue; - if (crtc_info != NULL && crtc_info->mode == None) - new_region(&screens[i], &screens[i].ws[w], - 0, 0, DisplayWidth(display, i), + if (ci != NULL && ci->mode == None) + new_region(&screens[i], &screens[i].ws[w], 0, 0, + DisplayWidth(display, i), DisplayHeight(display, i)); else new_region(&screens[i], &screens[i].ws[w], - crtc_info->x, crtc_info->y, - crtc_info->width, crtc_info->height); + ci->x, ci->y, ci->width, ci->height); w++; } + XRRFreeCrtcInfo(ci); + XRRFreeScreenResources(sr); #else - new_region(&screens[i], &screens[i].ws[w], - 0, 0, DisplayWidth(display, i), + new_region(&screens[i], &screens[i].ws[w], 0, 0, + DisplayWidth(display, i), DisplayHeight(display, i)); #endif /* SWM_XRR_HAS_CRTC */ @@ -1776,27 +1868,31 @@ setup_screens(void) if ((r = TAILQ_FIRST(&screens[i].rl)) == NULL) errx(1, "no regions on screen %d", i); - for (i = 0; i < num; i++) { + for (i = 0; i < no; i++) { XGetWindowAttributes(display, wins[i], &wa); if (!XGetWindowAttributes(display, wins[i], &wa) || wa.override_redirect || XGetTransientForHint(display, wins[i], &d1)) continue; + if (wa.map_state == IsViewable || getstate(wins[i]) == NormalState) manage_window(wins[i], r->ws); } /* transient windows */ - for (i = 0; i < num; i++) { + for (i = 0; i < no; i++) { if (!XGetWindowAttributes(display, wins[i], &wa)) continue; + if (XGetTransientForHint(display, wins[i], &d1) && (wa.map_state == IsViewable || getstate(wins[i]) == NormalState)) manage_window(wins[i], r->ws); } - if (wins) + if (wins) { XFree(wins); + wins = NULL; + } } } @@ -1807,6 +1903,8 @@ main(int argc, char *argv[]) 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); @@ -1826,6 +1924,8 @@ main(int argc, char *argv[]) if (pwd == NULL) errx(1, "invalid user %d", getuid()); + setup_screens(); + snprintf(conf, sizeof conf, "%s/.%s", pwd->pw_dir, SWM_CONF_FILE); if (stat(conf, &sb) != -1) { if (S_ISREG(sb.st_mode)) @@ -1839,18 +1939,28 @@ main(int argc, char *argv[]) } if (cfile) conf_load(cfile); + bar_refresh(); - setup_screens(); - - //ws[0].focus = TAILQ_FIRST(&ws[0].winlist); + /* ws[0].focus = TAILQ_FIRST(&ws[0].winlist); */ 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);