JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
Initial bits of support for different layouts, needs more splitting out of
[spectrwm.git] / scrotwm.c
index 5ad5b28..9ced019 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
 #include <err.h>
 #include <locale.h>
 #include <unistd.h>
+#include <time.h>
+#include <signal.h>
+#include <string.h>
+#include <util.h>
+#include <pwd.h>
 
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/queue.h>
+#include <sys/param.h>
 
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #ifdef SWM_DEBUG
 #define DPRINTF(x...)          do { if (swm_debug) fprintf(stderr, x); } while(0)
 #define DNPRINTF(n,x...)       do { if (swm_debug & n) fprintf(stderr, x); } while(0)
-#define        SWM_D_EVENT             0x0001
-#define        SWM_D_WS                0x0002
-
-uint32_t               swm_debug = 0
+#define        SWM_D_MISC              0x0001
+#define        SWM_D_EVENT             0x0002
+#define        SWM_D_WS                0x0004
+#define        SWM_D_FOCUS             0x0008
+#define        SWM_D_MOVE              0x0010
+
+u_int32_t              swm_debug = 0
+                           | SWM_D_MISC
                            | SWM_D_EVENT
                            | SWM_D_WS
+                           | SWM_D_FOCUS
+                           | SWM_D_MOVE
                            ;
 #else
 #define DPRINTF(x...)
@@ -94,14 +107,65 @@ int                        width, height;
 int                    running = 1;
 int                    ignore_enter = 0;
 unsigned int           numlockmask = 0;
-unsigned long          col_focus = 0xff0000;
-unsigned long          col_unfocus = 0x888888;
+unsigned long          color_focus = 0xff0000; /* XXX should this be per ws? */
+unsigned long          color_unfocus = 0x888888;
 Display                        *display;
 Window                 root;
 
+/* status bar */
+int                    bar_enabled = 1;
+int                    bar_height = 0;
+unsigned long          bar_border = 0x008080;
+unsigned long          bar_color = 0x000000;
+unsigned long          bar_font_color = 0xa0a0a0;
+Window                 bar_window;
+GC                     bar_gc;
+XGCValues              bar_gcv;
+XFontStruct            *bar_fs;
+char                   bar_text[128];
+char                   *bar_fonts[] = {
+                           "-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*",
+                           "-*-times-medium-r-*-*-*-*-*-*-*-*-*-*",
+                           NULL
+};
+
+/* terminal + args */
+char                           *spawn_term[] = { "xterm", NULL };
+char                           *spawn_menu[] = { "dmenu_run", NULL };
+char                           *spawn_scrotwm[] = { "scrotwm", NULL };
+
+/* layout manager data */
+void   stack(void);
+void   vertical_init(void);
+void   vertical_stack(void);
+void   horizontal_init(void);
+void   horizontal_stack(void);
+void   max_init(void);
+void   max_stack(void);
+
+struct layout {
+       void                    (*l_init)(void);        /* init/reset */
+       void                    (*l_stack)(void);       /* restack windows */
+} layouts[] =  {
+       /* init                 stack */
+       { vertical_init,        vertical_stack},
+       { horizontal_init,      horizontal_stack},
+       /* XXX not working yet
+        * { max_init,          max_stack},
+        */
+       { NULL,                 NULL},
+};
+
 struct ws_win {
        TAILQ_ENTRY(ws_win)     entry;
        Window                  id;
+       int                     x;
+       int                     y;
+       int                     width;
+       int                     height;
+       int                     floating;
+       int                     transient;
+       XWindowAttributes       wa;
 };
 
 TAILQ_HEAD(ws_win_list, ws_win);
@@ -109,31 +173,232 @@ TAILQ_HEAD(ws_win_list, ws_win);
 /* define work spaces */
 #define SWM_WS_MAX             (10)
 struct workspace {
-       int                      visible;       /* workspace visible */
+       int                     visible;        /* workspace visible */
+       int                     restack;        /* restack on switch */
+       struct layout           *cur_layout;    /* current layout handlers */
        struct ws_win           *focus;         /* which win has focus */
-       int                      winno;         /* total nr of windows */
-       struct ws_win_list       winlist;
+       struct ws_win_list      winlist;        /* list of windows in ws */
 } ws[SWM_WS_MAX];
 int                    current_ws = 0;
 
 /* args to functions */
 union arg {
-       int             id;
+       int                     id;
 #define SWM_ARG_ID_FOCUSNEXT   (0)
 #define SWM_ARG_ID_FOCUSPREV   (1)
 #define SWM_ARG_ID_FOCUSMAIN   (2)
-       char            **argv;
+#define SWM_ARG_ID_SWAPNEXT    (3)
+#define SWM_ARG_ID_SWAPPREV    (4)
+#define SWM_ARG_ID_SWAPMAIN    (5)
+       char                    **argv;
 };
 
+
+
+#define        SWM_CONF_WS     "\n= \t"
+#define SWM_CONF_FILE  "scrotwm.conf"
+int
+conf_load(char *filename)
+{
+       FILE                    *config;
+       char                    *line, *cp, *var, *val;
+       size_t                   len, lineno = 0;
+
+       DNPRINTF(SWM_D_MISC, "conf_load: filename %s\n", filename);
+
+       if (filename == NULL)
+               return (1);
+
+       if ((config = fopen(filename, "r")) == NULL)
+               return (1);
+
+       for (;;) {
+               if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL)
+                       if (feof(config))
+                               break;
+               cp = line;
+               cp += (long)strspn(cp, SWM_CONF_WS);
+               if (cp[0] == '\0') {
+                       /* empty line */
+                       free(line);
+                       continue;
+               }
+               if ((var = strsep(&cp, SWM_CONF_WS)) == NULL || cp == NULL)
+                       break;
+               cp += (long)strspn(cp, SWM_CONF_WS);
+               if ((val = strsep(&cp, SWM_CONF_WS)) == NULL)
+                       break;
+
+               DNPRINTF(SWM_D_MISC, "conf_load: %s=%s\n",var ,val);
+               switch (var[0]) {
+               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 (!strncmp(var, "bar_font", strlen("bar_font")))
+                               asprintf(&bar_fonts[0], "%s", 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);
+                       else
+                               goto bad;
+                       break;
+
+               case 's':
+                       if (!strncmp(var, "spawn_term", strlen("spawn_term")))
+                               asprintf(&spawn_term[0], "%s", val); /* XXX args? */
+                       break;
+               default:
+                       goto bad;
+               }
+               free(line);
+       }
+
+       fclose(config);
+       return (0);
+bad:
+       errx(1, "invalid conf file entry: %s=%s", var, val);
+}
+
+void
+bar_print(void)
+{
+       time_t                  tmt;
+       struct tm               tm;
+
+       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));
+
+       /* 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));
+       XSync(display, False);
+
+       alarm(60);
+}
+
+void
+bar_signal(int sig)
+{
+       /* XXX yeah yeah byte me */
+       bar_print();
+}
+
+void
+bar_toggle(union arg *args)
+{
+       int i;
+
+       DNPRINTF(SWM_D_MISC, "bar_toggle\n");
+
+       if (bar_enabled) {
+               bar_enabled = 0;
+               height += bar_height; /* correct screen height */
+               XUnmapWindow(display, bar_window);
+       } else {
+               bar_enabled = 1;
+               height -= bar_height; /* correct screen height */
+               XMapWindow(display, bar_window);
+       }
+       XSync(display, False);
+       for (i = 0; i < SWM_WS_MAX; i++)
+               ws[i].restack = 1;
+
+       stack();
+       bar_print(); /* must be after stack */
+}
+
+void
+bar_setup(void)
+{
+       int                     i;
+
+       for (i = 0; bar_fonts[i] != NULL; i++) {
+               bar_fs = XLoadQueryFont(display, bar_fonts[i]);
+               if (bar_fs)
+                       break;
+       }
+       if (bar_fonts[i] == NULL)
+                       errx(1, "couldn't load font");
+       bar_height = bar_fs->ascent + bar_fs->descent + 3;
+
+       bar_window = XCreateSimpleWindow(display, root, 0, 0, width,
+           bar_height - 2, 1, bar_border, bar_color);
+       bar_gc = XCreateGC(display, bar_window, 0, &bar_gcv);
+       XSetFont(display, bar_gc, bar_fs->fid);
+       XSelectInput(display, bar_window, VisibilityChangeMask);
+       if (bar_enabled) {
+               height -= bar_height; /* correct screen height */
+               XMapWindow(display, bar_window);
+       }
+       DNPRINTF(SWM_D_MISC, "bar_setup: bar_window %d\n", (int)bar_window);
+
+       if (signal(SIGALRM, bar_signal) == SIG_ERR)
+               err(1, "could not install bar_signal");
+       bar_print();
+}
+
+int
+count_win(int wsid, int count_transient)
+{
+       struct ws_win           *win;
+       int                     count = 0;
+
+       TAILQ_FOREACH (win, &ws[wsid].winlist, entry) {
+               if (count_transient == 0 && win->transient)
+                       continue;
+               count++;
+       }
+       DNPRINTF(SWM_D_MISC, "count_win: %d\n", count);
+
+       return (count);
+}
 void
 quit(union arg *args)
 {
+       DNPRINTF(SWM_D_MISC, "quit\n");
        running = 0;
 }
 
+
+void
+restart(union arg *args)
+{      
+       XCloseDisplay(display);
+       execvp(args->argv[0], args->argv);
+       fprintf(stderr, "execvp failed\n");
+       perror(" failed");
+       quit(NULL);
+}
+
 void
 spawn(union arg *args)
 {
+       DNPRINTF(SWM_D_MISC, "spawn: %s\n", args->argv[0]);
        /*
         * The double-fork construct avoids zombie processes and keeps the code
         * clean from stupid signal handlers.
@@ -155,7 +420,8 @@ spawn(union arg *args)
 void
 focus_win(struct ws_win *win)
 {
-       XSetWindowBorder(display, win->id, col_focus);
+       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;
 }
@@ -163,7 +429,8 @@ focus_win(struct ws_win *win)
 void
 unfocus_win(struct ws_win *win)
 {
-       XSetWindowBorder(display, win->id, col_unfocus);
+       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;
 }
@@ -173,7 +440,6 @@ switchws(union arg *args)
 {
        int                     wsid = args->id;
        struct ws_win           *win;
-       Window                  winfocus;
 
        DNPRINTF(SWM_D_WS, "switchws: %d\n", wsid + 1);
 
@@ -182,7 +448,7 @@ switchws(union arg *args)
 
        /* map new window first to prevent ugly blinking */
        TAILQ_FOREACH (win, &ws[wsid].winlist, entry)
-               XMapWindow(display, win->id);
+               XMapRaised(display, win->id);
        ws[wsid].visible = 1;
 
        TAILQ_FOREACH (win, &ws[current_ws].winlist, entry)
@@ -192,9 +458,66 @@ switchws(union arg *args)
        current_ws = wsid;
 
        ignore_enter = 1;
-       if (ws[wsid].focus != NULL)
-               focus_win(ws[wsid].focus);
-       XSync(display, False);
+       if (ws[wsid].restack) {
+               stack();
+               bar_print();
+       } else {
+               if (ws[wsid].focus != NULL)
+                       focus_win(ws[wsid].focus);
+               XSync(display, False);
+       }
+}
+
+void
+swapwin(union arg *args)
+{
+       struct ws_win           *target;
+
+       DNPRINTF(SWM_D_MOVE, "swapwin: id %d\n", args->id);
+       if (ws[current_ws].focus == NULL)
+               return;
+
+       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);
+               if (target == NULL)
+                       TAILQ_INSERT_TAIL(&ws[current_ws].winlist,
+                           ws[current_ws].focus, entry);
+               else
+                       TAILQ_INSERT_BEFORE(target, ws[current_ws].focus,
+                           entry);
+               break;
+       case SWM_ARG_ID_SWAPNEXT: 
+               target = TAILQ_NEXT(ws[current_ws].focus, entry);
+               TAILQ_REMOVE(&ws[current_ws].winlist,
+                   ws[current_ws].focus, entry);
+               if (target == NULL)
+                       TAILQ_INSERT_HEAD(&ws[current_ws].winlist,
+                           ws[current_ws].focus, entry);
+               else
+                       TAILQ_INSERT_AFTER(&ws[current_ws].winlist, target,
+                           ws[current_ws].focus, 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);
+               break;
+       default:
+               DNPRINTF(SWM_D_MOVE, "invalid id: %d\n", args->id);
+               return;
+       }
+
+       ignore_enter = 2;
+       stack();
 }
 
 void
@@ -202,73 +525,99 @@ focus(union arg *args)
 {
        struct ws_win           *winfocus, *winlostfocus;
 
-       if (ws[current_ws].focus == NULL || ws[current_ws].winno == 0)
+       DNPRINTF(SWM_D_FOCUS, "focus: id %d\n", args->id);
+       if (ws[current_ws].focus == NULL)
                return;
 
        winlostfocus = ws[current_ws].focus;
 
        switch (args->id) {
        case SWM_ARG_ID_FOCUSPREV:
-               if (ws[current_ws].focus ==
-                   TAILQ_FIRST(&ws[current_ws].winlist))
-                       ws[current_ws].focus =
+               winfocus = TAILQ_PREV(ws[current_ws].focus, ws_win_list, entry);
+               if (winfocus == NULL)
+                       winfocus =
                            TAILQ_LAST(&ws[current_ws].winlist, ws_win_list);
-               else
-                       ws[current_ws].focus =TAILQ_PREV(ws[current_ws].focus,
-                           ws_win_list, entry);
                break;
 
        case SWM_ARG_ID_FOCUSNEXT:
-               if (ws[current_ws].focus == TAILQ_LAST(&ws[current_ws].winlist,
-                   ws_win_list))
-                       ws[current_ws].focus =
-                           TAILQ_FIRST(&ws[current_ws].winlist);
-               else
-                       ws[current_ws].focus =
-                           TAILQ_NEXT(ws[current_ws].focus, entry);
+               winfocus = TAILQ_NEXT(ws[current_ws].focus, entry);
+               if (winfocus == NULL)
+                       winfocus = TAILQ_FIRST(&ws[current_ws].winlist);
                break;
 
        case SWM_ARG_ID_FOCUSMAIN:
-               ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist);;
+               winfocus = TAILQ_FIRST(&ws[current_ws].winlist);
                break;
 
        default:
                return;
        }
 
-       winfocus = ws[current_ws].focus;
+       if (winfocus == winlostfocus)
+               return;
+
        unfocus_win(winlostfocus);
        focus_win(winfocus);
        XSync(display, False);
 }
 
-/* I know this sucks but it works well enough */
 void
-stack(void)
+cycle_layout(union arg *args)
+{
+       DNPRINTF(SWM_D_EVENT, "cycle_layout: workspace: %d\n", current_ws);
+
+       ws[current_ws].cur_layout++;
+       if (ws[current_ws].cur_layout->l_stack == NULL)
+               ws[current_ws].cur_layout = &layouts[0];
+       stack();
+}
+
+void
+stack(void) {
+       DNPRINTF(SWM_D_EVENT, "stack: workspace: %d\n", current_ws);
+
+       ws[current_ws].restack = 0;
+
+       ws[current_ws].cur_layout->l_stack();
+
+       XSync(display, False);
+}
+
+void
+vertical_init(void)
 {
+       DNPRINTF(SWM_D_EVENT, "vertical_init: workspace: %d\n", current_ws);
+}
+
+/* I know this sucks but it works well enough */
+void
+vertical_stack(void) {
        XWindowChanges          wc;
        struct ws_win           wf, *win, *winfocus = &wf;
-       int                     i, h, w, x, y, winno, hrh;
+       int                     i, h, w, x, y, hrh, winno;
+       int floater = 0;
+       unsigned int mask;
 
-       DNPRINTF(SWM_D_EVENT, "stack: workspace: %d\n", current_ws);
+       DNPRINTF(SWM_D_EVENT, "vertical_stack: workspace: %d\n", current_ws);
 
        winfocus->id = root;
 
-       if (ws[current_ws].winno == 0)
+       winno = count_win(current_ws, 0);
+       if (winno == 0)
                return;
 
-       if (ws[current_ws].winno > 1)
+       if (winno > 1)
                w = width / 2;
        else
                w = width;
 
-       if (ws[current_ws].winno > 2)
-               hrh = height / (ws[current_ws].winno - 1);
+       if (winno > 2)
+               hrh = height / (winno - 1);
        else
                hrh = 0;
 
        x = 0;
-       y = 0;
+       y = bar_enabled ? bar_height : 0;
        h = height;
        i = 0;
        TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
@@ -294,43 +643,214 @@ stack(void)
                        }
                }
 
+               if (win->transient != 0 || win->floating != 0)
+                       floater = 1;
+               else
+                       floater = 0;
+
                bzero(&wc, sizeof wc);
-               wc.x = x;
-               wc.y = y;
-               wc.width = w;
-               wc.height = h;
                wc.border_width = 1;
-               XConfigureWindow(display, win->id, CWX | CWY | CWWidth |
-                   CWHeight | CWBorderWidth, &wc);
+               if (floater == 0) {
+                       win->x = wc.x = x;
+                       win->y = wc.y = y;
+                       win->width = wc.width = w;
+                       win->height = wc.height = h;
+                       mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
+               } else {
+                       /* make sure we don't clobber the screen */
+                       if (win->wa.width > width)
+                               win->wa.width = width;
+                       if (win->wa.height > height)
+                               win->wa.width = height;
+                       win->x = wc.x = (width - win->wa.width) / 2;
+                       win->y = wc.y = (height - win->wa.height) / 2;
+                       mask = CWX | CWY | CWBorderWidth;
+               }
+               XConfigureWindow(display, win->id, mask, &wc);
+
                if (win == ws[current_ws].focus)
                        winfocus = win;
                else
                        unfocus_win(win);
-               XMapWindow(display, win->id);
+               XMapRaised(display, win->id);
                i++;
        }
 
        focus_win(winfocus); /* this has to be done outside of the loop */
-       XSync(display, False);
 }
 
 void
-swap_to_main(union arg *args)
+horizontal_init(void)
 {
-       struct ws_win           *tmpwin = TAILQ_FIRST(&ws[current_ws].winlist);
+       DNPRINTF(SWM_D_EVENT, "horizontal_init: workspace: %d\n", current_ws);
+}
 
-       TAILQ_REMOVE(&ws[current_ws].winlist, tmpwin, entry);
-       TAILQ_INSERT_AFTER(&ws[current_ws].winlist, ws[current_ws].focus,
-           tmpwin, entry);
-       TAILQ_REMOVE(&ws[current_ws].winlist, ws[current_ws].focus, entry);
-       TAILQ_INSERT_HEAD(&ws[current_ws].winlist, ws[current_ws].focus, entry);
-       ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist);
-       ignore_enter = 2;
-       stack();
+void
+horizontal_stack(void) {
+       XWindowChanges          wc;
+       struct ws_win           wf, *win, *winfocus = &wf;
+       int                     i, h, w, x, y, hrw, winno;
+       int floater = 0;
+       unsigned int mask;
+
+       DNPRINTF(SWM_D_EVENT, "horizontal_stack: workspace: %d\n", current_ws);
+
+       winfocus->id = root;
+
+       winno = count_win(current_ws, 0);
+       if (winno == 0)
+               return;
+
+       if (winno > 1)
+               h = height / 2;
+       else
+               h = height;
+
+       if (winno > 2)
+               hrw = width / (winno - 1);
+       else
+               hrw = 0;
+
+       x = 0;
+       y = bar_enabled ? bar_height : 0;
+       w = width;
+       i = 0;
+       TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
+               if (i == 1) {
+                       y += h + 2;
+                       h -= 2;
+               }
+               if (i != 0 && hrw != 0) {
+                       /* correct the last window for lost pixels */
+                       if (win == TAILQ_LAST(&ws[current_ws].winlist,
+                           ws_win_list)) {
+                               w = width - (i * hrw);
+                               if (w == 0)
+                                       w = hrw;
+                               else
+                                       w += hrw;
+                               x += hrw;
+                       } else {
+                               w = hrw - 2;
+                               /* leave first bottom window at x = 0 */
+                               if (i > 1)
+                                       x += w + 2;
+                       }
+               }
+
+               if (win->transient != 0 || win->floating != 0)
+                       floater = 1;
+               else
+                       floater = 0;
+
+               bzero(&wc, sizeof wc);
+               wc.border_width = 1;
+               if (floater == 0) {
+                       win->x = wc.x = x;
+                       win->y = wc.y = y;
+                       win->width = wc.width = w;
+                       win->height = wc.height = h;
+                       mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
+               } else {
+                       /* make sure we don't clobber the screen */
+                       if (win->wa.width > width)
+                               win->wa.width = width;
+                       if (win->wa.height > height)
+                               win->wa.width = height;
+                       win->x = wc.x = (width - win->wa.width) / 2;
+                       win->y = wc.y = (height - win->wa.height) / 2;
+                       mask = CWX | CWY | CWBorderWidth;
+               }
+               XConfigureWindow(display, win->id, mask, &wc);
+
+               if (win == ws[current_ws].focus)
+                       winfocus = win;
+               else
+                       unfocus_win(win);
+               XMapRaised(display, win->id);
+               i++;
+       }
+
+       focus_win(winfocus); /* this has to be done outside of the loop */
 }
 
-/* terminal + args */
-char                           *term[] = { "xterm", NULL };
+/* fullscreen view */
+void
+max_init(void)
+{
+       DNPRINTF(SWM_D_EVENT, "max_init: workspace: %d\n", current_ws);
+}
+
+void
+max_stack(void) {
+       XWindowChanges          wc;
+       struct ws_win           wf, *win, *winfocus = &wf;
+       int                     i, h, w, x, y, winno;
+       unsigned int mask;
+
+       DNPRINTF(SWM_D_EVENT, "max_stack: workspace: %d\n", current_ws);
+
+       winfocus->id = root;
+
+       winno = count_win(current_ws, 0);
+       if (winno == 0)
+               return;
+
+       x = 0;
+       y = bar_enabled ? bar_height : 0;
+       TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
+               if (i == 1 && win->transient == 0 && win->floating != 0) {
+                       h = height - 2;
+                       w = width - 2;
+
+                       winfocus = win;
+
+                       bzero(&wc, sizeof wc);
+                       wc.border_width = 1;
+                       win->x = wc.x = x;
+                       win->y = wc.y = y;
+                       win->width = wc.width = w;
+                       win->height = wc.height = h;
+                       mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
+                       XConfigureWindow(display, win->id, mask, &wc);
+
+                       XMapRaised(display, win->id);
+               } else {
+                       /* hide all but the master window */
+                       XUnmapWindow(display, win->id);
+               }
+               i++;
+       }
+
+       focus_win(winfocus); /* this has to be done outside of the loop */
+}
+
+void
+send_to_ws(union arg *args)
+{
+       int                     wsid = args->id;
+       struct ws_win           *win = ws[current_ws].focus;
+
+       DNPRINTF(SWM_D_MOVE, "send_to_ws: win: %lu\n", win->id);
+
+       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;
+
+       TAILQ_REMOVE(&ws[current_ws].winlist, win, entry);
+
+       TAILQ_INSERT_TAIL(&ws[wsid].winlist, win, entry);
+       if (count_win(wsid, 1) == 0)
+               ws[wsid].focus = win;
+       ws[wsid].restack = 1;
+
+       stack();
+}
 
 /* key definitions */
 struct key {
@@ -340,9 +860,17 @@ struct key {
        union arg               args;
 } keys[] = {
        /* modifier             key     function                argument */
-       { MODKEY,               XK_Return,      swap_to_main,   {0} },
-       { MODKEY | ShiftMask,   XK_Return,      spawn,          {.argv = term } },
+       /* XXX alt-c is temporary, until I figure out how to grab spacebar */
+       { MODKEY,               XK_c,           cycle_layout,   {0} }, 
+       { 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_q,           quit,           {0} },
+       { MODKEY,               XK_q,           restart,        {.argv = spawn_scrotwm } },
        { MODKEY,               XK_m,           focus,          {.id = SWM_ARG_ID_FOCUSMAIN} },
        { MODKEY,               XK_1,           switchws,       {.id = 0} },
        { MODKEY,               XK_2,           switchws,       {.id = 1} },
@@ -354,6 +882,17 @@ struct key {
        { MODKEY,               XK_8,           switchws,       {.id = 7} },
        { MODKEY,               XK_9,           switchws,       {.id = 8} },
        { MODKEY,               XK_0,           switchws,       {.id = 9} },
+       { MODKEY | ShiftMask,   XK_1,           send_to_ws,     {.id = 0} },
+       { MODKEY | ShiftMask,   XK_2,           send_to_ws,     {.id = 1} },
+       { MODKEY | ShiftMask,   XK_3,           send_to_ws,     {.id = 2} },
+       { MODKEY | ShiftMask,   XK_4,           send_to_ws,     {.id = 3} },
+       { MODKEY | ShiftMask,   XK_5,           send_to_ws,     {.id = 4} },
+       { MODKEY | ShiftMask,   XK_6,           send_to_ws,     {.id = 5} },
+       { MODKEY | ShiftMask,   XK_7,           send_to_ws,     {.id = 6} },
+       { MODKEY | ShiftMask,   XK_8,           send_to_ws,     {.id = 7} },
+       { MODKEY | ShiftMask,   XK_9,           send_to_ws,     {.id = 8} },
+       { MODKEY | ShiftMask,   XK_0,           send_to_ws,     {.id = 9} },
+       { 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} },
 };
@@ -364,6 +903,7 @@ updatenumlockmask(void)
        unsigned int            i, j;
        XModifierKeymap         *modmap;
 
+       DNPRINTF(SWM_D_MISC, "updatenumlockmask\n");
        numlockmask = 0;
        modmap = XGetModifierMapping(display);
        for (i = 0; i < 8; i++)
@@ -383,6 +923,7 @@ grabkeys(void)
        unsigned int            modifiers[] =
            { 0, LockMask, numlockmask, numlockmask | LockMask };
 
+       DNPRINTF(SWM_D_MISC, "grabkeys\n");
        updatenumlockmask();
 
        XUngrabKey(display, AnyKey, AnyModifier, root);
@@ -397,9 +938,7 @@ grabkeys(void)
 void
 expose(XEvent *e)
 {
-       XExposeEvent            *ev = &e->xexpose;
-
-       DNPRINTF(SWM_D_EVENT, "expose: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "expose: window: %lu\n", e->xexpose.window);
 }
 
 void
@@ -409,7 +948,7 @@ keypress(XEvent *e)
        KeySym                  keysym;
        XKeyEvent               *ev = &e->xkey;
 
-       DNPRINTF(SWM_D_EVENT, "keypress: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "keypress: window: %lu\n", ev->window);
 
        keysym = XKeycodeToKeysym(display, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
@@ -423,15 +962,18 @@ void
 buttonpress(XEvent *e)
 {
        XButtonPressedEvent     *ev = &e->xbutton;
+#ifdef SWM_CLICKTOFOCUS
        struct ws_win           *win;
+#endif
 
-       DNPRINTF(SWM_D_EVENT, "buttonpress: window: %d\n", ev->window);
+
+       DNPRINTF(SWM_D_EVENT, "buttonpress: window: %lu\n", ev->window);
 
        if (ev->window == root)
                return;
        if (ev->window == ws[current_ws].focus->id)
                return;
-#if 0
+#ifdef SWM_CLICKTOFOCUS
        TAILQ_FOREACH(win, &ws[current_ws].winlist, entry)
                if (win->id == ev->window) {
                        /* focus in the clicked window */
@@ -447,57 +989,93 @@ buttonpress(XEvent *e)
 #endif
 }
 
-void
-configurerequest(XEvent *e)
+struct ws_win *
+manage_window(Window id)
 {
-       XConfigureRequestEvent  *ev = &e->xconfigurerequest;
        struct ws_win           *win;
 
-       DNPRINTF(SWM_D_EVENT, "configurerequest: window: %d\n", ev->window);
-
-       XSelectInput(display, ev->window, ButtonPressMask | EnterWindowMask |
-           FocusChangeMask);
+       TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
+               if (win->id == id)
+                       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 = ev->window;
+       win->id = id;
        TAILQ_INSERT_TAIL(&ws[current_ws].winlist, win, entry);
+
+       XSelectInput(display, id, ButtonPressMask | EnterWindowMask |
+           FocusChangeMask | ExposureMask);
+
+       return win;
+}
+
+
+void
+configurerequest(XEvent *e)
+{
+       XConfigureRequestEvent  *ev = &e->xconfigurerequest;
+       Window                  trans;
+       struct ws_win           *win;
+
+       DNPRINTF(SWM_D_EVENT, "configurerequest: window: %lu\n", ev->window);
+
+
+       win = manage_window(ev->window);
        ws[current_ws].focus = win; /* make new win focused */
-       ws[current_ws].winno++;
+
+       XGetTransientForHint(display, win->id, &trans);
+       if (trans) {
+               win->transient = trans;
+               DNPRINTF(SWM_D_MISC, "configurerequest: win %u transient %u\n",
+                   (unsigned)win->id, win->transient);
+       }
+       XGetWindowAttributes(display, win->id, &win->wa);
+#if 0
+       XClassHint ch = { 0 };
+       if(XGetClassHint(display, win->id, &ch)) {
+               fprintf(stderr, "class: %s name: %s\n", ch.res_class, ch.res_name);
+               if (!strcmp(ch.res_class, "Gvim") && !strcmp(ch.res_name, "gvim")) {
+                       win->floating = 0;
+               }
+               if(ch.res_class)
+                       XFree(ch.res_class);
+               if(ch.res_name)
+                       XFree(ch.res_name);
+       }
+#endif
        stack();
 }
 
 void
 configurenotify(XEvent *e)
 {
-       XConfigureEvent         *ev = &e->xconfigure;
-
-       DNPRINTF(SWM_D_EVENT, "configurenotify: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "configurenotify: window: %lu\n",
+           e->xconfigure.window);
 }
 
 void
 destroynotify(XEvent *e)
 {
-       size_t                   sz;
        struct ws_win           *win;
        XDestroyWindowEvent     *ev = &e->xdestroywindow;
 
-       DNPRINTF(SWM_D_EVENT, "destroynotify: window %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window);
 
        TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
-               DNPRINTF(SWM_D_EVENT, "trying: %x\n", win->id);
                if (ev->window == win->id) {
                        /* find a window to focus */
-                       ws[current_ws].focus =
-                           TAILQ_PREV(win, ws_win_list,entry);
+                       ws[current_ws].focus = TAILQ_PREV(win,
+                           ws_win_list, entry);
                        if (ws[current_ws].focus == NULL)
                                ws[current_ws].focus =
                                    TAILQ_FIRST(&ws[current_ws].winlist);
+                       if (win == ws[current_ws].focus)
+                               ws[current_ws].focus = NULL;
        
                        TAILQ_REMOVE(&ws[current_ws].winlist, win, entry);
                        free(win);
-                       ws[current_ws].winno--;
                        break;
                }
        }
@@ -511,7 +1089,7 @@ enternotify(XEvent *e)
        XCrossingEvent          *ev = &e->xcrossing;
        struct ws_win           *win;
 
-       DNPRINTF(SWM_D_EVENT, "enternotify: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "enternotify: window: %lu\n", ev->window);
 
        if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) &&
            ev->window != root)
@@ -534,17 +1112,18 @@ focusin(XEvent *e)
 {
        XFocusChangeEvent       *ev = &e->xfocus;
 
-       DNPRINTF(SWM_D_EVENT, "focusin: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "focusin: window: %lu\n", ev->window);
+
+       XSync(display, False); /* not sure this helps redrawing graphic apps */
 
        if (ev->window == root)
                return;
-
        /*
         * kill grab for now so that we can cut and paste , this screws up
         * click to focus
         */
        /*
-       DNPRINTF(SWM_D_EVENT, "focusin: window: %d grabbing\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "focusin: window: %lu grabbing\n", ev->window);
        XGrabButton(display, Button1, AnyModifier, ev->window, False,
            ButtonPress, GrabModeAsync, GrabModeSync, None, None);
        */
@@ -555,7 +1134,7 @@ mappingnotify(XEvent *e)
 {
        XMappingEvent           *ev = &e->xmapping;
 
-       DNPRINTF(SWM_D_EVENT, "mappingnotify: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "mappingnotify: window: %lu\n", ev->window);
 
        XRefreshKeyboardMapping(ev);
        if(ev->request == MappingKeyboard)
@@ -565,25 +1144,34 @@ mappingnotify(XEvent *e)
 void
 maprequest(XEvent *e)
 {
-       XMapRequestEvent        *ev = &e->xmaprequest;
+       DNPRINTF(SWM_D_EVENT, "maprequest: window: %lu\n",
+           e->xmaprequest.window);
 
-       DNPRINTF(SWM_D_EVENT, "maprequest: window: %d\n", ev->window);
+       manage_window(e->xmaprequest.window);
+       stack();
 }
 
 void
 propertynotify(XEvent *e)
 {
-       XPropertyEvent          *ev = &e->xproperty;
-
-       DNPRINTF(SWM_D_EVENT, "propertynotify: window: %d\n", ev->window);
+       DNPRINTF(SWM_D_EVENT, "propertynotify: window: %lu\n",
+           e->xproperty.window);
 }
 
 void
 unmapnotify(XEvent *e)
 {
-       XUnmapEvent             *ev = &e->xunmap;
+       DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %lu\n", e->xunmap.window);
+}
+
+void
+visibilitynotify(XEvent *e)
+{
+       DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: %lu\n", e->xvisibility.window);
 
-       DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %d\n", ev->window);
+       if (e->xvisibility.window == bar_window &&
+           e->xvisibility.state == VisibilityUnobscured)
+               bar_print();
 }
 
 void                   (*handler[LASTEvent])(XEvent *) = {
@@ -599,6 +1187,7 @@ void                       (*handler[LASTEvent])(XEvent *) = {
                                [MapRequest] = maprequest,
                                [PropertyNotify] = propertynotify,
                                [UnmapNotify] = unmapnotify,
+                               [VisibilityNotify] = visibilitynotify,
 };
 
 int
@@ -637,8 +1226,13 @@ active_wm(void)
 int
 main(int argc, char *argv[])
 {
+       struct passwd           *pwd;
+       char                    conf[PATH_MAX], *cfile = NULL;
+       struct stat             sb;
        XEvent                  e;
-       int                     i;
+       unsigned int            i, num;
+       Window                  d1, d2, *wins = NULL;
+       XWindowAttributes       wa;
 
        fprintf(stderr, "Welcome to scrotwm V%s\n", SWM_VERSION);
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
@@ -655,24 +1249,60 @@ main(int argc, char *argv[])
        width = DisplayWidth(display, screen) - 2;
        height = DisplayHeight(display, screen) - 2;
 
-       /* make work space 1 active */
-       ws[0].visible = 1;
-       ws[0].focus = NULL;
-       ws[0].winno = 0;
-       TAILQ_INIT(&ws[0].winlist);
-       for (i = 1; i < SWM_WS_MAX; i++) {
+       /* look for local and global conf file */
+       pwd = getpwuid(getuid());
+       if (pwd == NULL)
+               errx(1, "invalid user %d", getuid());
+
+       snprintf(conf, sizeof conf, "%s/.%s", pwd->pw_dir, SWM_CONF_FILE);
+       if (stat(conf, &sb) != -1) {
+               if (S_ISREG(sb.st_mode))
+                       cfile = conf;
+       } else {
+               /* try global conf file */
+               snprintf(conf, sizeof conf, "/etc/%s", SWM_CONF_FILE);
+               if (!stat(conf, &sb))
+                       if (S_ISREG(sb.st_mode))
+                               cfile = conf;
+       }
+       if (cfile)
+               conf_load(cfile);
+
+       /* init all workspaces */
+       for (i = 0; i < SWM_WS_MAX; i++) {
                ws[i].visible = 0;
+               ws[i].restack = 1;
                ws[i].focus = NULL;
-               ws[i].winno = 0;
                TAILQ_INIT(&ws[i].winlist);
+               ws[i].cur_layout = &layouts[0];
        }
+       /* make work space 1 active */
+       ws[0].visible = 1;
+
+       /* grab existing windows */
+       if (XQueryTree(display, root, &d1, &d2, &wins, &num)) {
+               for (i = 0; i < num; i++) {
+                        if (!XGetWindowAttributes(display, wins[i], &wa)
+                           || wa.override_redirect ||
+                           XGetTransientForHint(display, wins[i], &d1))
+                               continue;
+                       manage_window(wins[i]);
+                }
+                if(wins)
+                        XFree(wins);
+        }
+       ws[0].focus = TAILQ_FIRST(&ws[0].winlist);
+
+       /* setup status bar */
+       bar_setup();
 
        XSelectInput(display, root, SubstructureRedirectMask |
            SubstructureNotifyMask | ButtonPressMask | KeyPressMask |
            EnterWindowMask | LeaveWindowMask | StructureNotifyMask |
-           FocusChangeMask | PropertyChangeMask);
+           FocusChangeMask | PropertyChangeMask | ExposureMask);
 
        grabkeys();
+       stack();
 
        while (running) {
                XNextEvent(display, &e);