#include <stdlib.h>
#include <err.h>
#include <errno.h>
+#include <fcntl.h>
#include <locale.h>
#include <unistd.h>
#include <time.h>
#include <string.h>
#include <util.h>
#include <pwd.h>
+#include <ctype.h>
#include <sys/types.h>
#include <sys/time.h>
#define SWM_D_FOCUS 0x0008
#define SWM_D_MOVE 0x0010
#define SWM_D_STACK 0x0020
+#define SWM_D_MOUSE 0x0040
u_int32_t swm_debug = 0
| SWM_D_MISC
#define DNPRINTF(n,x...)
#endif
-#define LENGTH(x) (sizeof x / sizeof x[0])
+#define LENGTH(x) (sizeof x / sizeof x[0])
#define MODKEY Mod1Mask
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define X(r) (r)->g.x
#define Y(r) (r)->g.y
unsigned int numlockmask = 0;
Display *display;
+int cycle_empty = 0;
+int cycle_visible = 0;
+
/* dialog windows */
double dialog_ratio = .6;
/* status bar */
#define SWM_BAR_MAX (128)
+char *bar_argv[] = { NULL, NULL };
+int bar_pipe[2];
+char bar_ext[SWM_BAR_MAX];
sig_atomic_t bar_alarm = 0;
int bar_enabled = 1;
+int bar_extra = 1;
+int bar_extra_running = 0;
+int bar_verbose = 1;
int bar_height = 0;
+pid_t bar_pid;
GC bar_gc;
XGCValues bar_gcv;
+int bar_fidx = 0;
XFontStruct *bar_fs;
char *bar_fonts[] = {
"-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*",
};
/* terminal + args */
-char *spawn_term[] = { "xterm", NULL };
-char *spawn_menu[] = { "dmenu_run", NULL };
+char *spawn_term[] = { "xterm", NULL };
+char *spawn_menu[] = { "dmenu_run", "-fn", NULL,
+ "-nb", NULL, "-nf", NULL, "-sb", NULL, "-sf", NULL, NULL };
+
+#define SWM_MENU_FN (2)
+#define SWM_MENU_NB (4)
+#define SWM_MENU_NF (6)
+#define SWM_MENU_SB (8)
+#define SWM_MENU_SF (10)
/* layout manager data */
struct swm_geometry {
TAILQ_ENTRY(ws_win) entry;
Window id;
struct swm_geometry g;
- int focus;
+ int got_focus;
int floating;
int transient;
struct workspace *ws; /* always valid */
/* 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 *);
+void grabbuttons(struct ws_win *, int);
+
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 */
/* stacker state */
struct {
int horizontal_msize;
+ int horizontal_mwin;
int vertical_msize;
+ int vertical_mwin;
} l_state;
};
+enum { SWM_S_COLOR_BAR, SWM_S_COLOR_BAR_BORDER, SWM_S_COLOR_BAR_FONT,
+ SWM_S_COLOR_FOCUS, SWM_S_COLOR_UNFOCUS, SWM_S_COLOR_MAX };
+
/* physical screen mapping */
#define SWM_WS_MAX (10) /* XXX Too small? */
struct swm_screen {
struct workspace ws[SWM_WS_MAX];
/* colors */
- unsigned long bar_border;
- unsigned long bar_color;
- 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 {
+ unsigned long color;
+ char *name;
+ } c[SWM_S_COLOR_MAX];
};
struct swm_screen *screens;
int num_screens;
-Window rootclick = 0;
struct ws_win *cur_focus = NULL;
#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)
+#define SWM_ARG_ID_CYCLEWS_UP (12)
+#define SWM_ARG_ID_CYCLEWS_DOWN (13)
char **argv;
};
return (result);
}
+void
+setscreencolor(char *val, int i, int c)
+{
+ if (i > 0 && i <= ScreenCount(display)) {
+ screens[i - 1].c[c].color = name_to_color(val);
+ if ((screens[i - 1].c[c].name = strdup(val)) == NULL)
+ errx(1, "strdup");
+ } else if (i == -1) {
+ for (i = 0; i < ScreenCount(display); i++)
+ screens[i].c[c].color = name_to_color(val);
+ if ((screens[i - 1].c[c].name = strdup(val)) == NULL)
+ errx(1, "strdup");
+ } else
+ errx(1, "invalid screen index: %d out of bounds (maximum %d)\n",
+ i, ScreenCount(display));
+}
+
+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"
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);
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;
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))
+ setscreencolor(var, i, SWM_S_COLOR_BAR_BORDER);
+ else if (!varmatch(var, "bar_color", &i))
+ setscreencolor(var, i, SWM_S_COLOR_BAR);
+ else if (!varmatch(var, "bar_font_color", &i))
+ setscreencolor(var, i, SWM_S_COLOR_BAR_FONT);
else if (!strncmp(var, "bar_font", strlen("bar_font")))
asprintf(&bar_fonts[0], "%s", val);
+ else if (!strncmp(var, "bar_action", strlen("bar_action")))
+ asprintf(&bar_argv[0], "%s", val);
else
goto bad;
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))
+ setscreencolor(var, i, SWM_S_COLOR_FOCUS);
+ else if (!varmatch(var, "color_unfocus", &i))
+ setscreencolor(var, i, SWM_S_COLOR_UNFOCUS);
+ else if (!strncmp(var, "cycle_empty", strlen("cycle_empty")))
+ cycle_visible = atoi(val);
+ else if (!strncmp(var, "cycle_visible", strlen("cycle_visible")))
+ cycle_visible = atoi(val);
else
goto bad;
break;
fclose(config);
return (0);
+
bad:
errx(1, "invalid conf file entry: %s=%s", var, val);
}
void
-bar_print(void)
+socket_setnonblock(int fd)
+{
+ int flags;
+
+ if ((flags = fcntl(fd, F_GETFL, 0)) == -1)
+ err(1, "fcntl F_GETFL");
+ flags |= O_NONBLOCK;
+ if ((flags = fcntl(fd, F_SETFL, flags)) == -1)
+ err(1, "fcntl F_SETFL");
+}
+
+void
+bar_print(struct swm_region *r, char *s)
+{
+ XClearWindow(display, r->bar_window);
+ XSetForeground(display, bar_gc, r->s->c[SWM_S_COLOR_BAR_FONT].color);
+ XDrawString(display, r->bar_window, bar_gc, 4, bar_fs->ascent, s,
+ strlen(s));
+}
+
+void
+bar_extra_stop(void)
+{
+ if (bar_pipe[0]) {
+ close(bar_pipe[0]);
+ bzero(bar_pipe, sizeof bar_pipe);
+ }
+ if (bar_pid) {
+ kill(bar_pid, SIGTERM);
+ bar_pid = 0;
+ }
+ strlcpy(bar_ext, "", sizeof bar_ext);
+ bar_extra = 0;
+}
+
+void
+bar_update(void)
{
time_t tmt;
struct tm tm;
- struct swm_region *tmpr;
- int i;
- char tmp[SWM_BAR_MAX];
-
+ struct swm_region *r;
+ int i, x;
+ size_t len;
+ char s[SWM_BAR_MAX];
+ char loc[SWM_BAR_MAX];
+ char *b;
+
if (bar_enabled == 0)
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));
+ if (bar_extra && bar_extra_running) {
+ /* ignore short reads; it'll correct itself */
+ while ((b = fgetln(stdin, &len)) != NULL)
+ if (b && b[len - 1] == '\n') {
+ b[len - 1] = '\0';
+ strlcpy(bar_ext, b, sizeof bar_ext);
+ }
+ if (b == NULL && errno != EAGAIN) {
+ fprintf(stderr, "bar_extra failed: errno: %d %s\n",
+ errno, strerror(errno));
+ bar_extra_stop();
}
+ } else
+ strlcpy(bar_ext, "", sizeof bar_ext);
- /* draw new text */
time(&tmt);
localtime_r(&tmt, &tm);
- strftime(tmp, sizeof tmp, "%a %b %d %R %Z %Y", &tm);
- for (i = 0; i < ScreenCount(display); i++)
- TAILQ_FOREACH(tmpr, &screens[i].rl, entry) {
- XSetForeground(display, bar_gc,
- 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));
+ 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(loc, sizeof loc, "%s %d:%d %s",
+ s, x++, r->ws->idx + 1, bar_ext);
+ bar_print(r, loc);
}
-
+ }
XSync(display, False);
+
alarm(60);
}
bar_toggle(struct swm_region *r, union arg *args)
{
struct swm_region *tmpr;
- int i, j;
+ 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();
+ bar_update();
+}
+
+void
+bar_refresh(void)
+{
+ XSetWindowAttributes wa;
+ struct swm_region *r;
+ int i;
+
+ /* do this here because the conf file is in memory */
+ if (bar_extra && bar_extra_running == 0 && bar_argv[0]) {
+ /* launch external status app */
+ bar_extra_running = 1;
+ if (pipe(bar_pipe) == -1)
+ err(1, "pipe error");
+ socket_setnonblock(bar_pipe[0]);
+ socket_setnonblock(bar_pipe[1]); /* XXX hmmm, really? */
+ if (dup2(bar_pipe[0], 0) == -1)
+ errx(1, "dup2");
+ if (dup2(bar_pipe[1], 1) == -1)
+ errx(1, "dup2");
+ if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
+ err(1, "could not disable SIGPIPE");
+ switch (bar_pid = fork()) {
+ case -1:
+ err(1, "cannot fork");
+ break;
+ case 0: /* child */
+ close(bar_pipe[0]);
+ execvp(bar_argv[0], bar_argv);
+ err(1, "%s external app failed", bar_argv[0]);
+ break;
+ default: /* parent */
+ close(bar_pipe[1]);
+ break;
+ }
+ }
+
+ bzero(&wa, sizeof wa);
+ for (i = 0; i < ScreenCount(display); i++)
+ TAILQ_FOREACH(r, &screens[i].rl, entry) {
+ wa.border_pixel =
+ screens[i].c[SWM_S_COLOR_BAR_BORDER].color;
+ wa.background_pixel =
+ screens[i].c[SWM_S_COLOR_BAR].color;
+ XChangeWindowAttributes(display, r->bar_window,
+ CWBackPixel | CWBorderPixel, &wa);
+ }
+ bar_update();
}
void
for (i = 0; bar_fonts[i] != NULL; i++) {
bar_fs = XLoadQueryFont(display, bar_fonts[i]);
- if (bar_fs)
+ if (bar_fs) {
+ bar_fidx = i;
break;
+ }
}
if (bar_fonts[i] == NULL)
errx(1, "couldn't load font");
r->bar_window = XCreateSimpleWindow(display,
r->s->root, X(r), Y(r), WIDTH(r) - 2, bar_height - 2,
- 1, r->s->bar_border, r->s->bar_color);
+ 1, r->s->c[SWM_S_COLOR_BAR_BORDER].color,
+ r->s->c[SWM_S_COLOR_BAR].color);
bar_gc = XCreateGC(display, r->bar_window, 0, &bar_gcv);
XSetFont(display, bar_gc, bar_fs->fid);
XSelectInput(display, r->bar_window, VisibilityChangeMask);
if (signal(SIGALRM, bar_signal) == SIG_ERR)
err(1, "could not install bar_signal");
- bar_print();
+ bar_refresh();
}
void
if (signal(SIGALRM, SIG_IGN) == SIG_ERR)
errx(1, "can't disable alarm");
+ bar_extra_stop();
+ bar_extra = 1;
XCloseDisplay(display);
execvp(start_argv[0], start_argv);
fprintf(stderr, "execvp failed\n");
if (screens[i].root == root)
break;
- if (rootclick != root && /* if root was just clicked in, use cursor */
- cur_focus && cur_focus->ws->r && cur_focus->s == &screens[i])
- r = cur_focus->ws->r;
- else {
- if (XQueryPointer(display, screens[i].root,
- &rr, &cr, &x, &y, &wx, &wy, &mask) == False) {
- r = TAILQ_FIRST(&screens[i].rl);
- } else {
- TAILQ_FOREACH(r, &screens[i].rl, entry) {
- if (x > X(r) && x < X(r) + WIDTH(r) &&
- y > Y(r) && y < Y(r) + HEIGHT(r))
- break;
- }
-
- if (r == NULL)
- r = TAILQ_FIRST(&screens[i].rl);
+ if (XQueryPointer(display, screens[i].root,
+ &rr, &cr, &x, &y, &wx, &wy, &mask) == False) {
+ /* if we can't query the pointer, grab the first region */
+ r = TAILQ_FIRST(&screens[i].rl);
+ } else {
+ /* otherwise, choose a region based on pointer location */
+ TAILQ_FOREACH(r, &screens[i].rl, entry) {
+ if (x > X(r) && x < X(r) + WIDTH(r) &&
+ y > Y(r) && y < Y(r) + HEIGHT(r))
+ break;
}
+
+ if (r == NULL)
+ r = TAILQ_FIRST(&screens[i].rl);
}
return (r);
}
wait(0);
}
+
void
-unfocus_win(struct ws_win *win)
+spawnmenu(struct swm_region *r, union arg *args)
{
- DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %lu\n", win->id);
- if (win->ws->r && win->focus)
- XSetWindowBorder(display, win->id,
- win->ws->r->s->color_unfocus);
- win->focus = 0;
- if (win->ws->focus == win)
- win->ws->focus = NULL;
- if (cur_focus == win)
- cur_focus = NULL;
+ DNPRINTF(SWM_D_MISC, "spawnmenu\n");
+
+ spawn_menu[SWM_MENU_FN] = bar_fonts[bar_fidx];
+ spawn_menu[SWM_MENU_NB] = r->s->c[SWM_S_COLOR_BAR].name;
+ spawn_menu[SWM_MENU_NF] = r->s->c[SWM_S_COLOR_BAR_FONT].name;
+ spawn_menu[SWM_MENU_SB] = r->s->c[SWM_S_COLOR_BAR_BORDER].name;
+ spawn_menu[SWM_MENU_SF] = r->s->c[SWM_S_COLOR_BAR].name;
+
+ spawn(r, args);
}
+void
+unfocus_all(void)
+{
+ struct ws_win *win;
+ int i, j;
+
+ DNPRINTF(SWM_D_FOCUS, "unfocus_all:\n");
+
+ for (i = 0; i < ScreenCount(display); i++)
+ for (j = 0; j < SWM_WS_MAX; j++)
+ TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) {
+ if (win->ws->r == NULL)
+ continue;
+ grabbuttons(win, 0);
+ XSetWindowBorder(display, win->id,
+ win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);
+ win->got_focus = 0;
+ win->ws->focus = NULL;
+ cur_focus = NULL;
+ }
+}
void
focus_win(struct ws_win *win)
{
- DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win->id);
+ DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win ? win->id : 0);
- rootclick = 0;
+ if (win == NULL)
+ return;
+ unfocus_all();
win->ws->focus = win;
if (win->ws->r != NULL) {
- if (cur_focus && cur_focus != win)
- unfocus_win(cur_focus);
cur_focus = win;
- if (!win->focus)
+ if (!win->got_focus) {
XSetWindowBorder(display, win->id,
- win->ws->r->s->color_focus);
- win->focus = 1;
+ win->ws->r->s->c[SWM_S_COLOR_FOCUS].color);
+ grabbuttons(win, 1);
+ }
+ win->got_focus = 1;
XSetInputFocus(display, win->id,
RevertToPointerRoot, CurrentTime);
}
other_r = new_ws->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 (new_ws->focus)
focus_win(new_ws->focus);
stack();
+ bar_update();
+}
+
+void
+cyclews(struct swm_region *r, union arg *args)
+{
+ union arg a;
+ struct swm_screen *s = r->s;
+
+ DNPRINTF(SWM_D_WS, "cyclews id %d "
+ "in screen %d region %dx%d+%d+%d ws %d\n", args->id,
+ r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r), r->ws->idx);
+
+ a.id = r->ws->idx;
+
+ do {
+ switch (args->id) {
+ case SWM_ARG_ID_CYCLEWS_UP:
+ if (a.id < SWM_WS_MAX - 1)
+ a.id++;
+ else
+ a.id = 0;
+ break;
+ case SWM_ARG_ID_CYCLEWS_DOWN:
+ if (a.id > 0)
+ a.id--;
+ else
+ a.id = SWM_WS_MAX - 1;
+ break;
+ default:
+ return;
+ };
+
+ if (cycle_empty == 0 && TAILQ_EMPTY(&s->ws[a.id].winlist))
+ continue;
+ if (cycle_visible == 0 && s->ws[a.id].r != NULL)
+ continue;
+
+ switchws(r, &a);
+ } while (a.id != r->ws->idx);
}
void
}
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);
-}
-
-void
-stack_reset(struct swm_region *r, union arg *args)
-{
- struct workspace *ws = r->ws;
+ if (ws->cur_layout->l_config != NULL)
+ ws->cur_layout->l_config(ws, args->id);
- 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
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
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);
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);
XMapRaised(display, win->id);
i++;
+ j++;
}
if (winfocus)
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
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);
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);
}
XMapRaised(display, win->id);
+ j++;
i++;
}
} 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} },
{ MODKEY | ShiftMask, XK_j, swapwin, {.id = SWM_ARG_ID_SWAPNEXT} },
{ MODKEY | ShiftMask, XK_k, swapwin, {.id = SWM_ARG_ID_SWAPPREV} },
{ MODKEY | ShiftMask, XK_Return, spawn, {.argv = spawn_term} },
- { MODKEY, XK_p, spawn, {.argv = spawn_menu} },
+ { MODKEY, XK_p, spawnmenu, {.argv = spawn_menu} },
{ MODKEY | ShiftMask, XK_q, quit, {0} },
{ MODKEY, XK_q, restart, {0} },
{ MODKEY, XK_m, focus, {.id = SWM_ARG_ID_FOCUSMAIN} },
{ MODKEY, XK_8, switchws, {.id = 7} },
{ MODKEY, XK_9, switchws, {.id = 8} },
{ MODKEY, XK_0, switchws, {.id = 9} },
+ { MODKEY, XK_Right, cyclews, {.id = SWM_ARG_ID_CYCLEWS_UP} },
+ { MODKEY, XK_Left, cyclews, {.id = SWM_ARG_ID_CYCLEWS_DOWN} },
{ MODKEY | ShiftMask, XK_1, send_to_ws, {.id = 0} },
{ MODKEY | ShiftMask, XK_2, send_to_ws, {.id = 1} },
{ MODKEY | ShiftMask, XK_3, send_to_ws, {.id = 2} },
{ MODKEY | ShiftMask, XK_Tab, focus, {.id = SWM_ARG_ID_FOCUSPREV} },
};
+void
+click(struct swm_region *r, union arg *args)
+{
+ DNPRINTF(SWM_D_MOUSE, "click: button: %d\n", args->id);
+
+ switch (args->id) {
+ case Button1:
+ break;
+ case Button2:
+ break;
+ case Button3:
+ break;
+ default:
+ return;
+ }
+}
+
+/* mouse */
+enum { client_click, root_click };
+struct button {
+ unsigned int action;
+ unsigned int mask;
+ unsigned int button;
+ void (*func)(struct swm_region *r, union arg *);
+ union arg args;
+} buttons[] = {
+ /* action key mouse button func args */
+ { client_click, MODKEY, Button1, click, {.id=Button1} },
+};
+
void
updatenumlockmask(void)
{
}
}
}
+
+void
+grabbuttons(struct ws_win *win, int focused)
+{
+ unsigned int i, j;
+ unsigned int modifiers[] =
+ { 0, LockMask, numlockmask, numlockmask|LockMask };
+
+ updatenumlockmask();
+ XUngrabButton(display, AnyButton, AnyModifier, win->id);
+ if(focused) {
+ for (i = 0; i < LENGTH(buttons); i++)
+ if (buttons[i].action == client_click)
+ for (j = 0; j < LENGTH(modifiers); j++)
+ XGrabButton(display, buttons[i].button,
+ buttons[i].mask | modifiers[j],
+ win->id, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None,
+ None);
+ } else
+ XGrabButton(display, AnyButton, AnyModifier, win->id, False,
+ BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+}
+
void
expose(XEvent *e)
{
buttonpress(XEvent *e)
{
XButtonPressedEvent *ev = &e->xbutton;
-#ifdef SWM_CLICKTOFOCUS
+
struct ws_win *win;
- struct workspace *ws;
- struct swm_region *r;
-#endif
+ int i, action;
DNPRINTF(SWM_D_EVENT, "buttonpress: window: %lu\n", ev->window);
- if (ev->window == ev->root) {
- rootclick = ev->root;
- return;
- }
- if (ev->window == cur_focus->id)
+ action = root_click;
+ if ((win = find_window(ev->window)) == NULL)
return;
-#ifdef SWM_CLICKTOFOCUS
- r = root_to_region(ev->root);
- ws = r->ws;
- TAILQ_FOREACH(win, &ws->winlist, entry)
- if (win->id == ev->window) {
- /* focus in the clicked window */
- XSetWindowBorder(display, ev->window, 0xff0000);
- XSetWindowBorder(display, ws->focus->id, 0x888888);
- XSetInputFocus(display, ev->window, RevertToPointerRoot,
- CurrentTime);
- ws->focus = win;
- XSync(display, False);
- break;
+ else {
+ focus_win(win);
+ action = client_click;
}
-#endif
+
+ for (i = 0; i < LENGTH(buttons); i++)
+ if (action == buttons[i].action && buttons[i].func &&
+ buttons[i].button == ev->button &&
+ CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+ buttons[i].func(root_to_region(ev->root),
+ &buttons[i].args);
}
void
{
struct ws_win *win;
XDestroyWindowEvent *ev = &e->xdestroywindow;
+ struct workspace *ws;
DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window);
if ((win = find_window(ev->window)) != NULL) {
- struct workspace *ws = win->ws;
+ ws = win->ws;
/* find a window to focus */
if (ws->focus == win)
ws->focus = TAILQ_PREV(win, ws_win_list, entry);
ws->focus = TAILQ_FIRST(&ws->winlist);
if (ws->focus == win)
ws->focus = NULL;
- if (cur_focus == win) {
- if (ws->focus == NULL)
- unfocus_win(win); /* XXX focus another ws? */
- else
- focus_win(ws->focus);
- }
+ if (cur_focus == win)
+ focus_win(ws->focus);
TAILQ_REMOVE(&ws->winlist, win, entry);
set_win_state(win, WithdrawnState);
{
XCrossingEvent *ev = &e->xcrossing;
struct ws_win *win;
- int i, j;
DNPRINTF(SWM_D_EVENT, "enternotify: window: %lu\n", ev->window);
- if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) &&
- ev->window != ev->root)
- return;
if (ignore_enter) {
/* eat event(r) to prevent autofocus */
ignore_enter--;
return;
}
- /* brute force for now */
- for (i = 0; i < ScreenCount(display); i++) {
- for (j = 0; j < SWM_WS_MAX; j++) {
- TAILQ_FOREACH(win, &screens[i].ws[j].winlist , entry) {
- if (win->id == ev->window)
- focus_win(win);
- }
- }
- }
+
+ if ((win = find_window(ev->window)) != NULL)
+ focus_win(win);
}
void
focusin(XEvent *e)
{
DNPRINTF(SWM_D_EVENT, "focusin: window: %lu\n", e->xfocus.window);
-
- /* XXX this probably needs better handling now.
- if (ev->window == ev->root)
- return;
- */
- /*
- * kill grab for now so that we can cut and paste , this screws up
- * click to focus
- */
- /*
- DNPRINTF(SWM_D_EVENT, "focusin: window: %lu grabbing\n", ev->window);
- XGrabButton(display, Button1, AnyModifier, ev->window, False,
- ButtonPress, GrabModeAsync, GrabModeSync, None, None);
- */
}
void
for (i = 0; i < ScreenCount(display); i++)
TAILQ_FOREACH(r, &screens[i].rl, entry)
if (e->xvisibility.window == r->bar_window)
- bar_print();
+ bar_update();
}
void (*handler[LASTEvent])(XEvent *) = {
screens[i].idx = i;
TAILQ_INIT(&screens[i].rl);
screens[i].root = RootWindow(display, i);
- XGetWindowAttributes(display, screens[i].root, &wa);
- XSelectInput(display, screens[i].root,
- ButtonPressMask | wa.your_event_mask);
/* set default colors */
- screens[i].color_focus = name_to_color("red");
- screens[i].color_unfocus = name_to_color("rgb:88/88/88");
- screens[i].bar_border = name_to_color("rgb:00/80/80");
- screens[i].bar_color = name_to_color("black");
- screens[i].bar_font_color = name_to_color("rgb:a0/a0/a0");
+ setscreencolor("red", i + 1, SWM_S_COLOR_FOCUS);
+ setscreencolor("rgb:88/88/88", i + 1, SWM_S_COLOR_UNFOCUS);
+ setscreencolor("rgb:00/80/80", i + 1, SWM_S_COLOR_BAR_BORDER);
+ setscreencolor("black", i + 1, SWM_S_COLOR_BAR);
+ setscreencolor("rgb:a0/a0/a0", i + 1, SWM_S_COLOR_BAR_FONT);
/* init all workspaces */
for (j = 0; j < SWM_WS_MAX; j++) {
TAILQ_INIT(&ws->winlist);
for (k = 0; layouts[k].l_stack != NULL; k++)
- if (layouts[k].l_init != NULL)
- layouts[k].l_init(ws);
+ if (layouts[k].l_config != NULL)
+ layouts[k].l_config(ws,
+ SWM_ARG_ID_STACKINIT);
ws->cur_layout = &layouts[0];
}
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))
}
if (cfile)
conf_load(cfile);
-
- setup_screens();
+ bar_refresh();
/* ws[0].focus = TAILQ_FIRST(&ws[0].winlist); */
xfd = ConnectionNumber(display);
while (running) {
+ FD_ZERO(&rd);
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_print();
+ bar_update();
}
while(XPending(display)) {
XNextEvent(display, &e);