#include <stdio.h>
#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>
#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>
#include <X11/Xlib.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>
+#include <X11/extensions/Xrandr.h>
+
+#if RANDR_MAJOR < 1
+# error XRandR versions less than 1.0 are not supported
+#endif
+
+#if RANDR_MAJOR >= 1
+#if RANDR_MINOR >= 2
+#define SWM_XRR_HAS_CRTC
+#endif
+#endif
/* #define SWM_DEBUG */
#ifdef SWM_DEBUG
#define SWM_D_WS 0x0004
#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
| SWM_D_WS
| SWM_D_FOCUS
| SWM_D_MOVE
+ | SWM_D_STACK
;
#else
#define DPRINTF(x...)
#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 WIDTH ws[current_ws].g.w
-#define HEIGHT ws[current_ws].g.h
+#define X(r) (r)->g.x
+#define Y(r) (r)->g.y
+#define WIDTH(r) (r)->g.w
+#define HEIGHT(r) (r)->g.h
char **start_argv;
Atom astate;
int (*xerrorxlib)(Display *, XErrorEvent *);
int other_wm;
-int screen;
int running = 1;
+int xrandr_eventbase;
int ignore_enter = 0;
unsigned int numlockmask = 0;
-unsigned long color_focus = 0xff0000; /* XXX should this be per ws? */
-unsigned long color_unfocus = 0x888888;
Display *display;
-Window root;
+
+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;
-unsigned long bar_border = 0x008080;
-unsigned long bar_color = 0x000000;
-unsigned long bar_font_color = 0xa0a0a0;
-Window bar_window;
+pid_t bar_pid;
GC bar_gc;
XGCValues bar_gcv;
+int bar_fidx = 0;
XFontStruct *bar_fs;
-char bar_text[128];
char *bar_fonts[] = {
"-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*",
"-*-times-medium-r-*-*-*-*-*-*-*-*-*-*",
};
/* 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 {
int h;
};
+struct swm_screen;
+struct workspace;
+
+/* virtual "screens" */
+struct swm_region {
+ TAILQ_ENTRY(swm_region) entry;
+ struct swm_geometry g;
+ Window bar_window;
+ struct workspace *ws; /* current workspace on this region */
+ struct swm_screen *s; /* screen idx */
+};
+TAILQ_HEAD(swm_region_list, swm_region);
+
struct ws_win {
TAILQ_ENTRY(ws_win) entry;
Window id;
struct swm_geometry g;
+ int got_focus;
int floating;
int transient;
+ struct workspace *ws; /* always valid */
+ struct swm_screen *s; /* always valid, never changes */
XWindowAttributes wa;
};
TAILQ_HEAD(ws_win_list, ws_win);
/* layout handlers */
void stack(void);
-void vertical_init(int);
-void vertical_resize(int);
-void vertical_stack(struct swm_geometry *);
-void horizontal_init(int);
-void horizontal_resize(int);
-void horizontal_stack(struct swm_geometry *);
-void max_init(int);
-void max_focus(struct ws_win *);
-void max_stack(struct swm_geometry *);
+void vertical_config(struct workspace *, int);
+void vertical_stack(struct workspace *, struct swm_geometry *);
+void horizontal_config(struct workspace *, int);
+void horizontal_stack(struct workspace *, struct swm_geometry *);
+void max_stack(struct workspace *, struct swm_geometry *);
+
+void grabbuttons(struct ws_win *, int);
struct layout {
- void (*l_init)(int); /* init/reset */
- void (*l_stack)(struct swm_geometry *);
- void (*l_resize)(int);
- void (*l_focus)(struct ws_win *);
+ void (*l_stack)(struct workspace *, struct swm_geometry *);
+ void (*l_config)(struct workspace *, int);
} layouts[] = {
- /* init stack, resize */
- { vertical_init, vertical_stack, vertical_resize, NULL},
- { horizontal_init, horizontal_stack, horizontal_resize, NULL},
- { NULL, max_stack, NULL, max_focus},
- { 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 */
-#define SWM_WS_MAX (10)
struct workspace {
- int visible; /* workspace visible */
+ int idx; /* workspace index */
int restack; /* restack on switch */
- struct swm_geometry g;
struct layout *cur_layout; /* current layout handlers */
- struct ws_win *focus; /* which win has focus */
+ struct ws_win *focus; /* may be NULL */
+ struct swm_region *r; /* may be NULL */
struct ws_win_list winlist; /* list of windows in ws */
-} ws[SWM_WS_MAX];
-int current_ws = 0;
+
+ /* 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 {
+ int idx; /* screen index */
+ struct swm_region_list rl; /* list of regions on this screen */
+ Window root;
+ int xrandr_support;
+ struct workspace ws[SWM_WS_MAX];
+
+ /* colors */
+ struct {
+ unsigned long color;
+ char *name;
+ } c[SWM_S_COLOR_MAX];
+};
+struct swm_screen *screens;
+int num_screens;
+
+struct ws_win *cur_focus = NULL;
/* args to functions */
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)
+#define SWM_ARG_ID_CYCLEWS_UP (12)
+#define SWM_ARG_ID_CYCLEWS_DOWN (13)
char **argv;
};
name_to_color(char *colorname)
{
Colormap cmap;
- Status r;
+ Status status;
XColor screen_def, exact_def;
unsigned long result = 0;
char cname[32] = "#";
- cmap = DefaultColormap(display, screen);
- r = XAllocNamedColor(display, cmap, colorname, &screen_def, &exact_def);
- if (!r) {
+ cmap = DefaultColormap(display, screens[0].idx);
+ status = XAllocNamedColor(display, cmap, colorname,
+ &screen_def, &exact_def);
+ if (!status) {
strlcat(cname, colorname + 2, sizeof cname - 1);
- r = XAllocNamedColor(display, cmap, cname, &screen_def,
+ status = XAllocNamedColor(display, cmap, cname, &screen_def,
&exact_def);
}
- if (r)
+ if (status)
result = screen_def.pixel;
else
fprintf(stderr, "color '%s' not found.\n", colorname);
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;
+ size_t len, lineno = 0;
+ 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")))
- bar_border = name_to_color(val);
- else if (!strncmp(var, "bar_color",
- strlen("bar_color")))
- bar_color = name_to_color(val);
- else if (!strncmp(var, "bar_font_color",
- strlen("bar_font_color")))
- 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")))
- color_focus = name_to_color(val);
- else if (!strncmp(var, "color_unfocus",
- strlen("color_unfocus")))
- 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 *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 */
- XSetForeground(display, bar_gc, bar_color);
- XDrawString(display, bar_window, bar_gc, 4, bar_fs->ascent, bar_text,
- strlen(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(bar_text, sizeof bar_text, "%a %b %d %R %Z %Y", &tm);
- XSetForeground(display, bar_gc, bar_font_color);
- XDrawString(display, 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(loc, sizeof loc, "%s %d:%d %s",
+ s, x++, r->ws->idx + 1, bar_ext);
+ bar_print(r, loc);
+ }
+ }
XSync(display, False);
alarm(60);
void
bar_signal(int sig)
{
- /* XXX yeah yeah byte me */
- bar_print();
+ bar_alarm = 1;
}
void
-bar_toggle(union arg *args)
+bar_toggle(struct swm_region *r, union arg *args)
{
- int i;
+ struct swm_region *tmpr;
+ int i, j, sc = ScreenCount(display);
DNPRINTF(SWM_D_MISC, "bar_toggle\n");
- if (bar_enabled)
- XUnmapWindow(display, bar_window);
- else
- XMapRaised(display, bar_window);
+ if (bar_enabled) {
+ for (i = 0; i < sc; i++)
+ TAILQ_FOREACH(tmpr, &screens[i].rl, entry)
+ XUnmapWindow(display, tmpr->bar_window);
+ } else {
+ 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 < SWM_WS_MAX; i++)
- ws[i].restack = 1;
+ for (i = 0; i < sc; i++)
+ for (j = 0; j < SWM_WS_MAX; j++)
+ screens[i].ws[j].restack = 1;
stack();
- bar_print(); /* must be after stack */
+ /* must be after stack */
+ for (i = 0; i < sc; i++)
+ TAILQ_FOREACH(tmpr, &screens[i].rl, entry)
+ 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
-bar_setup(void)
+bar_setup(struct swm_region *r)
{
int i;
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");
bar_height = bar_fs->ascent + bar_fs->descent + 3;
- bar_window = XCreateSimpleWindow(display, root, 0, 0,
- WIDTH, bar_height - 2, 1, bar_border, bar_color);
- bar_gc = XCreateGC(display, bar_window, 0, &bar_gcv);
+ r->bar_window = XCreateSimpleWindow(display,
+ r->s->root, X(r), Y(r), WIDTH(r) - 2, bar_height - 2,
+ 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, bar_window, VisibilityChangeMask);
+ XSelectInput(display, r->bar_window, VisibilityChangeMask);
if (bar_enabled)
- XMapRaised(display, bar_window);
- DNPRINTF(SWM_D_MISC, "bar_setup: bar_window %d\n", (int)bar_window);
+ XMapRaised(display, r->bar_window);
+ DNPRINTF(SWM_D_MISC, "bar_setup: bar_window %lu\n", r->bar_window);
if (signal(SIGALRM, bar_signal) == SIG_ERR)
err(1, "could not install bar_signal");
- bar_print();
+ bar_refresh();
}
void
}
int
-count_win(int wsid, int count_transient)
+count_win(struct workspace *ws, int count_transient)
{
struct ws_win *win;
int count = 0;
- TAILQ_FOREACH (win, &ws[wsid].winlist, entry) {
+ TAILQ_FOREACH(win, &ws->winlist, entry) {
if (count_transient == 0 && win->floating)
continue;
if (count_transient == 0 && win->transient)
return (count);
}
+
void
-quit(union arg *args)
+quit(struct swm_region *r, union arg *args)
{
DNPRINTF(SWM_D_MISC, "quit\n");
running = 0;
}
void
-restart(union arg *args)
+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");
+
+ bar_extra_stop();
+ bar_extra = 1;
XCloseDisplay(display);
execvp(start_argv[0], start_argv);
fprintf(stderr, "execvp failed\n");
perror(" failed");
- quit(NULL);
+ quit(NULL, NULL);
+}
+
+struct swm_region *
+root_to_region(Window root)
+{
+ struct swm_region *r;
+ Window rr, cr;
+ int i, x, y, wx, wy;
+ unsigned int mask;
+
+ for (i = 0; i < ScreenCount(display); i++)
+ if (screens[i].root == root)
+ break;
+
+ 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);
+}
+
+struct ws_win *
+find_window(Window id)
+{
+ struct ws_win *win;
+ int i, j;
+
+ 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 (id == win->id)
+ return (win);
+ return (NULL);
}
void
-spawn(union arg *args)
+spawn(struct swm_region *r, union arg *args)
{
DNPRINTF(SWM_D_MISC, "spawn: %s\n", args->argv[0]);
/*
wait(0);
}
+
void
-focus_win(struct ws_win *win)
+spawnmenu(struct swm_region *r, union arg *args)
+{
+ 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)
{
- DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win->id);
- XSetWindowBorder(display, win->id, color_focus);
- XSetInputFocus(display, win->id, RevertToPointerRoot, CurrentTime);
- ws[current_ws].focus = win;
+ 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
-unfocus_win(struct ws_win *win)
+focus_win(struct ws_win *win)
{
- DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %lu\n", win->id);
- XSetWindowBorder(display, win->id, color_unfocus);
- if (ws[current_ws].focus == win)
- ws[current_ws].focus = NULL;
+ DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win ? win->id : 0);
+
+ if (win == NULL)
+ return;
+
+ unfocus_all();
+ win->ws->focus = win;
+ if (win->ws->r != NULL) {
+ cur_focus = win;
+ if (!win->got_focus) {
+ XSetWindowBorder(display, win->id,
+ win->ws->r->s->c[SWM_S_COLOR_FOCUS].color);
+ grabbuttons(win, 1);
+ }
+ win->got_focus = 1;
+ XSetInputFocus(display, win->id,
+ RevertToPointerRoot, CurrentTime);
+ }
}
void
-switchws(union arg *args)
+switchws(struct swm_region *r, union arg *args)
{
int wsid = args->id;
+ struct swm_region *this_r, *other_r;
struct ws_win *win;
+ struct workspace *new_ws, *old_ws;
- DNPRINTF(SWM_D_WS, "switchws: %d\n", wsid + 1);
+ this_r = r;
+ old_ws = this_r->ws;
+ new_ws = &this_r->s->ws[wsid];
- if (wsid == current_ws)
- return;
+ DNPRINTF(SWM_D_WS, "switchws screen %d region %dx%d+%d+%d: "
+ "%d -> %d\n", r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r),
+ old_ws->idx, wsid);
- /* map new window first to prevent ugly blinking */
- TAILQ_FOREACH (win, &ws[wsid].winlist, entry)
- XMapRaised(display, win->id);
- ws[wsid].visible = 1;
+ if (new_ws == old_ws)
+ return;
- TAILQ_FOREACH (win, &ws[current_ws].winlist, entry)
- XUnmapWindow(display, win->id);
- ws[current_ws].visible = 0;
+ 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);
- current_ws = wsid;
+ TAILQ_FOREACH(win, &old_ws->winlist, entry)
+ XUnmapWindow(display, win->id);
- ignore_enter = 1;
- if (ws[wsid].restack) {
- stack();
- bar_print();
+ old_ws->r = NULL;
+ old_ws->restack = 1;
} else {
- if (ws[wsid].focus != NULL)
- focus_win(ws[wsid].focus);
- XSync(display, False);
+ other_r->ws = old_ws;
+ old_ws->r = other_r;
}
+ this_r->ws = new_ws;
+ new_ws->r = this_r;
+
+ ignore_enter = 1;
+ /* set focus */
+ if (new_ws->focus)
+ focus_win(new_ws->focus);
+ stack();
+ bar_update();
}
void
-swapwin(union arg *args)
+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
+swapwin(struct swm_region *r, union arg *args)
{
struct ws_win *target;
+ struct ws_win_list *wl;
+
- DNPRINTF(SWM_D_MOVE, "swapwin: id %d\n", args->id);
- if (ws[current_ws].focus == NULL)
+ DNPRINTF(SWM_D_WS, "swapwin 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);
+ if (cur_focus == NULL)
return;
+ wl = &cur_focus->ws->winlist;
+
switch (args->id) {
case SWM_ARG_ID_SWAPPREV:
- target = TAILQ_PREV(ws[current_ws].focus, ws_win_list, entry);
- TAILQ_REMOVE(&ws[current_ws].winlist,
- ws[current_ws].focus, entry);
+ target = TAILQ_PREV(cur_focus, ws_win_list, entry);
+ TAILQ_REMOVE(wl, cur_focus, entry);
if (target == NULL)
- TAILQ_INSERT_TAIL(&ws[current_ws].winlist,
- ws[current_ws].focus, entry);
+ TAILQ_INSERT_TAIL(wl, cur_focus, entry);
else
- TAILQ_INSERT_BEFORE(target, ws[current_ws].focus,
- entry);
+ TAILQ_INSERT_BEFORE(target, cur_focus, entry);
break;
case SWM_ARG_ID_SWAPNEXT:
- target = TAILQ_NEXT(ws[current_ws].focus, entry);
- TAILQ_REMOVE(&ws[current_ws].winlist,
- ws[current_ws].focus, entry);
+ target = TAILQ_NEXT(cur_focus, entry);
+ TAILQ_REMOVE(wl, cur_focus, entry);
if (target == NULL)
- TAILQ_INSERT_HEAD(&ws[current_ws].winlist,
- ws[current_ws].focus, entry);
+ TAILQ_INSERT_HEAD(wl, cur_focus, entry);
else
- TAILQ_INSERT_AFTER(&ws[current_ws].winlist, target,
- ws[current_ws].focus, entry);
+ TAILQ_INSERT_AFTER(wl, target, cur_focus, entry);
break;
case SWM_ARG_ID_SWAPMAIN:
- target = TAILQ_FIRST(&ws[current_ws].winlist);
- if (target == ws[current_ws].focus)
+ target = TAILQ_FIRST(wl);
+ if (target == cur_focus)
return;
- TAILQ_REMOVE(&ws[current_ws].winlist, target, entry);
- TAILQ_INSERT_BEFORE(ws[current_ws].focus, target, entry);
- TAILQ_REMOVE(&ws[current_ws].winlist,
- ws[current_ws].focus, entry);
- TAILQ_INSERT_HEAD(&ws[current_ws].winlist,
- ws[current_ws].focus, entry);
+ TAILQ_REMOVE(wl, target, entry);
+ TAILQ_INSERT_BEFORE(cur_focus, target, entry);
+ TAILQ_REMOVE(wl, cur_focus, entry);
+ TAILQ_INSERT_HEAD(wl, cur_focus, entry);
break;
default:
DNPRINTF(SWM_D_MOVE, "invalid id: %d\n", args->id);
}
void
-focus(union arg *args)
+focus(struct swm_region *r, union arg *args)
{
struct ws_win *winfocus, *winlostfocus;
+ struct ws_win_list *wl;
DNPRINTF(SWM_D_FOCUS, "focus: id %d\n", args->id);
- if (ws[current_ws].focus == NULL)
+ if (cur_focus == NULL)
return;
- winlostfocus = ws[current_ws].focus;
+ wl = &cur_focus->ws->winlist;
+
+ winlostfocus = cur_focus;
switch (args->id) {
case SWM_ARG_ID_FOCUSPREV:
- winfocus = TAILQ_PREV(ws[current_ws].focus, ws_win_list, entry);
+ winfocus = TAILQ_PREV(cur_focus, ws_win_list, entry);
if (winfocus == NULL)
- winfocus =
- TAILQ_LAST(&ws[current_ws].winlist, ws_win_list);
+ winfocus = TAILQ_LAST(wl, ws_win_list);
break;
case SWM_ARG_ID_FOCUSNEXT:
- winfocus = TAILQ_NEXT(ws[current_ws].focus, entry);
+ winfocus = TAILQ_NEXT(cur_focus, entry);
if (winfocus == NULL)
- winfocus = TAILQ_FIRST(&ws[current_ws].winlist);
+ winfocus = TAILQ_FIRST(wl);
break;
case SWM_ARG_ID_FOCUSMAIN:
- winfocus = TAILQ_FIRST(&ws[current_ws].winlist);
+ winfocus = TAILQ_FIRST(wl);
break;
default:
if (winfocus == winlostfocus)
return;
- unfocus_win(winlostfocus);
focus_win(winfocus);
- /* XXX if we hook in focus_win(), we get a nasty cycle */
- if (ws[current_ws].cur_layout->l_focus != NULL)
- ws[current_ws].cur_layout->l_focus(winfocus);
XSync(display, False);
}
void
-cycle_layout(union arg *args)
+cycle_layout(struct swm_region *r, union arg *args)
{
- DNPRINTF(SWM_D_EVENT, "cycle_layout: workspace: %d\n", current_ws);
+ struct workspace *ws = r->ws;
+
+ DNPRINTF(SWM_D_EVENT, "cycle_layout: workspace: %d\n", ws->idx);
- ws[current_ws].cur_layout++;
- if (ws[current_ws].cur_layout->l_stack == NULL)
- ws[current_ws].cur_layout = &layouts[0];
+ ws->cur_layout++;
+ if (ws->cur_layout->l_stack == NULL)
+ ws->cur_layout = &layouts[0];
ignore_enter = 1;
stack();
}
void
-resize_master(union arg *args)
+stack_config(struct swm_region *r, union arg *args)
{
- DNPRINTF(SWM_D_EVENT, "resize_master: id %d\n", args->id);
+ struct workspace *ws = r->ws;
- if (ws[current_ws].cur_layout->l_resize != NULL)
- ws[current_ws].cur_layout->l_resize(args->id);
-}
+ DNPRINTF(SWM_D_STACK, "stack_config for workspace %d (id %d\n",
+ args->id, ws->idx);
-void
-stack_reset(union arg *args)
-{
- DNPRINTF(SWM_D_EVENT, "stack_reset: ws %d\n", current_ws);
+ if (ws->cur_layout->l_config != NULL)
+ ws->cur_layout->l_config(ws, args->id);
- if (ws[current_ws].cur_layout->l_init != NULL) {
- ws[current_ws].cur_layout->l_init(current_ws);
+ if (args->id != SWM_ARG_ID_STACKINIT);
stack();
- }
}
void
stack(void) {
- struct swm_geometry g;
- DNPRINTF(SWM_D_EVENT, "stack: workspace: %d\n", current_ws);
-
- /* start with workspace geometry, adjust for bar */
- g = ws[current_ws].g;
- if (bar_enabled) {
- g.y += bar_height;
- g.h -= bar_height;
- }
-
- ws[current_ws].restack = 0;
- ws[current_ws].cur_layout->l_stack(&g);
+ struct swm_geometry g;
+ struct swm_region *r;
+ int i, j;
+
+ DNPRINTF(SWM_D_STACK, "stack\n");
+
+ for (i = 0; i < ScreenCount(display); i++) {
+ j = 0;
+ TAILQ_FOREACH(r, &screens[i].rl, entry) {
+ DNPRINTF(SWM_D_STACK, "stacking workspace %d "
+ "(screen %d, region %d)\n", r->ws->idx, i, j++);
+
+ /* start with screen geometry, adjust for bar */
+ g = r->g;
+ g.w -= 2;
+ g.h -= 2;
+ if (bar_enabled) {
+ g.y += bar_height;
+ g.h -= bar_height;
+ }
+
+ r->ws->restack = 0;
+ r->ws->cur_layout->l_stack(r->ws, &g);
+ }
+ }
XSync(display, False);
}
void
-stack_floater(struct ws_win *win)
+stack_floater(struct ws_win *win, struct swm_region *r)
{
unsigned int mask;
XWindowChanges wc;
mask = CWX | CWY | CWBorderWidth | CWWidth | CWHeight;
wc.border_width = 1;
if (win->transient) {
- win->g.w = (double)WIDTH * dialog_ratio;
- win->g.h = (double)HEIGHT * dialog_ratio;
+ win->g.w = (double)WIDTH(r) * dialog_ratio;
+ win->g.h = (double)HEIGHT(r) * dialog_ratio;
}
wc.width = win->g.w;
wc.height = win->g.h;
- wc.x = (WIDTH - win->g.w) / 2;
- wc.y = (HEIGHT - win->g.h) / 2;
+ wc.x = (WIDTH(r) - win->g.w) / 2;
+ wc.y = (HEIGHT(r) - win->g.h) / 2;
- DNPRINTF(SWM_D_EVENT, "stack_floater: win %d x %d y %d w %d h %d\n",
- win, wc.x, wc.y, wc.width, wc.height);
+ DNPRINTF(SWM_D_STACK, "stack_floater: win %lu x %d y %d w %d h %d\n",
+ win->id, wc.x, wc.y, wc.width, wc.height);
XConfigureWindow(display, win->id, mask, &wc);
}
-int vertical_msize[SWM_WS_MAX];
-
-void
-vertical_init(int ws_idx)
-{
- DNPRINTF(SWM_D_MISC, "vertical_init: workspace: %d\n", current_ws);
-
- vertical_msize[ws_idx] = ws[ws_idx].g.w / 2;
-}
-
void
-vertical_resize(int id)
+vertical_config(struct workspace *ws, int id)
{
- DNPRINTF(SWM_D_MISC, "vertical_resize: workspace: %d\n", current_ws);
+ 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:
- vertical_msize[current_ws] -= WIDTH / 32;
- if ( vertical_msize[current_ws] < WIDTH / 16)
- vertical_msize[current_ws] = WIDTH / 16;
+ if (ws->l_state.vertical_msize > 1)
+ ws->l_state.vertical_msize--;
break;
case SWM_ARG_ID_MASTERGROW:
- vertical_msize[current_ws] += WIDTH / 32;
- if ( vertical_msize[current_ws] >
- (WIDTH - (WIDTH / 16)))
- vertical_msize[current_ws] =
- WIDTH - WIDTH / 16;
+ 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
-vertical_stack(struct swm_geometry *g) {
+vertical_stack(struct workspace *ws, struct swm_geometry *g) {
XWindowChanges wc;
struct swm_geometry gg = *g;
- struct ws_win wf, *win, *winfocus = &wf;
- int i, hrh, winno;
+ struct ws_win *win, *winfocus;
+ int i, j, split, colno, hrh, winno, main_width;
unsigned int mask;
- DNPRINTF(SWM_D_EVENT, "vertical_stack: workspace: %d\n", current_ws);
+ DNPRINTF(SWM_D_STACK, "vertical_stack: workspace: %d\n", ws->idx);
- winno = count_win(current_ws, 0);
- if (winno == 0)
+ if ((winno = count_win(ws, 0)) == 0)
return;
- winfocus->id = root;
-
- if (winno > 1)
- gg.w = vertical_msize[current_ws];
- if (winno > 2)
- hrh = g->h / (winno - 1);
- else
- hrh = 0;
-
- i = 0;
- TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
- if (i == 1) {
- gg.x += vertical_msize[current_ws] + 2;
- gg.w = g->w - (vertical_msize[current_ws] + 2);
- }
- if (i != 0 && hrh != 0) {
- /* correct the last window for lost pixels */
- if (win == TAILQ_LAST(&ws[current_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 (ws->focus == NULL)
+ ws->focus = TAILQ_FIRST(&ws->winlist);
+ winfocus = cur_focus ? cur_focus : ws->focus;
+
+ 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;
+
+ i = j = 0;
+ TAILQ_FOREACH(win, &ws->winlist, entry) {
+ 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 (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);
+ stack_floater(win, ws->r);
else {
bzero(&wc, sizeof wc);
wc.border_width = 1;
XConfigureWindow(display, win->id, mask, &wc);
}
- if (win == ws[current_ws].focus)
- winfocus = win;
- else
- unfocus_win(win);
XMapRaised(display, win->id);
i++;
+ j++;
}
- focus_win(winfocus); /* this has to be done outside of the loop */
+ if (winfocus)
+ focus_win(winfocus); /* has to be done outside of the loop */
}
-int horizontal_msize[SWM_WS_MAX];
-
-void
-horizontal_init(int ws_idx)
-{
- DNPRINTF(SWM_D_MISC, "horizontal_init: workspace: %d\n", current_ws);
-
- horizontal_msize[ws_idx] = ws[ws_idx].g.h / 2;
-}
void
-horizontal_resize(int id)
+horizontal_config(struct workspace *ws, int id)
{
- DNPRINTF(SWM_D_MISC, "horizontal_resize: workspace: %d\n", current_ws);
+ 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:
- horizontal_msize[current_ws] -= HEIGHT / 32;
- if ( horizontal_msize[current_ws] < HEIGHT / 16)
- horizontal_msize[current_ws] = HEIGHT / 16;
+ if (ws->l_state.horizontal_msize > 1)
+ ws->l_state.horizontal_msize--;
break;
case SWM_ARG_ID_MASTERGROW:
- horizontal_msize[current_ws] += HEIGHT / 32;
- if ( horizontal_msize[current_ws] >
- (HEIGHT - (HEIGHT / 16)))
- horizontal_msize[current_ws] =
- HEIGHT - HEIGHT / 16;
+ 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
-horizontal_stack(struct swm_geometry *g) {
+horizontal_stack(struct workspace *ws, struct swm_geometry *g) {
XWindowChanges wc;
struct swm_geometry gg = *g;
- struct ws_win wf, *win, *winfocus = &wf;
- int i, hrw, winno;
+ struct ws_win *win, *winfocus;
+ int i, j, split, rowno, hrw, winno, main_height;
unsigned int mask;
- DNPRINTF(SWM_D_EVENT, "horizontal_stack: workspace: %d\n", current_ws);
+ DNPRINTF(SWM_D_STACK, "horizontal_stack: workspace: %d\n", ws->idx);
- winno = count_win(current_ws, 0);
- if (winno == 0)
+ if ((winno = count_win(ws, 0)) == 0)
return;
- winfocus->id = root;
-
- if (winno > 1)
- gg.h = horizontal_msize[current_ws];
- if (winno > 2)
- hrw = g->w / (winno - 1);
- else
- hrw = 0;
-
- i = 0;
- TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
- if (i == 1) {
- gg.y += horizontal_msize[current_ws] + 2;
- gg.h = g->h - (horizontal_msize[current_ws] + 2);
- }
- if (i != 0 && hrw != 0) {
- /* correct the last window for lost pixels */
- if (win == TAILQ_LAST(&ws[current_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 (ws->focus == NULL)
+ ws->focus = TAILQ_FIRST(&ws->winlist);
+ winfocus = cur_focus ? cur_focus : ws->focus;
+
+ 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;
+
+ i = j = 0;
+ TAILQ_FOREACH(win, &ws->winlist, entry) {
+ 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 (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);
+ stack_floater(win, ws->r);
else {
bzero(&wc, sizeof wc);
wc.border_width = 1;
XConfigureWindow(display, win->id, mask, &wc);
}
- if (win == ws[current_ws].focus)
- winfocus = win;
- else
- unfocus_win(win);
XMapRaised(display, win->id);
+ j++;
i++;
}
- focus_win(winfocus); /* this has to be done outside of the loop */
-}
-
-void
-max_focus(struct ws_win *fwin)
-{
- struct ws_win *win;
-
- TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
- if (win->transient == 0 && win->floating == 0 && win == fwin)
- XMapRaised(display, win->id);
- else
- XUnmapWindow(display, win->id);
- }
+ if (winfocus)
+ focus_win(winfocus); /* this has to be done outside of the loop */
}
/* fullscreen view */
void
-max_stack(struct swm_geometry *g) {
+max_stack(struct workspace *ws, struct swm_geometry *g) {
XWindowChanges wc;
struct swm_geometry gg = *g;
struct ws_win *win, *winfocus;
unsigned int mask;
- DNPRINTF(SWM_D_EVENT, "max_stack: workspace: %d\n", current_ws);
+ DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx);
- if (count_win(current_ws, 0) == 0)
+ if (count_win(ws, 0) == 0)
return;
- winfocus = ws[current_ws].focus;
- if (!winfocus)
- winfocus = TAILQ_FIRST(&ws[current_ws].winlist);
+ if (ws->focus == NULL)
+ ws->focus = TAILQ_FIRST(&ws->winlist);
+ winfocus = cur_focus ? cur_focus : ws->focus;
- TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
+ TAILQ_FOREACH(win, &ws->winlist, entry) {
if (win->transient != 0 || win->floating != 0) {
- if (win == winfocus) {
- stack_floater(win); /* XXX maximize? */
+ if (win == ws->focus) {
+ /* XXX maximize? */
+ stack_floater(win, ws->r);
XMapRaised(display, win->id);
} else
XUnmapWindow(display, win->id);
mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
XConfigureWindow(display, win->id, mask, &wc);
- if (winfocus == win)
+ if (win == ws->focus) {
XMapRaised(display, win->id);
- else
+ } else
XUnmapWindow(display, win->id);
}
}
- focus_win(winfocus); /* this has to be done outside of the loop */
+ if (winfocus)
+ focus_win(winfocus); /* has to be done outside of the loop */
}
void
-send_to_ws(union arg *args)
+send_to_ws(struct swm_region *r, union arg *args)
{
int wsid = args->id;
- struct ws_win *win = ws[current_ws].focus;
+ struct ws_win *win = cur_focus;
+ struct workspace *ws, *nws;
DNPRINTF(SWM_D_MOVE, "send_to_ws: win: %lu\n", win->id);
+ ws = win->ws;
+ nws = &win->s->ws[wsid];
+
XUnmapWindow(display, win->id);
/* find a window to focus */
- ws[current_ws].focus = TAILQ_PREV(win, ws_win_list, entry);
- if (ws[current_ws].focus == NULL)
- ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist);
- if (ws[current_ws].focus == win)
- ws[current_ws].focus = NULL;
+ ws->focus = TAILQ_PREV(win, ws_win_list, entry);
+ if (ws->focus == NULL)
+ ws->focus = TAILQ_FIRST(&ws->winlist);
+ if (ws->focus == win)
+ ws->focus = NULL;
+
+ TAILQ_REMOVE(&ws->winlist, win, entry);
- TAILQ_REMOVE(&ws[current_ws].winlist, win, entry);
+ TAILQ_INSERT_TAIL(&nws->winlist, win, entry);
+ win->ws = nws;
- TAILQ_INSERT_TAIL(&ws[wsid].winlist, win, entry);
- if (count_win(wsid, 1) == 1)
- ws[wsid].focus = win;
- ws[wsid].restack = 1;
+ if (count_win(nws, 1) == 1)
+ nws->focus = win;
+ ws->restack = 1;
+ nws->restack = 1;
stack();
}
struct key {
unsigned int mod;
KeySym keysym;
- void (*func)(union arg *);
+ void (*func)(struct swm_region *r, union arg *);
union arg args;
} 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
grabkeys(void)
{
- unsigned int i, j;
+ unsigned int i, j, k;
KeyCode code;
unsigned int modifiers[] =
{ 0, LockMask, numlockmask, numlockmask | LockMask };
DNPRINTF(SWM_D_MISC, "grabkeys\n");
updatenumlockmask();
- XUngrabKey(display, AnyKey, AnyModifier, root);
- 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], root,
- True, GrabModeAsync, GrabModeAsync);
+ for (k = 0; k < ScreenCount(display); k++) {
+ 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++)
+ XGrabKey(display, code,
+ keys[i].mod | modifiers[j],
+ screens[k].root, True,
+ GrabModeAsync, GrabModeAsync);
+ }
}
}
+
+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)
{
if (keysym == keys[i].keysym
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
&& keys[i].func)
- keys[i].func(&(keys[i].args));
+ keys[i].func(root_to_region(ev->root),
+ &(keys[i].args));
}
void
buttonpress(XEvent *e)
{
XButtonPressedEvent *ev = &e->xbutton;
-#ifdef SWM_CLICKTOFOCUS
- struct ws_win *win;
-#endif
+ struct ws_win *win;
+ int i, action;
DNPRINTF(SWM_D_EVENT, "buttonpress: window: %lu\n", ev->window);
- if (ev->window == root)
- return;
- if (ev->window == ws[current_ws].focus->id)
+ action = root_click;
+ if ((win = find_window(ev->window)) == NULL)
return;
-#ifdef SWM_CLICKTOFOCUS
- TAILQ_FOREACH(win, &ws[current_ws].winlist, entry)
- if (win->id == ev->window) {
- /* focus in the clicked window */
- XSetWindowBorder(display, ev->window, 0xff0000);
- XSetWindowBorder(display,
- ws[current_ws].focus->id, 0x888888);
- XSetInputFocus(display, ev->window, RevertToPointerRoot,
- CurrentTime);
- ws[current_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 *
-manage_window(Window id)
+manage_window(Window id, struct workspace *ws)
{
Window trans;
struct ws_win *win;
XClassHint ch;
- TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
+ TAILQ_FOREACH(win, &ws->winlist, entry) {
if (win->id == id)
return (win); /* already being managed */
}
errx(1, "calloc: failed to allocate memory for new window");
win->id = id;
- TAILQ_INSERT_TAIL(&ws[current_ws].winlist, win, entry);
- ws[current_ws].focus = win; /* make new win focused */
+ win->ws = ws;
+ win->s = ws->r->s; /* this never changes */
+ TAILQ_INSERT_TAIL(&ws->winlist, win, entry);
+
+ /* make new win focused */
+ focus_win(win);
XGetTransientForHint(display, win->id, &trans);
if (trans) {
DNPRINTF(SWM_D_MISC, "manage_window: win %u transient %u\n",
(unsigned)win->id, win->transient);
}
- XGetWindowAttributes(display, win->id, &win->wa);
+ XGetWindowAttributes(display, id, &win->wa);
win->g.w = win->wa.width;
win->g.h = win->wa.height;
win->g.x = win->wa.x;
int new = 1;
XWindowChanges wc;
- TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
- if (win->id == ev->window) {
- new = 0;
- break;
- }
- }
+ if ((win = find_window(ev->window)) == NULL)
+ new = 1;
if (new) {
DNPRINTF(SWM_D_EVENT, "configurerequest: new window: %lu\n",
} else {
DNPRINTF(SWM_D_EVENT, "configurerequest: change window: %lu\n",
ev->window);
- if(win->floating) {
- if(ev->value_mask & CWX)
+ if (win->floating) {
+ if (ev->value_mask & CWX)
win->g.x = ev->x;
- if(ev->value_mask & CWY)
+ if (ev->value_mask & CWY)
win->g.y = ev->y;
- if(ev->value_mask & CWWidth)
+ if (ev->value_mask & CWWidth)
win->g.w = ev->width;
- if(ev->value_mask & CWHeight)
+ if (ev->value_mask & CWHeight)
win->g.h = ev->height;
- /* this seems to be full screen */
- if (win->g.w > WIDTH) {
- /* kill border */
- win->g.x -= 1;
- win->g.w += 1;
- }
- if (win->g.h > HEIGHT) {
- /* kill border */
- win->g.y -= 1;
- win->g.h += 1;
+ if (win->ws->r != NULL) {
+ /* this seems to be full screen */
+ if (win->g.w > WIDTH(win->ws->r)) {
+ /* kill border */
+ win->g.x -= 1;
+ win->g.w += 1;
+ }
+ if (win->g.h > HEIGHT(win->ws->r)) {
+ /* kill border */
+ win->g.y -= 1;
+ win->g.h += 1;
+ }
}
- if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
+ if ((ev->value_mask & (CWX|CWY)) &&
+ !(ev->value_mask & (CWWidth|CWHeight)))
config_win(win);
- XMoveResizeWindow(display, win->id, win->g.x, win->g.y, win->g.w, win->g.h);
+ XMoveResizeWindow(display, win->id,
+ win->g.x, win->g.y, win->g.w, win->g.h);
} else
config_win(win);
}
{
struct ws_win *win;
XDestroyWindowEvent *ev = &e->xdestroywindow;
+ struct workspace *ws;
DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window);
- TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
- if (ev->window == win->id) {
- /* find a window to focus */
- ws[current_ws].focus = TAILQ_PREV(win,
- ws_win_list, entry);
- if (ws[current_ws].focus == NULL)
- ws[current_ws].focus =
- TAILQ_FIRST(&ws[current_ws].winlist);
- if (win == ws[current_ws].focus)
- ws[current_ws].focus = NULL;
-
- TAILQ_REMOVE(&ws[current_ws].winlist, win, entry);
- set_win_state(win, WithdrawnState);
- free(win);
- break;
- }
+ if ((win = find_window(ev->window)) != NULL) {
+ ws = win->ws;
+ /* find a window to focus */
+ if (ws->focus == win)
+ ws->focus = TAILQ_PREV(win, ws_win_list, entry);
+ if (ws->focus == NULL)
+ ws->focus = TAILQ_FIRST(&ws->winlist);
+ if (ws->focus == win)
+ ws->focus = NULL;
+ if (cur_focus == win)
+ focus_win(ws->focus);
+
+ TAILQ_REMOVE(&ws->winlist, win, entry);
+ 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) &&
- ev->window != root)
- return;
if (ignore_enter) {
- /* eat event(s) to prevent autofocus */
+ /* eat event(r) to prevent autofocus */
ignore_enter--;
return;
}
- TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
- if (win->id == ev->window)
- focus_win(win);
- else
- unfocus_win(win);
- }
+
+ if ((win = find_window(ev->window)) != NULL)
+ focus_win(win);
}
void
focusin(XEvent *e)
{
- XFocusChangeEvent *ev = &e->xfocus;
-
- DNPRINTF(SWM_D_EVENT, "focusin: window: %lu\n", ev->window);
-
- if (ev->window == 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);
- */
+ DNPRINTF(SWM_D_EVENT, "focusin: window: %lu\n", e->xfocus.window);
}
void
{
XMapRequestEvent *ev = &e->xmaprequest;
XWindowAttributes wa;
+ struct swm_region *r;
DNPRINTF(SWM_D_EVENT, "maprequest: window: %lu\n",
e->xmaprequest.window);
return;
if (wa.override_redirect)
return;
- manage_window(e->xmaprequest.window);
+ r = root_to_region(wa.root);
+ manage_window(e->xmaprequest.window, r->ws);
stack();
}
void
visibilitynotify(XEvent *e)
{
- DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: %lu\n", e->xvisibility.window);
-
- if (e->xvisibility.window == bar_window &&
- e->xvisibility.state == VisibilityUnobscured)
- bar_print();
+ int i;
+ struct swm_region *r;
+
+ DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: %lu\n",
+ e->xvisibility.window);
+ if (e->xvisibility.state == VisibilityUnobscured)
+ for (i = 0; i < ScreenCount(display); i++)
+ TAILQ_FOREACH(r, &screens[i].rl, entry)
+ if (e->xvisibility.window == r->bar_window)
+ bar_update();
}
void (*handler[LASTEvent])(XEvent *) = {
return (result);
}
+void
+new_region(struct swm_screen *s, struct workspace *ws,
+ int x, int y, int w, int h)
+{
+ struct swm_region *r;
+
+ DNPRINTF(SWM_D_MISC, "new region on screen %d: %dx%d (%d, %d)\n",
+ s->idx, x, y, w, h);
+
+ if ((r = calloc(1, sizeof(struct swm_region))) == NULL)
+ errx(1, "calloc: failed to allocate memory for screen");
+
+ X(r) = x;
+ Y(r) = y;
+ WIDTH(r) = w;
+ HEIGHT(r) = h;
+ r->s = s;
+ r->ws = ws;
+ ws->r = r;
+ TAILQ_INSERT_TAIL(&s->rl, r, entry);
+ bar_setup(r);
+}
+
+void
+setup_screens(void)
+{
+#ifdef SWM_XRR_HAS_CRTC
+ XRRCrtcInfo *ci;
+ XRRScreenResources *sr;
+ int c;
+#endif /* SWM_XRR_HAS_CRTC */
+ Window d1, d2, *wins = NULL;
+ XWindowAttributes wa;
+ struct swm_region *r;
+ unsigned int no;
+ int errorbase, major, minor;
+ int ncrtc = 0, w = 0;
+ int i, j, k;
+ struct workspace *ws;
+
+ if ((screens = calloc(ScreenCount(display),
+ sizeof(struct swm_screen))) == NULL)
+ errx(1, "calloc: screens");
+
+ /* map physical screens */
+ for (i = 0; i < ScreenCount(display); i++) {
+ DNPRINTF(SWM_D_WS, "setup_screens: init screen %d\n", i);
+ screens[i].idx = i;
+ TAILQ_INIT(&screens[i].rl);
+ screens[i].root = RootWindow(display, i);
+
+ /* set default colors */
+ 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++) {
+ ws = &screens[i].ws[j];
+ ws->idx = j;
+ ws->restack = 1;
+ ws->focus = NULL;
+ ws->r = NULL;
+ TAILQ_INIT(&ws->winlist);
+
+ 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];
+ }
+
+ /* map virtual screens onto physical screens */
+ screens[i].xrandr_support = XRRQueryExtension(display,
+ &xrandr_eventbase, &errorbase);
+ if (screens[i].xrandr_support)
+ if (XRRQueryVersion(display, &major, &minor) &&
+ major < 1)
+ screens[i].xrandr_support = 0;
+
+#if 0 /* not ready for dynamic screen changes */
+ if (screens[i].xrandr_support)
+ XRRSelectInput(display,
+ screens[r->s].root,
+ RRScreenChangeNotifyMask);
+#endif
+
+ /* grab existing windows (before we build the bars)*/
+ if (!XQueryTree(display, screens[i].root, &d1, &d2, &wins, &no))
+ continue;
+
+#ifdef SWM_XRR_HAS_CRTC
+ 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 = sr->ncrtc;
+
+ for (c = 0; c < ncrtc; c++) {
+ ci = XRRGetCrtcInfo(display, sr, sr->crtcs[c]);
+ if (ci->noutput == 0)
+ continue;
+
+ 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],
+ 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),
+ DisplayHeight(display, i));
+#endif /* SWM_XRR_HAS_CRTC */
+
+ /* attach windows to a region */
+ /* normal windows */
+ if ((r = TAILQ_FIRST(&screens[i].rl)) == NULL)
+ errx(1, "no regions on screen %d", 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 < 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) {
+ XFree(wins);
+ wins = NULL;
+ }
+ }
+}
+
int
main(int argc, char *argv[])
{
char conf[PATH_MAX], *cfile = NULL;
struct stat sb;
XEvent e;
- unsigned int i, j, num;
- Window d1, d2, *wins = NULL;
- XWindowAttributes wa;
+ int xfd;
+ fd_set rd;
start_argv = argv;
fprintf(stderr, "Welcome to scrotwm V%s\n", SWM_VERSION);
if (active_wm())
errx(1, "other wm running");
- screen = DefaultScreen(display);
- root = RootWindow(display, screen);
astate = XInternAtom(display, "WM_STATE", False);
- /* set default colors */
- color_focus = name_to_color("red");
- color_unfocus = name_to_color("rgb:88/88/88");
- bar_border = name_to_color("rgb:00/80/80");
- bar_color = name_to_color("black");
- bar_font_color = name_to_color("rgb:a0/a0/a0");
-
/* look for local and global conf file */
pwd = getpwuid(getuid());
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);
+ bar_refresh();
- /* init all workspaces */
- for (i = 0; i < SWM_WS_MAX; i++) {
- ws[i].visible = 0;
- ws[i].restack = 1;
- ws[i].focus = NULL;
- ws[i].g.x = 0;
- ws[i].g.y = 0;
- ws[i].g.w = DisplayWidth(display, screen) - 2;
- ws[i].g.h = DisplayHeight(display, screen) - 2;
- TAILQ_INIT(&ws[i].winlist);
-
- for (j = 0; layouts[j].l_stack != NULL; j++) {
- if (layouts[j].l_init != NULL)
- layouts[j].l_init(i);
- }
- ws[i].cur_layout = &layouts[0];
- }
- /* make work space 1 active */
- ws[0].visible = 1;
-
- /* grab existing windows */
- if (XQueryTree(display, root, &d1, &d2, &wins, &num)) {
- /* normal windows */
- for (i = 0; i < num; 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]);
- }
- /* transient windows */
- for (i = 0; i < num; 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]);
- }
- if (wins)
- XFree(wins);
- }
- ws[0].focus = TAILQ_FIRST(&ws[0].winlist);
-
- /* setup status bar */
- bar_setup();
-
- XSelectInput(display, root, SubstructureRedirectMask |
- SubstructureNotifyMask | ButtonPressMask | KeyPressMask |
- EnterWindowMask | LeaveWindowMask | StructureNotifyMask |
- FocusChangeMask | PropertyChangeMask | ExposureMask);
+ /* 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_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_update();
+ }
+ while(XPending(display)) {
+ XNextEvent(display, &e);
+ if (handler[e.type])
+ handler[e.type](&e);
+ }
}
XCloseDisplay(display);