JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
Let scrotwm adjust the font size on xterms as it squishes them in tiling
[spectrwm.git] / scrotwm.c
index 7a13f55..835c1d4 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
  * DEALINGS IN THE SOFTWARE.
  */
 
-#define        SWM_VERSION     "0.5"
+static const char      *cvstag = "$scrotwm$";
+
+#define        SWM_VERSION     "0.8"
 
 #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
+#define        SWM_D_PROP              0x0080
+#define        SWM_D_CLASS             0x0100
 
 u_int32_t              swm_debug = 0
                            | SWM_D_MISC
@@ -90,40 +112,70 @@ u_int32_t          swm_debug = 0
                            | SWM_D_WS
                            | SWM_D_FOCUS
                            | SWM_D_MOVE
+                           | SWM_D_STACK
+                           | SWM_D_MOUSE
+                           | SWM_D_PROP
+                           | SWM_D_CLASS
                            ;
 #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 MOUSEMASK              (BUTTONMASK|PointerMotionMask)
+#define SWM_PROPLEN            (16)
+#define X(r)                   (r)->g.x
+#define Y(r)                   (r)->g.y
+#define WIDTH(r)               (r)->g.w
+#define HEIGHT(r)              (r)->g.h
+#define SWM_MAX_FONT_STEPS     (3)
+
+#ifndef SWM_LIB
+#define SWM_LIB                        "/usr/X11R6/lib/swmhack.so"
+#endif
 
 char                   **start_argv;
 Atom                   astate;
 int                    (*xerrorxlib)(Display *, XErrorEvent *);
 int                    other_wm;
-int                    screen;
 int                    running = 1;
+int                    ss_enabled = 0;
+int                    xrandr_support;
+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;
+int                    term_width = 0;
+int                    font_adjusted = 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];
+char                   bar_vertext[SWM_BAR_MAX];
+int                    bar_version = 0;
+sig_atomic_t           bar_alarm = 0;
+int                    bar_delay = 30;
 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-*-*-*-*-*-*-*-*-*-*",
@@ -131,8 +183,18 @@ char                       *bar_fonts[] = {
 };
 
 /* terminal + args */
-char                           *spawn_term[] = { "xterm", NULL };
-char                           *spawn_menu[] = { "dmenu_run", NULL };
+char                   *spawn_term[] = { "xterm", NULL };
+char                   *spawn_screenshot[] = { "screenshot.sh", NULL, NULL };
+char                   *spawn_lock[] = { "xlock", NULL };
+char                   *spawn_initscr[] = { "initscreen.sh", 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 {
@@ -142,55 +204,106 @@ struct swm_geometry {
        int                     h;
 };
 
+struct swm_screen;
+struct workspace;
+
+/* virtual "screens" */
+struct swm_region {
+       TAILQ_ENTRY(swm_region) entry;
+       struct swm_geometry     g;
+       struct workspace        *ws;    /* current workspace on this region */
+       struct swm_screen       *s;     /* screen idx */
+       Window                  bar_window;
+}; 
+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;
+       int                     manual;
+       int                     font_size_boundary[SWM_MAX_FONT_STEPS];
+       int                     font_steps;
+       int                     last_inc;
+       unsigned long           quirks;
+       struct workspace        *ws;    /* always valid */
+       struct swm_screen       *s;     /* always valid, never changes */
        XWindowAttributes       wa;
        XSizeHints              sh;
+       XClassHint              ch;
 };
 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 ws_win           *focus_prev;    /* 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 horizontal_stacks;
+                               int vertical_msize;
+                               int vertical_mwin;
+                               int vertical_stacks;
+       } 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 */
+       struct swm_region_list  orl;    /* list of old regions */
+       Window                  root;
+       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 {
@@ -203,9 +316,170 @@ 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)
+#define SWM_ARG_ID_CYCLESC_UP  (14)
+#define SWM_ARG_ID_CYCLESC_DOWN        (15)
+#define SWM_ARG_ID_STACKINC    (16)
+#define SWM_ARG_ID_STACKDEC    (17)
+#define SWM_ARG_ID_SS_ALL      (0)
+#define SWM_ARG_ID_SS_WINDOW   (1)
+#define SWM_ARG_ID_DONTCENTER  (0)
+#define SWM_ARG_ID_CENTER      (1)
        char                    **argv;
 };
 
+/* quirks */
+struct quirk {
+       char                    *class;
+       char                    *name;
+       unsigned long           quirk;
+#define SWM_Q_FLOAT            (1<<0)  /* float this window */
+#define SWM_Q_TRANSSZ          (1<<1)  /* transiend window size too small */
+#define SWM_Q_ANYWHERE         (1<<2)  /* don't position this window */
+#define SWM_Q_XTERM_FONTADJ    (1<<3)  /* adjust xterm fonts when resizing */
+} quirks[] = {
+       { "MPlayer",            "xv",           SWM_Q_FLOAT },
+       { "OpenOffice.org 2.4", "VCLSalFrame",  SWM_Q_FLOAT },
+       { "OpenOffice.org 3.0", "VCLSalFrame",  SWM_Q_FLOAT },
+       { "Firefox-bin",        "firefox-bin",  SWM_Q_TRANSSZ},
+       { "Gimp",               "gimp",         SWM_Q_FLOAT | SWM_Q_ANYWHERE},
+       { "XTerm",              "xterm",        SWM_Q_XTERM_FONTADJ},
+       { NULL,                 NULL,           0},
+};
+
+/* events */
+void                   expose(XEvent *);
+void                   keypress(XEvent *);
+void                   buttonpress(XEvent *);
+void                   configurerequest(XEvent *);
+void                   configurenotify(XEvent *);
+void                   destroynotify(XEvent *);
+void                   enternotify(XEvent *);
+void                   focusin(XEvent *);
+void                   mappingnotify(XEvent *);
+void                   maprequest(XEvent *);
+void                   propertynotify(XEvent *);
+void                   unmapnotify(XEvent *);
+void                   visibilitynotify(XEvent *);
+
+void                   (*handler[LASTEvent])(XEvent *) = {
+                               [Expose] = expose,
+                               [KeyPress] = keypress,
+                               [ButtonPress] = buttonpress,
+                               [ConfigureRequest] = configurerequest,
+                               [ConfigureNotify] = configurenotify,
+                               [DestroyNotify] = destroynotify,
+                               [EnterNotify] = enternotify,
+                               [FocusIn] = focusin,
+                               [MappingNotify] = mappingnotify,
+                               [MapRequest] = maprequest,
+                               [PropertyNotify] = propertynotify,
+                               [UnmapNotify] = unmapnotify,
+                               [VisibilityNotify] = visibilitynotify,
+};
+
+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);
+}
+
+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));
+}
+
+void           new_region(struct swm_screen *, int, int, int, int);
+
+void
+custom_region(char *val)
+{
+       unsigned int                    sidx, x, y, w, h;
+
+       if (sscanf(val, "screen[%u]:%ux%u+%u+%u", &sidx, &w, &h, &x, &y) != 5)
+               errx(1, "invalid custom region, "
+                   "should be 'screen[<n>]:<n>x<n>+<n>+<n>\n");
+       if (sidx < 1 || sidx > ScreenCount(display))
+               errx(1, "invalid screen index: %d out of bounds (maximum %d)\n",
+                   sidx, ScreenCount(display));
+       sidx--;
+
+       if (w < 1 || h < 1)
+               errx(1, "region %ux%u+%u+%u too small\n", w, h, x, y);
+
+       if (x  < 0 || x > DisplayWidth(display, sidx) ||
+           y < 0 || y > DisplayHeight(display, sidx) ||
+           w + x > DisplayWidth(display, sidx) ||
+           h + y > DisplayHeight(display, sidx))
+               errx(1, "region %ux%u+%u+%u not within screen boundaries "
+                   "(%ux%u)\n", w, h, x, y,
+                   DisplayWidth(display, sidx), DisplayHeight(display, sidx));
+           
+       new_region(&screens[sidx], x, y, w, h);
+}
+
+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"
@@ -214,7 +488,8 @@ conf_load(char *filename)
 {
        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);
 
@@ -224,7 +499,7 @@ conf_load(char *filename)
        if ((config = fopen(filename, "r")) == NULL)
                return (1);
 
-       for (;;) {
+       for (sc = ScreenCount(display);;) {
                if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL)
                        if (feof(config))
                                break;
@@ -246,35 +521,72 @@ conf_load(char *filename)
                case 'b':
                        if (!strncmp(var, "bar_enabled", strlen("bar_enabled")))
                                bar_enabled = atoi(val);
-                       else if (!strncmp(var, "bar_border",
-                           strlen("bar_border")))
-                               bar_border = strtol(val, NULL, 16);
-                       else if (!strncmp(var, "bar_color",
-                           strlen("bar_color")))
-                               bar_color = strtol(val, NULL, 16);
-                       else if (!strncmp(var, "bar_font_color",
-                           strlen("bar_font_color")))
-                               bar_font_color = strtol(val, NULL, 16);
+                       else if (!varmatch(var, "bar_border", &i))
+                               setscreencolor(val, i, SWM_S_COLOR_BAR_BORDER);
+                       else if (!varmatch(var, "bar_color", &i))
+                               setscreencolor(val, i, SWM_S_COLOR_BAR);
+                       else if (!varmatch(var, "bar_font_color", &i))
+                               setscreencolor(val, 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 if (!strncmp(var, "bar_delay", strlen("bar_delay")))
+                               bar_delay = atoi(val);
                        else
                                goto bad;
                        break;
 
                case 'c':
-                       if (!strncmp(var, "color_focus", strlen("color_focus")))
-                               color_focus = strtol(val, NULL, 16);
-                       else if (!strncmp(var, "color_unfocus",
-                           strlen("color_unfocus")))
-                               color_unfocus = strtol(val, NULL, 16);
+                       if (!varmatch(var, "color_focus", &i))
+                               setscreencolor(val, i, SWM_S_COLOR_FOCUS);
+                       else if (!varmatch(var, "color_unfocus", &i))
+                               setscreencolor(val, 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;
+
+               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 'r':
+                       if (!strncmp(var, "region", strlen("region")))
+                               custom_region(val);
                        else
                                goto bad;
                        break;
 
                case 's':
                        if (!strncmp(var, "spawn_term", strlen("spawn_term")))
-                               asprintf(&spawn_term[0], "%s", val); /* XXX args? */
+                               asprintf(&spawn_term[0], "%s", val);
+                       else if (!strncmp(var, "screenshot_enabled",
+                           strlen("screenshot_enabled")))
+                               ss_enabled = atoi(val);
+                       else if (!strncmp(var, "screenshot_app",
+                           strlen("screenshot_app")))
+                               asprintf(&spawn_screenshot[0], "%s", val);
+                       else
+                               goto bad;
+                       break;
+
+               case 't':
+                       if (!strncmp(var, "term_width", strlen("term_width")))
+                               term_width = atoi(val);
+                       else
+                               goto bad;
                        break;
+
                default:
                        goto bad;
                }
@@ -283,92 +595,218 @@ conf_load(char *filename)
 
        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",
+                           s, x++, r->ws->idx + 1, bar_ext, bar_vertext);
+                       bar_print(r, loc);
+               }
+       }
        XSync(display, False);
-
-       alarm(60);
+       alarm(bar_delay);
 }
 
 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) {
-               bar_enabled = 0;
-               XUnmapWindow(display, bar_window);
+               for (i = 0; i < sc; i++)
+                       TAILQ_FOREACH(tmpr, &screens[i].rl, entry)
+                               XUnmapWindow(display, tmpr->bar_window);
        } else {
-               bar_enabled = 1;
-               XMapRaised(display, bar_window);
+               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,
-           ws[current_ws].g.w, 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);
-       if (bar_enabled) {
-               XMapRaised(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_refresh();
+}
+
+void
+version(struct swm_region *r, union arg *args)
+{
+       bar_version = !bar_version;
+       if (bar_version)
+               strlcpy(bar_vertext, cvstag, sizeof bar_vertext);
+       else
+               strlcpy(bar_vertext, "", sizeof bar_vertext);
+       bar_update();
 }
 
 void
@@ -393,12 +831,12 @@ config_win(struct ws_win *win)
 }
 
 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)
@@ -409,28 +847,121 @@ count_win(int wsid, int count_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)
+unmap_all(void)
+{
+       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)
+                               XUnmapWindow(display, win->id);
+}
+
+void
+fake_keypress(struct ws_win *win, int keysym, int modifiers)
+{
+       XKeyEvent event;
+
+       event.display = display;        /* Ignored, but what the hell */
+       event.window = win->id;
+       event.root = win->s->root;
+       event.subwindow = None;
+       event.time = CurrentTime;
+       event.x = win->g.x;
+       event.y = win->g.y;
+       event.x_root = 1;
+       event.y_root = 1;
+       event.same_screen = True;
+       event.keycode = XKeysymToKeycode(display, keysym);
+       event.state = modifiers;
+
+       event.type = KeyPress;
+       XSendEvent(event.display, event.window, True,
+           KeyPressMask, (XEvent *)&event);
+
+       event.type = KeyRelease;
+       XSendEvent(event.display, event.window, True,
+           KeyPressMask, (XEvent *)&event);
+
+}
+
+void
+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;
+       unmap_all();
        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 = NULL;
+       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) {
+               /* 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)
 {
+       char                    *ret;
+       int                     si;
+
        DNPRINTF(SWM_D_MISC, "spawn: %s\n", args->argv[0]);
        /*
         * The double-fork construct avoids zombie processes and keeps the code
@@ -440,7 +971,22 @@ spawn(union arg *args)
                if (fork() == 0) {
                        if (display)
                                close(ConnectionNumber(display));
+                       setenv("LD_PRELOAD", SWM_LIB, 1);
+                       if (asprintf(&ret, "%d", r->ws->idx)) {
+                               setenv("_SWM_WS", ret, 1);
+                               free(ret);
+                       }
+                       if (asprintf(&ret, "%d", getpid())) {
+                               setenv("_SWM_PID", ret, 1);
+                               free(ret);
+                       }
                        setsid();
+                       /* kill stdin, mplayer, ssh-add etc. need that */
+                       si = open("/dev/null", O_RDONLY, 0);
+                       if (si == -1)
+                               err(1, "open /dev/null");
+                       if (dup2(si, 0) == -1)
+                               err(1, "dup2 /dev/null");
                        execvp(args->argv[0], args->argv);
                        fprintf(stderr, "execvp failed\n");
                        perror(" failed");
@@ -451,517 +997,698 @@ spawn(union arg *args)
 }
 
 void
-focus_win(struct ws_win *win)
+spawnterm(struct swm_region *r, union arg *args)
 {
-       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_MISC, "spawnterm\n");
+
+       if (term_width)
+               setenv("_SWM_XTERM_FONTADJ", "", 1);
+       spawn(r, args);
 }
 
 void
-unfocus_win(struct ws_win *win)
+spawnmenu(struct swm_region *r, union arg *args)
 {
-       DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %lu\n", win->id);
-       XSetWindowBorder(display, win->id, color_unfocus);
-       if (ws[current_ws].focus == win)
-               ws[current_ws].focus = NULL;
+       DNPRINTF(SWM_D_MISC, "spawnmenu\n");
+
+       spawn_menu[SWM_MENU_FN] = bar_fonts[bar_fidx];
+       spawn_menu[SWM_MENU_NB] = r->s->c[SWM_S_COLOR_BAR].name;
+       spawn_menu[SWM_MENU_NF] = r->s->c[SWM_S_COLOR_BAR_FONT].name;
+       spawn_menu[SWM_MENU_SB] = r->s->c[SWM_S_COLOR_BAR_BORDER].name;
+       spawn_menu[SWM_MENU_SF] = r->s->c[SWM_S_COLOR_BAR].name;
+
+       spawn(r, args);
 }
 
 void
-switchws(union arg *args)
+unfocus_all(void)
 {
-       int                     wsid = args->id;
        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;
+                       }
+}
 
-       DNPRINTF(SWM_D_WS, "switchws: %d\n", wsid + 1);
+void
+focus_win(struct ws_win *win)
+{
+       DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win ? win->id : 0);
 
-       if (wsid == current_ws)
+       if (win == NULL)
                return;
 
-       /* map new window first to prevent ugly blinking */
-       TAILQ_FOREACH (win, &ws[wsid].winlist, entry)
-               XMapRaised(display, win->id);
-       ws[wsid].visible = 1;
+       if (win->ws->focus != win && win->ws->focus != NULL)
+               win->ws->focus_prev = win->ws->focus;
+
+       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);
+       }
+}
 
-       TAILQ_FOREACH (win, &ws[current_ws].winlist, entry)
-               XUnmapWindow(display, win->id);
-       ws[current_ws].visible = 0;
+void
+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;
 
-       current_ws = wsid;
+       this_r = r;
+       old_ws = this_r->ws;
+       new_ws = &this_r->s->ws[wsid];
 
-       ignore_enter = 1;
-       if (ws[wsid].restack) {
-               stack();
-               bar_print();
+       DNPRINTF(SWM_D_WS, "switchws screen[%d]:%dx%d+%d+%d: "
+           "%d -> %d\n", r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r),
+           old_ws->idx, wsid);
+
+       if (new_ws == old_ws)
+               return;
+
+       other_r = new_ws->r;
+       if (!other_r) {
+               /* if the other workspace is hidden, switch windows */
+               /* map new window first to prevent ugly blinking */
+               old_ws->r = NULL;
+               old_ws->restack = 1;
+
+               TAILQ_FOREACH(win, &new_ws->winlist, entry)
+                       XMapRaised(display, win->id);
+
+               TAILQ_FOREACH(win, &old_ws->winlist, entry)
+                       XUnmapWindow(display, win->id);
        } 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
+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]:%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
+cyclescr(struct swm_region *r, union arg *args)
+{
+       struct swm_region       *rr;
+       int                     i;
+
+       i = r->s->idx;
+       switch (args->id) {
+       case SWM_ARG_ID_CYCLESC_UP:
+               rr = TAILQ_NEXT(r, entry);
+               if (rr == NULL)
+                       rr = TAILQ_FIRST(&screens[i].rl);
+               break;
+       case SWM_ARG_ID_CYCLESC_DOWN:
+               rr = TAILQ_PREV(r, swm_region_list, entry);
+               if (rr == NULL)
+                       rr = TAILQ_LAST(&screens[i].rl, swm_region_list);
+               break;
+       default:
+               return;
+       };
+       unfocus_all();
+       XSetInputFocus(display, PointerRoot, RevertToPointerRoot, CurrentTime);
+       XWarpPointer(display, None, rr->s[i].root, 0, 0, 0, 0, rr->g.x,
+           rr->g.y + bar_enabled ? bar_height : 0);
 }
 
 void
-swapwin(union arg *args)
+swapwin(struct swm_region *r, union arg *args)
 {
-       struct ws_win           *target;
+       struct ws_win           *target, *source;
+       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;
 
+       source = cur_focus;
+       wl = &source->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(source, 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, source, entry);
                else
-                       TAILQ_INSERT_BEFORE(target, ws[current_ws].focus,
-                           entry);
+                       TAILQ_INSERT_BEFORE(target, source, 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(source, entry);
+               TAILQ_REMOVE(wl, source, entry);
                if (target == NULL)
-                       TAILQ_INSERT_HEAD(&ws[current_ws].winlist,
-                           ws[current_ws].focus, entry);
+                       TAILQ_INSERT_HEAD(wl, source, entry);
                else
-                       TAILQ_INSERT_AFTER(&ws[current_ws].winlist, target,
-                           ws[current_ws].focus, entry);
+                       TAILQ_INSERT_AFTER(wl, target, source, entry);
                break;
        case SWM_ARG_ID_SWAPMAIN:
-               target = TAILQ_FIRST(&ws[current_ws].winlist);
-               if (target == ws[current_ws].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);
+               target = TAILQ_FIRST(wl);
+               if (target == source) {
+                       if (source->ws->focus_prev != NULL &&
+                           source->ws->focus_prev != target)  
+                                
+                               source = source->ws->focus_prev;
+                       else
+                               return;
+                }
+               source->ws->focus_prev = target;
+               TAILQ_REMOVE(wl, target, entry);
+               TAILQ_INSERT_BEFORE(source, target, entry);
+               TAILQ_REMOVE(wl, source, entry);
+               TAILQ_INSERT_HEAD(wl, source, entry);
                break;
        default:
                DNPRINTF(SWM_D_MOVE, "invalid id: %d\n", args->id);
                return;
        }
 
-       ignore_enter = 2;
+       ignore_enter = 1;
        stack();
 }
 
 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:
                return;
        }
 
-       if (winfocus == winlostfocus)
+       if (winfocus == winlostfocus || winfocus == NULL)
                return;
 
-       unfocus_win(winlostfocus);
+       XMapRaised(display, winfocus->id);
        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;
 
-       ws[current_ws].cur_layout++;
-       if (ws[current_ws].cur_layout->l_stack == NULL)
-               ws[current_ws].cur_layout = &layouts[0];
-       ignore_enter = 1;
+       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;
        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);
+               }
+       }
+       if (font_adjusted)
+               font_adjusted--;
        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;
 
-#if 0
        bzero(&wc, sizeof wc);
+       mask = CWX | CWY | CWBorderWidth | CWWidth | CWHeight;
        wc.border_width = 1;
-       mask = CWX | CWY | CWBorderWidth;
-
-       win->g.w = wc.width = win->wa.width;
-       win->g.h = wc.height = win->wa.height;
-       win->g.x = wc.x = (ws[current_ws].g.w - win->wa.width) / 2;
-       win->g.y = wc.y = (ws[current_ws].g.h - win->wa.height) / 2;
+       if (win->transient && (win->quirks & SWM_Q_TRANSSZ)) {
+               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;
+       if (win->manual) {
+               wc.x = win->g.x;
+               wc.y = win->g.y;
+       } else {
+               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);
-return;
-#endif
-       bzero(&wc, sizeof wc);
-       wc.border_width = 1;
-       mask = CWX | CWY | CWBorderWidth;
+}
 
-       /* use obsolete width height */
-       if (win->sh.flags & USPosition) {
-               win->g.w = wc.width = win->sh.width;
-               win->g.h = wc.height = win->sh.height;
-               mask |= CWWidth | CWHeight;
+/*
+ * Send keystrokes to terminal to decrease/increase the font size as the
+ * window size changes.
+ */
+void
+adjust_font(struct ws_win *win)
+{
+       if (!(win->quirks & SWM_Q_XTERM_FONTADJ) ||
+           win->floating || win->transient)
+               return;
+       
+       if (win->sh.width_inc && win->last_inc != win->sh.width_inc &&
+           win->g.w / win->sh.width_inc < term_width &&
+           win->font_steps < SWM_MAX_FONT_STEPS) {
+               win->font_size_boundary[win->font_steps] =
+                   (win->sh.width_inc * term_width) + win->sh.base_width;
+               win->font_steps++;
+               font_adjusted++;
+               win->last_inc = win->sh.width_inc;
+               fake_keypress(win, XK_KP_Subtract, ShiftMask);
+       } else if (win->font_steps && win->last_inc != win->sh.width_inc &&
+           win->g.w > win->font_size_boundary[win->font_steps - 1]) {
+               win->font_steps--;
+               font_adjusted++;
+               win->last_inc = win->sh.width_inc;
+               fake_keypress(win, XK_KP_Add, ShiftMask);
        }
+}
 
-       /* try min max */
-       if (win->sh.flags & PMinSize) {
-               /* some hints are retarded */
-               if (win->sh.min_width < ws[current_ws].g.w / 10)
-                       win->sh.min_width = ws[current_ws].g.w / 3;
-               if (win->sh.min_height < ws[current_ws].g.h / 10)
-                       win->sh.height = ws[current_ws].g.h / 3;
-
-               win->g.w = wc.width = win->sh.min_width * 2;
-               win->g.h = wc.height = win->sh.min_height * 2;
-               mask |= CWWidth | CWHeight;
-       }
-       if (win->sh.flags & PMaxSize) {
-               /* potentially override min values */
-               if (win->sh.max_width < ws[current_ws].g.w) {
-                       win->g.w = wc.width = win->sh.max_width;
-                       mask |= CWWidth;
-               }
-               if (win->sh.max_height < ws[current_ws].g.h) {
-                       win->g.h = wc.height = win->sh.max_height;
-                       mask |= CWHeight;
-               }
-       }
+#define SWAPXY(g)      do {                            \
+       int tmp;                                        \
+       tmp = (g)->y; (g)->y = (g)->x; (g)->x = tmp;    \
+       tmp = (g)->h; (g)->h = (g)->w; (g)->w = tmp;    \
+} while (0)
+void
+stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
+{
+       XWindowChanges          wc;
+       struct swm_geometry     win_g, r_g = *g;
+       struct ws_win           *win, *winfocus;
+       int                     i, j, s, w_inc, h_inc, w_base, h_base, stacks; 
+       int                     hrh, extra, h_slice, last_h = 0;
+       int                     split, colno, winno, mwin, msize, mscale;
+       int                     remain, missing, v_slice;;
+       unsigned int            mask;
+
+       DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d\n rot=%s flip=%s",
+           ws->idx, rot ? "yes" : "no", flip ? "yes" : "no");
 
-       /* make sure we don't clobber the screen */
-       if ((mask & CWWidth) && win->wa.width > ws[current_ws].g.w)
-               win->wa.width = ws[current_ws].g.w - 4;
-       if ((mask & CWHeight) && win->wa.height > ws[current_ws].g.h)
-               win->wa.height = ws[current_ws].g.h - 4;
+       if ((winno = count_win(ws, 0)) == 0)
+               return;
 
-       /* supposed to be obsolete */
-       if (win->sh.flags & USPosition) {
-               win->g.x = wc.x = win->sh.x;
-               win->g.y = wc.y = win->sh.y;
+       if (ws->focus == NULL)
+               ws->focus = TAILQ_FIRST(&ws->winlist);
+       winfocus = cur_focus ? cur_focus : ws->focus;
+
+       win = TAILQ_FIRST(&ws->winlist);
+       if (rot) {
+               w_inc = win->sh.width_inc;
+               w_base = win->sh.base_width;
+               mwin = ws->l_state.horizontal_mwin;
+               mscale = ws->l_state.horizontal_msize;
+               stacks = ws->l_state.horizontal_stacks;
+               SWAPXY(&r_g);
        } else {
-               win->g.x = wc.x = (ws[current_ws].g.w - win->wa.width) / 2;
-               win->g.y = wc.y = (ws[current_ws].g.h - win->wa.height) / 2;
+               w_inc = win->sh.height_inc;
+               w_base = win->sh.base_height;
+               mwin = ws->l_state.vertical_mwin;
+               mscale = ws->l_state.vertical_msize;
+               stacks = ws->l_state.vertical_stacks;
        }
-       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);
+       win_g = r_g;
 
-       XConfigureWindow(display, win->id, mask, &wc);
-}
+       if (stacks > winno - mwin)
+               stacks = winno - mwin;
+       if (stacks < 1)
+               stacks = 1;
 
+       h_slice = r_g.h / SWM_H_SLICE;
+       if (mwin && winno > mwin) {
+               v_slice = r_g.w / SWM_V_SLICE;
 
-int vertical_msize[SWM_WS_MAX];
+               split = mwin;
+               colno = split;
+               win_g.w = v_slice * mscale;
 
-void
-vertical_init(int ws_idx)
-{
-       DNPRINTF(SWM_D_MISC, "vertical_init: workspace: %d\n", current_ws);
+               if (w_inc > 1 && w_inc < v_slice) {
+                       /* adjust for window's requested size increment */
+                       remain = (win_g.w - w_base) % w_inc;
+                       missing = w_inc - remain;
 
-       vertical_msize[ws_idx] = ws[ws_idx].g.w / 2;
-}
-
-void
-vertical_resize(int id)
-{
-       DNPRINTF(SWM_D_MISC, "vertical_resize: workspace: %d\n", current_ws);
+                       if (missing <= extra || j == 0) {
+                               extra -= missing;
+                               win_g.w += missing;
+                       } else {
+                               win_g.w -= remain;
+                               extra += remain;
+                       }
+               }
 
-       switch (id) {
-       case SWM_ARG_ID_MASTERSHRINK:
-               vertical_msize[current_ws] -= ws[current_ws].g.w / 32;
-               if ( vertical_msize[current_ws] < ws[current_ws].g.w / 16)
-                       vertical_msize[current_ws] = ws[current_ws].g.w / 16;
-               break;
-       case SWM_ARG_ID_MASTERGROW:
-               vertical_msize[current_ws] += ws[current_ws].g.w / 32;
-               if ( vertical_msize[current_ws] >
-                  (ws[current_ws].g.w - (ws[current_ws].g.w / 16)))
-                       vertical_msize[current_ws] =
-                           ws[current_ws].g.w - ws[current_ws].g.w / 16;
-               break;
-       default:
-               return;
+               msize = win_g.w;
+               if (flip) 
+                       win_g.x += r_g.w - msize;
+       } else {
+               msize = -2;
+               colno = split = winno / stacks;
+               win_g.w = ((r_g.w - (stacks * 2) + 2) / stacks);
        }
-       stack();
-}
-
-void
-vertical_stack(struct swm_geometry *g) {
-       XWindowChanges          wc;
-       struct swm_geometry     gg = *g;
-       struct ws_win           wf, *win, *winfocus = &wf;
-       int                     i, hrh, winno;
-       unsigned int            mask;
-
-       DNPRINTF(SWM_D_EVENT, "vertical_stack: workspace: %d\n", current_ws);
-
-       winno = count_win(current_ws, 0);
-       if (winno == 0)
-               return;
-       winfocus->id = root;
-
-       if (winno > 1)
-               gg.w = vertical_msize[current_ws];
+       hrh = r_g.h / colno;
+       extra = r_g.h - (colno * hrh);
+       win_g.h = hrh - 2;
 
-       if (winno > 2)
-               hrh = g->h / (winno - 1);
-       else
-               hrh = 0;
+       /*  stack all the tiled windows */
+       i = j = 0, s = stacks;
+       TAILQ_FOREACH(win, &ws->winlist, entry) {
+               if (win->transient != 0 || win->floating != 0)
+                       continue;
 
-       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 (split && i == split) {
+                       colno = (winno - mwin) / stacks;
+                       if (s <= (winno - mwin) % stacks)
+                               colno++;
+                       split = split + colno;
+                       hrh = (r_g.h / colno);
+                       extra = r_g.h - (colno * hrh);
+                       if (flip)
+                               win_g.x = r_g.x;
+                       else
+                               win_g.x += win_g.w + 2;
+                       win_g.w = (r_g.w - msize - (stacks * 2)) / stacks;
+                       if (s == 1)
+                               win_g.w += (r_g.w - msize - (stacks * 2)) %
+                                   stacks;
+                       s--;
+                       j = 0;
+               }
+               win_g.h = hrh - 2;
+               if (rot) {
+                       h_inc = win->sh.width_inc;
+                       h_base = win->sh.base_width;
+               } else {
+                       h_inc = win->sh.height_inc;
+                       h_base = win->sh.base_height;
                }
-               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;
+               if (j == colno - 1) {
+                       win_g.h = hrh + extra;
+               } else if (h_inc > 1 && h_inc < h_slice) {
+                       /* adjust for window's requested size increment */
+                       remain = (win_g.h - h_base) % h_inc;
+                       missing = h_inc - remain;
+
+                       if (missing <= extra || j == 0) {
+                               extra -= missing;
+                               win_g.h += missing;
                        } else {
-                               gg.h = hrh - 2;
-                               /* leave first right hand window at y = 0 */
-                               if (i > 1)
-                                       gg.y += gg.h + 2;
+                               win_g.h -= remain;
+                               extra += remain;
                        }
                }
+                
+               if (j == 0)
+                       win_g.y = r_g.y;
+               else
+                       win_g.y += last_h + 2;
 
-               if (win->transient != 0 || win->floating != 0)
-                       stack_floater(win);
-               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;
-                       XConfigureWindow(display, win->id, mask, &wc);
+               bzero(&wc, sizeof wc);
+               wc.border_width = 1;
+               if (rot) {
+                       win->g.x = wc.x = win_g.y;
+                       win->g.y = wc.y = win_g.x;
+                       win->g.w = wc.width = win_g.h;
+                       win->g.h = wc.height = win_g.w;
+               } else {
+                       win->g.x = wc.x = win_g.x;
+                       win->g.y = wc.y = win_g.y;
+                       win->g.w = wc.width = win_g.w;
+                       win->g.h = wc.height = win_g.h;
                }
-
-               if (win == ws[current_ws].focus)
-                       winfocus = win;
-               else
-                       unfocus_win(win);
+               adjust_font(win);
+               mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
+               XConfigureWindow(display, win->id, mask, &wc);
                XMapRaised(display, win->id);
+
+               last_h = win_g.h;
                i++;
+               j++;
        }
 
-       focus_win(winfocus); /* this has to be done outside of the loop */
-}
-
-int horizontal_msize[SWM_WS_MAX];
+       /* now, stack all the floaters and transients */
+       TAILQ_FOREACH(win, &ws->winlist, entry) {
+               if (win->transient == 0 && win->floating == 0)
+                       continue;
 
-void
-horizontal_init(int ws_idx)
-{
-       DNPRINTF(SWM_D_MISC, "horizontal_init: workspace: %d\n", current_ws);
+               stack_floater(win, ws->r);
+               XMapRaised(display, win->id);
+       }
 
-       horizontal_msize[ws_idx] = ws[ws_idx].g.h / 2;
+       if (winfocus)
+               focus_win(winfocus); /* has to be done outside of the loop */
 }
 
 void
-horizontal_resize(int id)
+vertical_config(struct workspace *ws, int id)
 {
-       DNPRINTF(SWM_D_MISC, "horizontal_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;
+               ws->l_state.vertical_stacks = 1;
+               break;
        case SWM_ARG_ID_MASTERSHRINK:
-               horizontal_msize[current_ws] -= ws[current_ws].g.h / 32;
-               if ( horizontal_msize[current_ws] < ws[current_ws].g.h / 16)
-                       horizontal_msize[current_ws] = ws[current_ws].g.h / 16;
+               if (ws->l_state.vertical_msize > 1)
+                       ws->l_state.vertical_msize--;
                break;
        case SWM_ARG_ID_MASTERGROW:
-               horizontal_msize[current_ws] += ws[current_ws].g.h / 32;
-               if ( horizontal_msize[current_ws] >
-                  (ws[current_ws].g.h - (ws[current_ws].g.h / 16)))
-                       horizontal_msize[current_ws] =
-                           ws[current_ws].g.h - ws[current_ws].g.h / 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;
+       case SWM_ARG_ID_STACKINC:
+               ws->l_state.vertical_stacks++;
+               break;
+       case SWM_ARG_ID_STACKDEC:
+               if (ws->l_state.vertical_stacks > 1)
+                       ws->l_state.vertical_stacks--;
                break;
        default:
                return;
        }
-       stack();
 }
 
 void
-horizontal_stack(struct swm_geometry *g) {
-       XWindowChanges          wc;
-       struct swm_geometry     gg = *g;
-       struct ws_win           wf, *win, *winfocus = &wf;
-       int                     i, hrw, winno;
-       unsigned int            mask;
-
-       DNPRINTF(SWM_D_EVENT, "horizontal_stack: workspace: %d\n", current_ws);
-
-       winno = count_win(current_ws, 0);
-       if (winno == 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;
+vertical_stack(struct workspace *ws, struct swm_geometry *g)
+{
+       DNPRINTF(SWM_D_STACK, "vertical_stack: workspace: %d\n", ws->idx);
 
-       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;
-                       }
-               }
+       stack_master(ws, g, 0, 0);
+}
 
-               if (win->transient != 0 || win->floating != 0)
-                       stack_floater(win);
-               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;
-                       XConfigureWindow(display, win->id, mask, &wc);
-               }
+void
+horizontal_config(struct workspace *ws, int id)
+{
+       DNPRINTF(SWM_D_STACK, "horizontal_config: workspace: %d\n", ws->idx);
 
-               if (win == ws[current_ws].focus)
-                       winfocus = win;
-               else
-                       unfocus_win(win);
-               XMapRaised(display, win->id);
-               i++;
+       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;
+               ws->l_state.horizontal_stacks = 1;
+               break;
+       case SWM_ARG_ID_MASTERSHRINK:
+               if (ws->l_state.horizontal_msize > 1)
+                       ws->l_state.horizontal_msize--;
+               break;
+       case SWM_ARG_ID_MASTERGROW:
+               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;
+       case SWM_ARG_ID_STACKINC:
+               ws->l_state.horizontal_stacks++;
+               break;
+       case SWM_ARG_ID_STACKDEC:
+               if (ws->l_state.horizontal_stacks > 1)
+                       ws->l_state.horizontal_stacks--;
+               break;
+       default:
+               return;
        }
-
-       focus_win(winfocus); /* this has to be done outside of the loop */
 }
 
 void
-max_focus(struct ws_win *fwin)
+horizontal_stack(struct workspace *ws, struct swm_geometry *g)
 {
-       struct ws_win *win;
+       DNPRINTF(SWM_D_STACK, "vertical_stack: workspace: %d\n", ws->idx);
 
-       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);
-       }
+       stack_master(ws, g, 1, 0);
 }
 
 /* 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? */
-                       else
+                       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);
@@ -973,62 +1700,135 @@ max_stack(struct swm_geometry *g) {
                        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;
+       Atom                    ws_idx_atom = 0;
+       unsigned char           ws_idx_str[SWM_PROPLEN];
+
+       if (win == NULL)
+               return;
 
        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_INSERT_TAIL(&nws->winlist, win, entry);
+       win->ws = nws;
+
+       /* Try to update the window's workspace property */
+       ws_idx_atom = XInternAtom(display, "_SWM_WS", False);
+       if (ws_idx_atom &&
+           snprintf(ws_idx_str, SWM_PROPLEN, "%d", nws->idx) < SWM_PROPLEN) {
+               DNPRINTF(SWM_D_PROP, "setting property _SWM_WS to %s\n",
+                   ws_idx_str);
+               XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8,
+                   PropModeReplace, ws_idx_str, SWM_PROPLEN);
+       }
+
+       if (count_win(nws, 1) == 1)
+               nws->focus = win;
+       ws->restack = 1;
+       nws->restack = 1;
+
+       stack();
+}
+
+void
+wkill(struct swm_region *r, union arg *args)
+{
+       DNPRINTF(SWM_D_MISC, "wkill\n");
+       if(r->ws->focus != NULL)
+               XKillClient(display, r->ws->focus->id);
+}
+
+void
+screenshot(struct swm_region *r, union arg *args)
+{
+       union arg                       a;
 
-       TAILQ_REMOVE(&ws[current_ws].winlist, win, entry);
+       DNPRINTF(SWM_D_MISC, "screenshot\n");
 
-       TAILQ_INSERT_TAIL(&ws[wsid].winlist, win, entry);
-       if (count_win(wsid, 1) == 1)
-               ws[wsid].focus = win;
-       ws[wsid].restack = 1;
+       if (ss_enabled == 0)
+               return;
 
+       switch (args->id) {
+       case SWM_ARG_ID_SS_ALL:
+               spawn_screenshot[1] = "full";
+               break;
+       case SWM_ARG_ID_SS_WINDOW:
+               spawn_screenshot[1] = "window";
+               break;
+       default:
+               return;
+       }
+       a.argv = spawn_screenshot;
+       spawn(r, &a);
+}
+
+void
+floating_toggle(struct swm_region *r, union arg *args)
+{
+       struct ws_win   *win = cur_focus;
+
+       if (win == NULL)
+               return;
+
+       win->floating = !win->floating;
+       win->manual = 0;
        stack();
+       focus_win(win);
 }
 
 /* key definitions */
 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 | ShiftMask,   XK_comma,       stack_config,   {.id = SWM_ARG_ID_STACKINC} },
+       { MODKEY | ShiftMask,   XK_period,      stack_config,   {.id = SWM_ARG_ID_STACKDEC} },
        { 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 | ShiftMask,   XK_Return,      spawnterm,      {.argv = spawn_term} },
+       { 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} },
@@ -1042,6 +1842,10 @@ struct key {
        { 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_Right,       cyclescr,       {.id = SWM_ARG_ID_CYCLESC_UP} }, 
+       { MODKEY | ShiftMask,   XK_Left,        cyclescr,       {.id = SWM_ARG_ID_CYCLESC_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} },
@@ -1055,6 +1859,183 @@ struct key {
        { MODKEY,               XK_b,           bar_toggle,     {0} },
        { MODKEY,               XK_Tab,         focus,          {.id = SWM_ARG_ID_FOCUSNEXT} },
        { MODKEY | ShiftMask,   XK_Tab,         focus,          {.id = SWM_ARG_ID_FOCUSPREV} },
+       { MODKEY | ShiftMask,   XK_x,           wkill,          {0} },
+       { MODKEY,               XK_s,           screenshot,     {.id = SWM_ARG_ID_SS_ALL} },
+       { MODKEY | ShiftMask,   XK_s,           screenshot,     {.id = SWM_ARG_ID_SS_WINDOW} },
+       { MODKEY,               XK_t,           floating_toggle,{0} },
+       { MODKEY | ShiftMask,   XK_v,           version,        {0} },
+       { MODKEY | ShiftMask,   XK_Delete,      spawn,          {.argv = spawn_lock} },
+       { MODKEY | ShiftMask,   XK_i,           spawn,          {.argv = spawn_initscr} },
+};
+
+void
+resize_window(struct ws_win *win, int center)
+{
+       unsigned int            mask;
+       XWindowChanges          wc;
+       struct swm_region       *r;
+
+       r = root_to_region(win->wa.root);
+       bzero(&wc, sizeof wc);
+       mask = CWBorderWidth | CWWidth | CWHeight;
+       wc.border_width = 1;
+       wc.width = win->g.w;
+       wc.height = win->g.h;
+       if (center == SWM_ARG_ID_CENTER) {
+               wc.x = (WIDTH(r) - win->g.w) / 2;
+               wc.y = (HEIGHT(r) - win->g.h) / 2;
+               mask |= CWX | CWY;
+       }
+
+       DNPRINTF(SWM_D_STACK, "resize_window: 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);
+       config_win(win);
+}
+
+void
+resize(struct ws_win *win, union arg *args)
+{
+       XEvent                  ev;
+       Time                    time = 0;
+
+       DNPRINTF(SWM_D_MOUSE, "resize: win %lu floating %d trans %d\n",
+           win->id, win->floating, win->transient);
+
+       if (!(win->transient != 0 || win->floating != 0))
+               return;
+
+       if (XGrabPointer(display, win->id, False, MOUSEMASK, GrabModeAsync,
+           GrabModeAsync, None, None /* cursor */, CurrentTime) != GrabSuccess)
+               return;
+       XWarpPointer(display, None, win->id, 0, 0, 0, 0, win->g.w, win->g.h);
+       do {
+               XMaskEvent(display, MOUSEMASK | ExposureMask |
+                   SubstructureRedirectMask, &ev);
+               switch(ev.type) {
+               case ConfigureRequest:
+               case Expose:
+               case MapRequest:
+                       handler[ev.type](&ev);
+                       break;
+               case MotionNotify:
+                       if (ev.xmotion.x < 0)
+                               ev.xmotion.x = 0;
+                       if (ev.xmotion.y < 0)
+                               ev.xmotion.y = 0;
+                       win->g.w = ev.xmotion.x;
+                       win->g.h = ev.xmotion.y;
+
+                       /* not free, don't sync more than 60 times / second */
+                       if ((ev.xmotion.time - time) > (1000 / 60) ) {
+                               time = ev.xmotion.time;
+                               XSync(display, False);
+                               resize_window(win, args->id);
+                       }
+                       break;
+               }
+       } while (ev.type != ButtonRelease);
+       if (time) {
+               XSync(display, False);
+               resize_window(win, args->id);
+       }
+       XWarpPointer(display, None, win->id, 0, 0, 0, 0, win->g.w - 1,
+           win->g.h - 1);
+       XUngrabPointer(display, CurrentTime);
+
+       /* drain events */
+       while (XCheckMaskEvent(display, EnterWindowMask, &ev));
+}
+
+void
+move_window(struct ws_win *win)
+{
+       unsigned int            mask;
+       XWindowChanges          wc;
+       struct swm_region       *r;
+
+       r = root_to_region(win->wa.root);
+       bzero(&wc, sizeof wc);
+       mask = CWX | CWY;
+       wc.x = win->g.x;
+       wc.y = win->g.y;
+
+       DNPRINTF(SWM_D_STACK, "move_window: 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);
+       config_win(win);
+}
+
+void
+move(struct ws_win *win, union arg *args)
+{
+       XEvent                  ev;
+       Time                    time = 0;
+       int                     restack = 0;
+
+       DNPRINTF(SWM_D_MOUSE, "move: win %lu floating %d trans %d\n",
+           win->id, win->floating, win->transient);
+
+       if (win->floating == 0) {
+               win->floating = 1;
+               win->manual = 1;
+               restack = 1;
+       }
+
+       if (XGrabPointer(display, win->id, False, MOUSEMASK, GrabModeAsync,
+           GrabModeAsync, None, None /* cursor */, CurrentTime) != GrabSuccess)
+               return;
+       XWarpPointer(display, None, win->id, 0, 0, 0, 0, 0, 0);
+       do {
+               XMaskEvent(display, MOUSEMASK | ExposureMask |
+                   SubstructureRedirectMask, &ev);
+               switch(ev.type) {
+               case ConfigureRequest:
+               case Expose:
+               case MapRequest:
+                       handler[ev.type](&ev);
+                       break;
+               case MotionNotify:
+                       win->g.x = ev.xmotion.x_root;
+                       win->g.y = ev.xmotion.y_root;
+
+                       /* not free, don't sync more than 60 times / second */
+                       if ((ev.xmotion.time - time) > (1000 / 60) ) {
+                               time = ev.xmotion.time;
+                               XSync(display, False);
+                               move_window(win);
+                       }
+                       break;
+               }
+       } while (ev.type != ButtonRelease);
+       if (time) {
+               XSync(display, False);
+               move_window(win);
+       }
+       XWarpPointer(display, None, win->id, 0, 0, 0, 0, 0, 0);
+       XUngrabPointer(display, CurrentTime);
+       if (restack)
+               stack();
+
+       /* drain events */
+       while (XCheckMaskEvent(display, EnterWindowMask, &ev));
+}
+
+/* mouse */
+enum { client_click, root_click };
+struct button {
+       unsigned int            action;
+       unsigned int            mask;
+       unsigned int            button;
+       void                    (*func)(struct ws_win *, union arg *);
+       union arg               args;
+} buttons[] = {
+         /* action             key             mouse button    func            args */
+       { client_click,         MODKEY,         Button3,        resize,         {.id = SWM_ARG_ID_DONTCENTER} },
+       { client_click,         MODKEY | ShiftMask, Button3,    resize,         {.id = SWM_ARG_ID_CENTER} },
+       { client_click,         MODKEY,         Button1,        move,           {0} },
 };
 
 void
@@ -1078,7 +2059,7 @@ updatenumlockmask(void)
 void
 grabkeys(void)
 {
-       unsigned int            i, j;
+       unsigned int            i, j, k;
        KeyCode                 code;
        unsigned int            modifiers[] =
            { 0, LockMask, numlockmask, numlockmask | LockMask };
@@ -1086,15 +2067,44 @@ grabkeys(void)
        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)
 {
@@ -1115,38 +2125,33 @@ keypress(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(win, &buttons[i].args);
 }
 
 void
@@ -1164,65 +2169,171 @@ struct ws_win *
 manage_window(Window id)
 {
        Window                  trans;
+       struct workspace        *ws;
        struct ws_win           *win;
-       XClassHint              ch;
+       int                     format, i, ws_idx;
+       unsigned long           nitems, bytes;
+       Atom                    ws_idx_atom = 0, type;
+       unsigned char           ws_idx_str[SWM_PROPLEN], *prop = NULL;
+       struct swm_region       *r;
+       long                    mask;
+       const char              *errstr;
+       XWindowChanges          wc;
 
-       TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
-               if (win->id == id)
+       if ((win = find_window(id)) != NULL)
                        return (win);   /* already being managed */
-       }
 
        if ((win = calloc(1, sizeof(struct ws_win))) == NULL)
                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 */
-
-       XGetTransientForHint(display, win->id, &trans);
+       /* Get all the window data in one shot */
+       ws_idx_atom = XInternAtom(display, "_SWM_WS", False);
+       if (ws_idx_atom)
+               XGetWindowProperty(display, id, ws_idx_atom, 0, SWM_PROPLEN,
+                   False, XA_STRING, &type, &format, &nitems, &bytes, &prop);
+       XGetWindowAttributes(display, id, &win->wa);
+       XGetTransientForHint(display, id, &trans);
+       XGetWMNormalHints(display, id, &win->sh, &mask); /* XXX function? */
        if (trans) {
                win->transient = trans;
                DNPRINTF(SWM_D_MISC, "manage_window: win %u transient %u\n",
                    (unsigned)win->id, win->transient);
        }
-       XGetWindowAttributes(display, win->id, &win->wa);
-       XGetNormalHints(display, win->id, &win->sh);
-
-       /* XXX */
-       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;
+
+       /*
+        * Figure out where to put the window. If it was previously assigned to
+        * a workspace (either by spawn() or manually moving), and isn't
+        * transient, * put it in the same workspace
+        */
+       r = root_to_region(win->wa.root);
+       if (prop && win->transient == 0) {
+               DNPRINTF(SWM_D_PROP, "got property _SWM_WS=%s\n", prop);
+               ws_idx = strtonum(prop, 0, 9, &errstr);
+               if (errstr) {
+                       DNPRINTF(SWM_D_EVENT, "window idx is %s: %s",
+                           errstr, prop);
+               }
+               ws = &r->s->ws[ws_idx];
+       } else
+               ws = r->ws;
+
+       /* set up the window layout */
+       win->id = id;
+       win->ws = ws;
+       win->s = r->s;  /* this never changes */
+       TAILQ_INSERT_TAIL(&ws->winlist, win, entry);
+
+       win->g.w = win->wa.width;
+       win->g.h = win->wa.height;
+       win->g.x = win->wa.x;
+       win->g.y = win->wa.y;
+
+       /* Set window properties so we can remember this after reincarnation */
+       if (ws_idx_atom && prop == NULL &&
+           snprintf(ws_idx_str, SWM_PROPLEN, "%d", ws->idx) < SWM_PROPLEN) {
+               DNPRINTF(SWM_D_PROP, "setting property _SWM_WS to %s\n",
+                   ws_idx_str);
+               XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8,
+                   PropModeReplace, ws_idx_str, SWM_PROPLEN);
+       }
+       XFree(prop);
+
+       if (XGetClassHint(display, win->id, &win->ch)) {
+               DNPRINTF(SWM_D_CLASS, "class: %s name: %s\n",
+                   win->ch.res_class, win->ch.res_name);
+               for (i = 0; quirks[i].class != NULL && quirks[i].name != NULL &&
+                   quirks[i].quirk != 0; i++){
+                       if (!strcmp(win->ch.res_class, quirks[i].class) &&
+                           !strcmp(win->ch.res_name, quirks[i].name)) {
+                               DNPRINTF(SWM_D_CLASS, "found: %s name: %s\n",
+                                   win->ch.res_class, win->ch.res_name);
+                               if (quirks[i].quirk & SWM_Q_FLOAT)
+                                       win->floating = 1;
+                               win->quirks = quirks[i].quirk;
+                       }
                }
-               if (ch.res_class)
-                       XFree(ch.res_class);
-               if (ch.res_name)
-                       XFree(ch.res_name);
        }
 
-       XSelectInput(display, id, ButtonPressMask | EnterWindowMask |
-           FocusChangeMask | ExposureMask);
+       /* alter window position if quirky */
+       if (win->quirks & SWM_Q_ANYWHERE) {
+               win->manual = 1; /* don't center the quirky windows */
+               bzero(&wc, sizeof wc);
+               mask = 0;
+               if (win->g.y < bar_height) {
+                       win->g.y = wc.y = bar_height;
+                       mask |= CWY;
+               }
+               if (win->g.w + win->g.x > WIDTH(r)) {
+                       win->g.x = wc.x = WIDTH(win->ws->r) - win->g.w - 2;
+                       mask |= CWX;
+               }
+               wc.border_width = 1;
+               mask |= CWBorderWidth;
+               XConfigureWindow(display, win->id, mask, &wc);
+       }
+
+       XSelectInput(display, id, EnterWindowMask | FocusChangeMask |
+           PropertyChangeMask | StructureNotifyMask);
 
        set_win_state(win, NormalState);
 
+       /* floaters need to be mapped if they are in the current workspace */
+       if (win->floating && (ws->idx == r->ws->idx))
+               XMapRaised(display, win->id);
+
+       /* make new win focused */
+       focus_win(win);
+
        return (win);
 }
 
 void
+unmanage_window(struct ws_win *win)
+{
+       struct workspace        *ws;
+
+       if (win == NULL)
+               return;
+
+       DNPRINTF(SWM_D_MISC, "unmanage_window:  %lu\n", win->id);
+
+       /* don't unmanage if we are switching workspaces */
+       ws = win->ws;
+       if (ws->restack)
+               return;
+
+       /* 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 == NULL || ws->focus == win) {
+               ws->focus = NULL;
+               unfocus_all();
+       } else
+               focus_win(ws->focus);
+       if (ws->focus_prev == win)
+               ws->focus_prev = NULL;
+
+       TAILQ_REMOVE(&win->ws->winlist, win, entry);
+       set_win_state(win, WithdrawnState);
+       if (win->ch.res_class)
+               XFree(win->ch.res_class);
+       if (win->ch.res_name)
+               XFree(win->ch.res_name);
+       free(win);
+}
+
+void
 configurerequest(XEvent *e)
 {
        XConfigureRequestEvent  *ev = &e->xconfigurerequest;
        struct ws_win           *win;
-       int                     new = 1;
+       int                     new = 0;
        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",
@@ -1239,15 +2350,55 @@ configurerequest(XEvent *e)
        } else {
                DNPRINTF(SWM_D_EVENT, "configurerequest: change window: %lu\n",
                    ev->window);
-               config_win(win);
+               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)) {
+                                       win->g.x = -1;
+                                       win->g.w = WIDTH(win->ws->r);
+                                       ev->value_mask |= CWX | CWWidth;
+                               }
+                               if (win->g.h >= HEIGHT(win->ws->r)) {
+                                       /* kill border */
+                                       win->g.y = -1;
+                                       win->g.h = HEIGHT(win->ws->r);
+                                       ev->value_mask |= CWY | 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);
+               } else
+                       config_win(win);
        }
 }
 
 void
 configurenotify(XEvent *e)
 {
+       struct ws_win           *win;
+       long                    mask;
+
        DNPRINTF(SWM_D_EVENT, "configurenotify: window: %lu\n",
            e->xconfigure.window);
+
+       win = find_window(e->xconfigure.window);
+       XMapWindow(display, win->id);
+       XGetWMNormalHints(display, win->id, &win->sh, &mask);
+       adjust_font(win);
+       XMapWindow(display, win->id);
+       if (font_adjusted)
+               stack();
 }
 
 void
@@ -1258,25 +2409,10 @@ destroynotify(XEvent *e)
 
        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) {
+               unmanage_window(win);
+               stack();
        }
-
-       stack();
 }
 
 void
@@ -1287,40 +2423,20 @@ enternotify(XEvent *e)
 
        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
@@ -1349,48 +2465,73 @@ maprequest(XEvent *e)
        if (wa.override_redirect)
                return;
        manage_window(e->xmaprequest.window);
+
        stack();
 }
 
 void
 propertynotify(XEvent *e)
 {
+       struct ws_win           *win;
+       XPropertyEvent          *ev = &e->xproperty;
+
        DNPRINTF(SWM_D_EVENT, "propertynotify: window: %lu\n",
-           e->xproperty.window);
+           ev->window);
+
+       if (ev->state == PropertyDelete)
+               return; /* ignore */
+       win = find_window(ev->window);
+       if (win == NULL)
+               return;
+
+       switch (ev->atom) {
+       case XA_WM_NORMAL_HINTS:
+#if 0
+               long            mask;
+               XGetWMNormalHints(display, win->id, &win->sh, &mask);
+               fprintf(stderr, "normal hints: flag 0x%x\n", win->sh.flags);
+               if (win->sh.flags & PMinSize) {
+                       win->g.w = win->sh.min_width;
+                       win->g.h = win->sh.min_height;
+                       fprintf(stderr, "min %d %d\n", win->g.w, win->g.h);
+               }
+               XMoveResizeWindow(display, win->id,
+                   win->g.x, win->g.y, win->g.w, win->g.h);
+#endif
+               break;
+       default:
+               break;
+       }
 }
 
 void
 unmapnotify(XEvent *e)
 {
+       XDestroyWindowEvent     *ev = &e->xdestroywindow;
+       struct ws_win           *win;
+
        DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %lu\n", e->xunmap.window);
+
+       if ((win = find_window(ev->window)) != NULL)
+               if (win->transient)
+                       unmanage_window(win);
 }
 
 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 *) = {
-                               [Expose] = expose,
-                               [KeyPress] = keypress,
-                               [ButtonPress] = buttonpress,
-                               [ConfigureRequest] = configurerequest,
-                               [ConfigureNotify] = configurenotify,
-                               [DestroyNotify] = destroynotify,
-                               [EnterNotify] = enternotify,
-                               [FocusIn] = focusin,
-                               [MappingNotify] = mappingnotify,
-                               [MapRequest] = maprequest,
-                               [PropertyNotify] = propertynotify,
-                               [UnmapNotify] = unmapnotify,
-                               [VisibilityNotify] = visibilitynotify,
-};
-
 int
 xerror_start(Display *d, XErrorEvent *ee)
 {
@@ -1443,6 +2584,259 @@ getstate(Window w)
        return (result);
 }
 
+void
+new_region(struct swm_screen *s, int x, int y, int w, int h)
+{
+       struct swm_region       *r, *n;
+       struct workspace        *ws = NULL;
+       int                     i;
+
+       DNPRINTF(SWM_D_MISC, "new region: screen[%d]:%dx%d+%d+%d\n",
+            s->idx, w, h, x, y);
+
+       /* remove any conflicting regions */
+       n = TAILQ_FIRST(&s->rl);
+       while (n) {
+               r = n;
+               n = TAILQ_NEXT(r, entry);
+               if (X(r) < (x + w) &&
+                   (X(r) + WIDTH(r)) > x &&
+                   Y(r) < (y + h) &&
+                   (Y(r) + HEIGHT(r)) > y) {
+                       XDestroyWindow(display, r->bar_window);
+                       TAILQ_REMOVE(&s->rl, r, entry);
+                       TAILQ_INSERT_TAIL(&s->orl, r, entry);
+               }
+       }
+
+       /* search old regions for one to reuse */
+
+       /* size + location match */
+       TAILQ_FOREACH(r, &s->orl, entry)
+               if (X(r) == x && Y(r) == y &&
+                   HEIGHT(r) == h && WIDTH(r) == w)
+                       break;
+
+       /* size match */
+       TAILQ_FOREACH(r, &s->orl, entry)
+               if (HEIGHT(r) == h && WIDTH(r) == w)
+                       break;
+
+       if (r != NULL) {
+               TAILQ_REMOVE(&s->orl, r, entry);
+               /* try to use old region's workspace */
+               if (r->ws->r == NULL)
+                       ws = r->ws;
+       } else
+               if ((r = calloc(1, sizeof(struct swm_region))) == NULL)
+                       errx(1, "calloc: failed to allocate memory for screen");
+
+       /* if we don't have a workspace already, find one */
+       if (ws == NULL) {
+               for (i = 0; i < SWM_WS_MAX; i++)
+                       if (s->ws[i].r == NULL) {
+                               ws = &s->ws[i];
+                               break;
+                       }
+       }
+
+       if (ws == NULL)
+               errx(1, "no free workspaces\n");
+
+       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
+scan_xrandr(int i)
+{
+#ifdef SWM_XRR_HAS_CRTC
+       XRRCrtcInfo             *ci;
+       XRRScreenResources      *sr;
+       int                     c;
+       int                     ncrtc = 0;
+#endif /* SWM_XRR_HAS_CRTC */
+       struct swm_region       *r;
+
+
+       if (i >= ScreenCount(display))
+               errx(1, "invalid screen");
+
+       /* remove any old regions */
+       while ((r = TAILQ_FIRST(&screens[i].rl)) != NULL) {
+               r->ws->r = NULL;
+               XDestroyWindow(display, r->bar_window);
+               TAILQ_REMOVE(&screens[i].rl, r, entry);
+               TAILQ_INSERT_TAIL(&screens[i].orl, r, entry);
+       }
+
+       /* map virtual screens onto physical screens */
+#ifdef SWM_XRR_HAS_CRTC
+       if (xrandr_support) {
+               sr = XRRGetScreenResources(display, screens[i].root);
+               if (sr == NULL)
+                       new_region(&screens[i], 0, 0,
+                           DisplayWidth(display, i),
+                           DisplayHeight(display, i)); 
+               else 
+                       ncrtc = sr->ncrtc;
+
+               for (c = 0, ci = NULL; 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], 0, 0,
+                                   DisplayWidth(display, i),
+                                   DisplayHeight(display, i)); 
+                       else
+                               new_region(&screens[i],
+                                   ci->x, ci->y, ci->width, ci->height);
+               }
+               if (ci)
+                       XRRFreeCrtcInfo(ci);
+               XRRFreeScreenResources(sr);
+       } else
+#endif /* SWM_XRR_HAS_CRTC */
+       {
+               new_region(&screens[i], 0, 0, DisplayWidth(display, i),
+                   DisplayHeight(display, i)); 
+       }
+}
+
+void
+screenchange(XEvent *e) {
+       XRRScreenChangeNotifyEvent      *xe = (XRRScreenChangeNotifyEvent *)e;
+       struct swm_region               *r;
+       struct ws_win                   *win;
+       int                             i;
+
+       DNPRINTF(SWM_D_EVENT, "screenchange: %lu\n", xe->root);
+
+       if (!XRRUpdateConfiguration(e))
+               return;
+
+       /* silly event doesn't include the screen index */
+       for (i = 0; i < ScreenCount(display); i++)
+               if (screens[i].root == xe->root)
+                       break;
+       if (i >= ScreenCount(display))
+               errx(1, "screenchange: screen not found\n");
+
+       /* brute force for now, just re-enumerate the regions */
+       scan_xrandr(i);
+
+       /* hide any windows that went away */
+       TAILQ_FOREACH(r, &screens[i].rl, entry)
+               TAILQ_FOREACH(win, &r->ws->winlist, entry)
+                       XUnmapWindow(display, win->id);
+       stack();
+}
+
+void
+setup_screens(void)
+{
+       Window                  d1, d2, *wins = NULL;
+       XWindowAttributes       wa;
+       unsigned int            no;
+        int                    i, j, k;
+       int                     errorbase, major, minor;
+       struct workspace        *ws;
+       int                     ws_idx_atom;
+
+
+       if ((screens = calloc(ScreenCount(display),
+            sizeof(struct swm_screen))) == NULL)
+               errx(1, "calloc: screens");
+
+       ws_idx_atom = XInternAtom(display, "_SWM_WS", False);
+
+       /* initial Xrandr setup */
+       xrandr_support = XRRQueryExtension(display,
+           &xrandr_eventbase, &errorbase);
+       if (xrandr_support)
+               if (XRRQueryVersion(display, &major, &minor) && major < 1)
+                               xrandr_support = 0;
+
+       /* 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);
+               TAILQ_INIT(&screens[i].orl);
+               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 */
+               /* XXX these should be dynamically allocated too */
+               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];
+               }
+               /* grab existing windows (before we build the bars)*/
+               if (!XQueryTree(display, screens[i].root, &d1, &d2, &wins, &no))
+                       continue;
+
+               scan_xrandr(i);
+
+               if (xrandr_support)
+                       XRRSelectInput(display, screens[i].root,
+                           RRScreenChangeNotifyMask);
+
+               /* attach windows to a region */
+               /* normal windows */
+               for (j = 0; j < no; j++) {
+                        XGetWindowAttributes(display, wins[j], &wa);
+                       if (!XGetWindowAttributes(display, wins[j], &wa) ||
+                           wa.override_redirect ||
+                           XGetTransientForHint(display, wins[j], &d1))
+                               continue;
+
+                       if (wa.map_state == IsViewable ||
+                           getstate(wins[j]) == NormalState)
+                               manage_window(wins[j]);
+               }
+               /* transient windows */
+               for (j = 0; j < no; j++) {
+                       if (!XGetWindowAttributes(display, wins[j], &wa))
+                               continue;
+
+                       if (XGetTransientForHint(display, wins[j], &d1) &&
+                           (wa.map_state == IsViewable || getstate(wins[j]) ==
+                           NormalState))
+                               manage_window(wins[j]);
+                }
+                if (wins) {
+                        XFree(wins);
+                       wins = NULL;
+               }
+       }
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -1450,12 +2844,12 @@ 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);
+       fprintf(stderr, "Welcome to scrotwm V%s cvs tag: %s\n",
+           SWM_VERSION, cvstag);
        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                warnx("no locale support");
 
@@ -1465,8 +2859,6 @@ main(int argc, char *argv[])
        if (active_wm())
                errx(1, "other wm running");
 
-       screen = DefaultScreen(display);
-       root = RootWindow(display, screen);
        astate = XInternAtom(display, "WM_STATE", False);
 
        /* look for local and global conf file */
@@ -1474,6 +2866,8 @@ main(int argc, char *argv[])
        if (pwd == NULL)
                errx(1, "invalid user %d", getuid());
 
+       setup_screens();
+
        snprintf(conf, sizeof conf, "%s/.%s", pwd->pw_dir, SWM_CONF_FILE);
        if (stat(conf, &sb) != -1) {
                if (S_ISREG(sb.st_mode))
@@ -1487,67 +2881,46 @@ main(int argc, char *argv[])
        }
        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 (e.type < LASTEvent) {
+                               if (handler[e.type])
+                                       handler[e.type](&e);
+                               else
+                                       DNPRINTF(SWM_D_EVENT,
+                                           "win: %lu unknown event: %d\n",
+                                           e.xany.window, e.type);
+                       } else {
+                               switch (e.type - xrandr_eventbase) {
+                               case RRScreenChangeNotify:
+                                       screenchange(&e);
+                                       break;
+                               default:
+                                       DNPRINTF(SWM_D_EVENT,
+                                           "win: %lu unknown xrandr event: "
+                                           "%d\n", e.xany.window, e.type);
+                                       break;
+                               }
+                       }
+               }
        }
 
        XCloseDisplay(display);