#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
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 MODKEY Mod1Mask
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#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 width, height;
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;
+/* dialog windows */
+double dialog_ratio = .6;
/* status bar */
int bar_enabled = 1;
int bar_height = 0;
-unsigned long bar_border = 0x008080;
-unsigned long bar_color = 0x000000;
-unsigned long bar_font_color = 0xa0a0a0;
-Window bar_window;
GC bar_gc;
XGCValues bar_gcv;
XFontStruct *bar_fs;
/* terminal + args */
char *spawn_term[] = { "xterm", NULL };
char *spawn_menu[] = { "dmenu_run", NULL };
-char *spawn_scrotwm[] = { "scrotwm", NULL };
/* layout manager data */
-void stack(void);
-void vertical_init(void);
-void vertical_stack(void);
-void horizontal_init(void);
-void horizontal_stack(void);
-void max_init(void);
-void max_stack(void);
-
-struct layout {
- void (*l_init)(void); /* init/reset */
- void (*l_stack)(void); /* restack windows */
-} layouts[] = {
- /* init stack */
- { vertical_init, vertical_stack},
- { horizontal_init, horizontal_stack},
- /* XXX not working yet
- * { max_init, max_stack},
- */
- { NULL, NULL},
+struct swm_geometry {
+ int x;
+ int y;
+ int w;
+ 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;
- int x;
- int y;
- int width;
- int height;
+ struct swm_geometry g;
+ int 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(struct workspace *);
+void vertical_resize(int);
+void vertical_stack(struct workspace *, struct swm_geometry *);
+void horizontal_init(struct workspace *);
+void horizontal_resize(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)(int);
+} layouts[] = {
+ /* init stack, resize */
+ { vertical_init, vertical_stack, vertical_resize},
+ { horizontal_init, horizontal_stack, horizontal_resize},
+ { NULL, max_stack, NULL},
+ { 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 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 vertical_msize;
+ } l_state;
+};
+
+/* 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 */
+ 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;
+};
+struct swm_screen *screens;
+int num_screens;
+
+struct ws_win *cur_focus = NULL;
/* args to functions */
union arg {
#define SWM_ARG_ID_SWAPNEXT (3)
#define SWM_ARG_ID_SWAPPREV (4)
#define SWM_ARG_ID_SWAPMAIN (5)
+#define SWM_ARG_ID_MASTERSHRINK (6)
+#define SWM_ARG_ID_MASTERGROW (7)
char **argv;
};
+unsigned long
+name_to_color(char *colorname)
+{
+ Colormap cmap;
+ Status status;
+ XColor screen_def, exact_def;
+ unsigned long result = 0;
+ char cname[32] = "#";
+
+ cmap = DefaultColormap(display, screens[0].idx);
+ status = XAllocNamedColor(display, cmap, colorname,
+ &screen_def, &exact_def);
+ if (!status) {
+ strlcat(cname, colorname + 2, sizeof cname - 1);
+ status = XAllocNamedColor(display, cmap, cname, &screen_def,
+ &exact_def);
+ }
+ if (status)
+ result = screen_def.pixel;
+ else
+ fprintf(stderr, "color '%s' not found.\n", colorname);
+
+ return (result);
+}
+
/* 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;
DNPRINTF(SWM_D_MISC, "conf_load: filename %s\n", filename);
bar_enabled = atoi(val);
else if (!strncmp(var, "bar_border",
strlen("bar_border")))
- bar_border = strtol(val, NULL, 16);
+ for (i = 0; i < ScreenCount(display); i++)
+ screens[i].bar_border = name_to_color(val);
else if (!strncmp(var, "bar_color",
strlen("bar_color")))
- bar_color = strtol(val, NULL, 16);
+ 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")))
- bar_font_color = strtol(val, NULL, 16);
+ for (i = 0; i < ScreenCount(display); i++)
+ screens[i].bar_font_color = name_to_color(val);
else if (!strncmp(var, "bar_font", strlen("bar_font")))
asprintf(&bar_fonts[0], "%s", val);
else
case 'c':
if (!strncmp(var, "color_focus", strlen("color_focus")))
- color_focus = strtol(val, NULL, 16);
+ for (i = 0; i < ScreenCount(display); i++)
+ screens[i].color_focus = name_to_color(val);
else if (!strncmp(var, "color_unfocus",
strlen("color_unfocus")))
- color_unfocus = strtol(val, NULL, 16);
+ for (i = 0; i < ScreenCount(display); i++)
+ screens[i].color_unfocus = name_to_color(val);
else
goto bad;
break;
+ case 'd':
+ if (!strncmp(var, "dialog_ratio",
+ strlen("dialog_ratio"))) {
+ dialog_ratio = atof(val);
+ if (dialog_ratio > 1.0 || dialog_ratio <= .3)
+ dialog_ratio = .6;
+ } else
+ goto bad;
+ break;
+
case 's':
if (!strncmp(var, "spawn_term", strlen("spawn_term")))
asprintf(&spawn_term[0], "%s", val); /* XXX args? */
}
void
-bar_print(void)
+bar_print(struct swm_region *r)
{
time_t tmt;
struct tm tm;
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));
+ 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, bar_font_color);
- XDrawString(display, bar_window, bar_gc, 4, bar_fs->ascent, bar_text,
- strlen(bar_text));
+ XSetForeground(display, bar_gc, r->s->bar_font_color);
+ XDrawString(display, r->bar_window, bar_gc, 4,
+ bar_fs->ascent, bar_text, strlen(bar_text));
XSync(display, False);
alarm(60);
bar_signal(int sig)
{
/* XXX yeah yeah byte me */
- bar_print();
+ if (cur_focus)
+ bar_print(cur_focus->ws->r);
}
void
bar_toggle(union arg *args)
{
- int i;
+ struct swm_region *r;
+ int i, j;
DNPRINTF(SWM_D_MISC, "bar_toggle\n");
if (bar_enabled) {
- bar_enabled = 0;
- height += bar_height; /* correct screen height */
- XUnmapWindow(display, bar_window);
+ for (i = 0; i < ScreenCount(display); i++)
+ TAILQ_FOREACH(r, &screens[i].rl, entry)
+ XUnmapWindow(display, r->bar_window);
} else {
- bar_enabled = 1;
- height -= bar_height; /* correct screen height */
- XMapWindow(display, bar_window);
+ for (i = 0; i < ScreenCount(display); i++)
+ TAILQ_FOREACH(r, &screens[i].rl, entry)
+ XMapRaised(display, r->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 < ScreenCount(display); 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 < ScreenCount(display); i++)
+ TAILQ_FOREACH(r, &screens[i].rl, entry)
+ bar_print(r);
}
void
-bar_setup(void)
+bar_setup(struct swm_region *r)
{
int i;
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), 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);
- XSelectInput(display, bar_window, VisibilityChangeMask);
- if (bar_enabled) {
- height -= bar_height; /* correct screen height */
- XMapWindow(display, bar_window);
- }
- DNPRINTF(SWM_D_MISC, "bar_setup: bar_window %d\n", (int)bar_window);
+ XSelectInput(display, r->bar_window, VisibilityChangeMask);
+ if (bar_enabled)
+ 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_print(r);
+}
+
+void
+config_win(struct ws_win *win)
+{
+ XConfigureEvent ce;
+
+ DNPRINTF(SWM_D_MISC, "config_win: win %lu x %d y %d w %d h %d\n",
+ win->id, win->g.x, win->g.y, win->g.w, win->g.h);
+ ce.type = ConfigureNotify;
+ ce.display = display;
+ ce.event = win->id;
+ ce.window = win->id;
+ ce.x = win->g.x;
+ ce.y = win->g.y;
+ ce.width = win->g.w;
+ ce.height = win->g.h;
+ ce.border_width = 1; /* XXX store this! */
+ ce.above = None;
+ ce.override_redirect = False;
+ XSendEvent(display, win->id, False, StructureNotifyMask, (XEvent *)&ce);
}
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)
continue;
count++;
return (count);
}
+
void
quit(union arg *args)
{
running = 0;
}
-
void
restart(union arg *args)
{
+ DNPRINTF(SWM_D_MISC, "restart: %s\n", start_argv[0]);
+
XCloseDisplay(display);
- execvp(args->argv[0], args->argv);
+ execvp(start_argv[0], start_argv);
fprintf(stderr, "execvp failed\n");
perror(" failed");
quit(NULL);
}
+struct swm_region *
+cur_region(void)
+{
+ if (cur_focus && cur_focus->ws->r) {
+ return (cur_focus->ws->r);
+ } else {
+ /* XXX get region from pointer */
+ int i;
+ struct swm_region *r;
+ for (i = 0; i < ScreenCount(display); i++)
+ if ((r = TAILQ_FIRST(&screens[i].rl)) != NULL)
+ return (r);
+ }
+errx(1, "cur_region: no regions!?!?!\n");
+}
+
+struct workspace *
+cur_ws(void)
+{
+ return (cur_region()->ws);
+}
+
+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)
{
* The double-fork construct avoids zombie processes and keeps the code
* clean from stupid signal handlers.
*/
- if(fork() == 0) {
- if(fork() == 0) {
- if(display)
+ if (fork() == 0) {
+ if (fork() == 0) {
+ if (display)
close(ConnectionNumber(display));
setsid();
execvp(args->argv[0], args->argv);
}
void
-focus_win(struct ws_win *win)
+unfocus_win(struct ws_win *win)
{
- 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;
+ 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;
}
+
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->id);
+
+ 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)
+ XSetWindowBorder(display, win->id,
+ win->ws->r->s->color_focus);
+ win->focus = 1;
+ XSetInputFocus(display, win->id,
+ RevertToPointerRoot, CurrentTime);
+ }
}
void
switchws(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);
- if (wsid == current_ws)
+ this_r = cur_region();
+ old_ws = this_r->ws;
+ new_ws = &this_r->s->ws[wsid];
+
+ if (new_ws == old_ws)
return;
- /* map new window first to prevent ugly blinking */
- TAILQ_FOREACH (win, &ws[wsid].winlist, entry)
- XMapRaised(display, win->id);
- ws[wsid].visible = 1;
+ other_r = new_ws->r;
+ if (!other_r) {
+ /* if the other region is hidden, switch windows */
+
+ /* map new window first to prevent ugly blinking */
+ TAILQ_FOREACH(win, &new_ws->winlist, entry)
+ XMapRaised(display, win->id);
+
+ TAILQ_FOREACH(win, &old_ws->winlist, entry)
+ XUnmapWindow(display, win->id);
- TAILQ_FOREACH (win, &ws[current_ws].winlist, entry)
- XUnmapWindow(display, win->id);
- ws[current_ws].visible = 0;
+ old_ws->r = NULL;
+ } else {
+ other_r->ws = old_ws;
+ old_ws->r = other_r;
+ }
- current_ws = wsid;
+ this_r->ws = new_ws;
+ new_ws->r = this_r;
ignore_enter = 1;
- if (ws[wsid].restack) {
+ /* set focus */
+ if (new_ws->restack) {
stack();
- bar_print();
- } else {
- if (ws[wsid].focus != NULL)
- focus_win(ws[wsid].focus);
+ bar_print(this_r);
+ } else {
+ if (new_ws->focus)
+ focus_win(new_ws->focus);
XSync(display, False);
}
}
swapwin(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)
+ 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);
focus(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);
XSync(display, False);
}
void
cycle_layout(union arg *args)
{
- DNPRINTF(SWM_D_EVENT, "cycle_layout: workspace: %d\n", current_ws);
+ struct workspace *ws;
+
+ ws = cur_ws();
+
+ DNPRINTF(SWM_D_EVENT, "cycle_layout: workspace: %d\n", ws->idx);
+
+ ws->cur_layout++;
+ if (ws->cur_layout->l_stack == NULL)
+ ws->cur_layout = &layouts[0];
+ ignore_enter = 1;
- ws[current_ws].cur_layout++;
- if (ws[current_ws].cur_layout->l_stack == NULL)
- ws[current_ws].cur_layout = &layouts[0];
stack();
}
void
-stack(void) {
- DNPRINTF(SWM_D_EVENT, "stack: workspace: %d\n", current_ws);
+resize_master(union arg *args)
+{
+ struct workspace *ws = cur_ws();
- ws[current_ws].restack = 0;
- ws[current_ws].cur_layout->l_stack();
- XSync(display, False);
+ DNPRINTF(SWM_D_STACK, "resize_master for workspace %d (id %d\n",
+ args->id, ws->idx);
+
+ if (ws->cur_layout->l_resize != NULL)
+ ws->cur_layout->l_resize(args->id);
}
void
-vertical_init(void)
+stack_reset(union arg *args)
{
- DNPRINTF(SWM_D_EVENT, "vertical_init: workspace: %d\n", current_ws);
+ struct workspace *ws = cur_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);
+ stack();
+ }
}
-/* I know this sucks but it works well enough */
void
-vertical_stack(void) {
+stack(void) {
+ 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, struct swm_region *r)
+{
+ unsigned int mask;
XWindowChanges wc;
- struct ws_win wf, *win, *winfocus = &wf;
- int i, h, w, x, y, hrh, winno;
- int floater = 0;
- unsigned int mask;
- DNPRINTF(SWM_D_EVENT, "vertical_stack: workspace: %d\n", current_ws);
+ bzero(&wc, sizeof wc);
+ mask = CWX | CWY | CWBorderWidth | CWWidth | CWHeight;
+ wc.border_width = 1;
+ if (win->transient) {
+ 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(r) - win->g.w) / 2;
+ wc.y = (HEIGHT(r) - win->g.h) / 2;
+
+ 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(struct workspace *ws)
+{
+ DNPRINTF(SWM_D_MISC, "vertical_init: workspace: %d\n", ws->idx);
+
+ ws->l_state.vertical_msize = SWM_V_SLICE / 2;
+}
- winfocus->id = root;
+void
+vertical_resize(int id)
+{
+ struct workspace *ws = cur_ws();
- winno = count_win(current_ws, 0);
- if (winno == 0)
+ DNPRINTF(SWM_D_STACK, "vertical_resize: workspace: %d\n", ws->idx);
+
+ switch (id) {
+ case SWM_ARG_ID_MASTERSHRINK:
+ ws->l_state.vertical_msize--;
+ if (ws->l_state.vertical_msize < 1)
+ ws->l_state.vertical_msize = 1;
+ 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;
+ break;
+ default:
return;
+ }
+ stack();
+}
- if (winno > 1)
- w = width / 2;
- else
- w = width;
+void
+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;
+ unsigned int mask;
+
+ DNPRINTF(SWM_D_STACK, "vertical_stack: workspace: %d\n", ws->idx);
+
+ if ((winno = count_win(ws, 0)) == 0)
+ return;
+
+ if (ws->focus == NULL)
+ ws->focus = TAILQ_FIRST(&ws->winlist);
+ winfocus = cur_focus ? cur_focus : ws->focus;
+
+ if (winno > 1) {
+ main_width = (g->w / SWM_V_SLICE) *
+ ws->l_state.vertical_msize;
+ gg.w = main_width;
+ }
if (winno > 2)
- hrh = height / (winno - 1);
+ hrh = g->h / (winno - 1);
else
hrh = 0;
- x = 0;
- y = bar_enabled ? bar_height : 0;
- h = height;
i = 0;
- TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
+ TAILQ_FOREACH(win, &ws->winlist, entry) {
if (i == 1) {
- x += w + 2;
- w -= 2;
+ gg.x += main_width + 2;
+ gg.w = g->w - (main_width + 2);
}
if (i != 0 && hrh != 0) {
/* correct the last window for lost pixels */
- if (win == TAILQ_LAST(&ws[current_ws].winlist,
- ws_win_list)) {
- h = height - (i * hrh);
- if (h == 0)
- h = hrh;
- else
- h += hrh;
- y += hrh;
+ if (win == TAILQ_LAST(&ws->winlist, ws_win_list)) {
+ gg.h = hrh + (g->h - (i * hrh));
+ gg.y += hrh;
} else {
- h = hrh - 2;
+ gg.h = hrh - 2;
/* leave first right hand window at y = 0 */
if (i > 1)
- y += h + 2;
+ gg.y += gg.h + 2;
}
}
if (win->transient != 0 || win->floating != 0)
- floater = 1;
- else
- floater = 0;
-
- bzero(&wc, sizeof wc);
- wc.border_width = 1;
- if (floater == 0) {
- win->x = wc.x = x;
- win->y = wc.y = y;
- win->width = wc.width = w;
- win->height = wc.height = h;
+ stack_floater(win, ws->r);
+ else {
+ bzero(&wc, sizeof wc);
+ wc.border_width = 1;
+ win->g.x = wc.x = gg.x;
+ win->g.y = wc.y = gg.y;
+ win->g.w = wc.width = gg.w;
+ win->g.h = wc.height = gg.h;
mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
- } else {
- /* make sure we don't clobber the screen */
- if (win->wa.width > width)
- win->wa.width = width;
- if (win->wa.height > height)
- win->wa.width = height;
- win->x = wc.x = (width - win->wa.width) / 2;
- win->y = wc.y = (height - win->wa.height) / 2;
- mask = CWX | CWY | CWBorderWidth;
+ XConfigureWindow(display, win->id, mask, &wc);
}
- XConfigureWindow(display, win->id, mask, &wc);
- if (win == ws[current_ws].focus)
- winfocus = win;
- else
- unfocus_win(win);
XMapRaised(display, win->id);
i++;
}
- 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
-horizontal_init(void)
+horizontal_init(struct workspace *ws)
{
- DNPRINTF(SWM_D_EVENT, "horizontal_init: workspace: %d\n", current_ws);
+ DNPRINTF(SWM_D_STACK, "horizontal_init: workspace: %d\n", ws->idx);
+
+ ws->l_state.horizontal_msize = SWM_H_SLICE / 2;
}
void
-horizontal_stack(void) {
- XWindowChanges wc;
- struct ws_win wf, *win, *winfocus = &wf;
- int i, h, w, x, y, hrw, winno;
- int floater = 0;
- unsigned int mask;
+horizontal_resize(int id)
+{
+ struct workspace *ws = cur_ws();
+ DNPRINTF(SWM_D_STACK, "horizontal_resize: workspace: %d\n", ws->idx);
+
+ switch (id) {
+ case SWM_ARG_ID_MASTERSHRINK:
+ ws->l_state.horizontal_msize--;
+ if (ws->l_state.horizontal_msize < 1)
+ ws->l_state.horizontal_msize = 1;
+ 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;
+ break;
+ default:
+ return;
+ }
+ stack();
+}
- DNPRINTF(SWM_D_EVENT, "horizontal_stack: workspace: %d\n", current_ws);
+void
+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;
+ unsigned int mask;
- winfocus->id = root;
+ 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;
- if (winno > 1)
- h = height / 2;
- else
- h = height;
+ if (ws->focus == NULL)
+ 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;
+ gg.h = main_height;
+ }
if (winno > 2)
- hrw = width / (winno - 1);
+ hrw = g->w / (winno - 1);
else
hrw = 0;
- x = 0;
- y = bar_enabled ? bar_height : 0;
- w = width;
i = 0;
- TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
+ TAILQ_FOREACH(win, &ws->winlist, entry) {
if (i == 1) {
- y += h + 2;
- h -= (2 - height % 2);
+ gg.y += main_height + 2;
+ gg.h = g->h - (main_height + 2);
}
if (i != 0 && hrw != 0) {
/* correct the last window for lost pixels */
- if (win == TAILQ_LAST(&ws[current_ws].winlist,
- ws_win_list)) {
- w = width - (i * hrw);
- if (w == 0)
- w = hrw;
- else
- w += hrw;
- x += hrw;
+ if (win == TAILQ_LAST(&ws->winlist, ws_win_list)) {
+ gg.w = hrw + (g->w - (i * hrw));
+ gg.x += hrw;
} else {
- w = hrw - 2;
+ gg.w = hrw - 2;
/* leave first bottom window at x = 0 */
if (i > 1)
- x += w + 2;
+ gg.x += gg.w + 2;
}
}
if (win->transient != 0 || win->floating != 0)
- floater = 1;
- else
- floater = 0;
-
- bzero(&wc, sizeof wc);
- wc.border_width = 1;
- if (floater == 0) {
- win->x = wc.x = x;
- win->y = wc.y = y;
- win->width = wc.width = w;
- win->height = wc.height = h;
+ stack_floater(win, ws->r);
+ else {
+ bzero(&wc, sizeof wc);
+ wc.border_width = 1;
+ win->g.x = wc.x = gg.x;
+ win->g.y = wc.y = gg.y;
+ win->g.w = wc.width = gg.w;
+ win->g.h = wc.height = gg.h;
mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
- } else {
- /* make sure we don't clobber the screen */
- if (win->wa.width > width)
- win->wa.width = width;
- if (win->wa.height > height)
- win->wa.width = height;
- win->x = wc.x = (width - win->wa.width) / 2;
- win->y = wc.y = (height - win->wa.height) / 2;
- mask = CWX | CWY | CWBorderWidth;
+ XConfigureWindow(display, win->id, mask, &wc);
}
- XConfigureWindow(display, win->id, mask, &wc);
- if (win == ws[current_ws].focus)
- winfocus = win;
- else
- unfocus_win(win);
XMapRaised(display, win->id);
i++;
}
- focus_win(winfocus); /* this has to be done outside of the loop */
+ if (winfocus)
+ focus_win(winfocus); /* this has to be done outside of the loop */
}
/* fullscreen view */
void
-max_init(void)
-{
- DNPRINTF(SWM_D_EVENT, "max_init: workspace: %d\n", current_ws);
-}
-
-void
-max_stack(void) {
+max_stack(struct workspace *ws, struct swm_geometry *g) {
XWindowChanges wc;
- struct ws_win wf, *win, *winfocus = &wf;
- int i, h, w, x, y, winno;
- unsigned int mask;
-
- DNPRINTF(SWM_D_EVENT, "max_stack: workspace: %d\n", current_ws);
+ struct swm_geometry gg = *g;
+ struct ws_win *win, *winfocus;
+ unsigned int mask;
- winfocus->id = root;
+ DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx);
- winno = count_win(current_ws, 0);
- if (winno == 0)
+ if (count_win(ws, 0) == 0)
return;
- x = 0;
- y = bar_enabled ? bar_height : 0;
- TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
- if (i == 1 && win->transient == 0 && win->floating != 0) {
- h = height - 2;
- w = width - 2;
-
- winfocus = win;
-
+ if (ws->focus == NULL)
+ ws->focus = TAILQ_FIRST(&ws->winlist);
+ winfocus = cur_focus ? cur_focus : ws->focus;
+
+ TAILQ_FOREACH(win, &ws->winlist, entry) {
+ if (win->transient != 0 || win->floating != 0) {
+ if (win == ws->focus) {
+ /* XXX maximize? */
+ stack_floater(win, ws->r);
+ XMapRaised(display, win->id);
+ } else
+ XUnmapWindow(display, win->id);
+ } else {
bzero(&wc, sizeof wc);
wc.border_width = 1;
- win->x = wc.x = x;
- win->y = wc.y = y;
- win->width = wc.width = w;
- win->height = wc.height = h;
+ win->g.x = wc.x = gg.x;
+ win->g.y = wc.y = gg.y;
+ win->g.w = wc.width = gg.w;
+ win->g.h = wc.height = gg.h;
mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
XConfigureWindow(display, win->id, mask, &wc);
- XMapRaised(display, win->id);
- } else {
- /* hide all but the master window */
- XUnmapWindow(display, win->id);
+ if (win == ws->focus) {
+ XMapRaised(display, win->id);
+ } else
+ XUnmapWindow(display, win->id);
}
- i++;
}
- 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)
{
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();
}
union arg args;
} keys[] = {
/* modifier key function argument */
- /* XXX alt-c is temporary, until I figure out how to grab spacebar */
- { MODKEY, XK_c, cycle_layout, {0} },
+ { 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, 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_Return, spawn, {.argv = spawn_term} },
{ MODKEY, XK_p, spawn, {.argv = spawn_menu} },
{ MODKEY | ShiftMask, XK_q, quit, {0} },
- { MODKEY, XK_q, restart, {.argv = spawn_scrotwm } },
+ { MODKEY, XK_q, restart, {0} },
{ MODKEY, XK_m, focus, {.id = SWM_ARG_ID_FOCUSMAIN} },
{ MODKEY, XK_1, switchws, {.id = 0} },
{ MODKEY, XK_2, switchws, {.id = 1} },
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
DNPRINTF(SWM_D_EVENT, "keypress: window: %lu\n", ev->window);
keysym = XKeycodeToKeysym(display, (KeyCode)ev->keycode, 0);
- for(i = 0; i < LENGTH(keys); i++)
- if(keysym == keys[i].keysym
+ for (i = 0; i < LENGTH(keys); i++)
+ if (keysym == keys[i].keysym
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
&& keys[i].func)
keys[i].func(&(keys[i].args));
XButtonPressedEvent *ev = &e->xbutton;
#ifdef SWM_CLICKTOFOCUS
struct ws_win *win;
+ struct workspace *ws = cur_ws();
#endif
-
DNPRINTF(SWM_D_EVENT, "buttonpress: window: %lu\n", ev->window);
- if (ev->window == root)
+ if (ev->window == ev->root)
return;
- if (ev->window == ws[current_ws].focus->id)
+ if (ev->window == cur_focus->id)
return;
#ifdef SWM_CLICKTOFOCUS
- TAILQ_FOREACH(win, &ws[current_ws].winlist, entry)
+ TAILQ_FOREACH(win, &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);
+ XSetWindowBorder(display, ws->focus->id, 0x888888);
XSetInputFocus(display, ev->window, RevertToPointerRoot,
CurrentTime);
- ws[current_ws].focus = win;
+ ws->focus = win;
XSync(display, False);
break;
}
#endif
}
+void
+set_win_state(struct ws_win *win, long state)
+{
+ long data[] = {state, None};
+
+ DNPRINTF(SWM_D_EVENT, "set_win_state: window: %lu\n", win->id);
+
+ XChangeProperty(display, win->id, astate, astate, 32, PropModeReplace,
+ (unsigned char *)data, 2);
+}
+
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);
+ win->ws = ws;
+ win->s = ws->r->s; /* this never changes */
+ TAILQ_INSERT_TAIL(&ws->winlist, win, entry);
- XSelectInput(display, id, ButtonPressMask | EnterWindowMask |
- FocusChangeMask | ExposureMask);
-
- return win;
-}
-
-
-void
-configurerequest(XEvent *e)
-{
- XConfigureRequestEvent *ev = &e->xconfigurerequest;
- Window trans;
- struct ws_win *win;
-
- DNPRINTF(SWM_D_EVENT, "configurerequest: window: %lu\n", ev->window);
-
-
- win = manage_window(ev->window);
- ws[current_ws].focus = win; /* make new win focused */
+ /* make new win focused */
+ focus_win(win);
XGetTransientForHint(display, win->id, &trans);
if (trans) {
win->transient = trans;
- DNPRINTF(SWM_D_MISC, "configurerequest: win %u transient %u\n",
+ DNPRINTF(SWM_D_MISC, "manage_window: win %u transient %u\n",
(unsigned)win->id, win->transient);
}
XGetWindowAttributes(display, win->id, &win->wa);
-#if 0
- XClassHint ch = { 0 };
- if(XGetClassHint(display, win->id, &ch)) {
- fprintf(stderr, "class: %s name: %s\n", ch.res_class, ch.res_name);
- if (!strcmp(ch.res_class, "Gvim") && !strcmp(ch.res_name, "gvim")) {
- win->floating = 0;
+ win->g.w = win->wa.width;
+ win->g.h = win->wa.height;
+ win->g.x = win->wa.x;
+ win->g.y = win->wa.y;
+
+ /* XXX make this a table */
+ bzero(&ch, sizeof ch);
+ if (XGetClassHint(display, win->id, &ch)) {
+ /*fprintf(stderr, "class: %s name: %s\n", ch.res_class, ch.res_name); */
+ if (!strcmp(ch.res_class, "MPlayer") && !strcmp(ch.res_name, "xv")) {
+ win->floating = 1;
}
- if(ch.res_class)
+ if (ch.res_class)
XFree(ch.res_class);
- if(ch.res_name)
+ if (ch.res_name)
XFree(ch.res_name);
}
-#endif
- stack();
+
+ XSelectInput(display, id, EnterWindowMask | FocusChangeMask |
+ PropertyChangeMask | StructureNotifyMask);
+
+ set_win_state(win, NormalState);
+
+ return (win);
+}
+
+void
+configurerequest(XEvent *e)
+{
+ XConfigureRequestEvent *ev = &e->xconfigurerequest;
+ struct ws_win *win;
+ int new = 1;
+ XWindowChanges wc;
+
+ if ((win = find_window(ev->window)) == NULL)
+ new = 1;
+
+ if (new) {
+ DNPRINTF(SWM_D_EVENT, "configurerequest: new window: %lu\n",
+ ev->window);
+ bzero(&wc, sizeof wc);
+ wc.x = ev->x;
+ wc.y = ev->y;
+ wc.width = ev->width;
+ wc.height = ev->height;
+ wc.border_width = ev->border_width;
+ wc.sibling = ev->above;
+ wc.stack_mode = ev->detail;
+ XConfigureWindow(display, ev->window, ev->value_mask, &wc);
+ } else {
+ DNPRINTF(SWM_D_EVENT, "configurerequest: change window: %lu\n",
+ ev->window);
+ if (win->floating) {
+ if (ev->value_mask & CWX)
+ win->g.x = ev->x;
+ if (ev->value_mask & CWY)
+ win->g.y = ev->y;
+ if (ev->value_mask & CWWidth)
+ win->g.w = ev->width;
+ if (ev->value_mask & CWHeight)
+ win->g.h = ev->height;
+ 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)))
+ config_win(win);
+ XMoveResizeWindow(display, win->id,
+ win->g.x, win->g.y, win->g.w, win->g.h);
+ } else
+ config_win(win);
+ }
}
void
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);
- free(win);
- break;
+ if ((win = find_window(ev->window)) != NULL) {
+ struct workspace *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) {
+ if (ws->focus == NULL)
+ unfocus_win(win); /* XXX focus another ws? */
+ else
+ focus_win(ws->focus);
}
+
+ TAILQ_REMOVE(&ws->winlist, win, entry);
+ set_win_state(win, WithdrawnState);
+ free(win);
}
stack();
{
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 != root)
+ ev->window != ev->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);
+ /* XXX update cur_ws here?... 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);
+ }
+ }
}
}
void
focusin(XEvent *e)
{
- XFocusChangeEvent *ev = &e->xfocus;
+ DNPRINTF(SWM_D_EVENT, "focusin: window: %lu\n", e->xfocus.window);
- DNPRINTF(SWM_D_EVENT, "focusin: window: %lu\n", ev->window);
-
- XSync(display, False); /* not sure this helps redrawing graphic apps */
-
- if (ev->window == root)
+ /* 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, "mappingnotify: window: %lu\n", ev->window);
XRefreshKeyboardMapping(ev);
- if(ev->request == MappingKeyboard)
+ if (ev->request == MappingKeyboard)
grabkeys();
}
void
maprequest(XEvent *e)
{
+ XMapRequestEvent *ev = &e->xmaprequest;
+ XWindowAttributes wa;
+ struct workspace *ws = cur_ws();
+
DNPRINTF(SWM_D_EVENT, "maprequest: window: %lu\n",
e->xmaprequest.window);
- manage_window(e->xmaprequest.window);
+ if (!XGetWindowAttributes(display, ev->window, &wa))
+ return;
+ if (wa.override_redirect)
+ return;
+ manage_window(e->xmaprequest.window, ws); /* RRR */
stack();
}
void
visibilitynotify(XEvent *e)
{
+ int i;
+ struct swm_region *r;
DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: %lu\n", e->xvisibility.window);
-
- if (e->xvisibility.window == bar_window &&
- e->xvisibility.state == VisibilityUnobscured)
- bar_print();
+ 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_print(r);
}
void (*handler[LASTEvent])(XEvent *) = {
int
xerror(Display *d, XErrorEvent *ee)
{
- fprintf(stderr, "error: %p %p\n", display, ee);
-
+ /* fprintf(stderr, "error: %p %p\n", display, ee); */
return (-1);
}
XSelectInput(display, DefaultRootWindow(display),
SubstructureRedirectMask);
XSync(display, False);
- if(other_wm)
+ if (other_wm)
return (1);
XSetErrorHandler(xerror);
return (0);
}
+long
+getstate(Window w)
+{
+ int format, status;
+ long result = -1;
+ unsigned char *p = NULL;
+ unsigned long n, extra;
+ Atom real;
+
+ astate = XInternAtom(display, "WM_STATE", False);
+ status = XGetWindowProperty(display, w, astate, 0L, 2L, False, astate,
+ &real, &format, &n, &extra, (unsigned char **)&p);
+ if (status != Success)
+ return (-1);
+ if (n != 0)
+ result = *p;
+ XFree(p);
+ 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)
+{
+ int i;
+
+
+ if ((screens = calloc(ScreenCount(display),
+ sizeof(struct swm_screen))) == NULL)
+ errx(1, "calloc: screens");
+
+ /* map physical screens */
+ for (i = 0; i < ScreenCount(display); i++) {
+#ifdef SWM_XRR_HAS_CRTC
+ XRRCrtcInfo *crtc_info;
+ XRRScreenResources *res;
+ int c;
+#endif /* SWM_XRR_HAS_CRTC */
+ Window d1, d2, *wins = NULL;
+ XWindowAttributes wa;
+ struct swm_region *r;
+ int errorbase, major, minor;
+ int j, ncrtc, w = 0;
+ unsigned int num;
+
+ screens[i].idx = i;
+ TAILQ_INIT(&screens[i].rl);
+ screens[i].root = ScreenOfDisplay(display, i)->root;
+ screens[i].root = RootWindow(display, i);
+
+ /* 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");
+
+ /* init all workspaces */
+ for (j = 0; j < SWM_WS_MAX; j++) {
+ int k;
+ struct workspace *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_init != NULL)
+ layouts[k].l_init(ws);
+ }
+ 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, &num)) {
+ if (wins) /* not sure if this is necessary */
+ XFree(wins);
+ continue;
+ }
+
+
+#ifdef SWM_XRR_HAS_CRTC
+ res = XRRGetScreenResources (display, screens[i].root);
+ if (res == NULL) {
+ ncrtc = 0;
+ new_region(&screens[i], &screens[i].ws[w],
+ 0, 0, DisplayWidth(display, i),
+ DisplayHeight(display, i));
+ } else
+ ncrtc = res->ncrtc;
+
+ for (c = 0; c < ncrtc; c++) {
+ crtc_info = XRRGetCrtcInfo(display, res, res->crtcs[c]);
+ if (crtc_info != NULL && crtc_info->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);
+ w++;
+ }
+#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 < 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], r->ws);
+ }
+ /* 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], r->ws);
+ }
+ if (wins)
+ XFree(wins);
+ }
+}
+
int
main(int argc, char *argv[])
{
char conf[PATH_MAX], *cfile = NULL;
struct stat sb;
XEvent e;
- unsigned int i, num;
- Window d1, d2, *wins = NULL;
- XWindowAttributes wa;
+ start_argv = argv;
fprintf(stderr, "Welcome to scrotwm V%s\n", SWM_VERSION);
- if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+ if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
warnx("no locale support");
- if(!(display = XOpenDisplay(0)))
+ if (!(display = XOpenDisplay(0)))
errx(1, "can not open display");
if (active_wm())
errx(1, "other wm running");
- screen = DefaultScreen(display);
- root = RootWindow(display, screen);
- width = DisplayWidth(display, screen) - 2;
- height = DisplayHeight(display, screen) - 2;
+ astate = XInternAtom(display, "WM_STATE", False);
/* look for local and global conf file */
pwd = getpwuid(getuid());
if (cfile)
conf_load(cfile);
- /* init all workspaces */
- for (i = 0; i < SWM_WS_MAX; i++) {
- ws[i].visible = 0;
- ws[i].restack = 1;
- ws[i].focus = NULL;
- TAILQ_INIT(&ws[i].winlist);
- 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)) {
- for (i = 0; i < num; i++) {
- if (!XGetWindowAttributes(display, wins[i], &wa)
- || wa.override_redirect ||
- XGetTransientForHint(display, wins[i], &d1))
- continue;
- manage_window(wins[i]);
- }
- if(wins)
- XFree(wins);
- }
- ws[0].focus = TAILQ_FIRST(&ws[0].winlist);
-
- /* setup status bar */
- bar_setup();
+ setup_screens();
- XSelectInput(display, root, SubstructureRedirectMask |
- SubstructureNotifyMask | ButtonPressMask | KeyPressMask |
- EnterWindowMask | LeaveWindowMask | StructureNotifyMask |
- FocusChangeMask | PropertyChangeMask | ExposureMask);
+ //ws[0].focus = TAILQ_FIRST(&ws[0].winlist);
grabkeys();
stack();