JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
Merge branch 'master' of opensource.conformal.com:/git/scrotwm
[spectrwm.git] / scrotwm.c
index 70aee79..55bf753 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -1,9 +1,11 @@
 /* $scrotwm$ */
 /*
- * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
- * Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com>
+ * Copyright (c) 2009-2010-2011 Marco Peereboom <marco@peereboom.us>
+ * Copyright (c) 2009-2010-2011 Ryan McBride <mcbride@countersiege.com>
  * Copyright (c) 2009 Darrin Chandler <dwchandler@stilyagin.com>
  * Copyright (c) 2009 Pierre-Yves Ritschard <pyr@spootnik.org>
+ * Copyright (c) 2010 Tuukka Kataja <stuge@xor.fi>
+ * Copyright (c) 2011 Jason L. Wright <jason@thought.net>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,7 +22,7 @@
 /*
  * Much code and ideas taken from dwm under the following license:
  * MIT/X Consortium License
- * 
+ *
  * 2006-2008 Anselm R Garbe <garbeam at gmail dot com>
  * 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
  * 2006-2007 Jukka Salmi <jukka at salmi dot ch>
  * 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
  * 2007-2008 Peter Hartlich <sgkkr at hartlich dot com>
  * 2008 Martin Hurton <martin dot hurton at gmail dot com>
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * DEALINGS IN THE SOFTWARE.
  */
 
-static const char      *cvstag = "$scrotwm$";
+static const char      *cvstag =
+    "$scrotwm$";
 
-#define        SWM_VERSION     "0.9.5"
+#define        SWM_VERSION     "0.9.34"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -66,6 +69,7 @@ static const char     *cvstag = "$scrotwm$";
 #include <string.h>
 #include <util.h>
 #include <pwd.h>
+#include <paths.h>
 #include <ctype.h>
 
 #include <sys/types.h>
@@ -83,6 +87,11 @@ static const char    *cvstag = "$scrotwm$";
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/Xrandr.h>
+#include <X11/extensions/XTest.h>
+
+#ifdef __OSX__
+#include <osx.h>
+#endif
 
 #if RANDR_MAJOR < 1
 #  error XRandR versions less than 1.0 are not supported
@@ -94,10 +103,10 @@ static const char  *cvstag = "$scrotwm$";
 #endif
 #endif
 
-/* #define SWM_DEBUG */
+/*#define SWM_DEBUG*/
 #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 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_MISC              0x0001
 #define        SWM_D_EVENT             0x0002
 #define        SWM_D_WS                0x0004
@@ -109,6 +118,9 @@ static const char   *cvstag = "$scrotwm$";
 #define        SWM_D_CLASS             0x0100
 #define SWM_D_KEY              0x0200
 #define SWM_D_QUIRK            0x0400
+#define SWM_D_SPAWN            0x0800
+#define SWM_D_EVENTQ           0x1000
+#define SWM_D_CONF             0x2000
 
 u_int32_t              swm_debug = 0
                            | SWM_D_MISC
@@ -122,6 +134,9 @@ u_int32_t           swm_debug = 0
                            | SWM_D_CLASS
                            | SWM_D_KEY
                            | SWM_D_QUIRK
+                           | SWM_D_SPAWN
+                           | SWM_D_EVENTQ
+                           | SWM_D_CONF
                            ;
 #else
 #define DPRINTF(x...)
@@ -142,22 +157,34 @@ u_int32_t         swm_debug = 0
 #define WIDTH(r)               (r)->g.w
 #define HEIGHT(r)              (r)->g.h
 #define SWM_MAX_FONT_STEPS     (3)
+#define WINID(w)               (w ? w->id : 0)
+
+#define SWM_FOCUS_DEFAULT      (0)
+#define SWM_FOCUS_SYNERGY      (1)
+#define SWM_FOCUS_FOLLOW       (2)
 
 #ifndef SWM_LIB
-#define SWM_LIB                        "/usr/X11R6/lib/swmhack.so"
+#define SWM_LIB                        "/usr/local/lib/libswmhack.so"
 #endif
 
 char                   **start_argv;
 Atom                   astate;
 Atom                   aprot;
 Atom                   adelete;
+Atom                   takefocus;
+Atom                   a_wmname;
+Atom                   a_utf8_string;
+Atom                   a_string;
+Atom                   a_swm_iconic;
+volatile sig_atomic_t   running = 1;
+volatile sig_atomic_t   restart_wm = 0;
+int                    outputs = 0;
+int                    last_focus_event = FocusOut;
 int                    (*xerrorxlib)(Display *, XErrorEvent *);
 int                    other_wm;
-int                    running = 1;
 int                    ss_enabled = 0;
 int                    xrandr_support;
 int                    xrandr_eventbase;
-int                    ignore_enter = 0;
 unsigned int           numlockmask = 0;
 Display                        *display;
 
@@ -165,6 +192,14 @@ int                        cycle_empty = 0;
 int                    cycle_visible = 0;
 int                    term_width = 0;
 int                    font_adjusted = 0;
+unsigned int           mod_key = MODKEY;
+
+/* dmenu search */
+struct swm_region      *search_r;
+int                    select_list_pipe[2];
+int                    select_resp_pipe[2];
+pid_t                  searchpid;
+volatile sig_atomic_t  search_resp;
 
 /* dialog windows */
 double                 dialog_ratio = .6;
@@ -178,31 +213,30 @@ int                       bar_version = 0;
 sig_atomic_t           bar_alarm = 0;
 int                    bar_delay = 30;
 int                    bar_enabled = 1;
+int                    bar_border_width = 1;
+int                    bar_at_bottom = 0;
 int                    bar_extra = 1;
 int                    bar_extra_running = 0;
 int                    bar_verbose = 1;
 int                    bar_height = 0;
+int                    stack_enabled = 1;
 int                    clock_enabled = 1;
+int                    urgent_enabled = 0;
+char                   *clock_format = NULL;
 int                    title_name_enabled = 0;
 int                    title_class_enabled = 0;
+int                    window_name_enabled = 0;
+int                    focus_mode = SWM_FOCUS_DEFAULT;
+int                    disable_border = 0;
+int                    border_width = 1;
+int                    verbose_layout = 0;
 pid_t                  bar_pid;
 GC                     bar_gc;
 XGCValues              bar_gcv;
 int                    bar_fidx = 0;
 XFontStruct            *bar_fs;
-char                   *bar_fonts[] = {
-                           "-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*",
-                           "-*-times-medium-r-*-*-*-*-*-*-*-*-*-*",
-                           NULL
-};
-
-/* terminal + args */
-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 };
+char                   *bar_fonts[] = { NULL, NULL, NULL, NULL };/* XXX Make fully dynamic */
+char                   *spawn_term[] = { NULL, NULL };         /* XXX Make fully dynamic */
 
 #define SWM_MENU_FN    (2)
 #define SWM_MENU_NB    (4)
@@ -225,88 +259,51 @@ struct workspace;
 struct swm_region {
        TAILQ_ENTRY(swm_region) entry;
        struct swm_geometry     g;
-       struct workspace        *ws;    /* current workspace on this region */
+       struct workspace        *ws;    /* current workspace on this region */
+       struct workspace        *ws_prior; /* prior 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;
+       Window                  transient;
+       struct ws_win           *child_trans;   /* transient child window */
+       struct swm_geometry     g;              /* current geometry */
+       struct swm_geometry     g_float;        /* geometry when floating */
+       struct swm_geometry     rg_float;       /* region geom when floating */
+       int                     g_floatvalid;   /* flag: geometry in g_float is valid */
+       int                     floatmaxed;     /* flag: floater was maxed in max_stack */
        int                     floating;
-       int                     transient;
        int                     manual;
+       int                     iconic;
+       unsigned int            ewmh_flags;
        int                     font_size_boundary[SWM_MAX_FONT_STEPS];
        int                     font_steps;
        int                     last_inc;
        int                     can_delete;
+       int                     take_focus;
+       int                     java;
        unsigned long           quirks;
        struct workspace        *ws;    /* always valid */
        struct swm_screen       *s;     /* always valid, never changes */
        XWindowAttributes       wa;
        XSizeHints              sh;
        XClassHint              ch;
+       XWMHints                *hints;
 };
 TAILQ_HEAD(ws_win_list, ws_win);
 
-/* user/key callable function IDs */
-enum keyfuncid {
-       kf_cycle_layout,
-       kf_stack_reset,
-       kf_master_shrink,
-       kf_master_grow,
-       kf_master_add,
-       kf_master_del,
-       kf_stack_inc,
-       kf_stack_dec,
-       kf_swap_main,
-       kf_focus_next,
-       kf_focus_prev,
-       kf_swap_next,
-       kf_swap_prev,
-       kf_spawn_term,
-       kf_spawn_menu,
-       kf_quit,
-       kf_restart,
-       kf_focus_main,
-       kf_ws_1,
-       kf_ws_2,
-       kf_ws_3,
-       kf_ws_4,
-       kf_ws_5,
-       kf_ws_6,
-       kf_ws_7,
-       kf_ws_8,
-       kf_ws_9,
-       kf_ws_10,
-       kf_ws_next,
-       kf_ws_prev,
-       kf_screen_next,
-       kf_screen_prev,
-       kf_mvws_1,
-       kf_mvws_2,
-       kf_mvws_3,
-       kf_mvws_4,
-       kf_mvws_5,
-       kf_mvws_6,
-       kf_mvws_7,
-       kf_mvws_8,
-       kf_mvws_9,
-       kf_mvws_10,
-       kf_bar_toggle,
-       kf_wind_kill,
-       kf_wind_del,
-       kf_screenshot_all,
-       kf_screenshot_wind,
-       kf_float_toggle,
-       kf_version,
-       kf_spawn_lock,
-       kf_spawn_initscr,
-       kf_invalid
+/* pid goo */
+struct pid_e {
+       TAILQ_ENTRY(pid_e)      entry;
+       long                    pid;
+       int                     ws;
 };
+TAILQ_HEAD(pid_list, pid_e);
+struct pid_list                        pidlist = TAILQ_HEAD_INITIALIZER(pidlist);
 
 /* layout handlers */
 void   stack(void);
@@ -315,42 +312,52 @@ 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   plain_stacker(struct workspace *);
+void   fancy_stacker(struct workspace *);
+
+struct ws_win *find_window(Window);
 
 void   grabbuttons(struct ws_win *, int);
 void   new_region(struct swm_screen *, int, int, int, int);
-void   update_modkey(unsigned int);
-/* user functions / key binding */
-int    bindmatch(const char *var, const char *name, unsigned int currmod, char *keystr,
-    enum keyfuncid *kfid, unsigned int *mod, KeySym *ks);
-void   setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid);
-/* quirks */
-int    quirkmatch(const char *var, const char *name, char *qstr,
-    char *qclass, char *qname, unsigned long *qquirk);
-void   setquirk(const char *class, const char *name, const int quirk);
+void   unmanage_window(struct ws_win *);
+long   getstate(Window);
 
 struct layout {
        void            (*l_stack)(struct workspace *, struct swm_geometry *);
        void            (*l_config)(struct workspace *, int);
+       u_int32_t       flags;
+#define SWM_L_FOCUSPREV                (1<<0)
+#define SWM_L_MAPONFOCUS       (1<<1)
+       void            (*l_string)(struct workspace *);
 } layouts[] =  {
        /* stack,               configure */
-       { vertical_stack,       vertical_config},
-       { horizontal_stack,     horizontal_config},
-       { max_stack,            NULL},
-       { NULL,                 NULL},
+       { vertical_stack,       vertical_config,        0,      plain_stacker },
+       { horizontal_stack,     horizontal_config,      0,      plain_stacker },
+       { max_stack,            NULL,
+         SWM_L_MAPONFOCUS | SWM_L_FOCUSPREV,                   plain_stacker },
+       { NULL,                 NULL,                   0,      NULL  },
 };
 
+/* position of max_stack mode in the layouts array, index into layouts! */
+#define SWM_V_STACK            (0)
+#define SWM_H_STACK            (1)
+#define SWM_MAX_STACK          (2)
+
 #define SWM_H_SLICE            (32)
 #define SWM_V_SLICE            (32)
 
 /* define work spaces */
 struct workspace {
        int                     idx;            /* workspace index */
-       int                     restack;        /* restack on switch */
+       int                     always_raise;   /* raise windows on focus */
        struct layout           *cur_layout;    /* current layout handlers */
        struct ws_win           *focus;         /* may be NULL */
        struct ws_win           *focus_prev;    /* may be NULL */
        struct swm_region       *r;             /* may be NULL */
+       struct swm_region       *old_r;         /* may be NULL */
        struct ws_win_list      winlist;        /* list of windows in ws */
+       struct ws_win_list      unmanagedlist;  /* list of dead windows in ws */
+       char                    stacker[10];    /* display stacker and layout */
 
        /* stacker state */
        struct {
@@ -367,9 +374,9 @@ 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? */
+#define SWM_WS_MAX             (10)
 struct swm_screen {
-       int                     idx;            /* screen index */
+       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;
@@ -384,374 +391,921 @@ struct swm_screen {
 struct swm_screen      *screens;
 int                    num_screens;
 
-struct ws_win          *cur_focus = NULL;
-
 /* args to functions */
 union arg {
        int                     id;
 #define SWM_ARG_ID_FOCUSNEXT   (0)
 #define SWM_ARG_ID_FOCUSPREV   (1)
 #define SWM_ARG_ID_FOCUSMAIN   (2)
-#define SWM_ARG_ID_SWAPNEXT    (3)
-#define SWM_ARG_ID_SWAPPREV    (4)
-#define SWM_ARG_ID_SWAPMAIN    (5)
-#define SWM_ARG_ID_MASTERSHRINK (6)
-#define SWM_ARG_ID_MASTERGROW  (7)
-#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)
-#define SWM_ARG_ID_KILLWINDOW  (0)
-#define SWM_ARG_ID_DELETEWINDOW        (1)
+#define SWM_ARG_ID_FOCUSCUR    (4)
+#define SWM_ARG_ID_SWAPNEXT    (10)
+#define SWM_ARG_ID_SWAPPREV    (11)
+#define SWM_ARG_ID_SWAPMAIN    (12)
+#define SWM_ARG_ID_MOVELAST    (13)
+#define SWM_ARG_ID_MASTERSHRINK (20)
+#define SWM_ARG_ID_MASTERGROW  (21)
+#define SWM_ARG_ID_MASTERADD   (22)
+#define SWM_ARG_ID_MASTERDEL   (23)
+#define SWM_ARG_ID_STACKRESET  (30)
+#define SWM_ARG_ID_STACKINIT   (31)
+#define SWM_ARG_ID_CYCLEWS_UP  (40)
+#define SWM_ARG_ID_CYCLEWS_DOWN        (41)
+#define SWM_ARG_ID_CYCLESC_UP  (42)
+#define SWM_ARG_ID_CYCLESC_DOWN        (43)
+#define SWM_ARG_ID_STACKINC    (50)
+#define SWM_ARG_ID_STACKDEC    (51)
+#define SWM_ARG_ID_SS_ALL      (60)
+#define SWM_ARG_ID_SS_WINDOW   (61)
+#define SWM_ARG_ID_DONTCENTER  (70)
+#define SWM_ARG_ID_CENTER      (71)
+#define SWM_ARG_ID_KILLWINDOW  (80)
+#define SWM_ARG_ID_DELETEWINDOW        (81)
+#define SWM_ARG_ID_WIDTHGROW   (90)
+#define SWM_ARG_ID_WIDTHSHRINK (91)
+#define SWM_ARG_ID_HEIGHTGROW  (92)
+#define SWM_ARG_ID_HEIGHTSHRINK        (93)
+#define SWM_ARG_ID_MOVEUP      (100)
+#define SWM_ARG_ID_MOVEDOWN    (101)
+#define SWM_ARG_ID_MOVELEFT    (102)
+#define SWM_ARG_ID_MOVERIGHT   (103)
        char                    **argv;
 };
 
+void   focus(struct swm_region *, union arg *);
+void   focus_magic(struct ws_win *);
+
 /* quirks */
 struct quirk {
-       char                    class[SWM_QUIRK_LEN];
-       char                    name[SWM_QUIRK_LEN];
+       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 */
 #define SWM_Q_FULLSCREEN       (1<<4)  /* remove border */
+#define SWM_Q_FOCUSPREV                (1<<5)  /* focus on caller */
 };
 int                            quirks_size = 0, quirks_length = 0;
 struct quirk                   *quirks = NULL;
 
-/* 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                   focusout(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,
-                               [FocusOut] = focusout,
-                               [MappingNotify] = mappingnotify,
-                               [MapRequest] = maprequest,
-                               [PropertyNotify] = propertynotify,
-                               [UnmapNotify] = unmapnotify,
-                               [VisibilityNotify] = visibilitynotify,
+/*
+ * Supported EWMH hints should be added to
+ * both the enum and the ewmh array
+ */
+enum { _NET_ACTIVE_WINDOW, _NET_MOVERESIZE_WINDOW, _NET_CLOSE_WINDOW,
+    _NET_WM_WINDOW_TYPE, _NET_WM_WINDOW_TYPE_DOCK,
+    _NET_WM_WINDOW_TYPE_TOOLBAR, _NET_WM_WINDOW_TYPE_UTILITY,
+    _NET_WM_WINDOW_TYPE_SPLASH, _NET_WM_WINDOW_TYPE_DIALOG,
+    _NET_WM_WINDOW_TYPE_NORMAL, _NET_WM_STATE,
+    _NET_WM_STATE_MAXIMIZED_HORZ, _NET_WM_STATE_MAXIMIZED_VERT,
+    _NET_WM_STATE_SKIP_TASKBAR, _NET_WM_STATE_SKIP_PAGER,
+    _NET_WM_STATE_HIDDEN, _NET_WM_STATE_ABOVE, _SWM_WM_STATE_MANUAL,
+    _NET_WM_STATE_FULLSCREEN, _NET_WM_ALLOWED_ACTIONS, _NET_WM_ACTION_MOVE,
+    _NET_WM_ACTION_RESIZE, _NET_WM_ACTION_FULLSCREEN, _NET_WM_ACTION_CLOSE,
+    SWM_EWMH_HINT_MAX };
+
+struct ewmh_hint {
+       char    *name;
+       Atom     atom;
+} ewmh[SWM_EWMH_HINT_MAX] =    {
+    /* must be in same order as in the enum */
+    {"_NET_ACTIVE_WINDOW", None},
+    {"_NET_MOVERESIZE_WINDOW", None},
+    {"_NET_CLOSE_WINDOW", None},
+    {"_NET_WM_WINDOW_TYPE", None},
+    {"_NET_WM_WINDOW_TYPE_DOCK", None},
+    {"_NET_WM_WINDOW_TYPE_TOOLBAR", None},
+    {"_NET_WM_WINDOW_TYPE_UTILITY", None},
+    {"_NET_WM_WINDOW_TYPE_SPLASH", None},
+    {"_NET_WM_WINDOW_TYPE_DIALOG", None},
+    {"_NET_WM_WINDOW_TYPE_NORMAL", None},
+    {"_NET_WM_STATE", None},
+    {"_NET_WM_STATE_MAXIMIZED_HORZ", None},
+    {"_NET_WM_STATE_MAXIMIZED_VERT", None},
+    {"_NET_WM_STATE_SKIP_TASKBAR", None},
+    {"_NET_WM_STATE_SKIP_PAGER", None},
+    {"_NET_WM_STATE_HIDDEN", None},
+    {"_NET_WM_STATE_ABOVE", None},
+    {"_SWM_WM_STATE_MANUAL", None},
+    {"_NET_WM_STATE_FULLSCREEN", None},
+    {"_NET_WM_ALLOWED_ACTIONS", None},
+    {"_NET_WM_ACTION_MOVE", None},
+    {"_NET_WM_ACTION_RESIZE", None},
+    {"_NET_WM_ACTION_FULLSCREEN", None},
+    {"_NET_WM_ACTION_CLOSE", None},
 };
 
-unsigned long
-name_to_color(char *colorname)
+void   store_float_geom(struct ws_win *win, struct swm_region *r);
+int    floating_toggle_win(struct ws_win *win);
+void   spawn_select(struct swm_region *, union arg *, char *, int *);
+
+int
+get_property(Window id, Atom atom, long count, Atom type,
+    unsigned long *n, unsigned char **data)
 {
-       Colormap                cmap;
-       Status                  status;
-       XColor                  screen_def, exact_def;
-       unsigned long           result = 0;
-       char                    cname[32] = "#";
+       int                     format, status;
+       unsigned long           tmp, extra;
+       unsigned long           *nitems;
+       Atom                    real;
 
-       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);
+       nitems = n != NULL ? n : &tmp;
+       status = XGetWindowProperty(display, id, atom, 0L, count, False, type,
+           &real, &format, nitems, &extra, data);
 
-       return (result);
+       if (status != Success)
+               return False;
+       if (real != type)
+               return False;
+
+       return True;
 }
 
 void
-setscreencolor(char *val, int i, int c)
+update_iconic(struct ws_win *win, int newv)
 {
-       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));
+       int32_t v = newv;
+       Atom iprop;
+
+       win->iconic = newv;
+
+       iprop = XInternAtom(display, "_SWM_ICONIC", False);
+       if (!iprop)
+               return;
+       if (newv)
+               XChangeProperty(display, win->id, iprop, XA_INTEGER, 32,
+                   PropModeReplace, (unsigned char *)&v, 1);
+       else
+               XDeleteProperty(display, win->id, iprop);
+}
+
+int
+get_iconic(struct ws_win *win)
+{
+       int32_t v = 0;
+       int retfmt, status;
+       Atom iprop, rettype;
+       unsigned long nitems, extra;
+       unsigned char *prop = NULL;
+
+       iprop = XInternAtom(display, "_SWM_ICONIC", False);
+       if (!iprop)
+               goto out;
+       status = XGetWindowProperty(display, win->id, iprop, 0L, 1L,
+           False, XA_INTEGER, &rettype, &retfmt, &nitems, &extra, &prop);
+       if (status != Success)
+               goto out;
+       if (rettype != XA_INTEGER || retfmt != 32)
+               goto out;
+       if (nitems != 1)
+               goto out;
+       v = *((int32_t *)prop);
+
+out:
+       if (prop != NULL)
+               XFree(prop);
+       return (v);
 }
 
 void
-custom_region(char *val)
+setup_ewmh(void)
 {
-       unsigned int                    sidx, x, y, w, h;
+       int                     i,j;
+       Atom                    sup_list;
 
-       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--;
+       sup_list = XInternAtom(display, "_NET_SUPPORTED", False);
 
-       if (w < 1 || h < 1)
-               errx(1, "region %ux%u+%u+%u too small\n", w, h, x, y);
+       for (i = 0; i < LENGTH(ewmh); i++)
+               ewmh[i].atom = XInternAtom(display, ewmh[i].name, False);
 
-       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);
+       for (i = 0; i < ScreenCount(display); i++) {
+               /* Support check window will be created by workaround(). */
+
+               /* Report supported atoms */
+               XDeleteProperty(display, screens[i].root, sup_list);
+               for (j = 0; j < LENGTH(ewmh); j++)
+                       XChangeProperty(display, screens[i].root,
+                           sup_list, XA_ATOM, 32,
+                           PropModeAppend, (unsigned char *)&ewmh[j].atom,1);
+       }
 }
 
-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);
+void
+teardown_ewmh(void)
+{
+       int                     i, success;
+       unsigned char           *data = NULL;
+       unsigned long           n;
+       Atom                    sup_check, sup_list;
+       Window                  id;
+
+       sup_check = XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", False);
+       sup_list = XInternAtom(display, "_NET_SUPPORTED", False);
+
+       for (i = 0; i < ScreenCount(display); i++) {
+               /* Get the support check window and destroy it */
+               success = get_property(screens[i].root, sup_check, 1, XA_WINDOW,
+                   &n, &data);
+
+               if (success) {
+                       id = data[0];
+                       XDestroyWindow(display, id);
+                       XDeleteProperty(display, screens[i].root, sup_check);
+                       XDeleteProperty(display, screens[i].root, sup_list);
+               }
+
+               XFree(data);
+       }
 }
 
-/* conf file stuff */
-#define        SWM_CONF_WS     "\n= \t"
-#define SWM_CONF_FILE  "scrotwm.conf"
-int
-conf_load(char *filename)
+void
+ewmh_autoquirk(struct ws_win *win)
 {
-       FILE                    *config;
-       char                    *line, *cp, *var, *val;
-       size_t                  len, lineno = 0;
-       int                     i, sc;
-       unsigned int            modkey = MODKEY, modmask;
-       KeySym                  ks;
-       enum keyfuncid          kfid;
-       char                    class[SWM_QUIRK_LEN];
-       char                    name[SWM_QUIRK_LEN];
-       unsigned long           quirk;
-
-       DNPRINTF(SWM_D_MISC, "conf_load: filename %s\n", filename);
+       int                     success, i;
+       unsigned long           *data = NULL, n;
+       Atom                    type;
 
-       if (filename == NULL)
-               return (1);
+       success = get_property(win->id, ewmh[_NET_WM_WINDOW_TYPE].atom, (~0L),
+           XA_ATOM, &n, (void *)&data);
 
-       if ((config = fopen(filename, "r")) == NULL)
-               return (1);
+       if (!success) {
+               XFree(data);
+               return;
+       }
 
-       for (sc = ScreenCount(display);;) {
-               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)
+       for (i = 0; i < n; i++) {
+               type = data[i];
+               if (type == ewmh[_NET_WM_WINDOW_TYPE_NORMAL].atom)
                        break;
-               cp += (long)strspn(cp, SWM_CONF_WS);
-               if ((val = strsep(&cp, SWM_CONF_WS)) == NULL)
+               if (type == ewmh[_NET_WM_WINDOW_TYPE_DOCK].atom ||
+                   type == ewmh[_NET_WM_WINDOW_TYPE_TOOLBAR].atom ||
+                   type == ewmh[_NET_WM_WINDOW_TYPE_UTILITY].atom) {
+                       win->floating = 1;
+                       win->quirks = SWM_Q_FLOAT | SWM_Q_ANYWHERE;
                        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 (!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 if (!bindmatch(var, "bind", modkey, val,
-                           &kfid, &modmask, &ks))
-                               setkeybinding(modmask, ks, kfid);
-                       else
-                               goto bad;
+               }
+               if (type == ewmh[_NET_WM_WINDOW_TYPE_SPLASH].atom ||
+                   type == ewmh[_NET_WM_WINDOW_TYPE_DIALOG].atom) {
+                       win->floating = 1;
+                       win->quirks = SWM_Q_FLOAT;
                        break;
+               }
+       }
 
-               case 'c':
-                       if (!strncmp(var, "clock_enabled", strlen("clock_enabled")))
-                               clock_enabled = atoi(val);
-                       else 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;
+       XFree(data);
+}
 
-               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;
+#define SWM_EWMH_ACTION_COUNT_MAX      (6)
+#define EWMH_F_FULLSCREEN              (1<<0)
+#define EWMH_F_ABOVE                   (1<<1)
+#define EWMH_F_HIDDEN                  (1<<2)
+#define EWMH_F_SKIP_PAGER              (1<<3)
+#define EWMH_F_SKIP_TASKBAR            (1<<4)
+#define SWM_F_MANUAL                   (1<<5)
 
-               case 'm':
-                       if (!strncmp(var, "modkey", strlen("modkey"))) {
-                               modkey = MODKEY;
-                               if (!strncmp(val, "Mod2", strlen("Mod2")))
-                                       modkey = Mod2Mask;
-                               else if (!strncmp(val, "Mod3", strlen("Mod3")))
-                                       modkey = Mod3Mask;
-                               else if (!strncmp(val, "Mod4", strlen("Mod4")))
-                                       modkey = Mod4Mask;
-                               else
-                                       modkey = Mod1Mask;
-                               update_modkey(modkey);
-                       } else
-                               goto bad;
-                       break;
+int
+ewmh_set_win_fullscreen(struct ws_win *win, int fs)
+{
+       struct swm_geometry     rg;
 
-               case 'q':
-                       if (!quirkmatch(var, "quirk", val, class, name, &quirk))
-                               setquirk(class, name, quirk);
-                       else
-                               goto bad;
-                       break;
+       if (!win->ws->r)
+               return 0;
 
-               case 'r':
-                       if (!strncmp(var, "region", strlen("region")))
-                               custom_region(val);
-                       else
-                               goto bad;
-                       break;
+       if (!win->floating)
+               return 0;
 
-               case 's':
-                       if (!strncmp(var, "spawn_term", strlen("spawn_term")))
-                               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;
+       DNPRINTF(SWM_D_MISC, "ewmh_set_win_fullscreen: win 0x%lx fs: %d\n",
+           win->id, fs);
 
-               case 't':
-                       if (!strncmp(var, "term_width", strlen("term_width")))
-                               term_width = atoi(val);
-                       else if (!strncmp(var, "title_class_enabled",
-                           strlen("title_class_enabled")))
-                               title_class_enabled = atoi(val);
-                       else if (!strncmp(var, "title_name_enabled",
-                           strlen("title_name_enabled")))
-                               title_name_enabled = atoi(val);
-                       else
-                               goto bad;
-                       break;
+       rg = win->ws->r->g;
 
-               default:
-                       goto bad;
+       if (fs) {
+               store_float_geom(win, win->ws->r);
+
+               win->g.x = rg.x;
+               win->g.y = rg.y;
+               win->g.w = rg.w;
+               win->g.h = rg.h;
+       } else {
+               if (win->g_floatvalid) {
+                       /* refloat at last floating relative position */
+                       win->g.x = win->g_float.x - win->rg_float.x + rg.x;
+                       win->g.y = win->g_float.y - win->rg_float.y + rg.y;
+                       win->g.w = win->g_float.w;
+                       win->g.h = win->g_float.h;
                }
-               free(line);
        }
 
-       fclose(config);
-       return (0);
-
-bad:
-       errx(1, "invalid conf file entry: %s=%s", var, val);
+       return 1;
 }
 
 void
-socket_setnonblock(int fd)
+ewmh_update_actions(struct ws_win *win)
 {
-       int                     flags;
+       Atom                    actions[SWM_EWMH_ACTION_COUNT_MAX];
+       int                     n = 0;
 
-       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");
-}
+       if (win == NULL)
+               return;
 
-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));
+       actions[n++] = ewmh[_NET_WM_ACTION_CLOSE].atom;
+
+       if (win->floating) {
+               actions[n++] = ewmh[_NET_WM_ACTION_MOVE].atom;
+               actions[n++] = ewmh[_NET_WM_ACTION_RESIZE].atom;
+       }
+
+       XChangeProperty(display, win->id, ewmh[_NET_WM_ALLOWED_ACTIONS].atom,
+           XA_ATOM, 32, PropModeReplace, (unsigned char *)actions, n);
 }
 
+#define _NET_WM_STATE_REMOVE   0    /* remove/unset property */
+#define _NET_WM_STATE_ADD      1    /* add/set property */
+#define _NET_WM_STATE_TOGGLE   2    /* toggle property */
+
 void
-bar_extra_stop(void)
+ewmh_update_win_state(struct ws_win *win, long state, long action)
 {
-       if (bar_pipe[0]) {
-               close(bar_pipe[0]);
-               bzero(bar_pipe, sizeof bar_pipe);
-       }
-       if (bar_pid) {
+       unsigned int            mask = 0;
+       unsigned int            changed = 0;
+       unsigned int            orig_flags;
+
+       if (win == NULL)
+               return;
+
+       if (state == ewmh[_NET_WM_STATE_FULLSCREEN].atom)
+               mask = EWMH_F_FULLSCREEN;
+       if (state == ewmh[_NET_WM_STATE_ABOVE].atom)
+               mask = EWMH_F_ABOVE;
+       if (state == ewmh[_SWM_WM_STATE_MANUAL].atom)
+               mask = SWM_F_MANUAL;
+       if (state == ewmh[_NET_WM_STATE_SKIP_PAGER].atom)
+               mask = EWMH_F_SKIP_PAGER;
+       if (state == ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom)
+               mask = EWMH_F_SKIP_TASKBAR;
+
+
+       orig_flags = win->ewmh_flags;
+
+       switch (action) {
+       case _NET_WM_STATE_REMOVE:
+               win->ewmh_flags &= ~mask;
+               break;
+       case _NET_WM_STATE_ADD:
+               win->ewmh_flags |= mask;
+               break;
+       case _NET_WM_STATE_TOGGLE:
+               win->ewmh_flags ^= mask;
+               break;
+       }
+
+       changed = (win->ewmh_flags & mask) ^ (orig_flags & mask) ? 1 : 0;
+
+       if (state == ewmh[_NET_WM_STATE_ABOVE].atom)
+               if (changed)
+                       if (!floating_toggle_win(win))
+                               win->ewmh_flags = orig_flags; /* revert */
+       if (state == ewmh[_SWM_WM_STATE_MANUAL].atom)
+               if (changed)
+                       win->manual = (win->ewmh_flags & SWM_F_MANUAL) != 0;
+       if (state == ewmh[_NET_WM_STATE_FULLSCREEN].atom)
+               if (changed)
+                       if (!ewmh_set_win_fullscreen(win,
+                           win->ewmh_flags & EWMH_F_FULLSCREEN))
+                               win->ewmh_flags = orig_flags; /* revert */
+
+       XDeleteProperty(display, win->id, ewmh[_NET_WM_STATE].atom);
+
+       if (win->ewmh_flags & EWMH_F_FULLSCREEN)
+               XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom,
+                   XA_ATOM, 32, PropModeAppend,
+                   (unsigned char *)&ewmh[_NET_WM_STATE_FULLSCREEN].atom, 1);
+       if (win->ewmh_flags & EWMH_F_SKIP_PAGER)
+               XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom,
+                   XA_ATOM, 32, PropModeAppend,
+                   (unsigned char *)&ewmh[_NET_WM_STATE_SKIP_PAGER].atom, 1);
+       if (win->ewmh_flags & EWMH_F_SKIP_TASKBAR)
+               XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom,
+                   XA_ATOM, 32, PropModeAppend,
+                   (unsigned char *)&ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom, 1);
+       if (win->ewmh_flags & EWMH_F_ABOVE)
+               XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom,
+                   XA_ATOM, 32, PropModeAppend,
+                   (unsigned char *)&ewmh[_NET_WM_STATE_ABOVE].atom, 1);
+       if (win->ewmh_flags & SWM_F_MANUAL)
+               XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom,
+                   XA_ATOM, 32, PropModeAppend,
+                   (unsigned char *)&ewmh[_SWM_WM_STATE_MANUAL].atom, 1);
+}
+
+void
+ewmh_get_win_state(struct ws_win *win)
+{
+       int                     success, i;
+       unsigned long           n;
+       Atom                    *states;
+
+       if (win == NULL)
+               return;
+
+       win->ewmh_flags = 0;
+       if (win->floating)
+               win->ewmh_flags |= EWMH_F_ABOVE;
+       if (win->manual)
+               win->ewmh_flags |= SWM_F_MANUAL;
+
+       success = get_property(win->id, ewmh[_NET_WM_STATE].atom,
+           (~0L), XA_ATOM, &n, (void *)&states);
+
+       if (!success)
+               return;
+
+       for (i = 0; i < n; i++)
+               ewmh_update_win_state(win, states[i], _NET_WM_STATE_ADD);
+
+       XFree(states);
+}
+
+/* events */
+#ifdef SWM_DEBUG
+void
+dumpevent(XEvent *e)
+{
+       char                    *name = NULL;
+
+       switch (e->type) {
+       case KeyPress:
+               name = "KeyPress";
+               break;
+       case KeyRelease:
+               name = "KeyRelease";
+               break;
+       case ButtonPress:
+               name = "ButtonPress";
+               break;
+       case ButtonRelease:
+               name = "ButtonRelease";
+               break;
+       case MotionNotify:
+               name = "MotionNotify";
+               break;
+       case EnterNotify:
+               name = "EnterNotify";
+               break;
+       case LeaveNotify:
+               name = "LeaveNotify";
+               break;
+       case FocusIn:
+               name = "FocusIn";
+               break;
+       case FocusOut:
+               name = "FocusOut";
+               break;
+       case KeymapNotify:
+               name = "KeymapNotify";
+               break;
+       case Expose:
+               name = "Expose";
+               break;
+       case GraphicsExpose:
+               name = "GraphicsExpose";
+               break;
+       case NoExpose:
+               name = "NoExpose";
+               break;
+       case VisibilityNotify:
+               name = "VisibilityNotify";
+               break;
+       case CreateNotify:
+               name = "CreateNotify";
+               break;
+       case DestroyNotify:
+               name = "DestroyNotify";
+               break;
+       case UnmapNotify:
+               name = "UnmapNotify";
+               break;
+       case MapNotify:
+               name = "MapNotify";
+               break;
+       case MapRequest:
+               name = "MapRequest";
+               break;
+       case ReparentNotify:
+               name = "ReparentNotify";
+               break;
+       case ConfigureNotify:
+               name = "ConfigureNotify";
+               break;
+       case ConfigureRequest:
+               name = "ConfigureRequest";
+               break;
+       case GravityNotify:
+               name = "GravityNotify";
+               break;
+       case ResizeRequest:
+               name = "ResizeRequest";
+               break;
+       case CirculateNotify:
+               name = "CirculateNotify";
+               break;
+       case CirculateRequest:
+               name = "CirculateRequest";
+               break;
+       case PropertyNotify:
+               name = "PropertyNotify";
+               break;
+       case SelectionClear:
+               name = "SelectionClear";
+               break;
+       case SelectionRequest:
+               name = "SelectionRequest";
+               break;
+       case SelectionNotify:
+               name = "SelectionNotify";
+               break;
+       case ColormapNotify:
+               name = "ColormapNotify";
+               break;
+       case ClientMessage:
+               name = "ClientMessage";
+               break;
+       case MappingNotify:
+               name = "MappingNotify";
+               break;
+       }
+
+       if (name)
+               DNPRINTF(SWM_D_EVENTQ ,"window: %lu event: %s (%d), %d "
+                   "remaining\n",
+                   e->xany.window, name, e->type, QLength(display));
+       else
+               DNPRINTF(SWM_D_EVENTQ, "window: %lu unknown event %d, %d "
+                   "remaining\n",
+                   e->xany.window, e->type, QLength(display));
+}
+
+void
+dumpwins(struct swm_region *r, union arg *args)
+{
+       struct ws_win           *win;
+       unsigned int            state;
+       XWindowAttributes       wa;
+
+       if (r->ws == NULL) {
+               fprintf(stderr, "invalid workspace\n");
+               return;
+       }
+
+       fprintf(stderr, "=== managed window list ws %02d ===\n", r->ws->idx);
+
+       TAILQ_FOREACH(win, &r->ws->winlist, entry) {
+               state = getstate(win->id);
+               if (!XGetWindowAttributes(display, win->id, &wa))
+                       fprintf(stderr, "window: %lu failed "
+                           "XGetWindowAttributes\n", win->id);
+               fprintf(stderr, "window: %lu map_state: %d state: %d "
+                   "transient: %lu\n",
+                   win->id, wa.map_state, state, win->transient);
+       }
+
+       fprintf(stderr, "===== unmanaged window list =====\n");
+       TAILQ_FOREACH(win, &r->ws->unmanagedlist, entry) {
+               state = getstate(win->id);
+               if (!XGetWindowAttributes(display, win->id, &wa))
+                       fprintf(stderr, "window: %lu failed "
+                           "XGetWindowAttributes\n", win->id);
+               fprintf(stderr, "window: %lu map_state: %d state: %d "
+                   "transient: %lu\n",
+                   win->id, wa.map_state, state, win->transient);
+       }
+
+       fprintf(stderr, "=================================\n");
+}
+#else
+#define dumpevent(e)
+void
+dumpwins(struct swm_region *r, union arg *args)
+{
+}
+#endif /* SWM_DEBUG */
+
+void                   expose(XEvent *);
+void                   keypress(XEvent *);
+void                   buttonpress(XEvent *);
+void                   configurerequest(XEvent *);
+void                   configurenotify(XEvent *);
+void                   destroynotify(XEvent *);
+void                   enternotify(XEvent *);
+void                   focusevent(XEvent *);
+void                   mapnotify(XEvent *);
+void                   mappingnotify(XEvent *);
+void                   maprequest(XEvent *);
+void                   propertynotify(XEvent *);
+void                   unmapnotify(XEvent *);
+void                   visibilitynotify(XEvent *);
+void                   clientmessage(XEvent *);
+
+void                   (*handler[LASTEvent])(XEvent *) = {
+                               [Expose] = expose,
+                               [KeyPress] = keypress,
+                               [ButtonPress] = buttonpress,
+                               [ConfigureRequest] = configurerequest,
+                               [ConfigureNotify] = configurenotify,
+                               [DestroyNotify] = destroynotify,
+                               [EnterNotify] = enternotify,
+                               [FocusIn] = focusevent,
+                               [FocusOut] = focusevent,
+                               [MapNotify] = mapnotify,
+                               [MappingNotify] = mappingnotify,
+                               [MapRequest] = maprequest,
+                               [PropertyNotify] = propertynotify,
+                               [UnmapNotify] = unmapnotify,
+                               [VisibilityNotify] = visibilitynotify,
+                               [ClientMessage] = clientmessage,
+};
+
+void
+sighdlr(int sig)
+{
+       int                     saved_errno, status;
+       pid_t                   pid;
+
+       saved_errno = errno;
+
+       switch (sig) {
+       case SIGCHLD:
+               while ((pid = waitpid(WAIT_ANY, &status, WNOHANG)) != 0) {
+                       if (pid == -1) {
+                               if (errno == EINTR)
+                                       continue;
+#ifdef SWM_DEBUG
+                               if (errno != ECHILD)
+                                       warn("sighdlr: waitpid");
+#endif /* SWM_DEBUG */
+                               break;
+                       }
+                       if (pid == searchpid)
+                               search_resp = 1;
+
+#ifdef SWM_DEBUG
+                       if (WIFEXITED(status)) {
+                               if (WEXITSTATUS(status) != 0)
+                                       warnx("sighdlr: child exit status: %d",
+                                           WEXITSTATUS(status));
+                       } else
+                               warnx("sighdlr: child is terminated "
+                                   "abnormally");
+#endif /* SWM_DEBUG */
+               }
+               break;
+
+       case SIGHUP:
+               restart_wm = 1;
+               break;
+       case SIGINT:
+       case SIGTERM:
+       case SIGQUIT:
+               running = 0;
+               break;
+       }
+
+       errno = saved_errno;
+}
+
+struct pid_e *
+find_pid(long pid)
+{
+       struct pid_e            *p = NULL;
+
+       DNPRINTF(SWM_D_MISC, "find_pid: %lu\n", pid);
+
+       if (pid == 0)
+               return (NULL);
+
+       TAILQ_FOREACH(p, &pidlist, entry) {
+               if (p->pid == pid)
+                       return (p);
+       }
+
+       return (NULL);
+}
+
+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);
+               free(screens[i - 1].c[c].name);
+               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);
+                       free(screens[i].c[c].name);
+                       if ((screens[i].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
+fancy_stacker(struct workspace *ws)
+{
+       strcpy(ws->stacker, "[   ]");
+       if (ws->cur_layout->l_stack == vertical_stack)
+               snprintf(ws->stacker, sizeof ws->stacker, "[%d|%d]",
+                   ws->l_state.vertical_mwin, ws->l_state.vertical_stacks);
+       if (ws->cur_layout->l_stack == horizontal_stack)
+               snprintf(ws->stacker, sizeof ws->stacker, "[%d-%d]",
+                   ws->l_state.horizontal_mwin, ws->l_state.horizontal_stacks);
+}
+
+void
+plain_stacker(struct workspace *ws)
+{
+       strcpy(ws->stacker, "[ ]");
+       if (ws->cur_layout->l_stack == vertical_stack)
+               strcpy(ws->stacker, "[|]");
+       if (ws->cur_layout->l_stack == horizontal_stack)
+               strcpy(ws->stacker, "[-]");
+}
+
+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 > DisplayWidth(display, sidx) ||
+           y > DisplayHeight(display, sidx) ||
+           w + x > DisplayWidth(display, sidx) ||
+           h + y > DisplayHeight(display, sidx)) {
+               fprintf(stderr, "ignoring region %ux%u+%u+%u "
+                   "- not within screen boundaries "
+                   "(%ux%u)\n", w, h, x, y,
+                   DisplayWidth(display, sidx), DisplayHeight(display, sidx));
+               return;
+       }
+
+       new_region(&screens[sidx], x, y, w, h);
+}
+
+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;
+       strlcpy(bar_ext, "", sizeof bar_ext);
+       bar_extra = 0;
+}
+
+void
+bar_class_name(char *s, ssize_t sz, struct ws_win *cur_focus)
+{
+       int                     do_class, do_name;
+       Status                  status;
+       XClassHint              *xch = NULL;
+
+       if ((title_name_enabled == 1 || title_class_enabled == 1) &&
+           cur_focus != NULL) {
+               if ((xch = XAllocClassHint()) == NULL)
+                       goto out;
+               status = XGetClassHint(display, cur_focus->id, xch);
+               if (status == BadWindow || status == BadAlloc)
+                       goto out;
+               do_class = (title_class_enabled && xch->res_class != NULL);
+               do_name = (title_name_enabled && xch->res_name != NULL);
+               if (do_class)
+                       strlcat(s, xch->res_class, sz);
+               if (do_class && do_name)
+                       strlcat(s, ":", sz);
+               if (do_name)
+                       strlcat(s, xch->res_name, sz);
+               strlcat(s, "    ", sz);
+       }
+out:
+       if (xch)
+               XFree(xch);
+}
+
+void
+bar_window_name(char *s, ssize_t sz, struct ws_win *cur_focus)
+{
+       char                    *title;
+
+       if (window_name_enabled && cur_focus != NULL) {
+               XFetchName(display, cur_focus->id, &title);
+               if (title) {
+                       if (cur_focus->floating)
+                               strlcat(s, "(f) ", sz);
+                       strlcat(s, title, sz);
+                       strlcat(s, " ", sz);
+                       XFree(title);
+               }
+       }
+}
+
+int            urgent[SWM_WS_MAX];
+void
+bar_urgent(char *s, ssize_t sz)
+{
+       XWMHints                *wmh = NULL;
+       struct ws_win           *win;
+       int                     i, j;
+       char                    b[8];
+
+       if (urgent_enabled == 0)
+               return;
+
+       for (i = 0; i < SWM_WS_MAX; i++)
+               urgent[i] = 0;
+
+       for (i = 0; i < ScreenCount(display); i++)
+               for (j = 0; j < SWM_WS_MAX; j++)
+                       TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) {
+                               wmh = XGetWMHints(display, win->id);
+                               if (wmh == NULL)
+                                       continue;
+
+                               if (wmh->flags & XUrgencyHint)
+                                       urgent[j] = 1;
+                               XFree(wmh);
+                       }
+
+       strlcat(s, "* ", sz);
+       for (i = 0; i < SWM_WS_MAX; i++) {
+               if (urgent[i])
+                       snprintf(b, sizeof b, "%d ", i + 1);
+               else
+                       snprintf(b, sizeof b, "- ");
+               strlcat(s, b, sz);
+       }
+       strlcat(s, "*    ", sz);
 }
 
 void
@@ -763,10 +1317,9 @@ bar_update(void)
        int                     i, x;
        size_t                  len;
        char                    s[SWM_BAR_MAX];
+       char                    cn[SWM_BAR_MAX];
        char                    loc[SWM_BAR_MAX];
        char                    *b;
-       XClassHint              *xch;
-       Status                   status;
 
        if (bar_enabled == 0)
                return;
@@ -790,35 +1343,26 @@ bar_update(void)
        else {
                time(&tmt);
                localtime_r(&tmt, &tm);
-               strftime(s, sizeof s, "%a %b %d %R %Z %Y    ", &tm);
-       }
-       xch = NULL;
-       if ((title_name_enabled == 1 || title_class_enabled == 1) &&
-           cur_focus != NULL) {
-               if ((xch = XAllocClassHint()) == NULL)
-                       goto out;
-               status = XGetClassHint(display, cur_focus->id, xch);
-               if (status == BadWindow || status == BadAlloc)
-                       goto out;
-               if (title_class_enabled)
-                       strlcat(s, xch->res_class, sizeof s);
-               if (title_name_enabled && title_class_enabled)
-                       strlcat(s, ":", sizeof s);
-               if (title_name_enabled)
-                       strlcat(s, xch->res_name, sizeof s);
+               strftime(s, sizeof s, clock_format, &tm);
+               strlcat(s, "    ", sizeof s);
        }
-out:
-       if (xch)
-               XFree(xch);
+
        for (i = 0; i < ScreenCount(display); i++) {
                x = 1;
                TAILQ_FOREACH(r, &screens[i].rl, entry) {
-                       snprintf(loc, sizeof loc, "%d:%d    %s %s    %s",
-                           x++, r->ws->idx + 1, s, bar_ext, bar_vertext);
+                       strlcpy(cn, "", sizeof cn);
+                       if (r && r->ws) {
+                               bar_urgent(cn, sizeof cn);
+                               bar_class_name(cn, sizeof cn, r->ws->focus);
+                               bar_window_name(cn, sizeof cn, r->ws->focus);
+                       }
+
+                       snprintf(loc, sizeof loc, "%d:%d %s   %s%s    %s    %s",
+                           x++, r->ws->idx + 1, r->ws->stacker, s, cn, bar_ext,
+                           bar_vertext);
                        bar_print(r, loc);
                }
        }
-       XSync(display, False);
        alarm(bar_delay);
 }
 
@@ -832,7 +1376,7 @@ void
 bar_toggle(struct swm_region *r, union arg *args)
 {
        struct swm_region       *tmpr;
-       int                     i, j, sc = ScreenCount(display);
+       int                     i, sc = ScreenCount(display);
 
        DNPRINTF(SWM_D_MISC, "bar_toggle\n");
 
@@ -846,9 +1390,6 @@ bar_toggle(struct swm_region *r, union arg *args)
                                XMapRaised(display, tmpr->bar_window);
 
        bar_enabled = !bar_enabled;
-       for (i = 0; i < sc; i++)
-               for (j = 0; j < SWM_WS_MAX; j++)
-                       screens[i].ws[j].restack = 1;
 
        stack();
        /* must be after stack */
@@ -907,7 +1448,12 @@ bar_refresh(void)
 void
 bar_setup(struct swm_region *r)
 {
-       int                     i;
+       int                     i, x, y;
+
+       if (bar_fs) {
+               XFreeFont(display, bar_fs);
+               bar_fs = NULL;
+       }
 
        for (i = 0; bar_fonts[i] != NULL; i++) {
                bar_fs = XLoadQueryFont(display, bar_fonts[i]);
@@ -918,11 +1464,18 @@ bar_setup(struct swm_region *r)
        }
        if (bar_fonts[i] == NULL)
                        errx(1, "couldn't load font");
-       bar_height = bar_fs->ascent + bar_fs->descent + 3;
-
-       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,
+       if (bar_fs == NULL)
+               errx(1, "couldn't create font structure");
+
+       bar_height = bar_fs->ascent + bar_fs->descent + 1 +
+           2 * bar_border_width;
+       x = X(r);
+       y = bar_at_bottom ? (Y(r) + HEIGHT(r) - bar_height) : Y(r);
+
+       r->bar_window = XCreateSimpleWindow(display,
+           r->s->root, x, y, WIDTH(r) - 2 * bar_border_width,
+           bar_height - 2 * bar_border_width,
+           bar_border_width, 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);
@@ -937,6 +1490,47 @@ bar_setup(struct swm_region *r)
 }
 
 void
+drain_enter_notify(void)
+{
+       int                     i = 0;
+       XEvent                  cne;
+
+       while (XCheckMaskEvent(display, EnterWindowMask, &cne))
+               i++;
+
+       DNPRINTF(SWM_D_MISC, "drain_enter_notify: drained %d\n", i);
+}
+
+void
+set_win_state(struct ws_win *win, long state)
+{
+       long                    data[] = {state, None};
+
+       DNPRINTF(SWM_D_EVENT, "set_win_state: window: %lu\n", win->id);
+
+       if (win == NULL)
+               return;
+
+       XChangeProperty(display, win->id, astate, astate, 32, PropModeReplace,
+           (unsigned char *)data, 2);
+}
+
+long
+getstate(Window w)
+{
+       long                    result = -1;
+       unsigned char           *p = NULL;
+       unsigned long           n;
+
+       if (!get_property(w, astate, 2L, astate, &n, &p))
+               return (-1);
+       if (n != 0)
+               result = *((long *)p);
+       XFree(p);
+       return (result);
+}
+
+void
 version(struct swm_region *r, union arg *args)
 {
        bar_version = !bar_version;
@@ -953,6 +1547,9 @@ client_msg(struct ws_win *win, Atom a)
 {
        XClientMessageEvent     cm;
 
+       if (win == NULL)
+               return;
+
        bzero(&cm, sizeof cm);
        cm.type = ClientMessage;
        cm.window = win->id;
@@ -964,23 +1561,46 @@ client_msg(struct ws_win *win, Atom a)
 }
 
 void
-config_win(struct ws_win *win)
+config_win(struct ws_win *win, XConfigureRequestEvent  *ev)
 {
        XConfigureEvent         ce;
 
-       DNPRINTF(SWM_D_MISC, "config_win: win %lu x %d y %d w %d h %d\n",
-           win->id, win->g.x, win->g.y, win->g.w, win->g.h);
-       ce.type = ConfigureNotify;
-       ce.display = display;
-       ce.event = win->id;
-       ce.window = win->id;
-       ce.x = win->g.x;
-       ce.y = win->g.y;
-       ce.width = win->g.w;
-       ce.height = win->g.h;
-       ce.border_width = 1; /* XXX store this! */
-       ce.above = None;
-       ce.override_redirect = False;
+       if (win == NULL)
+               return;
+
+       if (ev == NULL) {
+               DNPRINTF(SWM_D_MISC,
+                   "config_win: win %lu x %d y %d w %d h %d\n",
+                   win->id, win->g.x, win->g.y, win->g.w, win->g.h);
+
+               ce.type = ConfigureNotify;
+               ce.display = display;
+               ce.event = win->id;
+               ce.window = win->id;
+               ce.x = win->g.x;
+               ce.y = win->g.y;
+               ce.width = win->g.w;
+               ce.height = win->g.h;
+               ce.border_width = border_width;
+               ce.above = None;
+               ce.override_redirect = False;
+       } else {
+               DNPRINTF(SWM_D_MISC,
+                   "config_win: ev win %lu x %d y %d w %d h %d\n",
+                   ev->window, ev->x, ev->y, ev->width, ev->height);
+               ce.type = ConfigureNotify;
+               ce.display = ev->display;
+               ce.event = ev->window;
+               ce.window = ev->window;
+               ce.x = ev->x;
+               ce.y = ev->y;
+               ce.width = ev->width;
+               ce.height = ev->height;
+               ce.border_width = ev->border_width;
+               ce.above = ev->above;
+               ce.override_redirect = False;
+       }
+
        XSendEvent(display, win->id, False, StructureNotifyMask, (XEvent *)&ce);
 }
 
@@ -995,6 +1615,8 @@ count_win(struct workspace *ws, int count_transient)
                        continue;
                if (count_transient == 0 && win->transient)
                        continue;
+               if (win->iconic)
+                       continue;
                count++;
        }
        DNPRINTF(SWM_D_MISC, "count_win: %d\n", count);
@@ -1010,6 +1632,23 @@ quit(struct swm_region *r, union arg *args)
 }
 
 void
+unmap_window(struct ws_win *win)
+{
+       if (win == NULL)
+               return;
+
+       /* don't unmap again */
+       if (getstate(win->id) == IconicState)
+               return;
+
+       set_win_state(win, IconicState);
+
+       XUnmapWindow(display, win->id);
+       XSetWindowBorder(display, win->id,
+           win->s->c[SWM_S_COLOR_UNFOCUS].color);
+}
+
+void
 unmap_all(void)
 {
        struct ws_win           *win;
@@ -1018,7 +1657,7 @@ unmap_all(void)
        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);
+                               unmap_window(win);
 }
 
 void
@@ -1026,6 +1665,9 @@ fake_keypress(struct ws_win *win, int keysym, int modifiers)
 {
        XKeyEvent event;
 
+       if (win == NULL)
+               return;
+
        event.display = display;        /* Ignored, but what the hell */
        event.window = win->id;
        event.root = win->s->root;
@@ -1081,7 +1723,7 @@ root_to_region(Window root)
                if (screens[i].root == root)
                        break;
 
-       if (XQueryPointer(display, screens[i].root, 
+       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)
@@ -1097,57 +1739,108 @@ root_to_region(Window root)
 }
 
 struct ws_win *
+find_unmanaged_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].unmanagedlist,
+                           entry)
+                               if (id == win->id)
+                                       return (win);
+       return (NULL);
+}
+
+struct ws_win *
 find_window(Window id)
 {
        struct ws_win           *win;
+       Window                  wrr, wpr, *wcr = NULL;
        int                     i, j;
+       unsigned int            nc;
 
        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);
+
+       /* if we were looking for the parent return that window instead */
+       if (XQueryTree(display, id, &wrr, &wpr, &wcr, &nc) == 0)
+               return (NULL);
+       if (wcr)
+               XFree(wcr);
+
+       /* ignore not found and root */
+       if (wpr == 0 || wrr == wpr)
+               return (NULL);
+
+       /* look for parent */
+       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 (wpr == win->id)
+                                       return (win);
+
        return (NULL);
 }
 
 void
-spawn(struct swm_region *r, union arg *args)
+spawn(int ws_idx, union arg *args, int close_fd)
 {
-       char                    *ret;
-       int                     si;
+       int                     fd;
+       char                    *ret = NULL;
 
        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.
-        */
-       if (fork() == 0) {
-               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");
+
+       if (display)
+               close(ConnectionNumber(display));
+
+       setenv("LD_PRELOAD", SWM_LIB, 1);
+
+       if (asprintf(&ret, "%d", ws_idx) == -1) {
+               perror("_SWM_WS");
+               _exit(1);
+       }
+       setenv("_SWM_WS", ret, 1);
+       free(ret);
+       ret = NULL;
+
+       if (asprintf(&ret, "%d", getpid()) == -1) {
+               perror("_SWM_PID");
+               _exit(1);
+       }
+       setenv("_SWM_PID", ret, 1);
+       free(ret);
+       ret = NULL;
+
+       if (setsid() == -1) {
+               perror("setsid");
+               _exit(1);
+       }
+
+       if (close_fd) {
+               /*
+                * close stdin and stdout to prevent interaction between apps
+                * and the baraction script
+                * leave stderr open to record errors
+               */
+               if ((fd = open(_PATH_DEVNULL, O_RDWR, 0)) == -1) {
+                       perror("open");
+                       _exit(1);
                }
-               exit(0);
+               dup2(fd, STDIN_FILENO);
+               dup2(fd, STDOUT_FILENO);
+               if (fd > 2)
+                       close(fd);
        }
-       wait(0);
+
+       execvp(args->argv[0], args->argv);
+
+       perror("execvp");
+       _exit(1);
 }
 
 void
@@ -1155,45 +1848,123 @@ spawnterm(struct swm_region *r, union arg *args)
 {
        DNPRINTF(SWM_D_MISC, "spawnterm\n");
 
-       if (term_width)
-               setenv("_SWM_XTERM_FONTADJ", "", 1);
-       spawn(r, args);
+       if (fork() == 0) {
+               if (term_width)
+                       setenv("_SWM_XTERM_FONTADJ", "", 1);
+               spawn(r->ws->idx, args, 1);
+       }
 }
 
 void
-spawnmenu(struct swm_region *r, union arg *args)
+kill_refs(struct ws_win *win)
+{
+       int                     i, x;
+       struct swm_region       *r;
+       struct workspace        *ws;
+
+       if (win == NULL)
+               return;
+
+       for (i = 0; i < ScreenCount(display); i++)
+               TAILQ_FOREACH(r, &screens[i].rl, entry)
+                       for (x = 0; x < SWM_WS_MAX; x++) {
+                               ws = &r->s->ws[x];
+                               if (win == ws->focus)
+                                       ws->focus = NULL;
+                               if (win == ws->focus_prev)
+                                       ws->focus_prev = NULL;
+                       }
+}
+
+int
+validate_win(struct ws_win *testwin)
 {
-       DNPRINTF(SWM_D_MISC, "spawnmenu\n");
+       struct ws_win           *win;
+       struct workspace        *ws;
+       struct swm_region       *r;
+       int                     i, x, foundit = 0;
+
+       if (testwin == NULL)
+               return (0);
+
+       for (i = 0, foundit = 0; i < ScreenCount(display); i++)
+               TAILQ_FOREACH(r, &screens[i].rl, entry)
+                       for (x = 0; x < SWM_WS_MAX; x++) {
+                               ws = &r->s->ws[x];
+                               TAILQ_FOREACH(win, &ws->winlist, entry)
+                                       if (win == testwin)
+                                               return (0);
+                       }
+       return (1);
+}
 
-       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;
+int
+validate_ws(struct workspace *testws)
+{
+       struct swm_region       *r;
+       struct workspace        *ws;
+       int                     foundit, i, x;
 
-       spawn(r, args);
+       /* validate all ws */
+       for (i = 0, foundit = 0; i < ScreenCount(display); i++)
+               TAILQ_FOREACH(r, &screens[i].rl, entry)
+                       for (x = 0; x < SWM_WS_MAX; x++) {
+                               ws = &r->s->ws[x];
+                               if (ws == testws)
+                                       return (0);
+                       }
+       return (1);
 }
 
 void
 unfocus_win(struct ws_win *win)
 {
+       XEvent                  cne;
+       Window                  none = None;
+
+       DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %lu\n", WINID(win));
+
        if (win == NULL)
                return;
+       if (win->ws == NULL)
+               return;
 
-       if (win->ws->focus != win && win->ws->focus != NULL)
-               win->ws->focus_prev = win->ws->focus;
+       if (validate_ws(win->ws))
+               return; /* XXX this gets hit with thunderbird, needs fixing */
 
        if (win->ws->r == NULL)
                return;
 
+       if (validate_win(win)) {
+               kill_refs(win);
+               return;
+       }
+
+       if (win->ws->focus == win) {
+               win->ws->focus = NULL;
+               win->ws->focus_prev = win;
+       }
+
+       if (validate_win(win->ws->focus)) {
+               kill_refs(win->ws->focus);
+               win->ws->focus = NULL;
+       }
+       if (validate_win(win->ws->focus_prev)) {
+               kill_refs(win->ws->focus_prev);
+               win->ws->focus_prev = NULL;
+       }
+
+       /* drain all previous unfocus events */
+       while (XCheckTypedEvent(display, FocusOut, &cne) == True)
+               ;
+
        grabbuttons(win, 0);
        XSetWindowBorder(display, win->id,
            win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);
-       win->got_focus = 0;
-       if (win->ws->focus == win)
-               win->ws->focus = NULL;
-       if (cur_focus == win)
-               cur_focus = NULL;
+
+       XChangeProperty(display, win->s->root,
+           ewmh[_NET_ACTIVE_WINDOW].atom, XA_WINDOW, 32,
+           PropModeReplace, (unsigned char *)&none,1);
 }
 
 void
@@ -1202,7 +1973,7 @@ unfocus_all(void)
        struct ws_win           *win;
        int                     i, j;
 
-       DNPRINTF(SWM_D_FOCUS, "unfocus_all:\n");
+       DNPRINTF(SWM_D_FOCUS, "unfocus_all\n");
 
        for (i = 0; i < ScreenCount(display); i++)
                for (j = 0; j < SWM_WS_MAX; j++)
@@ -1213,40 +1984,80 @@ unfocus_all(void)
 void
 focus_win(struct ws_win *win)
 {
+       XEvent                  cne;
+       Window                  cur_focus;
+       int                     rr;
+       struct ws_win           *cfw = NULL;
+
+
        DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win ? win->id : 0);
 
        if (win == NULL)
                return;
+       if (win->ws == NULL)
+               return;
+
+       if (validate_ws(win->ws))
+               return; /* XXX this gets hit with thunderbird, needs fixing */
+
+       if (validate_win(win)) {
+               kill_refs(win);
+               return;
+       }
+
+       if (validate_win(win)) {
+               kill_refs(win);
+               return;
+       }
 
-       if (cur_focus)
-               unfocus_win(cur_focus);
-       if (win->ws->focus) {
-               /* probably shouldn't happen due to the previous unfocus_win */
-               DNPRINTF(SWM_D_FOCUS, "unfocusing win->ws->focus: %lu\n",
-                   win->ws->focus->id);
-               unfocus_win(win->ws->focus);
+       XGetInputFocus(display, &cur_focus, &rr);
+       if ((cfw = find_window(cur_focus)) != NULL)
+               unfocus_win(cfw);
+       else {
+               /* use larger hammer since the window was killed somehow */
+               TAILQ_FOREACH(cfw, &win->ws->winlist, entry)
+                       if (cfw->ws && cfw->ws->r && cfw->ws->r->s)
+                               XSetWindowBorder(display, cfw->id,
+                                   cfw->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);
        }
+
        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);
+               /* drain all previous focus events */
+               while (XCheckTypedEvent(display, FocusIn, &cne) == True)
+                       ;
+
+               if (win->java == 0)
+                       XSetInputFocus(display, win->id,
+                           RevertToParent, CurrentTime);
+               grabbuttons(win, 1);
+               XSetWindowBorder(display, win->id,
+                   win->ws->r->s->c[SWM_S_COLOR_FOCUS].color);
+               if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS ||
+                   win->ws->always_raise)
+                       XMapRaised(display, win->id);
+
+               XChangeProperty(display, win->s->root,
+                   ewmh[_NET_ACTIVE_WINDOW].atom, XA_WINDOW, 32,
+                   PropModeReplace, (unsigned char *)&win->id,1);
        }
+
+       if (window_name_enabled)
+               bar_update();
 }
 
 void
 switchws(struct swm_region *r, union arg *args)
 {
-       int                     wsid = args->id;
+       int                     wsid = args->id, unmap_old = 0;
        struct swm_region       *this_r, *other_r;
        struct ws_win           *win;
        struct workspace        *new_ws, *old_ws;
+       union arg               a;
+
+       if (!(r && r->s))
+               return;
 
        this_r = r;
        old_ws = this_r->ws;
@@ -1256,36 +2067,42 @@ switchws(struct swm_region *r, union arg *args)
            "%d -> %d\n", r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r),
            old_ws->idx, wsid);
 
+       if (new_ws == NULL || old_ws == NULL)
+               return;
        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 */
+       if (other_r == NULL) {
+               /* the other workspace is hidden, hide this one */
                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);
+               unmap_old = 1;
        } else {
+               /* the other ws is visible in another region, exchange them */
+               other_r->ws_prior = new_ws;
                other_r->ws = old_ws;
                old_ws->r = other_r;
        }
+       this_r->ws_prior = old_ws;
        this_r->ws = new_ws;
        new_ws->r = this_r;
 
-       ignore_enter = 1;
-       /* set focus */
-       if (new_ws->focus == NULL)
-               new_ws->focus = TAILQ_FIRST(&new_ws->winlist);
-       if (new_ws->focus)
-               focus_win(new_ws->focus);
+       /* this is needed so that we can click on a window after a restart */
+       unfocus_all();
+
        stack();
+       a.id = SWM_ARG_ID_FOCUSCUR;
+       focus(new_ws->r, &a);
+
        bar_update();
+
+       /* unmap old windows */
+       if (unmap_old)
+               TAILQ_FOREACH(win, &old_ws->winlist, entry)
+                       unmap_window(win);
+
+       if (focus_mode == SWM_FOCUS_DEFAULT)
+               drain_enter_notify();
 }
 
 void
@@ -1327,10 +2144,31 @@ cyclews(struct swm_region *r, union arg *args)
 }
 
 void
+priorws(struct swm_region *r, union arg *args)
+{
+       union arg               a;
+
+       DNPRINTF(SWM_D_WS, "priorws 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);
+
+       if (r->ws_prior == NULL)
+               return;
+
+       a.id = r->ws_prior->idx;
+       switchws(r, &a);
+}
+
+void
 cyclescr(struct swm_region *r, union arg *args)
 {
-       struct swm_region       *rr;
-       int                     i;
+       struct swm_region       *rr = NULL;
+       union arg               a;
+       int                     i, x, y;
+
+       /* do nothing if we don't have more than one screen */
+       if (!(ScreenCount(display) > 1 || outputs > 1))
+               return;
 
        i = r->s->idx;
        switch (args->id) {
@@ -1347,22 +2185,61 @@ cyclescr(struct swm_region *r, union arg *args)
        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);
+       if (rr == NULL)
+               return;
+
+       /* move mouse to region */
+       x = rr->g.x + 1;
+       y = rr->g.y + 1 + (bar_enabled ? bar_height : 0);
+       XWarpPointer(display, None, rr->s[i].root, 0, 0, 0, 0, x, y);
+
+       a.id = SWM_ARG_ID_FOCUSCUR;
+       focus(rr, &a);
+
+       if (rr->ws->focus) {
+               /* move to focus window */
+               x = rr->ws->focus->g.x + 1;
+               y = rr->ws->focus->g.y + 1;
+               XWarpPointer(display, None, rr->s[i].root, 0, 0, 0, 0, x, y);
+       }
+}
+
+void
+sort_windows(struct ws_win_list *wl)
+{
+       struct ws_win           *win, *parent, *nxt;
+
+       if (wl == NULL)
+               return;
+
+       for (win = TAILQ_FIRST(wl); win != TAILQ_END(wl); win = nxt) {
+               nxt = TAILQ_NEXT(win, entry);
+               if (win->transient) {
+                       parent = find_window(win->transient);
+                       if (parent == NULL) {
+                               fprintf(stderr, "not possible bug\n");
+                               continue;
+                       }
+                       TAILQ_REMOVE(wl, win, entry);
+                       TAILQ_INSERT_AFTER(wl, parent, win, entry);
+               }
+       }
+
 }
 
 void
 swapwin(struct swm_region *r, union arg *args)
 {
        struct ws_win           *target, *source;
+       struct ws_win           *cur_focus;
        struct ws_win_list      *wl;
 
 
        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);
+
+       cur_focus = r->ws->focus;
        if (cur_focus == NULL)
                return;
 
@@ -1371,15 +2248,22 @@ swapwin(struct swm_region *r, union arg *args)
 
        switch (args->id) {
        case SWM_ARG_ID_SWAPPREV:
+               if (source->transient)
+                       source = find_window(source->transient);
                target = TAILQ_PREV(source, ws_win_list, entry);
-               TAILQ_REMOVE(wl, cur_focus, entry);
+               if (target && target->transient)
+                       target = find_window(target->transient);
+               TAILQ_REMOVE(wl, source, entry);
                if (target == NULL)
                        TAILQ_INSERT_TAIL(wl, source, entry);
                else
                        TAILQ_INSERT_BEFORE(target, source, entry);
                break;
-       case SWM_ARG_ID_SWAPNEXT: 
+       case SWM_ARG_ID_SWAPNEXT:
                target = TAILQ_NEXT(source, entry);
+               /* move the parent and let the sort handle the move */
+               if (source->transient)
+                       source = find_window(source->transient);
                TAILQ_REMOVE(wl, source, entry);
                if (target == NULL)
                        TAILQ_INSERT_HEAD(wl, source, entry);
@@ -1390,86 +2274,201 @@ swapwin(struct swm_region *r, union arg *args)
                target = TAILQ_FIRST(wl);
                if (target == source) {
                        if (source->ws->focus_prev != NULL &&
-                           source->ws->focus_prev != target)  
-                                
+                           source->ws->focus_prev != target)
+
                                source = source->ws->focus_prev;
                        else
                                return;
-                }
+               }
+               if (target == NULL || source == NULL)
+                       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;
+       case SWM_ARG_ID_MOVELAST:
+               TAILQ_REMOVE(wl, source, entry);
+               TAILQ_INSERT_TAIL(wl, source, entry);
+               break;
        default:
                DNPRINTF(SWM_D_MOVE, "invalid id: %d\n", args->id);
                return;
        }
 
-       ignore_enter = 1;
+       sort_windows(wl);
+
        stack();
 }
 
 void
+focus_prev(struct ws_win *win)
+{
+       struct ws_win           *winfocus = NULL, *winlostfocus = NULL;
+       struct ws_win           *cur_focus = NULL;
+       struct ws_win_list      *wl = NULL;
+       struct workspace        *ws = NULL;
+
+       DNPRINTF(SWM_D_FOCUS, "focus_prev: id %lu\n", WINID(win));
+
+       if (!(win && win->ws))
+               return;
+
+       ws = win->ws;
+       wl = &ws->winlist;
+       cur_focus = ws->focus;
+       winlostfocus = cur_focus;
+
+       /* pickle, just focus on whatever */
+       if (cur_focus == NULL) {
+               /* use prev_focus if valid */
+               if (ws->focus_prev && ws->focus_prev != cur_focus &&
+                   find_window(WINID(ws->focus_prev)))
+                       winfocus = ws->focus_prev;
+               if (winfocus == NULL)
+                       winfocus = TAILQ_FIRST(wl);
+               goto done;
+       }
+
+       /* if transient focus on parent */
+       if (cur_focus->transient) {
+               winfocus = find_window(cur_focus->transient);
+               goto done;
+       }
+
+       /* if in max_stack try harder */
+       if ((win->quirks & SWM_Q_FOCUSPREV) ||
+           (ws->cur_layout->flags & SWM_L_FOCUSPREV)) {
+               if (cur_focus != ws->focus_prev)
+                       winfocus = ws->focus_prev;
+               else if (cur_focus != ws->focus)
+                       winfocus = ws->focus;
+               else
+                       winfocus = TAILQ_PREV(win, ws_win_list, entry);
+               if (winfocus)
+                       goto done;
+       }
+
+       if (cur_focus == win)
+               winfocus = TAILQ_PREV(win, ws_win_list, entry);
+       if (winfocus == NULL)
+               winfocus = TAILQ_LAST(wl, ws_win_list);
+       if (winfocus == NULL || winfocus == win)
+               winfocus = TAILQ_NEXT(cur_focus, entry);
+done:
+       if (winfocus == winlostfocus || winfocus == NULL)
+               return;
+
+       focus_magic(winfocus);
+}
+
+void
 focus(struct swm_region *r, union arg *args)
 {
-       struct ws_win           *winfocus, *winlostfocus;
-       struct ws_win_list      *wl;
+       struct ws_win           *winfocus = NULL, *winlostfocus = NULL, *head;
+       struct ws_win           *cur_focus = NULL;
+       struct ws_win_list      *wl = NULL;
+       struct workspace        *ws = NULL;
+
+       if (!(r && r->ws))
+               return;
 
        DNPRINTF(SWM_D_FOCUS, "focus: id %d\n", args->id);
-       if (cur_focus == NULL)
+
+       /* treat FOCUS_CUR special */
+       if (args->id == SWM_ARG_ID_FOCUSCUR) {
+               if (r->ws->focus && r->ws->focus->iconic == 0)
+                       winfocus = r->ws->focus;
+               else if (r->ws->focus_prev && r->ws->focus_prev->iconic == 0)
+                       winfocus = r->ws->focus_prev;
+               else
+                       TAILQ_FOREACH(winfocus, &r->ws->winlist, entry)
+                               if (winfocus->iconic == 0)
+                                       break;
+
+               focus_magic(winfocus);
                return;
+       }
 
-       wl = &cur_focus->ws->winlist;
+       if ((cur_focus = r->ws->focus) == NULL)
+               return;
+       ws = r->ws;
+       wl = &ws->winlist;
 
        winlostfocus = cur_focus;
 
        switch (args->id) {
        case SWM_ARG_ID_FOCUSPREV:
-               winfocus = TAILQ_PREV(cur_focus, ws_win_list, entry);
-               if (winfocus == NULL)
-                       winfocus = TAILQ_LAST(wl, ws_win_list);
+               head = TAILQ_PREV(cur_focus, ws_win_list, entry);
+               if (head == NULL)
+                       head = TAILQ_LAST(wl, ws_win_list);
+               winfocus = head;
+               if (WINID(winfocus) == cur_focus->transient) {
+                       head = TAILQ_PREV(winfocus, ws_win_list, entry);
+                       if (head == NULL)
+                               head = TAILQ_LAST(wl, ws_win_list);
+                       winfocus = head;
+               }
+
+               /* skip iconics */
+               if (winfocus && winfocus->iconic) {
+                       TAILQ_FOREACH_REVERSE(winfocus, wl, ws_win_list, entry)
+                               if (winfocus->iconic == 0)
+                                       break;
+               }
                break;
 
        case SWM_ARG_ID_FOCUSNEXT:
-               winfocus = TAILQ_NEXT(cur_focus, entry);
-               if (winfocus == NULL)
-                       winfocus = TAILQ_FIRST(wl);
+               head = TAILQ_NEXT(cur_focus, entry);
+               if (head == NULL)
+                       head = TAILQ_FIRST(wl);
+               winfocus = head;
+
+               /* skip iconics */
+               if (winfocus && winfocus->iconic) {
+                       TAILQ_FOREACH(winfocus, wl, entry)
+                               if (winfocus->iconic == 0)
+                                       break;
+               }
                break;
 
        case SWM_ARG_ID_FOCUSMAIN:
                winfocus = TAILQ_FIRST(wl);
                if (winfocus == cur_focus)
                        winfocus = cur_focus->ws->focus_prev;
-               if (winfocus == NULL)
-                       return;
                break;
 
        default:
                return;
        }
-
        if (winfocus == winlostfocus || winfocus == NULL)
                return;
 
-       XMapRaised(display, winfocus->id);
-       focus_win(winfocus);
-       XSync(display, False);
+       focus_magic(winfocus);
 }
 
 void
 cycle_layout(struct swm_region *r, union arg *args)
 {
        struct workspace        *ws = r->ws;
+       struct ws_win           *winfocus;
+       union arg               a;
 
        DNPRINTF(SWM_D_EVENT, "cycle_layout: workspace: %d\n", ws->idx);
 
+       winfocus = ws->focus;
+
        ws->cur_layout++;
        if (ws->cur_layout->l_stack == NULL)
                ws->cur_layout = &layouts[0];
-       ignore_enter = 1;
+
        stack();
+       if (focus_mode == SWM_FOCUS_DEFAULT)
+               drain_enter_notify();
+       a.id = SWM_ARG_ID_FOCUSCUR;
+       focus(r, &a);
+       bar_update();
 }
 
 void
@@ -1483,8 +2482,9 @@ stack_config(struct swm_region *r, union arg *args)
        if (ws->cur_layout->l_config != NULL)
                ws->cur_layout->l_config(ws, args->id);
 
-       if (args->id != SWM_ARG_ID_STACKINIT);
+       if (args->id != SWM_ARG_ID_STACKINIT)
                stack();
+       bar_update();
 }
 
 void
@@ -1503,20 +2503,39 @@ stack(void) {
 
                        /* start with screen geometry, adjust for bar */
                        g = r->g;
-                       g.w -= 2;
-                       g.h -= 2;
+                       g.w -= 2 * border_width;
+                       g.h -= 2 * border_width;
                        if (bar_enabled) {
-                               g.y += bar_height;
+                               if (!bar_at_bottom)
+                                       g.y += bar_height;
                                g.h -= bar_height;
-                       } 
-
-                       r->ws->restack = 0;
+                       }
                        r->ws->cur_layout->l_stack(r->ws, &g);
+                       r->ws->cur_layout->l_string(r->ws);
+                       /* save r so we can track region changes */
+                       r->ws->old_r = r;
                }
        }
        if (font_adjusted)
                font_adjusted--;
-       XSync(display, False);
+
+       if (focus_mode == SWM_FOCUS_DEFAULT)
+               drain_enter_notify();
+}
+
+void
+store_float_geom(struct ws_win *win, struct swm_region *r)
+{
+       /* retain window geom and region geom */
+       win->g_float.x = win->g.x;
+       win->g_float.y = win->g.y;
+       win->g_float.w = win->g.w;
+       win->g_float.h = win->g.h;
+       win->rg_float.x = r->g.x;
+       win->rg_float.y = r->g.y;
+       win->rg_float.w = r->g.w;
+       win->rg_float.h = r->g.h;
+       win->g_floatvalid = 1;
 }
 
 void
@@ -1525,28 +2544,79 @@ stack_floater(struct ws_win *win, struct swm_region *r)
        unsigned int            mask;
        XWindowChanges          wc;
 
+       if (win == NULL)
+               return;
+
        bzero(&wc, sizeof wc);
        mask = CWX | CWY | CWBorderWidth | CWWidth | CWHeight;
-       if ((win->quirks & SWM_Q_FULLSCREEN) && (win->g.w == WIDTH(r)) &&
-           (win->g.h == HEIGHT(r)))
+
+       /*
+        * to allow windows to change their size (e.g. mplayer fs) only retrieve
+        * geom on ws switches or return from max mode
+        */
+
+       if (win->floatmaxed || (r != r->ws->old_r && win->g_floatvalid
+           && !(win->ewmh_flags & EWMH_F_FULLSCREEN))) {
+               /*
+                * use stored g and rg to set relative position and size
+                * as in old region or before max stack mode
+                */
+               win->g.x = win->g_float.x - win->rg_float.x + r->g.x;
+               win->g.y = win->g_float.y - win->rg_float.y + r->g.y;
+               win->g.w = win->g_float.w;
+               win->g.h = win->g_float.h;
+               win->g_floatvalid = 0;
+       }
+
+       win->floatmaxed = 0;
+
+       if ((win->quirks & SWM_Q_FULLSCREEN) && (win->g.w >= WIDTH(r)) &&
+           (win->g.h >= HEIGHT(r)))
                wc.border_width = 0;
        else
-               wc.border_width = 1;
+               wc.border_width = border_width;
        if (win->transient && (win->quirks & SWM_Q_TRANSSZ)) {
                win->g.w = (double)WIDTH(r) * dialog_ratio;
                win->g.h = (double)HEIGHT(r) * dialog_ratio;
        }
+
+       if (!win->manual) {
+               /*
+                * floaters and transients are auto-centred unless moved
+                * or resized
+                */
+               win->g.x = r->g.x + (WIDTH(r) - win->g.w) /
+                   2 - wc.border_width;
+               win->g.y = r->g.y + (HEIGHT(r) - win->g.h) /
+                   2 - wc.border_width;
+       }
+
+       /* win can be outside r if new r smaller than old r */
+       /* Ensure top left corner inside r (move probs otherwise) */
+       if (win->g.x < r->g.x - wc.border_width)
+               win->g.x = r->g.x - wc.border_width;
+       if (win->g.x > r->g.x + r->g.w - 1)
+               win->g.x = (win->g.w > r->g.w) ? r->g.x :
+                   (r->g.x + r->g.w - win->g.w - 2 * wc.border_width);
+       if (win->g.y < r->g.y - wc.border_width)
+               win->g.y = r->g.y - wc.border_width;
+       if (win->g.y > r->g.y + r->g.h - 1)
+               win->g.y = (win->g.h > r->g.h) ? r->g.y :
+                   (r->g.y + r->g.h - win->g.h - 2 * wc.border_width);
+
+       wc.x = win->g.x;
+       wc.y = win->g.y;
        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_STACK, "stack_floater: win %lu x %d y %d w %d h %d\n",
+       /*
+        * Retain floater and transient geometry for correct positioning
+        * when ws changes region
+        */
+       if (!(win->ewmh_flags & EWMH_F_FULLSCREEN))
+               store_float_geom(win, r);
+
+       DNPRINTF(SWM_D_MISC, "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);
@@ -1562,7 +2632,7 @@ 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) {
@@ -1590,27 +2660,26 @@ void
 stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 {
        XWindowChanges          wc;
+       XWindowAttributes       wa;
        struct swm_geometry     win_g, r_g = *g;
-       struct ws_win           *win, *winfocus;
-       int                     i, j, s, stacks; 
+       struct ws_win           *win, *fs_win = 0;
+       int                     i, j, s, stacks;
        int                     w_inc = 1, h_inc, w_base = 1, h_base;
        int                     hrh, extra = 0, h_slice, last_h = 0;
        int                     split, colno, winno, mwin, msize, mscale;
-       int                     remain, missing, v_slice;
+       int                     remain, missing, v_slice, reconfigure;
        unsigned int            mask;
 
        DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d\n rot=%s flip=%s",
            ws->idx, rot ? "yes" : "no", flip ? "yes" : "no");
 
-       if ((winno = count_win(ws, 0)) == 0)
+       winno = count_win(ws, 0);
+       if (winno == 0 && count_win(ws, 1) == 0)
                return;
 
-       if (ws->focus == NULL)
-               ws->focus = TAILQ_FIRST(&ws->winlist);
-       winfocus = cur_focus ? cur_focus : ws->focus;
-
        TAILQ_FOREACH(win, &ws->winlist, entry)
-               if (win->transient == 0 && win->floating == 0)
+               if (win->transient == 0 && win->floating == 0
+                   && win->iconic == 0)
                        break;
 
        if (win == NULL)
@@ -1654,22 +2723,30 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
                }
 
                msize = win_g.w;
-               if (flip) 
+               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);
+               win_g.w = ((r_g.w - (stacks * 2 * border_width) +
+                   2 * border_width) / stacks);
        }
        hrh = r_g.h / colno;
        extra = r_g.h - (colno * hrh);
-       win_g.h = hrh - 2;
+       win_g.h = hrh - 2 * border_width;
 
        /*  stack all the tiled windows */
        i = j = 0, s = stacks;
        TAILQ_FOREACH(win, &ws->winlist, entry) {
                if (win->transient != 0 || win->floating != 0)
                        continue;
+               if (win->iconic != 0)
+                       continue;
+
+               if (win->ewmh_flags & EWMH_F_FULLSCREEN) {
+                       fs_win = win;
+                       continue;
+               }
 
                if (split && i == split) {
                        colno = (winno - mwin) / stacks;
@@ -1681,20 +2758,21 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
                        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;
+                               win_g.x += win_g.w + 2 * border_width;
+                       win_g.w = (r_g.w - msize -
+                           (stacks * 2 * border_width)) / stacks;
                        if (s == 1)
-                               win_g.w += (r_g.w - msize - (stacks * 2)) %
-                                   stacks;
+                               win_g.w += (r_g.w - msize -
+                                   (stacks * 2 * border_width)) % stacks;
                        s--;
                        j = 0;
                }
-               win_g.h = hrh - 2;
+               win_g.h = hrh - 2 * border_width;
                if (rot) {
                        h_inc = win->sh.width_inc;
                        h_base = win->sh.base_width;
                } else {
-                       h_inc = win->sh.height_inc;
+                       h_inc = win->sh.height_inc;
                        h_base = win->sh.base_height;
                }
                if (j == colno - 1) {
@@ -1712,47 +2790,74 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
                                extra += remain;
                        }
                }
-                
+
                if (j == 0)
                        win_g.y = r_g.y;
                else
-                       win_g.y += last_h + 2;
+                       win_g.y += last_h + 2 * border_width;
 
                bzero(&wc, sizeof wc);
-               wc.border_width = 1;
+               if (disable_border && bar_enabled == 0 && winno == 1){
+                       wc.border_width = 0;
+                       win_g.w += 2 * border_width;
+                       win_g.h += 2 * border_width;
+               } else
+                       wc.border_width = border_width;
+               reconfigure = 0;
                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;
+                       if (win->g.x != win_g.y || win->g.y != win_g.x ||
+                           win->g.w != win_g.h || win->g.h != win_g.w) {
+                               reconfigure = 1;
+                               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->g.x != win_g.x || win->g.y != win_g.y ||
+                           win->g.w != win_g.w || win->g.h != win_g.h) {
+                               reconfigure = 1;
+                               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;
+                       }
                }
-               adjust_font(win);
-               mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
-               XConfigureWindow(display, win->id, mask, &wc);
-               XMapRaised(display, win->id);
+               if (reconfigure) {
+                       adjust_font(win);
+                       mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
+                       XConfigureWindow(display, win->id, mask, &wc);
+               }
+
+               if (XGetWindowAttributes(display, win->id, &wa))
+                       if (wa.map_state == IsUnmapped)
+                               XMapRaised(display, win->id);
 
                last_h = win_g.h;
                i++;
                j++;
        }
 
- notiles:
+notiles:
        /* now, stack all the floaters and transients */
        TAILQ_FOREACH(win, &ws->winlist, entry) {
                if (win->transient == 0 && win->floating == 0)
                        continue;
+               if (win->iconic == 1)
+                       continue;
+               if (win->ewmh_flags & EWMH_F_FULLSCREEN) {
+                       fs_win = win;
+                       continue;
+               }
 
                stack_floater(win, ws->r);
                XMapRaised(display, win->id);
        }
 
-       if (winfocus)
-               focus_win(winfocus); /* has to be done outside of the loop */
+       if (fs_win) {
+               stack_floater(fs_win, ws->r);
+               XMapRaised(display, fs_win->id);
+       }
 }
 
 void
@@ -1844,104 +2949,299 @@ horizontal_config(struct workspace *ws, int id)
 void
 horizontal_stack(struct workspace *ws, struct swm_geometry *g)
 {
-       DNPRINTF(SWM_D_STACK, "vertical_stack: workspace: %d\n", ws->idx);
+       DNPRINTF(SWM_D_STACK, "horizontal_stack: workspace: %d\n", ws->idx);
 
        stack_master(ws, g, 1, 0);
 }
 
 /* fullscreen view */
 void
-max_stack(struct workspace *ws, 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;
+       struct ws_win           *win, *wintrans = NULL, *parent = NULL;
        unsigned int            mask;
+       int                     winno;
 
        DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx);
 
-       if (count_win(ws, 0) == 0)
+       if (ws == NULL)
                return;
 
-       if (ws->focus == NULL)
-               ws->focus = TAILQ_FIRST(&ws->winlist);
-       winfocus = cur_focus ? cur_focus : ws->focus;
+       winno = count_win(ws, 0);
+       if (winno == 0 && count_win(ws, 1) == 0)
+               return;
 
        TAILQ_FOREACH(win, &ws->winlist, entry) {
-               if (win->transient != 0 || win->floating != 0) {
-                       if (win == ws->focus) {
-                               /* XXX maximize? */
-                               stack_floater(win, ws->r);
-                               XMapRaised(display, win->id);
-                       } else
-                               XUnmapWindow(display, win->id);
-               } else {
+               if (win->transient) {
+                       wintrans = win;
+                       parent = find_window(win->transient);
+                       continue;
+               }
+
+               if (win->floating && win->floatmaxed == 0 ) {
+                       /*
+                        * retain geometry for retrieval on exit from
+                        * max_stack mode
+                        */
+                       store_float_geom(win, ws->r);
+                       win->floatmaxed = 1;
+               }
+
+               /* only reconfigure if necessary */
+               if (win->g.x != gg.x || win->g.y != gg.y || win->g.w != gg.w ||
+                   win->g.h != gg.h) {
                        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;
+                       if (bar_enabled){
+                               wc.border_width = border_width;
+                               win->g.w = wc.width = gg.w;
+                               win->g.h = wc.height = gg.h;
+                       } else {
+                               wc.border_width = 0;
+                               win->g.w = wc.width = gg.w + 2 * border_width;
+                               win->g.h = wc.height = gg.h + 2 * border_width;
+                       }
                        mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
                        XConfigureWindow(display, win->id, mask, &wc);
-
-                       if (win == ws->focus) {
-                               XMapRaised(display, win->id);
-                       } else
-                               XUnmapWindow(display, win->id);
                }
+               /* unmap only if we don't have multi screen */
+               if (win != ws->focus)
+                       if (!(ScreenCount(display) > 1 || outputs > 1))
+                               unmap_window(win);
        }
 
-       if (winfocus)
-               focus_win(winfocus); /* has to be done outside of the loop */
+       /* put the last transient on top */
+       if (wintrans) {
+               if (parent)
+                       XMapRaised(display, parent->id);
+               stack_floater(wintrans, ws->r);
+               focus_magic(wintrans);
+       }
 }
 
 void
 send_to_ws(struct swm_region *r, union arg *args)
 {
        int                     wsid = args->id;
-       struct ws_win           *win = cur_focus;
+       struct ws_win           *win = NULL, *parent;
        struct workspace        *ws, *nws;
        Atom                    ws_idx_atom = 0;
        unsigned char           ws_idx_str[SWM_PROPLEN];
+       union arg               a;
 
+       if (r && r->ws)
+               win = r->ws->focus;
+       else
+               return;
        if (win == NULL)
                return;
+       if (win->ws->idx == wsid)
+               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->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;
-
+       a.id = SWM_ARG_ID_FOCUSPREV;
+       focus(r, &a);
+       if (win->transient) {
+               parent = find_window(win->transient);
+               if (parent) {
+                       unmap_window(parent);
+                       TAILQ_REMOVE(&ws->winlist, parent, entry);
+                       TAILQ_INSERT_TAIL(&nws->winlist, parent, entry);
+                       parent->ws = nws;
+               }
+       }
+       unmap_window(win);
        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) {
+           snprintf((char *)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
+pressbutton(struct swm_region *r, union arg *args)
+{
+       XTestFakeButtonEvent(display, args->id, True, CurrentTime);
+       XTestFakeButtonEvent(display, args->id, False, CurrentTime);
+}
+
+void
+raise_toggle(struct swm_region *r, union arg *args)
+{
+       if (r && r->ws == NULL)
+               return;
+
+       r->ws->always_raise = !r->ws->always_raise;
+
+       /* bring floaters back to top */
+       if (r->ws->always_raise == 0)
+               stack();
+}
+
+void
+iconify(struct swm_region *r, union arg *args)
+{
+       union arg a;
 
+       if (r->ws->focus == NULL)
+               return;
+       unmap_window(r->ws->focus);
+       update_iconic(r->ws->focus, 1);
        stack();
+       if (focus_mode == SWM_FOCUS_DEFAULT)
+               drain_enter_notify();
+       r->ws->focus = NULL;
+       a.id = SWM_ARG_ID_FOCUSCUR;
+       focus(r, &a);
+}
+
+unsigned char *
+get_win_name(Display *dpy, Window win, Atom wname, Atom stype,
+    unsigned long *slen)
+{
+       int                     status, retfmt;
+       unsigned long           nitems, nbytes, nextra;
+       unsigned char           *prop = NULL;
+       Atom                    rettype;
+
+       status = XGetWindowProperty(dpy, win, wname, 0L, 0L, False, stype,
+           &rettype, &retfmt,  &nitems, &nbytes, &prop);
+       if (status != Success)
+               return (NULL);
+       XFree(prop);
+
+       status = XGetWindowProperty(dpy, win, wname, 0L, nbytes, False,
+           stype, &rettype, &retfmt, &nitems, &nextra, &prop);
+       if (status != Success) {
+               XFree(prop);
+               return (NULL);
+       }
+       if (rettype != stype) {
+               XFree(prop);
+               return (NULL);
+       }
+       *slen = nitems;
+       return (prop);
+}
+
+void
+uniconify(struct swm_region *r, union arg *args)
+{
+       struct ws_win           *win;
+       FILE                    *lfile;
+       unsigned char           *name;
+       int                     count = 0;
+       unsigned long           len;
+
+       DNPRINTF(SWM_D_MISC, "uniconify\n");
+
+       if (r && r->ws == NULL)
+               return;
+
+       /* make sure we have anything to uniconify */
+       TAILQ_FOREACH(win, &r->ws->winlist, entry) {
+               if (win->ws == NULL)
+                       continue; /* should never happen */
+               if (win->iconic == 0)
+                       continue;
+               count++;
+       }
+       if (count == 0)
+               return;
+
+       search_r = r;
+
+       spawn_select(r, args, "uniconify", &searchpid);
+
+       if ((lfile = fdopen(select_list_pipe[1], "w")) == NULL)
+               return;
+
+       TAILQ_FOREACH(win, &r->ws->winlist, entry) {
+               if (win->ws == NULL)
+                       continue; /* should never happen */
+               if (win->iconic == 0)
+                       continue;
+
+               name = get_win_name(display, win->id, a_wmname, a_string,
+                   &len);
+               if (name == NULL)
+                       continue;
+               fprintf(lfile, "%s.%lu\n", name, win->id);
+               XFree(name);
+       }
+
+       fclose(lfile);
+}
+
+#define MAX_RESP_LEN   1024
+
+void
+search_do_resp(void)
+{
+       ssize_t                 rbytes;
+       struct ws_win           *win;
+       unsigned char           *name;
+       char                    *resp, *s;
+       unsigned long           len;
+
+       DNPRINTF(SWM_D_MISC, "search_do_resp:\n");
+
+       search_resp = 0;
+       searchpid = 0;
+
+       if ((resp = calloc(1, MAX_RESP_LEN + 1)) == NULL) {
+               fprintf(stderr, "search: calloc\n");
+               return;
+       }
+
+       rbytes = read(select_resp_pipe[0], resp, MAX_RESP_LEN);
+       if (rbytes <= 0) {
+               fprintf(stderr, "search: read error: %s\n", strerror(errno));
+               goto done;
+       }
+       resp[rbytes] = '\0';
+       len = strlen(resp);
+
+       DNPRINTF(SWM_D_MISC, "search_do_resp: resp %s\n", resp);
+       TAILQ_FOREACH(win, &search_r->ws->winlist, entry) {
+               if (win->iconic == 0)
+                       continue;
+               name = get_win_name(display, win->id, a_wmname, a_string, &len);
+               if (name == NULL)
+                       continue;
+               if (asprintf(&s, "%s.%lu", name, win->id) == -1) {
+                       XFree(name);
+                       continue;
+               }
+               XFree(name);
+               if (strncmp(s, resp, len) == 0) {
+                       /* XXX this should be a callback to generalize */
+                       update_iconic(win, 0);
+                       free(s);
+                       break;
+               }
+               free(s);
+       }
+done:
+       free(resp);
 }
 
 void
@@ -1949,7 +3249,7 @@ wkill(struct swm_region *r, union arg *args)
 {
        DNPRINTF(SWM_D_MISC, "wkill %d\n", args->id);
 
-       if(r->ws->focus == NULL)
+       if (r->ws->focus == NULL)
                return;
 
        if (args->id == SWM_ARG_ID_KILLWINDOW)
@@ -1959,42 +3259,66 @@ wkill(struct swm_region *r, union arg *args)
                        client_msg(r->ws->focus, adelete);
 }
 
-void
-screenshot(struct swm_region *r, union arg *args)
+
+int
+floating_toggle_win(struct ws_win *win)
 {
-       union arg                       a;
+       struct swm_region       *r;
 
-       DNPRINTF(SWM_D_MISC, "screenshot\n");
+       if (win == NULL)
+               return 0;
 
-       if (ss_enabled == 0)
-               return;
+       if (!win->ws->r)
+               return 0;
 
-       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;
+       r = win->ws->r;
+
+       /* reject floating toggles in max stack mode */
+       if (win->ws->cur_layout == &layouts[SWM_MAX_STACK])
+               return 0;
+
+       if (win->floating) {
+               if (!win->floatmaxed) {
+                       /* retain position for refloat */
+                       store_float_geom(win, r);
+               }
+               win->floating = 0;
+       } else {
+               if (win->g_floatvalid) {
+                       /* refloat at last floating relative position */
+                       win->g.x = win->g_float.x - win->rg_float.x + r->g.x;
+                       win->g.y = win->g_float.y - win->rg_float.y + r->g.y;
+                       win->g.w = win->g_float.w;
+                       win->g.h = win->g_float.h;
+               }
+               win->floating = 1;
        }
-       a.argv = spawn_screenshot;
-       spawn(r, &a);
+
+       ewmh_update_actions(win);
+
+       return 1;
 }
 
 void
 floating_toggle(struct swm_region *r, union arg *args)
 {
-       struct ws_win   *win = cur_focus;
+       struct ws_win           *win = r->ws->focus;
+       union arg               a;
 
        if (win == NULL)
                return;
 
-       win->floating = !win->floating;
-       win->manual = 0;
+       ewmh_update_win_state(win, ewmh[_NET_WM_STATE_ABOVE].atom,
+           _NET_WM_STATE_TOGGLE);
+
        stack();
-       focus_win(win);
+       if (focus_mode == SWM_FOCUS_DEFAULT)
+               drain_enter_notify();
+
+       if (win == win->ws->focus) {
+               a.id = SWM_ARG_ID_FOCUSCUR;
+               focus(win->ws->r, &a);
+       }
 }
 
 void
@@ -2007,12 +3331,12 @@ resize_window(struct ws_win *win, int center)
        r = root_to_region(win->wa.root);
        bzero(&wc, sizeof wc);
        mask = CWBorderWidth | CWWidth | CWHeight;
-       wc.border_width = 1;
+       wc.border_width = border_width;
        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;
+               wc.x = (WIDTH(r) - win->g.w) / 2 - border_width;
+               wc.y = (HEIGHT(r) - win->g.h) / 2 - border_width;
                mask |= CWX | CWY;
        }
 
@@ -2020,44 +3344,110 @@ resize_window(struct ws_win *win, int center)
            win->id, wc.x, wc.y, wc.width, wc.height);
 
        XConfigureWindow(display, win->id, mask, &wc);
-       config_win(win);
 }
 
+#define SWM_RESIZE_STEPS       (50)
+
 void
 resize(struct ws_win *win, union arg *args)
 {
        XEvent                  ev;
        Time                    time = 0;
+       struct swm_region       *r = NULL;
+       int                     relx, rely;
+       int                     resize_step = 0;
+
+       if (win == NULL)
+               return;
+       r = win->ws->r;
 
-       DNPRINTF(SWM_D_MOUSE, "resize: win %lu floating %d trans %d\n",
+       DNPRINTF(SWM_D_MOUSE, "resize: win %lu floating %d trans %lu\n",
            win->id, win->floating, win->transient);
 
        if (!(win->transient != 0 || win->floating != 0))
                return;
 
+       /* reject resizes in max mode for floaters (transient ok) */
+       if (win->floatmaxed)
+               return;
+
+       win->manual = 1;
+       ewmh_update_win_state(win, ewmh[_SWM_WM_STATE_MANUAL].atom,
+           _NET_WM_STATE_ADD);
+
+       stack();
+
+       switch (args->id) {
+       case SWM_ARG_ID_WIDTHSHRINK:
+               win->g.w -= SWM_RESIZE_STEPS;
+               resize_step = 1;
+               break;
+       case SWM_ARG_ID_WIDTHGROW:
+               win->g.w += SWM_RESIZE_STEPS;
+               resize_step = 1;
+               break;
+       case SWM_ARG_ID_HEIGHTSHRINK:
+               win->g.h -= SWM_RESIZE_STEPS;
+               resize_step = 1;
+               break;
+       case SWM_ARG_ID_HEIGHTGROW:
+               win->g.h += SWM_RESIZE_STEPS;
+               resize_step = 1;
+               break;
+       default:
+               break;
+       }
+       if (resize_step) {
+               resize_window(win, 0);
+               store_float_geom(win,r);
+               return;
+       }
+
+       if (focus_mode == SWM_FOCUS_DEFAULT)
+               drain_enter_notify();
+
        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);
+
+       /* place pointer at bottom left corner or nearest point inside r */
+       if ( win->g.x + win->g.w < r->g.x + r->g.w - 1)
+               relx = win->g.w - 1;
+       else
+               relx = r->g.x + r->g.w - win->g.x - 1;
+
+       if ( win->g.y + win->g.h < r->g.y + r->g.h - 1)
+               rely = win->g.h - 1;
+       else
+               rely = r->g.y + r->g.h - win->g.y - 1;
+
+       XWarpPointer(display, None, win->id, 0, 0, 0, 0, relx, rely);
        do {
                XMaskEvent(display, MOUSEMASK | ExposureMask |
                    SubstructureRedirectMask, &ev);
-               switch(ev.type) {
+               switch (ev.type) {
                case ConfigureRequest:
                case Expose:
                case MapRequest:
                        handler[ev.type](&ev);
                        break;
                case MotionNotify:
+                       /* do not allow resize outside of region */
+                       if (    ev.xmotion.x_root < r->g.x ||
+                               ev.xmotion.x_root > r->g.x + r->g.w - 1 ||
+                               ev.xmotion.y_root < r->g.y ||
+                               ev.xmotion.y_root > r->g.y + r->g.h - 1)
+                               continue;
+
                        if (ev.xmotion.x <= 1)
                                ev.xmotion.x = 1;
                        if (ev.xmotion.y <= 1)
                                ev.xmotion.y = 1;
-                       win->g.w = ev.xmotion.x;
-                       win->g.h = ev.xmotion.y;
+                       win->g.w = ev.xmotion.x + 1;
+                       win->g.h = ev.xmotion.y + 1;
 
-                       /* not free, don't sync more than 60 times / second */
-                       if ((ev.xmotion.time - time) > (1000 / 60) ) {
+                       /* not free, don't sync more than 120 times / second */
+                       if ((ev.xmotion.time - time) > (1000 / 120) ) {
                                time = ev.xmotion.time;
                                XSync(display, False);
                                resize_window(win, args->id);
@@ -2069,14 +3459,30 @@ resize(struct ws_win *win, union arg *args)
                XSync(display, False);
                resize_window(win, args->id);
        }
+       store_float_geom(win,r);
+
        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));
+       drain_enter_notify();
+}
+
+void
+resize_step(struct swm_region *r, union arg *args)
+{
+       struct ws_win           *win = NULL;
+
+       if (r && r->ws && r->ws->focus)
+               win = r->ws->focus;
+       else
+               return;
+
+       resize(win, args);
 }
 
+
 void
 move_window(struct ws_win *win)
 {
@@ -2089,30 +3495,73 @@ move_window(struct ws_win *win)
        mask = CWX | CWY;
        wc.x = win->g.x;
        wc.y = win->g.y;
+       wc.border_width = border_width;
 
        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);
 }
 
+#define SWM_MOVE_STEPS (50)
+
 void
 move(struct ws_win *win, union arg *args)
 {
        XEvent                  ev;
        Time                    time = 0;
-       int                     restack = 0;
+       int                     move_step = 0;
+       struct swm_region       *r = NULL;
+
+       if (win == NULL)
+               return;
+       r = win->ws->r;
 
-       DNPRINTF(SWM_D_MOUSE, "move: win %lu floating %d trans %d\n",
+       DNPRINTF(SWM_D_MOUSE, "move: win %lu floating %d trans %lu\n",
            win->id, win->floating, win->transient);
 
-       if (win->floating == 0) {
-               win->floating = 1;
-               win->manual = 1;
-               restack = 1;
+       /* in max_stack mode should only move transients */
+       if (win->ws->cur_layout == &layouts[SWM_MAX_STACK] && !win->transient)
+               return;
+
+       win->manual = 1;
+       if (win->floating == 0 && !win->transient) {
+               ewmh_update_win_state(win, ewmh[_NET_WM_STATE_ABOVE].atom,
+                   _NET_WM_STATE_ADD);
+       }
+       ewmh_update_win_state(win, ewmh[_SWM_WM_STATE_MANUAL].atom,
+           _NET_WM_STATE_ADD);
+
+       stack();
+
+       move_step = 0;
+       switch (args->id) {
+       case SWM_ARG_ID_MOVELEFT:
+               win->g.x -= (SWM_MOVE_STEPS - border_width);
+               move_step = 1;
+               break;
+       case SWM_ARG_ID_MOVERIGHT:
+               win->g.x += (SWM_MOVE_STEPS - border_width);
+               move_step = 1;
+               break;
+       case SWM_ARG_ID_MOVEUP:
+               win->g.y -= (SWM_MOVE_STEPS - border_width);
+               move_step = 1;
+               break;
+       case SWM_ARG_ID_MOVEDOWN:
+               win->g.y += (SWM_MOVE_STEPS - border_width);
+               move_step = 1;
+               break;
+       default:
+               break;
+       }
+       if (move_step) {
+               move_window(win);
+               store_float_geom(win,r);
+               return;
        }
 
+
        if (XGrabPointer(display, win->id, False, MOUSEMASK, GrabModeAsync,
            GrabModeAsync, None, None /* cursor */, CurrentTime) != GrabSuccess)
                return;
@@ -2120,18 +3569,25 @@ move(struct ws_win *win, union arg *args)
        do {
                XMaskEvent(display, MOUSEMASK | ExposureMask |
                    SubstructureRedirectMask, &ev);
-               switch(ev.type) {
+               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;
+                       /* don't allow to move window origin out of region */
+                       if (    ev.xmotion.x_root < r->g.x ||
+                               ev.xmotion.x_root > r->g.x + r->g.w - 1 ||
+                               ev.xmotion.y_root < r->g.y ||
+                               ev.xmotion.y_root > r->g.y + r->g.h - 1)
+                               continue;
+
+                       win->g.x = ev.xmotion.x_root - border_width;
+                       win->g.y = ev.xmotion.y_root - border_width;
 
-                       /* not free, don't sync more than 60 times / second */
-                       if ((ev.xmotion.time - time) > (1000 / 60) ) {
+                       /* not free, don't sync more than 120 times / second */
+                       if ((ev.xmotion.time - time) > (1000 / 120) ) {
                                time = ev.xmotion.time;
                                XSync(display, False);
                                move_window(win);
@@ -2143,24 +3599,121 @@ move(struct ws_win *win, union arg *args)
                XSync(display, False);
                move_window(win);
        }
+       store_float_geom(win,r);
        XWarpPointer(display, None, win->id, 0, 0, 0, 0, 0, 0);
        XUngrabPointer(display, CurrentTime);
-       if (restack)
-               stack();
 
        /* drain events */
-       while (XCheckMaskEvent(display, EnterWindowMask, &ev));
+       drain_enter_notify();
+}
+
+void
+move_step(struct swm_region *r, union arg *args)
+{
+       struct ws_win           *win = NULL;
+
+       if (r && r->ws && r->ws->focus)
+               win = r->ws->focus;
+       else
+               return;
+
+       if (!(win->transient != 0 || win->floating != 0))
+               return;
+
+       move(win, args);
 }
 
+
+/* user/key callable function IDs */
+enum keyfuncid {
+       kf_cycle_layout,
+       kf_stack_reset,
+       kf_master_shrink,
+       kf_master_grow,
+       kf_master_add,
+       kf_master_del,
+       kf_stack_inc,
+       kf_stack_dec,
+       kf_swap_main,
+       kf_focus_next,
+       kf_focus_prev,
+       kf_swap_next,
+       kf_swap_prev,
+       kf_spawn_term,
+       kf_spawn_menu,
+       kf_quit,
+       kf_restart,
+       kf_focus_main,
+       kf_ws_1,
+       kf_ws_2,
+       kf_ws_3,
+       kf_ws_4,
+       kf_ws_5,
+       kf_ws_6,
+       kf_ws_7,
+       kf_ws_8,
+       kf_ws_9,
+       kf_ws_10,
+       kf_ws_next,
+       kf_ws_prev,
+       kf_ws_prior,
+       kf_screen_next,
+       kf_screen_prev,
+       kf_mvws_1,
+       kf_mvws_2,
+       kf_mvws_3,
+       kf_mvws_4,
+       kf_mvws_5,
+       kf_mvws_6,
+       kf_mvws_7,
+       kf_mvws_8,
+       kf_mvws_9,
+       kf_mvws_10,
+       kf_bar_toggle,
+       kf_wind_kill,
+       kf_wind_del,
+       kf_screenshot_all,
+       kf_screenshot_wind,
+       kf_float_toggle,
+       kf_version,
+       kf_spawn_lock,
+       kf_spawn_initscr,
+       kf_spawn_custom,
+       kf_iconify,
+       kf_uniconify,
+       kf_raise_toggle,
+       kf_button2,
+       kf_width_shrink,
+       kf_width_grow,
+       kf_height_shrink,
+       kf_height_grow,
+       kf_move_left,
+       kf_move_right,
+       kf_move_up,
+       kf_move_down,
+       kf_dumpwins, /* MUST BE LAST */
+       kf_invalid
+};
+
 /* key definitions */
+void
+dummykeyfunc(struct swm_region *r, union arg *args)
+{
+};
+
+void
+legacyfunc(struct swm_region *r, union arg *args)
+{
+};
+
 struct keyfunc {
        char                    name[SWM_FUNCNAME_LEN];
        void                    (*func)(struct swm_region *r, union arg *);
        union arg               args;
-} keyfuncs[kf_invalid] = {
+} keyfuncs[kf_invalid + 1] = {
        /* name                 function        argument */
-       { "cycle_layout",       cycle_layout,   {0} }, 
-       { "stack_reset",        stack_config,   {.id = SWM_ARG_ID_STACKRESET} }, 
+       { "cycle_layout",       cycle_layout,   {0} },
+       { "stack_reset",        stack_config,   {.id = SWM_ARG_ID_STACKRESET} },
        { "master_shrink",      stack_config,   {.id = SWM_ARG_ID_MASTERSHRINK} },
        { "master_grow",        stack_config,   {.id = SWM_ARG_ID_MASTERGROW} },
        { "master_add",         stack_config,   {.id = SWM_ARG_ID_MASTERADD} },
@@ -2173,7 +3726,7 @@ struct keyfunc {
        { "swap_next",          swapwin,        {.id = SWM_ARG_ID_SWAPNEXT} },
        { "swap_prev",          swapwin,        {.id = SWM_ARG_ID_SWAPPREV} },
        { "spawn_term",         spawnterm,      {.argv = spawn_term} },
-       { "spawn_menu",         spawnmenu,      {.argv = spawn_menu} },
+       { "spawn_menu",         legacyfunc,     {0} },
        { "quit",               quit,           {0} },
        { "restart",            restart,        {0} },
        { "focus_main",         focus,          {.id = SWM_ARG_ID_FOCUSMAIN} },
@@ -2187,10 +3740,11 @@ struct keyfunc {
        { "ws_8",               switchws,       {.id = 7} },
        { "ws_9",               switchws,       {.id = 8} },
        { "ws_10",              switchws,       {.id = 9} },
-       { "ws_next",            cyclews,        {.id = SWM_ARG_ID_CYCLEWS_UP} }, 
-       { "ws_prev",            cyclews,        {.id = SWM_ARG_ID_CYCLEWS_DOWN} }, 
-       { "screen_next",        cyclescr,       {.id = SWM_ARG_ID_CYCLESC_UP} }, 
-       { "screen_prev",        cyclescr,       {.id = SWM_ARG_ID_CYCLESC_DOWN} }, 
+       { "ws_next",            cyclews,        {.id = SWM_ARG_ID_CYCLEWS_UP} },
+       { "ws_prev",            cyclews,        {.id = SWM_ARG_ID_CYCLEWS_DOWN} },
+       { "ws_prior",           priorws,        {0} },
+       { "screen_next",        cyclescr,       {.id = SWM_ARG_ID_CYCLESC_UP} },
+       { "screen_prev",        cyclescr,       {.id = SWM_ARG_ID_CYCLESC_DOWN} },
        { "mvws_1",             send_to_ws,     {.id = 0} },
        { "mvws_2",             send_to_ws,     {.id = 1} },
        { "mvws_3",             send_to_ws,     {.id = 2} },
@@ -2204,17 +3758,33 @@ struct keyfunc {
        { "bar_toggle",         bar_toggle,     {0} },
        { "wind_kill",          wkill,          {.id = SWM_ARG_ID_KILLWINDOW} },
        { "wind_del",           wkill,          {.id = SWM_ARG_ID_DELETEWINDOW} },
-       { "screenshot_all",     screenshot,     {.id = SWM_ARG_ID_SS_ALL} },
-       { "screenshot_wind",    screenshot,     {.id = SWM_ARG_ID_SS_WINDOW} },
+       { "screenshot_all",     legacyfunc,     {0} },
+       { "screenshot_wind",    legacyfunc,     {0} },
        { "float_toggle",       floating_toggle,{0} },
        { "version",            version,        {0} },
-       { "spawn_lock",         spawn,          {.argv = spawn_lock} },
-       { "spawn_initscr",      spawn,          {.argv = spawn_initscr} },
+       { "spawn_lock",         legacyfunc,     {0} },
+       { "spawn_initscr",      legacyfunc,     {0} },
+       { "spawn_custom",       dummykeyfunc,   {0} },
+       { "iconify",            iconify,        {0} },
+       { "uniconify",          uniconify,      {0} },
+       { "raise_toggle",       raise_toggle,   {0} },
+       { "button2",            pressbutton,    {2} },
+       { "width_shrink",       resize_step,    {.id = SWM_ARG_ID_WIDTHSHRINK} },
+       { "width_grow",         resize_step,    {.id = SWM_ARG_ID_WIDTHGROW} },
+       { "height_shrink",      resize_step,    {.id = SWM_ARG_ID_HEIGHTSHRINK} },
+       { "height_grow",        resize_step,    {.id = SWM_ARG_ID_HEIGHTGROW} },
+       { "move_left",          move_step,      {.id = SWM_ARG_ID_MOVELEFT} },
+       { "move_right",         move_step,      {.id = SWM_ARG_ID_MOVERIGHT} },
+       { "move_up",            move_step,      {.id = SWM_ARG_ID_MOVEUP} },
+       { "move_down",          move_step,      {.id = SWM_ARG_ID_MOVEDOWN} },
+       { "dumpwins",           dumpwins,       {0} }, /* MUST BE LAST */
+       { "invalid key func",   NULL,           {0} },
 };
 struct key {
        unsigned int            mod;
        KeySym                  keysym;
        enum keyfuncid          funcid;
+       char                    *spawn_name;
 };
 int                            keys_size = 0, keys_length = 0;
 struct key                     *keys = NULL;
@@ -2228,10 +3798,10 @@ struct 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} },
+         /* 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
@@ -2239,6 +3809,7 @@ update_modkey(unsigned int mod)
 {
        int                     i;
 
+       mod_key = mod;
        for (i = 0; i < keys_length; i++)
                if (keys[i].mod & ShiftMask)
                        keys[i].mod = mod | ShiftMask;
@@ -2252,6 +3823,302 @@ update_modkey(unsigned int mod)
                        buttons[i].mask = mod;
 }
 
+/* spawn */
+struct spawn_prog {
+       char                    *name;
+       int                     argc;
+       char                    **argv;
+};
+
+int                            spawns_size = 0, spawns_length = 0;
+struct spawn_prog              *spawns = NULL;
+
+int
+spawn_expand(struct swm_region *r, union arg *args, char *spawn_name,
+    char ***ret_args)
+{
+       struct spawn_prog       *prog = NULL;
+       int                     i;
+       char                    *ap, **real_args;
+
+       DNPRINTF(SWM_D_SPAWN, "spawn_expand %s\n", spawn_name);
+
+       /* find program */
+       for (i = 0; i < spawns_length; i++) {
+               if (!strcasecmp(spawn_name, spawns[i].name))
+                       prog = &spawns[i];
+       }
+       if (prog == NULL) {
+               fprintf(stderr, "spawn_custom: program %s not found\n",
+                   spawn_name);
+               return (-1);
+       }
+
+       /* make room for expanded args */
+       if ((real_args = calloc(prog->argc + 1, sizeof(char *))) == NULL)
+               err(1, "spawn_custom: calloc real_args");
+
+       /* expand spawn_args into real_args */
+       for (i = 0; i < prog->argc; i++) {
+               ap = prog->argv[i];
+               DNPRINTF(SWM_D_SPAWN, "spawn_custom: raw arg = %s\n", ap);
+               if (!strcasecmp(ap, "$bar_border")) {
+                       if ((real_args[i] =
+                           strdup(r->s->c[SWM_S_COLOR_BAR_BORDER].name))
+                           == NULL)
+                               err(1,  "spawn_custom border color");
+               } else if (!strcasecmp(ap, "$bar_color")) {
+                       if ((real_args[i] =
+                           strdup(r->s->c[SWM_S_COLOR_BAR].name))
+                           == NULL)
+                               err(1, "spawn_custom bar color");
+               } else if (!strcasecmp(ap, "$bar_font")) {
+                       if ((real_args[i] = strdup(bar_fonts[bar_fidx]))
+                           == NULL)
+                               err(1, "spawn_custom bar fonts");
+               } else if (!strcasecmp(ap, "$bar_font_color")) {
+                       if ((real_args[i] =
+                           strdup(r->s->c[SWM_S_COLOR_BAR_FONT].name))
+                           == NULL)
+                               err(1, "spawn_custom color font");
+               } else if (!strcasecmp(ap, "$color_focus")) {
+                       if ((real_args[i] =
+                           strdup(r->s->c[SWM_S_COLOR_FOCUS].name))
+                           == NULL)
+                               err(1, "spawn_custom color focus");
+               } else if (!strcasecmp(ap, "$color_unfocus")) {
+                       if ((real_args[i] =
+                           strdup(r->s->c[SWM_S_COLOR_UNFOCUS].name))
+                           == NULL)
+                               err(1, "spawn_custom color unfocus");
+               } else {
+                       /* no match --> copy as is */
+                       if ((real_args[i] = strdup(ap)) == NULL)
+                               err(1, "spawn_custom strdup(ap)");
+               }
+               DNPRINTF(SWM_D_SPAWN, "spawn_custom: cooked arg = %s\n",
+                   real_args[i]);
+       }
+
+#ifdef SWM_DEBUG
+       if ((swm_debug & SWM_D_SPAWN) != 0) {
+               fprintf(stderr, "spawn_custom: result = ");
+               for (i = 0; i < prog->argc; i++)
+                       fprintf(stderr, "\"%s\" ", real_args[i]);
+               fprintf(stderr, "\n");
+       }
+#endif
+       *ret_args = real_args;
+       return (prog->argc);
+}
+
+void
+spawn_custom(struct swm_region *r, union arg *args, char *spawn_name)
+{
+       union arg               a;
+       char                    **real_args;
+       int                     spawn_argc, i;
+
+       if ((spawn_argc = spawn_expand(r, args, spawn_name, &real_args)) < 0)
+               return;
+       a.argv = real_args;
+       if (fork() == 0)
+               spawn(r->ws->idx, &a, 1);
+
+       for (i = 0; i < spawn_argc; i++)
+               free(real_args[i]);
+       free(real_args);
+}
+
+void
+spawn_select(struct swm_region *r, union arg *args, char *spawn_name, int *pid)
+{
+       union arg               a;
+       char                    **real_args;
+       int                     i, spawn_argc;
+
+       if ((spawn_argc = spawn_expand(r, args, spawn_name, &real_args)) < 0)
+               return;
+       a.argv = real_args;
+
+       if (pipe(select_list_pipe) == -1)
+               err(1, "pipe error");
+       if (pipe(select_resp_pipe) == -1)
+               err(1, "pipe error");
+
+       if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
+               err(1, "could not disable SIGPIPE");
+       switch (*pid = fork()) {
+       case -1:
+               err(1, "cannot fork");
+               break;
+       case 0: /* child */
+               if (dup2(select_list_pipe[0], 0) == -1)
+                       errx(1, "dup2");
+               if (dup2(select_resp_pipe[1], 1) == -1)
+                       errx(1, "dup2");
+               close(select_list_pipe[1]);
+               close(select_resp_pipe[0]);
+               spawn(r->ws->idx, &a, 0);
+               break;
+       default: /* parent */
+               close(select_list_pipe[0]);
+               close(select_resp_pipe[1]);
+               break;
+       }
+
+       for (i = 0; i < spawn_argc; i++)
+               free(real_args[i]);
+       free(real_args);
+}
+
+void
+setspawn(struct spawn_prog *prog)
+{
+       int                     i, j;
+
+       if (prog == NULL || prog->name == NULL)
+               return;
+
+       /* find existing */
+       for (i = 0; i < spawns_length; i++) {
+               if (!strcmp(spawns[i].name, prog->name)) {
+                       /* found */
+                       if (prog->argv == NULL) {
+                               /* delete */
+                               DNPRINTF(SWM_D_SPAWN,
+                                   "setspawn: delete #%d %s\n",
+                                   i, spawns[i].name);
+                               free(spawns[i].name);
+                               for (j = 0; j < spawns[i].argc; j++)
+                                       free(spawns[i].argv[j]);
+                               free(spawns[i].argv);
+                               j = spawns_length - 1;
+                               if (i < j)
+                                       spawns[i] = spawns[j];
+                               spawns_length--;
+                               free(prog->name);
+                       } else {
+                               /* replace */
+                               DNPRINTF(SWM_D_SPAWN,
+                                   "setspawn: replace #%d %s\n",
+                                   i, spawns[i].name);
+                               free(spawns[i].name);
+                               for (j = 0; j < spawns[i].argc; j++)
+                                       free(spawns[i].argv[j]);
+                               free(spawns[i].argv);
+                               spawns[i] = *prog;
+                       }
+                       /* found case handled */
+                       free(prog);
+                       return;
+               }
+       }
+
+       if (prog->argv == NULL) {
+               fprintf(stderr,
+                   "error: setspawn: cannot find program %s", prog->name);
+               free(prog);
+               return;
+       }
+
+       /* not found: add */
+       if (spawns_size == 0 || spawns == NULL) {
+               spawns_size = 4;
+               DNPRINTF(SWM_D_SPAWN, "setspawn: init list %d\n", spawns_size);
+               spawns = malloc((size_t)spawns_size *
+                   sizeof(struct spawn_prog));
+               if (spawns == NULL) {
+                       fprintf(stderr, "setspawn: malloc failed\n");
+                       perror(" failed");
+                       quit(NULL, NULL);
+               }
+       } else if (spawns_length == spawns_size) {
+               spawns_size *= 2;
+               DNPRINTF(SWM_D_SPAWN, "setspawn: grow list %d\n", spawns_size);
+               spawns = realloc(spawns, (size_t)spawns_size *
+                   sizeof(struct spawn_prog));
+               if (spawns == NULL) {
+                       fprintf(stderr, "setspawn: realloc failed\n");
+                       perror(" failed");
+                       quit(NULL, NULL);
+               }
+       }
+
+       if (spawns_length < spawns_size) {
+               DNPRINTF(SWM_D_SPAWN, "setspawn: add #%d %s\n",
+                   spawns_length, prog->name);
+               i = spawns_length++;
+               spawns[i] = *prog;
+       } else {
+               fprintf(stderr, "spawns array problem?\n");
+               if (spawns == NULL) {
+                       fprintf(stderr, "spawns array is NULL!\n");
+                       quit(NULL, NULL);
+               }
+       }
+       free(prog);
+}
+
+int
+setconfspawn(char *selector, char *value, int flags)
+{
+       struct spawn_prog       *prog;
+       char                    *vp, *cp, *word;
+
+       DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, value);
+       if ((prog = calloc(1, sizeof *prog)) == NULL)
+               err(1, "setconfspawn: calloc prog");
+       prog->name = strdup(selector);
+       if (prog->name == NULL)
+               err(1, "setconfspawn prog->name");
+       if ((cp = vp = strdup(value)) == NULL)
+               err(1, "setconfspawn: strdup(value) ");
+       while ((word = strsep(&cp, " \t")) != NULL) {
+               DNPRINTF(SWM_D_SPAWN, "setconfspawn: arg [%s]\n", word);
+               if (cp)
+                       cp += (long)strspn(cp, " \t");
+               if (strlen(word) > 0) {
+                       prog->argc++;
+                       if ((prog->argv = realloc(prog->argv,
+                           prog->argc * sizeof(char *))) == NULL)
+                               err(1, "setconfspawn: realloc");
+                       if ((prog->argv[prog->argc - 1] = strdup(word)) == NULL)
+                               err(1, "setconfspawn: strdup");
+               }
+       }
+       free(vp);
+
+       setspawn(prog);
+
+       DNPRINTF(SWM_D_SPAWN, "setconfspawn: done\n");
+       return (0);
+}
+
+void
+setup_spawn(void)
+{
+       setconfspawn("term",            "xterm",                0);
+       setconfspawn("screenshot_all",  "screenshot.sh full",   0);
+       setconfspawn("screenshot_wind", "screenshot.sh window", 0);
+       setconfspawn("lock",            "xlock",                0);
+       setconfspawn("initscr",         "initscreen.sh",        0);
+       setconfspawn("menu",            "dmenu_run"
+                                       " -fn $bar_font"
+                                       " -nb $bar_color"
+                                       " -nf $bar_font_color"
+                                       " -sb $bar_border"
+                                       " -sf $bar_color",      0);
+       setconfspawn("uniconify",       "dmenu"
+                                       " -i"
+                                       " -fn $bar_font"
+                                       " -nb $bar_color"
+                                       " -nf $bar_font_color"
+                                       " -sb $bar_border"
+                                       " -sf $bar_color",      0);
+}
+
+/* key bindings */
 #define SWM_MODNAME_SIZE       32
 #define        SWM_KEY_WS              "\n+ \t"
 int
@@ -2259,11 +4126,20 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks)
 {
        char                    *cp, *name;
        KeySym                  uks;
-       if (mod == NULL || ks == NULL)
-               return (0);
+       DNPRINTF(SWM_D_KEY, "parsekeys: enter [%s]\n", keystr);
+       if (mod == NULL || ks == NULL) {
+               DNPRINTF(SWM_D_KEY, "parsekeys: no mod or key vars\n");
+               return (1);
+       }
+       if (keystr == NULL || strlen(keystr) == 0) {
+               DNPRINTF(SWM_D_KEY, "parsekeys: no keystr\n");
+               return (1);
+       }
        cp = keystr;
+       *ks = NoSymbol;
        *mod = 0;
        while ((name = strsep(&cp, SWM_KEY_WS)) != NULL) {
+               DNPRINTF(SWM_D_KEY, "parsekeys: key [%s]\n", name);
                if (cp)
                        cp += (long)strspn(cp, SWM_KEY_WS);
                if (strncasecmp(name, "MOD", SWM_MODNAME_SIZE) == 0)
@@ -2287,51 +4163,30 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks)
                                DNPRINTF(SWM_D_KEY,
                                    "parsekeys: invalid key %s\n",
                                    name);
-                               return (0);
+                               return (1);
                        }
                }
        }
-       return (1);
+       DNPRINTF(SWM_D_KEY, "parsekeys: leave ok\n");
+       return (0);
 }
-int
-bindmatch(const char *var, const char *name, unsigned int currmod, char *keystr,
-    enum keyfuncid *kfid, unsigned int *mod, KeySym *ks)
-{
-       char                    *p;
-       int                     i;
-       char                    funcname[SWM_FUNCNAME_LEN];
-       i = strncmp(var, name, 255);
-       if (kfid == NULL || mod == NULL || ks == NULL)
-               return (i);
-       *kfid = kf_invalid;
-       *mod = 0;
-       *ks = NoSymbol;
-       bzero(funcname, LENGTH(funcname));
-       if (i <= 0)
-               return (i);
-       p = (char *)var + strlen(name);
-       if (*p++ != '[')
-               return (i);
-       i = 0;
-       while (isgraph(*p) && *p != ']' && i < LENGTH(funcname))
-               funcname[i++] = *p++;
-       if (i >= LENGTH(funcname) || *p != ']')
-               return (1);
-       if (i == 0)
-               return (!parsekeys(keystr, currmod, mod, ks));
-       for (*kfid = 0; *kfid < kf_invalid; (*kfid)++) {
-               if (strncasecmp(funcname, keyfuncs[*kfid].name,
-                   SWM_FUNCNAME_LEN) == 0) {
-                       return (!parsekeys(keystr, currmod, mod, ks));
-               }
 
-       }
-       return (1);
+char *
+strdupsafe(char *str)
+{
+       if (str == NULL)
+               return (NULL);
+       else
+               return (strdup(str));
 }
+
 void
-setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid)
+setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid,
+    char *spawn_name)
 {
        int                     i, j;
+       DNPRINTF(SWM_D_KEY, "setkeybinding: enter %s [%s]\n",
+           keyfuncs[kfid].name, spawn_name);
        /* find existing */
        for (i = 0; i < keys_length; i++) {
                if (keys[i].mod == mod && keys[i].keysym == ks) {
@@ -2340,19 +4195,25 @@ setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid)
                                DNPRINTF(SWM_D_KEY,
                                    "setkeybinding: delete #%d %s\n",
                                    i, keyfuncs[keys[i].funcid].name);
+                               free(keys[i].spawn_name);
                                j = keys_length - 1;
                                if (i < j)
                                        keys[i] = keys[j];
                                keys_length--;
+                               DNPRINTF(SWM_D_KEY, "setkeybinding: leave\n");
                                return;
                        } else {
                                /* found: replace */
                                DNPRINTF(SWM_D_KEY,
-                                   "setkeybinding: replace #%d %s\n",
-                                   i, keyfuncs[keys[i].funcid].name);
+                                   "setkeybinding: replace #%d %s %s\n",
+                                   i, keyfuncs[keys[i].funcid].name,
+                                   spawn_name);
+                               free(keys[i].spawn_name);
                                keys[i].mod = mod;
                                keys[i].keysym = ks;
                                keys[i].funcid = kfid;
+                               keys[i].spawn_name = strdupsafe(spawn_name);
+                               DNPRINTF(SWM_D_KEY, "setkeybinding: leave\n");
                                return;
                        }
                }
@@ -2360,6 +4221,7 @@ setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid)
        if (kfid == kf_invalid) {
                fprintf(stderr,
                    "error: setkeybinding: cannot find mod/key combination");
+               DNPRINTF(SWM_D_KEY, "setkeybinding: leave\n");
                return;
        }
        /* not found: add */
@@ -2367,7 +4229,7 @@ setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid)
                keys_size = 4;
                DNPRINTF(SWM_D_KEY, "setkeybinding: init list %d\n", keys_size);
                keys = malloc((size_t)keys_size * sizeof(struct key));
-               if (!keys) {
+               if (keys == NULL) {
                        fprintf(stderr, "malloc failed\n");
                        perror(" failed");
                        quit(NULL, NULL);
@@ -2376,83 +4238,151 @@ setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid)
                keys_size *= 2;
                DNPRINTF(SWM_D_KEY, "setkeybinding: grow list %d\n", keys_size);
                keys = realloc(keys, (size_t)keys_size * sizeof(struct key));
-               if (!keys) {
+               if (keys == NULL) {
                        fprintf(stderr, "realloc failed\n");
                        perror(" failed");
                        quit(NULL, NULL);
                }
        }
-       if (keys_length < keys_size) {
-               DNPRINTF(SWM_D_KEY, "setkeybinding: add %d\n", keys_length);
-               j = keys_length++;
-               keys[j].mod = mod;
-               keys[j].keysym = ks;
-               keys[j].funcid = kfid;
-       } else {
-               fprintf(stderr, "keys array problem?\n");
-               if (!keys) {
-                       fprintf(stderr, "keys array problem\n");
-                       quit(NULL, NULL);
+       if (keys_length < keys_size) {
+               j = keys_length++;
+               DNPRINTF(SWM_D_KEY, "setkeybinding: add #%d %s %s\n",
+                   j, keyfuncs[kfid].name, spawn_name);
+               keys[j].mod = mod;
+               keys[j].keysym = ks;
+               keys[j].funcid = kfid;
+               keys[j].spawn_name = strdupsafe(spawn_name);
+       } else {
+               fprintf(stderr, "keys array problem?\n");
+               if (keys == NULL) {
+                       fprintf(stderr, "keys array problem\n");
+                       quit(NULL, NULL);
+               }
+       }
+       DNPRINTF(SWM_D_KEY, "setkeybinding: leave\n");
+}
+
+int
+setconfbinding(char *selector, char *value, int flags)
+{
+       enum keyfuncid          kfid;
+       unsigned int            mod;
+       KeySym                  ks;
+       int                     i;
+       DNPRINTF(SWM_D_KEY, "setconfbinding: enter\n");
+       if (selector == NULL) {
+               DNPRINTF(SWM_D_KEY, "setconfbinding: unbind %s\n", value);
+               if (parsekeys(value, mod_key, &mod, &ks) == 0) {
+                       kfid = kf_invalid;
+                       setkeybinding(mod, ks, kfid, NULL);
+                       return (0);
+               } else
+                       return (1);
+       }
+       /* search by key function name */
+       for (kfid = 0; kfid < kf_invalid; (kfid)++) {
+               if (strncasecmp(selector, keyfuncs[kfid].name,
+                   SWM_FUNCNAME_LEN) == 0) {
+                       DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match\n",
+                           selector);
+                       if (parsekeys(value, mod_key, &mod, &ks) == 0) {
+                               setkeybinding(mod, ks, kfid, NULL);
+                               return (0);
+                       } else
+                               return (1);
+               }
+       }
+       /* search by custom spawn name */
+       for (i = 0; i < spawns_length; i++) {
+               if (strcasecmp(selector, spawns[i].name) == 0) {
+                       DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match\n",
+                           selector);
+                       if (parsekeys(value, mod_key, &mod, &ks) == 0) {
+                               setkeybinding(mod, ks, kf_spawn_custom,
+                                   spawns[i].name);
+                               return (0);
+                       } else
+                               return (1);
                }
        }
+       DNPRINTF(SWM_D_KEY, "setconfbinding: no match\n");
+       return (1);
 }
+
 void
 setup_keys(void)
 {
-       setkeybinding(MODKEY,           XK_space,       kf_cycle_layout); 
-       setkeybinding(MODKEY|ShiftMask, XK_space,       kf_stack_reset);
-       setkeybinding(MODKEY,           XK_h,           kf_master_shrink);
-       setkeybinding(MODKEY,           XK_l,           kf_master_grow);
-       setkeybinding(MODKEY,           XK_comma,       kf_master_add);
-       setkeybinding(MODKEY,           XK_period,      kf_master_del);
-       setkeybinding(MODKEY|ShiftMask, XK_comma,       kf_stack_inc);
-       setkeybinding(MODKEY|ShiftMask, XK_period,      kf_stack_dec);
-       setkeybinding(MODKEY,           XK_Return,      kf_swap_main);
-       setkeybinding(MODKEY,           XK_j,           kf_focus_next);
-       setkeybinding(MODKEY,           XK_k,           kf_focus_prev);
-       setkeybinding(MODKEY|ShiftMask, XK_j,           kf_swap_next);
-       setkeybinding(MODKEY|ShiftMask, XK_k,           kf_swap_prev);
-       setkeybinding(MODKEY|ShiftMask, XK_Return,      kf_spawn_term);
-       setkeybinding(MODKEY,           XK_p,           kf_spawn_menu);
-       setkeybinding(MODKEY|ShiftMask, XK_q,           kf_quit);
-       setkeybinding(MODKEY,           XK_q,           kf_restart);
-       setkeybinding(MODKEY,           XK_m,           kf_focus_main);
-       setkeybinding(MODKEY,           XK_1,           kf_ws_1);
-       setkeybinding(MODKEY,           XK_2,           kf_ws_2);
-       setkeybinding(MODKEY,           XK_3,           kf_ws_3);
-       setkeybinding(MODKEY,           XK_4,           kf_ws_4);
-       setkeybinding(MODKEY,           XK_5,           kf_ws_5);
-       setkeybinding(MODKEY,           XK_6,           kf_ws_6);
-       setkeybinding(MODKEY,           XK_7,           kf_ws_7);
-       setkeybinding(MODKEY,           XK_8,           kf_ws_8);
-       setkeybinding(MODKEY,           XK_9,           kf_ws_9);
-       setkeybinding(MODKEY,           XK_0,           kf_ws_10);
-       setkeybinding(MODKEY,           XK_Right,       kf_ws_next);
-       setkeybinding(MODKEY,           XK_Left,        kf_ws_prev);
-       setkeybinding(MODKEY|ShiftMask, XK_Right,       kf_screen_next);
-       setkeybinding(MODKEY|ShiftMask, XK_Left,        kf_screen_prev);
-       setkeybinding(MODKEY|ShiftMask, XK_1,           kf_mvws_1);
-       setkeybinding(MODKEY|ShiftMask, XK_2,           kf_mvws_2);
-       setkeybinding(MODKEY|ShiftMask, XK_3,           kf_mvws_3);
-       setkeybinding(MODKEY|ShiftMask, XK_4,           kf_mvws_4);
-       setkeybinding(MODKEY|ShiftMask, XK_5,           kf_mvws_5);
-       setkeybinding(MODKEY|ShiftMask, XK_6,           kf_mvws_6);
-       setkeybinding(MODKEY|ShiftMask, XK_7,           kf_mvws_7);
-       setkeybinding(MODKEY|ShiftMask, XK_8,           kf_mvws_8);
-       setkeybinding(MODKEY|ShiftMask, XK_9,           kf_mvws_9);
-       setkeybinding(MODKEY|ShiftMask, XK_0,           kf_mvws_10);
-       setkeybinding(MODKEY,           XK_b,           kf_bar_toggle);
-       setkeybinding(MODKEY,           XK_Tab,         kf_focus_next);
-       setkeybinding(MODKEY|ShiftMask, XK_Tab,         kf_focus_prev);
-       setkeybinding(MODKEY|ShiftMask, XK_x,           kf_wind_kill);
-       setkeybinding(MODKEY,           XK_x,           kf_wind_del);
-       setkeybinding(MODKEY,           XK_s,           kf_screenshot_all);
-       setkeybinding(MODKEY|ShiftMask, XK_s,           kf_screenshot_wind);
-       setkeybinding(MODKEY,           XK_t,           kf_float_toggle);
-       setkeybinding(MODKEY|ShiftMask, XK_v,           kf_version);
-       setkeybinding(MODKEY|ShiftMask, XK_Delete,      kf_spawn_lock);
-       setkeybinding(MODKEY|ShiftMask, XK_i,           kf_spawn_initscr);
+       setkeybinding(MODKEY,           XK_space,       kf_cycle_layout,NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_space,       kf_stack_reset, NULL);
+       setkeybinding(MODKEY,           XK_h,           kf_master_shrink,NULL);
+       setkeybinding(MODKEY,           XK_l,           kf_master_grow, NULL);
+       setkeybinding(MODKEY,           XK_comma,       kf_master_add,  NULL);
+       setkeybinding(MODKEY,           XK_period,      kf_master_del,  NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_comma,       kf_stack_inc,   NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_period,      kf_stack_dec,   NULL);
+       setkeybinding(MODKEY,           XK_Return,      kf_swap_main,   NULL);
+       setkeybinding(MODKEY,           XK_j,           kf_focus_next,  NULL);
+       setkeybinding(MODKEY,           XK_k,           kf_focus_prev,  NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_j,           kf_swap_next,   NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_k,           kf_swap_prev,   NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_Return,      kf_spawn_term,  NULL);
+       setkeybinding(MODKEY,           XK_p,           kf_spawn_custom,"menu");
+       setkeybinding(MODKEY|ShiftMask, XK_q,           kf_quit,        NULL);
+       setkeybinding(MODKEY,           XK_q,           kf_restart,     NULL);
+       setkeybinding(MODKEY,           XK_m,           kf_focus_main,  NULL);
+       setkeybinding(MODKEY,           XK_1,           kf_ws_1,        NULL);
+       setkeybinding(MODKEY,           XK_2,           kf_ws_2,        NULL);
+       setkeybinding(MODKEY,           XK_3,           kf_ws_3,        NULL);
+       setkeybinding(MODKEY,           XK_4,           kf_ws_4,        NULL);
+       setkeybinding(MODKEY,           XK_5,           kf_ws_5,        NULL);
+       setkeybinding(MODKEY,           XK_6,           kf_ws_6,        NULL);
+       setkeybinding(MODKEY,           XK_7,           kf_ws_7,        NULL);
+       setkeybinding(MODKEY,           XK_8,           kf_ws_8,        NULL);
+       setkeybinding(MODKEY,           XK_9,           kf_ws_9,        NULL);
+       setkeybinding(MODKEY,           XK_0,           kf_ws_10,       NULL);
+       setkeybinding(MODKEY,           XK_Right,       kf_ws_next,     NULL);
+       setkeybinding(MODKEY,           XK_Left,        kf_ws_prev,     NULL);
+       setkeybinding(MODKEY,           XK_a,           kf_ws_prior,    NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_Right,       kf_screen_next, NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_Left,        kf_screen_prev, NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_1,           kf_mvws_1,      NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_2,           kf_mvws_2,      NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_3,           kf_mvws_3,      NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_4,           kf_mvws_4,      NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_5,           kf_mvws_5,      NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_6,           kf_mvws_6,      NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_7,           kf_mvws_7,      NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_8,           kf_mvws_8,      NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_9,           kf_mvws_9,      NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_0,           kf_mvws_10,     NULL);
+       setkeybinding(MODKEY,           XK_b,           kf_bar_toggle,  NULL);
+       setkeybinding(MODKEY,           XK_Tab,         kf_focus_next,  NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_Tab,         kf_focus_prev,  NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_x,           kf_wind_kill,   NULL);
+       setkeybinding(MODKEY,           XK_x,           kf_wind_del,    NULL);
+       setkeybinding(MODKEY,           XK_s,           kf_spawn_custom,"screenshot_all");
+       setkeybinding(MODKEY|ShiftMask, XK_s,           kf_spawn_custom,"screenshot_wind");
+       setkeybinding(MODKEY,           XK_t,           kf_float_toggle,NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_v,           kf_version,     NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_Delete,      kf_spawn_custom,"lock");
+       setkeybinding(MODKEY|ShiftMask, XK_i,           kf_spawn_custom,"initscr");
+       setkeybinding(MODKEY,           XK_w,           kf_iconify,     NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_w,           kf_uniconify,   NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_r,           kf_raise_toggle,NULL);
+       setkeybinding(MODKEY,           XK_v,           kf_button2,     NULL);
+       setkeybinding(MODKEY,           XK_equal,       kf_width_grow,  NULL);
+       setkeybinding(MODKEY,           XK_minus,       kf_width_shrink,NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_equal,       kf_height_grow, NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_minus,       kf_height_shrink,NULL);
+       setkeybinding(MODKEY,           XK_bracketleft, kf_move_left,   NULL);
+       setkeybinding(MODKEY,           XK_bracketright,kf_move_right,  NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_bracketleft, kf_move_up,     NULL);
+       setkeybinding(MODKEY|ShiftMask, XK_bracketright,kf_move_down,   NULL);
+#ifdef SWM_DEBUG
+       setkeybinding(MODKEY|ShiftMask, XK_d,           kf_dumpwins,    NULL);
+#endif
 }
+
 void
 updatenumlockmask(void)
 {
@@ -2465,7 +4395,7 @@ updatenumlockmask(void)
        for (i = 0; i < 8; i++)
                for (j = 0; j < modmap->max_keypermod; j++)
                        if (modmap->modifiermap[i * modmap->max_keypermod + j]
-                         == XKeysymToKeycode(display, XK_Num_Lock))
+                           == XKeysymToKeycode(display, XK_Num_Lock))
                                numlockmask = (1 << i);
 
        XFreeModifiermap(modmap);
@@ -2506,7 +4436,7 @@ grabbuttons(struct ws_win *win, int focused)
 
        updatenumlockmask();
        XUngrabButton(display, AnyButton, AnyModifier, win->id);
-       if(focused) {
+       if (focused) {
                for (i = 0; i < LENGTH(buttons); i++)
                        if (buttons[i].action == client_click)
                                for (j = 0; j < LENGTH(modifiers); j++)
@@ -2520,245 +4450,691 @@ grabbuttons(struct ws_win *win, int focused)
                    BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
 }
 
-void
-expose(XEvent *e)
+const char *quirkname[] = {
+       "NONE",         /* config string for "no value" */
+       "FLOAT",
+       "TRANSSZ",
+       "ANYWHERE",
+       "XTERM_FONTADJ",
+       "FULLSCREEN",
+       "FOCUSPREV",
+};
+
+/* SWM_Q_WS: retain '|' for back compat for now (2009-08-11) */
+#define        SWM_Q_WS                "\n|+ \t"
+int
+parsequirks(char *qstr, unsigned long *quirk)
 {
-       DNPRINTF(SWM_D_EVENT, "expose: window: %lu\n", e->xexpose.window);
+       char                    *cp, *name;
+       int                     i;
+
+       if (quirk == NULL)
+               return (1);
+
+       cp = qstr;
+       *quirk = 0;
+       while ((name = strsep(&cp, SWM_Q_WS)) != NULL) {
+               if (cp)
+                       cp += (long)strspn(cp, SWM_Q_WS);
+               for (i = 0; i < LENGTH(quirkname); i++) {
+                       if (!strncasecmp(name, quirkname[i], SWM_QUIRK_LEN)) {
+                               DNPRINTF(SWM_D_QUIRK,
+                                   "parsequirks: %s\n", name);
+                               if (i == 0) {
+                                       *quirk = 0;
+                                       return (0);
+                               }
+                               *quirk |= 1 << (i-1);
+                               break;
+                       }
+               }
+               if (i >= LENGTH(quirkname)) {
+                       DNPRINTF(SWM_D_QUIRK,
+                           "parsequirks: invalid quirk [%s]\n", name);
+                       return (1);
+               }
+       }
+       return (0);
 }
 
 void
-keypress(XEvent *e)
+setquirk(const char *class, const char *name, const int quirk)
 {
-       unsigned int            i;
-       KeySym                  keysym;
-       XKeyEvent               *ev = &e->xkey;
+       int                     i, j;
 
-       DNPRINTF(SWM_D_EVENT, "keypress: window: %lu\n", ev->window);
+       /* find existing */
+       for (i = 0; i < quirks_length; i++) {
+               if (!strcmp(quirks[i].class, class) &&
+                   !strcmp(quirks[i].name, name)) {
+                       if (!quirk) {
+                               /* found: delete */
+                               DNPRINTF(SWM_D_QUIRK,
+                                   "setquirk: delete #%d %s:%s\n",
+                                   i, quirks[i].class, quirks[i].name);
+                               free(quirks[i].class);
+                               free(quirks[i].name);
+                               j = quirks_length - 1;
+                               if (i < j)
+                                       quirks[i] = quirks[j];
+                               quirks_length--;
+                               return;
+                       } else {
+                               /* found: replace */
+                               DNPRINTF(SWM_D_QUIRK,
+                                   "setquirk: replace #%d %s:%s\n",
+                                   i, quirks[i].class, quirks[i].name);
+                               free(quirks[i].class);
+                               free(quirks[i].name);
+                               quirks[i].class = strdup(class);
+                               quirks[i].name = strdup(name);
+                               quirks[i].quirk = quirk;
+                               return;
+                       }
+               }
+       }
+       if (!quirk) {
+               fprintf(stderr,
+                   "error: setquirk: cannot find class/name combination");
+               return;
+       }
+       /* not found: add */
+       if (quirks_size == 0 || quirks == NULL) {
+               quirks_size = 4;
+               DNPRINTF(SWM_D_QUIRK, "setquirk: init list %d\n", quirks_size);
+               quirks = malloc((size_t)quirks_size * sizeof(struct quirk));
+               if (quirks == NULL) {
+                       fprintf(stderr, "setquirk: malloc failed\n");
+                       perror(" failed");
+                       quit(NULL, NULL);
+               }
+       } else if (quirks_length == quirks_size) {
+               quirks_size *= 2;
+               DNPRINTF(SWM_D_QUIRK, "setquirk: grow list %d\n", quirks_size);
+               quirks = realloc(quirks,
+                   (size_t)quirks_size * sizeof(struct quirk));
+               if (quirks == NULL) {
+                       fprintf(stderr, "setquirk: realloc failed\n");
+                       perror(" failed");
+                       quit(NULL, NULL);
+               }
+       }
+       if (quirks_length < quirks_size) {
+               DNPRINTF(SWM_D_QUIRK, "setquirk: add %d\n", quirks_length);
+               j = quirks_length++;
+               quirks[j].class = strdup(class);
+               quirks[j].name = strdup(name);
+               quirks[j].quirk = quirk;
+       } else {
+               fprintf(stderr, "quirks array problem?\n");
+               if (quirks == NULL) {
+                       fprintf(stderr, "quirks array problem!\n");
+                       quit(NULL, NULL);
+               }
+       }
+}
 
-       keysym = XKeycodeToKeysym(display, (KeyCode)ev->keycode, 0);
-       for (i = 0; i < keys_length; i++)
-               if (keysym == keys[i].keysym
-                  && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
-                  && keyfuncs[keys[i].funcid].func)
-                       keyfuncs[keys[i].funcid].func(
-                           root_to_region(ev->root),
-                           &(keyfuncs[keys[i].funcid].args)
-                           );
+int
+setconfquirk(char *selector, char *value, int flags)
+{
+       char                    *cp, *class, *name;
+       int                     retval;
+       unsigned long           quirks;
+       if (selector == NULL)
+               return (0);
+       if ((cp = strchr(selector, ':')) == NULL)
+               return (0);
+       *cp = '\0';
+       class = selector;
+       name = cp + 1;
+       if ((retval = parsequirks(value, &quirks)) == 0)
+               setquirk(class, name, quirks);
+       return (retval);
 }
 
 void
-buttonpress(XEvent *e)
+setup_quirks(void)
 {
-       XButtonPressedEvent     *ev = &e->xbutton;
+       setquirk("MPlayer",             "xv",           SWM_Q_FLOAT | SWM_Q_FULLSCREEN | SWM_Q_FOCUSPREV);
+       setquirk("OpenOffice.org 3.2",  "VCLSalFrame",  SWM_Q_FLOAT);
+       setquirk("Firefox-bin",         "firefox-bin",  SWM_Q_TRANSSZ);
+       setquirk("Firefox",             "Dialog",       SWM_Q_FLOAT);
+       setquirk("Gimp",                "gimp",         SWM_Q_FLOAT | SWM_Q_ANYWHERE);
+       setquirk("XTerm",               "xterm",        SWM_Q_XTERM_FONTADJ);
+       setquirk("xine",                "Xine Window",  SWM_Q_FLOAT | SWM_Q_ANYWHERE);
+       setquirk("Xitk",                "Xitk Combo",   SWM_Q_FLOAT | SWM_Q_ANYWHERE);
+       setquirk("xine",                "xine Panel",   SWM_Q_FLOAT | SWM_Q_ANYWHERE);
+       setquirk("Xitk",                "Xine Window",  SWM_Q_FLOAT | SWM_Q_ANYWHERE);
+       setquirk("xine",                "xine Video Fullscreen Window", SWM_Q_FULLSCREEN | SWM_Q_FLOAT);
+       setquirk("pcb",                 "pcb",          SWM_Q_FLOAT);
+       setquirk("SDL_App",             "SDL_App",      SWM_Q_FLOAT | SWM_Q_FULLSCREEN);
+}
 
-       struct ws_win           *win;
-       int                     i, action;
+/* conf file stuff */
+#define SWM_CONF_FILE  "scrotwm.conf"
 
-       DNPRINTF(SWM_D_EVENT, "buttonpress: window: %lu\n", ev->window);
+enum   { SWM_S_BAR_DELAY, SWM_S_BAR_ENABLED, SWM_S_BAR_BORDER_WIDTH,
+         SWM_S_STACK_ENABLED, SWM_S_CLOCK_ENABLED, SWM_S_CLOCK_FORMAT,
+         SWM_S_CYCLE_EMPTY, SWM_S_CYCLE_VISIBLE, SWM_S_SS_ENABLED,
+         SWM_S_TERM_WIDTH, SWM_S_TITLE_CLASS_ENABLED,
+         SWM_S_TITLE_NAME_ENABLED, SWM_S_WINDOW_NAME_ENABLED, SWM_S_URGENT_ENABLED,
+         SWM_S_FOCUS_MODE, SWM_S_DISABLE_BORDER, SWM_S_BORDER_WIDTH,
+         SWM_S_BAR_FONT, SWM_S_BAR_ACTION, SWM_S_SPAWN_TERM,
+         SWM_S_SS_APP, SWM_S_DIALOG_RATIO, SWM_S_BAR_AT_BOTTOM,
+         SWM_S_VERBOSE_LAYOUT
+       };
 
-       action = root_click;
-       if ((win = find_window(ev->window)) == NULL)
-               return;
-       else {
-               focus_win(win);
-               action = client_click;
+int
+setconfvalue(char *selector, char *value, int flags)
+{
+       int i;
+       switch (flags) {
+       case SWM_S_BAR_DELAY:
+               bar_delay = atoi(value);
+               break;
+       case SWM_S_BAR_ENABLED:
+               bar_enabled = atoi(value);
+               break;
+       case SWM_S_BAR_BORDER_WIDTH:
+               bar_border_width = atoi(value);
+               break;
+       case SWM_S_BAR_AT_BOTTOM:
+               bar_at_bottom = atoi(value);
+               break;
+       case SWM_S_STACK_ENABLED:
+               stack_enabled = atoi(value);
+               break;
+       case SWM_S_CLOCK_ENABLED:
+               clock_enabled = atoi(value);
+               break;
+       case SWM_S_CLOCK_FORMAT:
+#ifndef SWM_DENY_CLOCK_FORMAT
+               free(clock_format);
+               if ((clock_format = strdup(value)) == NULL)
+                       err(1, "setconfvalue: clock_format");
+#endif
+               break;
+       case SWM_S_CYCLE_EMPTY:
+               cycle_empty = atoi(value);
+               break;
+       case SWM_S_CYCLE_VISIBLE:
+               cycle_visible = atoi(value);
+               break;
+       case SWM_S_SS_ENABLED:
+               ss_enabled = atoi(value);
+               break;
+       case SWM_S_TERM_WIDTH:
+               term_width = atoi(value);
+               break;
+       case SWM_S_TITLE_CLASS_ENABLED:
+               title_class_enabled = atoi(value);
+               break;
+       case SWM_S_WINDOW_NAME_ENABLED:
+               window_name_enabled = atoi(value);
+               break;
+       case SWM_S_TITLE_NAME_ENABLED:
+               title_name_enabled = atoi(value);
+               break;
+       case SWM_S_URGENT_ENABLED:
+               urgent_enabled = atoi(value);
+               break;
+       case SWM_S_FOCUS_MODE:
+               if (!strcmp(value, "default"))
+                       focus_mode = SWM_FOCUS_DEFAULT;
+               else if (!strcmp(value, "follow_cursor"))
+                       focus_mode = SWM_FOCUS_FOLLOW;
+               else if (!strcmp(value, "synergy"))
+                       focus_mode = SWM_FOCUS_SYNERGY;
+               else
+                       err(1, "focus_mode");
+               break;
+       case SWM_S_DISABLE_BORDER:
+               disable_border = atoi(value);
+               break;
+       case SWM_S_BORDER_WIDTH:
+               border_width = atoi(value);
+               break;
+       case SWM_S_BAR_FONT:
+               free(bar_fonts[0]);
+               if ((bar_fonts[0] = strdup(value)) == NULL)
+                       err(1, "setconfvalue: bar_font");
+               break;
+       case SWM_S_BAR_ACTION:
+               free(bar_argv[0]);
+               if ((bar_argv[0] = strdup(value)) == NULL)
+                       err(1, "setconfvalue: bar_action");
+               break;
+       case SWM_S_SPAWN_TERM:
+               free(spawn_term[0]);
+               if ((spawn_term[0] = strdup(value)) == NULL)
+                       err(1, "setconfvalue: spawn_term");
+               break;
+       case SWM_S_SS_APP:
+               break;
+       case SWM_S_DIALOG_RATIO:
+               dialog_ratio = atof(value);
+               if (dialog_ratio > 1.0 || dialog_ratio <= .3)
+                       dialog_ratio = .6;
+               break;
+       case SWM_S_VERBOSE_LAYOUT:
+               verbose_layout = atoi(value);
+               for (i = 0; layouts[i].l_stack != NULL; i++) {
+                       if (verbose_layout)
+                               layouts[i].l_string = fancy_stacker;
+                       else
+                               layouts[i].l_string = plain_stacker;
+               }
+               break;
+       default:
+               return (1);
        }
+       return (0);
+}
 
-       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);
+int
+setconfmodkey(char *selector, char *value, int flags)
+{
+       if (!strncasecmp(value, "Mod1", strlen("Mod1")))
+               update_modkey(Mod1Mask);
+       else if (!strncasecmp(value, "Mod2", strlen("Mod2")))
+               update_modkey(Mod2Mask);
+       else if (!strncasecmp(value, "Mod3", strlen("Mod3")))
+               update_modkey(Mod3Mask);
+       else if (!strncasecmp(value, "Mod4", strlen("Mod4")))
+               update_modkey(Mod4Mask);
+       else
+               return (1);
+       return (0);
 }
 
-void
-set_win_state(struct ws_win *win, long state)
+int
+setconfcolor(char *selector, char *value, int flags)
 {
-       long                    data[] = {state, None};
+       setscreencolor(value, ((selector == NULL)?-1:atoi(selector)), flags);
+       return (0);
+}
 
-       DNPRINTF(SWM_D_EVENT, "set_win_state: window: %lu\n", win->id);
+int
+setconfregion(char *selector, char *value, int flags)
+{
+       custom_region(value);
+       return (0);
+}
 
-       XChangeProperty(display, win->id, astate, astate, 32, PropModeReplace,
-           (unsigned char *)data, 2);
+int
+setautorun(char *selector, char *value, int flags)
+{
+       int                     ws_id;
+       char                    s[1024];
+       char                    *ap, *sp = s;
+       union arg               a;
+       int                     argc = 0;
+       long                    pid;
+       struct pid_e            *p;
+
+       if (getenv("SWM_STARTED"))
+               return (0);
+
+       bzero(s, sizeof s);
+       if (sscanf(value, "ws[%d]:%1023c", &ws_id, s) != 2)
+               errx(1, "invalid autorun entry, should be 'ws[<idx>]:command'\n");
+       ws_id--;
+       if (ws_id < 0 || ws_id >= SWM_WS_MAX)
+               errx(1, "autorun: invalid workspace %d\n", ws_id + 1);
+
+       /*
+        * This is a little intricate
+        *
+        * If the pid already exists we simply reuse it because it means it was
+        * used before AND not claimed by manage_window.  We get away with
+        * altering it in the parent after INSERT because this can not be a race
+        */
+       a.argv = NULL;
+       while ((ap = strsep(&sp, " \t")) != NULL) {
+               if (*ap == '\0')
+                       continue;
+               DNPRINTF(SWM_D_SPAWN, "setautorun: arg [%s]\n", ap);
+               argc++;
+               if ((a.argv = realloc(a.argv, argc * sizeof(char *))) == NULL)
+                       err(1, "setautorun: realloc");
+               a.argv[argc - 1] = ap;
+       }
+
+       if ((a.argv = realloc(a.argv, (argc + 1) * sizeof(char *))) == NULL)
+               err(1, "setautorun: realloc");
+       a.argv[argc] = NULL;
+
+       if ((pid = fork()) == 0) {
+               spawn(ws_id, &a, 1);
+               /* NOTREACHED */
+               _exit(1);
+       }
+       free(a.argv);
+
+       /* parent */
+       p = find_pid(pid);
+       if (p == NULL) {
+               p = calloc(1, sizeof *p);
+               if (p == NULL)
+                       return (1);
+               TAILQ_INSERT_TAIL(&pidlist, p, entry);
+       }
+
+       p->pid = pid;
+       p->ws = ws_id;
+
+       return (0);
 }
 
-const char *quirkname[] = {
-       "NONE",         /* config string for "no value" */
-       "FLOAT",
-       "TRANSSZ",
-       "ANYWHERE",
-       "XTERM_FONTADJ",
-       "FULLSCREEN",
+int
+setlayout(char *selector, char *value, int flags)
+{
+       int                     ws_id, i, x, mg, ma, si, raise;
+       int                     st = SWM_V_STACK;
+       char                    s[1024];
+       struct workspace        *ws;
+
+       if (getenv("SWM_STARTED"))
+               return (0);
+
+       bzero(s, sizeof s);
+       if (sscanf(value, "ws[%d]:%d:%d:%d:%d:%1023c",
+           &ws_id, &mg, &ma, &si, &raise, s) != 6)
+               errx(1, "invalid layout entry, should be 'ws[<idx>]:"
+                   "<master_grow>:<master_add>:<stack_inc>:<always_raise>:"
+                   "<type>'\n");
+       ws_id--;
+       if (ws_id < 0 || ws_id >= SWM_WS_MAX)
+               errx(1, "layout: invalid workspace %d\n", ws_id + 1);
+
+       if (!strcasecmp(s, "vertical"))
+               st = SWM_V_STACK;
+       else if (!strcasecmp(s, "horizontal"))
+               st = SWM_H_STACK;
+       else if (!strcasecmp(s, "fullscreen"))
+               st = SWM_MAX_STACK;
+       else
+               errx(1, "invalid layout entry, should be 'ws[<idx>]:"
+                   "<master_grow>:<master_add>:<stack_inc>:<always_raise>:"
+                   "<type>'\n");
+
+       for (i = 0; i < ScreenCount(display); i++) {
+               ws = (struct workspace *)&screens[i].ws;
+               ws[ws_id].cur_layout = &layouts[st];
+
+               ws[ws_id].always_raise = raise;
+               if (st == SWM_MAX_STACK)
+                       continue;
+
+               /* master grow */
+               for (x = 0; x < abs(mg); x++) {
+                       ws[ws_id].cur_layout->l_config(&ws[ws_id],
+                           mg >= 0 ?  SWM_ARG_ID_MASTERGROW :
+                           SWM_ARG_ID_MASTERSHRINK);
+                       stack();
+               }
+               /* master add */
+               for (x = 0; x < abs(ma); x++) {
+                       ws[ws_id].cur_layout->l_config(&ws[ws_id],
+                           ma >= 0 ?  SWM_ARG_ID_MASTERADD :
+                           SWM_ARG_ID_MASTERDEL);
+                       stack();
+               }
+               /* stack inc */
+               for (x = 0; x < abs(si); x++) {
+                       ws[ws_id].cur_layout->l_config(&ws[ws_id],
+                           si >= 0 ?  SWM_ARG_ID_STACKINC :
+                           SWM_ARG_ID_STACKDEC);
+                       stack();
+               }
+       }
+
+       return (0);
+}
+
+/* config options */
+struct config_option {
+       char                    *optname;
+       int                     (*func)(char*, char*, int);
+       int                     funcflags;
 };
+struct config_option configopt[] = {
+       { "bar_enabled",                setconfvalue,   SWM_S_BAR_ENABLED },
+       { "bar_at_bottom",              setconfvalue,   SWM_S_BAR_AT_BOTTOM },
+       { "bar_border",                 setconfcolor,   SWM_S_COLOR_BAR_BORDER },
+       { "bar_border_width",           setconfvalue,   SWM_S_BAR_BORDER_WIDTH },
+       { "bar_color",                  setconfcolor,   SWM_S_COLOR_BAR },
+       { "bar_font_color",             setconfcolor,   SWM_S_COLOR_BAR_FONT },
+       { "bar_font",                   setconfvalue,   SWM_S_BAR_FONT },
+       { "bar_action",                 setconfvalue,   SWM_S_BAR_ACTION },
+       { "bar_delay",                  setconfvalue,   SWM_S_BAR_DELAY },
+       { "bind",                       setconfbinding, 0 },
+       { "stack_enabled",              setconfvalue,   SWM_S_STACK_ENABLED },
+       { "clock_enabled",              setconfvalue,   SWM_S_CLOCK_ENABLED },
+       { "clock_format",               setconfvalue,   SWM_S_CLOCK_FORMAT },
+       { "color_focus",                setconfcolor,   SWM_S_COLOR_FOCUS },
+       { "color_unfocus",              setconfcolor,   SWM_S_COLOR_UNFOCUS },
+       { "cycle_empty",                setconfvalue,   SWM_S_CYCLE_EMPTY },
+       { "cycle_visible",              setconfvalue,   SWM_S_CYCLE_VISIBLE },
+       { "dialog_ratio",               setconfvalue,   SWM_S_DIALOG_RATIO },
+       { "verbose_layout",             setconfvalue,   SWM_S_VERBOSE_LAYOUT },
+       { "modkey",                     setconfmodkey,  0 },
+       { "program",                    setconfspawn,   0 },
+       { "quirk",                      setconfquirk,   0 },
+       { "region",                     setconfregion,  0 },
+       { "spawn_term",                 setconfvalue,   SWM_S_SPAWN_TERM },
+       { "screenshot_enabled",         setconfvalue,   SWM_S_SS_ENABLED },
+       { "screenshot_app",             setconfvalue,   SWM_S_SS_APP },
+       { "window_name_enabled",        setconfvalue,   SWM_S_WINDOW_NAME_ENABLED },
+       { "urgent_enabled",             setconfvalue,   SWM_S_URGENT_ENABLED },
+       { "term_width",                 setconfvalue,   SWM_S_TERM_WIDTH },
+       { "title_class_enabled",        setconfvalue,   SWM_S_TITLE_CLASS_ENABLED },
+       { "title_name_enabled",         setconfvalue,   SWM_S_TITLE_NAME_ENABLED },
+       { "focus_mode",                 setconfvalue,   SWM_S_FOCUS_MODE },
+       { "disable_border",             setconfvalue,   SWM_S_DISABLE_BORDER },
+       { "border_width",               setconfvalue,   SWM_S_BORDER_WIDTH },
+       { "autorun",                    setautorun,     0 },
+       { "layout",                     setlayout,      0 },
+};
+
 
-#define        SWM_Q_WS                "\n| \t"
 int
-parsequirks(char *qstr, unsigned long *quirk)
+conf_load(char *filename)
 {
-       char                    *cp, *name;
-       int                     i;
-       if (quirk == NULL)
-               return (0);
-       cp = qstr;
-       *quirk = 0;
-       while ((name = strsep(&cp, SWM_Q_WS)) != NULL) {
-               if (cp)
-                       cp += (long)strspn(cp, SWM_Q_WS);
-               for (i = 0; i < LENGTH(quirkname); i++) {
-                       if (!strncasecmp(name, quirkname[i], SWM_QUIRK_LEN)) {
-                               DNPRINTF(SWM_D_QUIRK, "parsequirks: %s\n", name);
-                               if (i == 0) {
-                                       *quirk = 0;
+       FILE                    *config;
+       char                    *line, *cp, *optsub, *optval;
+       size_t                  linelen, lineno = 0;
+       int                     wordlen, i, optind;
+       struct config_option    *opt;
+
+       DNPRINTF(SWM_D_CONF, "conf_load begin\n");
+
+       if (filename == NULL) {
+               fprintf(stderr, "conf_load: no filename\n");
+               return (1);
+       }
+       if ((config = fopen(filename, "r")) == NULL) {
+               warn("conf_load: fopen");
+               return (1);
+       }
+
+       while (!feof(config)) {
+               if ((line = fparseln(config, &linelen, &lineno, NULL, 0))
+                   == NULL) {
+                       if (ferror(config))
+                               err(1, "%s", filename);
+                       else
+                               continue;
+               }
+               cp = line;
+               cp += strspn(cp, " \t\n"); /* eat whitespace */
+               if (cp[0] == '\0') {
+                       /* empty line */
+                       free(line);
+                       continue;
+               }
+               /* get config option */
+               wordlen = strcspn(cp, "=[ \t\n");
+               if (wordlen == 0) {
+                       warnx("%s: line %zd: no option found",
+                           filename, lineno);
+                       return (1);
+               }
+               optind = -1;
+               for (i = 0; i < LENGTH(configopt); i++) {
+                       opt = &configopt[i];
+                       if (!strncasecmp(cp, opt->optname, wordlen) &&
+                           strlen(opt->optname) == wordlen) {
+                               optind = i;
+                               break;
+                       }
+               }
+               if (optind == -1) {
+                       warnx("%s: line %zd: unknown option %.*s",
+                           filename, lineno, wordlen, cp);
+                       return (1);
+               }
+               cp += wordlen;
+               cp += strspn(cp, " \t\n"); /* eat whitespace */
+               /* get [selector] if any */
+               optsub = NULL;
+               if (*cp == '[') {
+                       cp++;
+                       wordlen = strcspn(cp, "]");
+                       if (*cp != ']') {
+                               if (wordlen == 0) {
+                                       warnx("%s: line %zd: syntax error",
+                                           filename, lineno);
                                        return (1);
                                }
-                               *quirk |= 1 << (i-1);
-                               break;
+                               asprintf(&optsub, "%.*s", wordlen, cp);
                        }
+                       cp += wordlen;
+                       cp += strspn(cp, "] \t\n"); /* eat trailing */
                }
-               if (i >= LENGTH(quirkname)) {
-                       DNPRINTF(SWM_D_QUIRK,
-                           "parsequirks: invalid quirk [%s]\n", name);
-                       return (0);
+               cp += strspn(cp, "= \t\n"); /* eat trailing */
+               /* get RHS value */
+               optval = strdup(cp);
+               /* call function to deal with it all */
+               if (configopt[optind].func(optsub, optval,
+                   configopt[optind].funcflags) != 0) {
+                       fprintf(stderr, "%s line %zd: %s\n",
+                           filename, lineno, line);
+                       errx(1, "%s: line %zd: invalid data for %s",
+                           filename, lineno, configopt[optind].optname);
                }
+               free(optval);
+               free(optsub);
+               free(line);
        }
-       return (1);
-}
-int
-quirkmatch(const char *var, const char *name, char *qstr, char *qclass,
-    char *qname, unsigned long *qquirk)
-{
-       char                    *p;
-       int                     i;
-       char                    classname[SWM_QUIRK_LEN*2+1];
-       DNPRINTF(SWM_D_QUIRK, "quirkmatch: in [%s]\n", var);
-       i = strncmp(var, name, 255);
-       if (qclass == NULL || qname == NULL || qquirk == NULL)
-               return (i);
-       *qquirk = 0;
-       *qclass = '\0';
-       *qname  = '\0';
-       bzero(classname, LENGTH(classname));
-       if (i <= 0)
-               return (i);
-       p = (char *)var + strlen(name);
-       if (*p++ != '[')
-               return (i);
-       i = 0;
-       while (isgraph(*p) && *p != ']' && i < LENGTH(classname))
-               classname[i++] = *p++;
-       if (i >= LENGTH(classname) || *p != ']')
-               return (1);
-       if ((p = strchr(classname, ':')) == NULL || p-classname >= SWM_QUIRK_LEN)
-               return (1);
-       strlcpy(qclass, classname, p-classname+1);
-       strlcpy(qname, ++p, SWM_QUIRK_LEN);
-       for (p = qclass; *p && p-qclass < SWM_QUIRK_LEN; p++)
-               if (*p == '_')
-                       *p = ' ';
-       for (p = qname; *p && p-qname < SWM_QUIRK_LEN; p++)
-               if (*p == '_')
-                       *p = ' ';
-       i = (!parsequirks(qstr, qquirk));
-       DNPRINTF(SWM_D_QUIRK, "quirkmatch: [%s][%s] %d\n", qclass, qname, i);
-       return (i);
+
+       fclose(config);
+       DNPRINTF(SWM_D_CONF, "conf_load end\n");
+
+       return (0);
 }
+
 void
-setquirk(const char *class, const char *name, const int quirk)
+set_child_transient(struct ws_win *win, Window *trans)
 {
-       int                     i, j;
-       /* find existing */
-       for (i = 0; i < quirks_length; i++) {
-               if (!strcmp(quirks[i].class, class) &&
-                   !strcmp(quirks[i].name, name)) {
-                       if (!quirk) {
-                               /* found: delete */
-                               DNPRINTF(SWM_D_QUIRK,
-                                   "setquirk: delete #%d %s:%s\n",
-                                   i, quirks[i].class, quirks[i].name);
-                               j = quirks_length - 1;
-                               if (i < j)
-                                       quirks[i] = quirks[j];
-                               quirks_length--;
-                               return;
-                       } else {
-                               /* found: replace */
-                               DNPRINTF(SWM_D_QUIRK,
-                                   "setquirk: replace #%d %s:%s\n",
-                                   i, quirks[i].class, quirks[i].name);
-                               strlcpy(quirks[i].class, class,
-                                   sizeof quirks->class);
-                               strlcpy(quirks[i].name, name,
-                                   sizeof quirks->name);
-                               quirks[i].quirk = quirk;
-                               return;
-                       }
-               }
-       }
-       if (!quirk) {
-               fprintf(stderr,
-                   "error: setquirk: cannot find class/name combination");
-               return;
-       }
-       /* not found: add */
-       if (quirks_size == 0 || quirks == NULL) {
-               quirks_size = 4;
-               DNPRINTF(SWM_D_QUIRK, "setquirk: init list %d\n", quirks_size);
-               quirks = malloc((size_t)quirks_size * sizeof(struct quirk));
-               if (!quirks) {
-                       fprintf(stderr, "setquirk: malloc failed\n");
-                       perror(" failed");
-                       quit(NULL, NULL);
-               }
-       } else if (quirks_length == quirks_size) {
-               quirks_size *= 2;
-               DNPRINTF(SWM_D_QUIRK, "setquirk: grow list %d\n", quirks_size);
-               quirks = realloc(quirks, (size_t)quirks_size * sizeof(struct quirk));
-               if (!quirks) {
-                       fprintf(stderr, "setquirk: realloc failed\n");
-                       perror(" failed");
-                       quit(NULL, NULL);
+       struct ws_win           *parent, *w;
+       XWMHints                *wmh = NULL;
+       struct swm_region       *r;
+       struct workspace        *ws;
+
+       parent = find_window(win->transient);
+       if (parent)
+               parent->child_trans = win;
+       else {
+               DNPRINTF(SWM_D_MISC, "set_child_transient: parent doesn't exist"
+                   " for %lu trans %lu\n", win->id, win->transient);
+
+               if (win->hints == NULL) {
+                       fprintf(stderr, "no hints for %lu\n", win->id);
+                       return;
                }
-       }
-       if (quirks_length < quirks_size) {
-               DNPRINTF(SWM_D_QUIRK, "setquirk: add %d\n", quirks_length);
-               j = quirks_length++;
-               strlcpy(quirks[j].class, class, sizeof quirks->class);
-               strlcpy(quirks[j].name, name, sizeof quirks->name);
-               quirks[j].quirk = quirk;
-       } else {
-               fprintf(stderr, "quirks array problem?\n");
-               if (!quirks) {
-                       fprintf(stderr, "quirks array problem!\n");
-                       quit(NULL, NULL);
+
+               r = root_to_region(win->wa.root);
+               ws = r->ws;
+               /* parent doen't exist in our window list */
+               TAILQ_FOREACH(w, &ws->winlist, entry) {
+                       if (wmh)
+                               XFree(wmh);
+
+                       if ((wmh = XGetWMHints(display, w->id)) == NULL) {
+                               fprintf(stderr, "can't get hints for %lu\n",
+                                   w->id);
+                               continue;
+                       }
+
+                       if (win->hints->window_group != wmh->window_group)
+                               continue;
+
+                       w->child_trans = win;
+                       win->transient = w->id;
+                       *trans = w->id;
+                       DNPRINTF(SWM_D_MISC, "set_child_transient: asjusting "
+                           "transient to %lu\n", win->transient);
+                       break;
                }
        }
+
+       if (wmh)
+               XFree(wmh);
 }
 
-void
-setup_quirks(void)
+long
+window_get_pid(Window win)
 {
-       setquirk("MPlayer",             "xv",           SWM_Q_FLOAT | SWM_Q_FULLSCREEN);
-       setquirk("OpenOffice.org 2.4",  "VCLSalFrame",  SWM_Q_FLOAT);
-       setquirk("OpenOffice.org 3.0",  "VCLSalFrame",  SWM_Q_FLOAT);
-       setquirk("Firefox-bin",         "firefox-bin",  SWM_Q_TRANSSZ);
-       setquirk("Firefox",             "Dialog",       SWM_Q_FLOAT);
-       setquirk("Gimp",                "gimp",         SWM_Q_FLOAT | SWM_Q_ANYWHERE);
-       setquirk("XTerm",               "xterm",        SWM_Q_XTERM_FONTADJ);
-       setquirk("xine",                "Xine Window",  SWM_Q_FLOAT | SWM_Q_ANYWHERE);
-       setquirk("Xitk",                "Xitk Combo",   SWM_Q_FLOAT | SWM_Q_ANYWHERE);
-       setquirk("xine",                "xine Panel",   SWM_Q_FLOAT | SWM_Q_ANYWHERE);
-       setquirk("Xitk",                "Xine Window",  SWM_Q_FLOAT | SWM_Q_ANYWHERE);
-       setquirk("xine",                "xine Video Fullscreen Window", SWM_Q_FULLSCREEN | SWM_Q_FLOAT);
-       setquirk("pcb",                 "pcb",          SWM_Q_FLOAT);
+       Atom                    actual_type_return;
+       int                     actual_format_return = 0;
+       unsigned long           nitems_return = 0;
+       unsigned long           bytes_after_return = 0;
+       long                    *pid = NULL;
+       long                    ret = 0;
+       const char              *errstr;
+       unsigned char           *prop = NULL;
+
+       if (XGetWindowProperty(display, win,
+           XInternAtom(display, "_NET_WM_PID", False), 0, 1, False,
+           XA_CARDINAL, &actual_type_return, &actual_format_return,
+           &nitems_return, &bytes_after_return,
+           (unsigned char**)(void*)&pid) != Success)
+               goto tryharder;
+       if (actual_type_return != XA_CARDINAL)
+               goto tryharder;
+       if (pid == NULL)
+               goto tryharder;
+
+       ret = *pid;
+       XFree(pid);
+
+       return (ret);
+
+tryharder:
+       if (XGetWindowProperty(display, win,
+           XInternAtom(display, "_SWM_PID", False), 0, SWM_PROPLEN, False,
+           XA_STRING, &actual_type_return, &actual_format_return,
+           &nitems_return, &bytes_after_return, &prop) != Success)
+               return (0);
+       if (actual_type_return != XA_STRING)
+               return (0);
+       if (prop == NULL)
+               return (0);
+
+       ret = strtonum((const char *)prop, 0, UINT_MAX, &errstr);
+       /* ignore error because strtonum returns 0 anyway */
+       XFree(prop);
+
+       return (ret);
 }
 
 struct ws_win *
 manage_window(Window id)
 {
-       Window                  trans;
+       Window                  trans = 0;
        struct workspace        *ws;
-       struct ws_win           *win;
-       int                     format, i, ws_idx, n;
+       struct ws_win           *win, *ww;
+       int                     format, i, ws_idx, n, border_me = 0;
        unsigned long           nitems, bytes;
        Atom                    ws_idx_atom = 0, type;
        Atom                    *prot = NULL, *pp;
@@ -2767,83 +5143,150 @@ manage_window(Window id)
        long                    mask;
        const char              *errstr;
        XWindowChanges          wc;
+       struct pid_e            *p;
 
        if ((win = find_window(id)) != NULL)
-                       return (win);   /* already being managed */
+               return (win);   /* already being managed */
+
+       /* see if we are on the unmanaged list */
+       if ((win = find_unmanaged_window(id)) != NULL) {
+               DNPRINTF(SWM_D_MISC, "manage previously unmanaged window "
+                   "%lu\n", win->id);
+               TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry);
+               if (win->transient) {
+                       set_child_transient(win, &trans);
+               } if (trans && (ww = find_window(trans)))
+                       TAILQ_INSERT_AFTER(&win->ws->winlist, ww, win, entry);
+               else
+                       TAILQ_INSERT_TAIL(&win->ws->winlist, win, entry);
+               ewmh_update_actions(win);
+               return (win);
+       }
 
        if ((win = calloc(1, sizeof(struct ws_win))) == NULL)
                errx(1, "calloc: failed to allocate memory for new window");
 
+       win->id = id;
+
+       /* see if we need to override the workspace */
+       p = find_pid(window_get_pid(id));
+
        /* Get all the window data in one shot */
        ws_idx_atom = XInternAtom(display, "_SWM_WS", False);
-       if (ws_idx_atom)
+       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);
+       XGetWMNormalHints(display, id, &win->sh, &mask);
+       win->hints = XGetWMHints(display, id);
        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);
+               set_child_transient(win, &trans);
+               DNPRINTF(SWM_D_MISC, "manage_window: win %lu transient %lu\n",
+                   win->id, win->transient);
        }
+
        /* get supported protocols */
        if (XGetWMProtocols(display, id, &prot, &n)) {
-               for (i = 0, pp = prot; i < n; i++, pp++)
+               for (i = 0, pp = prot; i < n; i++, pp++) {
+                       if (*pp == takefocus)
+                               win->take_focus = 1;
                        if (*pp == adelete)
                                win->can_delete = 1;
+               }
                if (prot)
                        XFree(prot);
        }
 
+       win->iconic = get_iconic(win);
+
        /*
         * 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) {
+       if (p) {
+               ws = &r->s->ws[p->ws];
+               TAILQ_REMOVE(&pidlist, p, entry);
+               free(p);
+               p = NULL;
+       } else if (prop && win->transient == 0) {
                DNPRINTF(SWM_D_PROP, "got property _SWM_WS=%s\n", prop);
-               ws_idx = strtonum(prop, 0, 9, &errstr);
+               ws_idx = strtonum((const char *)prop, 0, 9, &errstr);
                if (errstr) {
                        DNPRINTF(SWM_D_EVENT, "window idx is %s: %s",
                            errstr, prop);
                }
                ws = &r->s->ws[ws_idx];
-       } else
+       } else {
                ws = r->ws;
+               /* this should launch transients in the same ws as parent */
+               if (id && trans)
+                       if ((ww = find_window(trans)) != NULL)
+                               if (ws->r) {
+                                       ws = ww->ws;
+                                       if (ww->ws->r)
+                                               r = ww->ws->r;
+                                       else
+                                               fprintf(stderr,
+                                                   "fix this bug mcbride\n");
+                                       border_me = 1;
+                               }
+       }
 
        /* 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);
+       if (trans && (ww = find_window(trans)))
+               TAILQ_INSERT_AFTER(&ws->winlist, ww, win, entry);
+       else
+               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;
+       win->g_floatvalid = 0;
+       win->floatmaxed = 0;
+       win->ewmh_flags = 0;
 
        /* 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) {
+           snprintf((char *)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 (prop)
+               XFree(prop);
+
+       ewmh_autoquirk(win);
 
        if (XGetClassHint(display, win->id, &win->ch)) {
                DNPRINTF(SWM_D_CLASS, "class: %s name: %s\n",
                    win->ch.res_class, win->ch.res_name);
+
+               /* java is retarded so treat it special */
+               if (strstr(win->ch.res_name, "sun-awt")) {
+                       win->java = 1;
+                       border_me = 1;
+               }
+
                for (i = 0; i < quirks_length; 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)
+                               if (quirks[i].quirk & SWM_Q_FLOAT) {
                                        win->floating = 1;
+                                       border_me = 1;
+                               }
                                win->quirks = quirks[i].quirk;
                        }
                }
@@ -2854,17 +5297,15 @@ manage_window(Window id)
                win->manual = 1; /* don't center the quirky windows */
                bzero(&wc, sizeof wc);
                mask = 0;
-               if (win->g.y < bar_height) {
+               if (bar_enabled && 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;
+                       win->g.x = wc.x = WIDTH(r) - win->g.w - 2;
                        mask |= CWX;
                }
-               wc.border_width = 1;
-               mask |= CWBorderWidth;
-               XConfigureWindow(display, win->id, mask, &wc);
+               border_me = 1;
        }
 
        /* Reset font sizes (the bruteforce way; no default keybinding). */
@@ -2875,56 +5316,170 @@ manage_window(Window id)
                        fake_keypress(win, XK_KP_Add, ShiftMask);
        }
 
+       ewmh_get_win_state(win);
+       ewmh_update_actions(win);
+       ewmh_update_win_state(win, None, _NET_WM_STATE_REMOVE);
+
+       /* border me */
+       if (border_me) {
+               bzero(&wc, sizeof wc);
+               wc.border_width = border_width;
+               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))
+       if ((win->floating || win->transient) && (ws->idx == r->ws->idx))
                XMapRaised(display, win->id);
 
-       /* make new win focused */
-       focus_win(win);
-
        return (win);
 }
 
 void
+free_window(struct ws_win *win)
+{
+       DNPRINTF(SWM_D_MISC, "free_window:  %lu\n", win->id);
+
+       if (win == NULL)
+               return;
+
+       /* needed for restart wm */
+       set_win_state(win, WithdrawnState);
+
+       TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry);
+
+       if (win->ch.res_class)
+               XFree(win->ch.res_class);
+       if (win->ch.res_name)
+               XFree(win->ch.res_name);
+
+       kill_refs(win);
+
+       /* paint memory */
+       memset(win, 0xff, sizeof *win); /* XXX kill later */
+
+       free(win);
+}
+
+void
 unmanage_window(struct ws_win *win)
 {
-       struct workspace        *ws;
+       struct ws_win           *parent;
 
        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)
+       if (win->transient) {
+               parent = find_window(win->transient);
+               if (parent)
+                       parent->child_trans = NULL;
+       }
+
+       /* focus on root just in case */
+       XSetInputFocus(display, PointerRoot, PointerRoot, CurrentTime);
+
+       focus_prev(win);
+
+       TAILQ_REMOVE(&win->ws->winlist, win, entry);
+       TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry);
+
+       kill_refs(win);
+}
+
+void
+focus_magic(struct ws_win *win)
+{
+       DNPRINTF(SWM_D_FOCUS, "focus_magic: %lu\n", WINID(win));
+
+       if (win == NULL)
+               return;
+
+       if (win->child_trans) {
+               /* win = parent & has a transient so focus on that */
+               if (win->java) {
+                       focus_win(win->child_trans);
+                       if (win->child_trans->take_focus)
+                               client_msg(win, takefocus);
+               } else {
+                       /* make sure transient hasn't dissapeared */
+                       if (validate_win(win->child_trans) == 0) {
+                               focus_win(win->child_trans);
+                               if (win->child_trans->take_focus)
+                                       client_msg(win->child_trans, takefocus);
+                       } else {
+                               win->child_trans = NULL;
+                               focus_win(win);
+                               if (win->take_focus)
+                                       client_msg(win, takefocus);
+                       }
+               }
+       } else {
+               /* regular focus */
+               focus_win(win);
+               if (win->take_focus)
+                       client_msg(win, takefocus);
+       }
+}
+
+void
+expose(XEvent *e)
+{
+       DNPRINTF(SWM_D_EVENT, "expose: window: %lu\n", e->xexpose.window);
+}
+
+void
+keypress(XEvent *e)
+{
+       unsigned int            i;
+       KeySym                  keysym;
+       XKeyEvent               *ev = &e->xkey;
+
+       DNPRINTF(SWM_D_EVENT, "keypress: window: %lu\n", ev->window);
+
+       keysym = XKeycodeToKeysym(display, (KeyCode)ev->keycode, 0);
+       for (i = 0; i < keys_length; i++)
+               if (keysym == keys[i].keysym
+                   && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+                   && keyfuncs[keys[i].funcid].func) {
+                       if (keys[i].funcid == kf_spawn_custom)
+                               spawn_custom(
+                                   root_to_region(ev->root),
+                                   &(keyfuncs[keys[i].funcid].args),
+                                   keys[i].spawn_name
+                                   );
+                       else
+                               keyfuncs[keys[i].funcid].func(
+                                   root_to_region(ev->root),
+                                   &(keyfuncs[keys[i].funcid].args)
+                                   );
+               }
+}
+
+void
+buttonpress(XEvent *e)
+{
+       struct ws_win           *win;
+       int                     i, action;
+       XButtonPressedEvent     *ev = &e->xbutton;
+
+       DNPRINTF(SWM_D_EVENT, "buttonpress: window: %lu\n", ev->window);
+
+       if ((win = find_window(ev->window)) == NULL)
                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_win(win);
-       } else
-               focus_win(ws->focus);
-       if (ws->focus_prev == win)
-               ws->focus_prev = NULL;
+       focus_magic(win);
+       action = client_click;
 
-       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);
+       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
@@ -2936,7 +5491,8 @@ configurerequest(XEvent *e)
        XWindowChanges          wc;
 
        if ((win = find_window(ev->window)) == NULL)
-               new = 1;
+               if ((win = find_unmanaged_window(ev->window)) == NULL)
+                       new = 1;
 
        if (new) {
                DNPRINTF(SWM_D_EVENT, "configurerequest: new window: %lu\n",
@@ -2953,36 +5509,7 @@ configurerequest(XEvent *e)
        } else {
                DNPRINTF(SWM_D_EVENT, "configurerequest: change window: %lu\n",
                    ev->window);
-               if (win->floating) {
-                       if (ev->value_mask & CWX)
-                               win->g.x = ev->x;
-                       if (ev->value_mask & CWY)
-                               win->g.y = ev->y;
-                       if (ev->value_mask & CWWidth)
-                               win->g.w = ev->width;
-                       if (ev->value_mask & CWHeight)
-                               win->g.h = ev->height;
-                       if (win->ws->r != NULL) {
-                               /* this seems to be full screen */
-                               if (win->g.w >= WIDTH(win->ws->r)) {
-                                       win->g.x = 0;
-                                       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 = 0;
-                                       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);
+               config_win(win, ev);
        }
 }
 
@@ -2995,14 +5522,14 @@ configurenotify(XEvent *e)
        DNPRINTF(SWM_D_EVENT, "configurenotify: window: %lu\n",
            e->xconfigure.window);
 
-       XMapWindow(display, e->xconfigure.window);
        win = find_window(e->xconfigure.window);
        if (win) {
                XGetWMNormalHints(display, win->id, &win->sh, &mask);
                adjust_font(win);
-               XMapWindow(display, win->id);
                if (font_adjusted)
                        stack();
+               if (focus_mode == SWM_FOCUS_DEFAULT)
+                       drain_enter_notify();
        }
 }
 
@@ -3014,57 +5541,192 @@ destroynotify(XEvent *e)
 
        DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window);
 
-       if ((win = find_window(ev->window)) != NULL) {
-               unmanage_window(win);
-               stack();
+       if ((win = find_window(ev->window)) == NULL) {
+               if ((win = find_unmanaged_window(ev->window)) == NULL)
+                       return;
+               free_window(win);
+               return;
        }
+
+       /* make sure we focus on something */
+       win->floating = 0;
+
+       unmanage_window(win);
+       stack();
+       if (focus_mode == SWM_FOCUS_DEFAULT)
+               drain_enter_notify();
+       free_window(win);
 }
 
 void
 enternotify(XEvent *e)
 {
        XCrossingEvent          *ev = &e->xcrossing;
+       XEvent                  cne;
        struct ws_win           *win;
+#if 0
+       struct ws_win           *w;
+       Window                  focus_return;
+       int                     revert_to_return;
+#endif
+       DNPRINTF(SWM_D_FOCUS, "enternotify: window: %lu mode %d detail %d root "
+           "%lu subwindow %lu same_screen %d focus %d state %d\n",
+           ev->window, ev->mode, ev->detail, ev->root, ev->subwindow,
+           ev->same_screen, ev->focus, ev->state);
+
+       switch (focus_mode) {
+       case SWM_FOCUS_DEFAULT:
+               break;
+       case SWM_FOCUS_FOLLOW:
+               break;
+       case SWM_FOCUS_SYNERGY:
+#if 0
+       /*
+        * all these checks need to be in this order because the
+        * XCheckTypedWindowEvent relies on weeding out the previous events
+        *
+        * making this code an option would enable a follow mouse for focus
+        * feature
+        */
+
+       /*
+        * state is set when we are switching workspaces and focus is set when
+        * the window or a subwindow already has focus (occurs during restart).
+        *
+        * Only honor the focus flag if last_focus_event is not FocusOut,
+        * this allows scrotwm to continue to control focus when another
+        * program is also playing with it.
+        */
+       if (ev->state || (ev->focus && last_focus_event != FocusOut)) {
+               DNPRINTF(SWM_D_EVENT, "ignoring enternotify: focus\n");
+               return;
+       }
 
-       DNPRINTF(SWM_D_EVENT, "enternotify: window: %lu\n", ev->window);
+       /*
+        * happens when a window is created or destroyed and the border
+        * crosses the mouse pointer and when switching ws
+        *
+        * we need the subwindow test to see if we came from root in order
+        * to give focus to floaters
+        */
+       if (ev->mode == NotifyNormal && ev->detail == NotifyVirtual &&
+           ev->subwindow == 0) {
+               DNPRINTF(SWM_D_EVENT, "ignoring enternotify: NotifyVirtual\n");
+               return;
+       }
 
-       if (ignore_enter) {
-               /* eat event(r) to prevent autofocus */
-               ignore_enter--;
+       /* this window already has focus */
+       if (ev->mode == NotifyNormal && ev->detail == NotifyInferior) {
+               DNPRINTF(SWM_D_EVENT, "ignoring enternotify: win has focus\n");
                return;
        }
 
-       if ((win = find_window(ev->window)) != NULL)
-               focus_win(win);
+       /* this window is being deleted or moved to another ws */
+       if (XCheckTypedWindowEvent(display, ev->window, ConfigureNotify,
+           &cne) == True) {
+               DNPRINTF(SWM_D_EVENT, "ignoring enternotify: configurenotify\n");
+               XPutBackEvent(display, &cne);
+               return;
+       }
+
+       if ((win = find_window(ev->window)) == NULL) {
+               DNPRINTF(SWM_D_EVENT, "ignoring enternotify: win == NULL\n");
+               return;
+       }
+
+       /*
+        * In fullstack kill all enters unless they come from a different ws
+        * (i.e. another region) or focus has been grabbed externally.
+        */
+       if (win->ws->cur_layout->flags & SWM_L_FOCUSPREV &&
+           last_focus_event != FocusOut) {
+               XGetInputFocus(display, &focus_return, &revert_to_return);
+               if ((w = find_window(focus_return)) == NULL ||
+                   w->ws == win->ws) {
+                       DNPRINTF(SWM_D_EVENT, "ignoring event: fullstack\n");
+                       return;
+               }
+       }
+#endif
+               break;
+       }
+
+       if ((win = find_window(ev->window)) == NULL) {
+               DNPRINTF(SWM_D_EVENT, "ignoring enternotify: win == NULL\n");
+               return;
+       }
+
+       /*
+        * if we have more enternotifies let them handle it in due time
+        */
+       if (XCheckTypedEvent(display, EnterNotify, &cne) == True) {
+               DNPRINTF(SWM_D_EVENT,
+                   "ignoring enternotify: got more enternotify\n");
+               XPutBackEvent(display, &cne);
+               return;
+       }
+
+       focus_magic(win);
 }
 
+/* lets us use one switch statement for arbitrary mode/detail combinations */
+#define MERGE_MEMBERS(a,b)     (((a & 0xffff) << 16) | (b & 0xffff))
+
 void
-focusin(XEvent *e)
+focusevent(XEvent *e)
 {
-       DNPRINTF(SWM_D_EVENT, "focusin: window: %lu\n", e->xfocus.window);
+#if 0
+       struct ws_win           *win;
+       u_int32_t               mode_detail;
+       XFocusChangeEvent       *ev = &e->xfocus;
+
+       DNPRINTF(SWM_D_EVENT, "focusevent: %s window: %lu mode %d detail %d\n",
+           ev->type == FocusIn ? "entering" : "leaving",
+           ev->window, ev->mode, ev->detail);
+
+       if (last_focus_event == ev->type) {
+               DNPRINTF(SWM_D_FOCUS, "ignoring focusevent: bad ordering\n");
+               return;
+       }
+
+       last_focus_event = ev->type;
+       mode_detail = MERGE_MEMBERS(ev->mode, ev->detail);
+
+       switch (mode_detail) {
+       /* synergy client focus operations */
+       case MERGE_MEMBERS(NotifyNormal, NotifyNonlinear):
+       case MERGE_MEMBERS(NotifyNormal, NotifyNonlinearVirtual):
+
+       /* synergy server focus operations */
+       case MERGE_MEMBERS(NotifyWhileGrabbed, NotifyNonlinear):
+
+       /* Entering applications like rdesktop that mangle the pointer */
+       case MERGE_MEMBERS(NotifyNormal, NotifyPointer):
+
+               if ((win = find_window(e->xfocus.window)) != NULL && win->ws->r)
+                       XSetWindowBorder(display, win->id,
+                           win->ws->r->s->c[ev->type == FocusIn ?
+                           SWM_S_COLOR_FOCUS : SWM_S_COLOR_UNFOCUS].color);
+               break;
+       default:
+               fprintf(stderr, "ignoring focusevent\n");
+               DNPRINTF(SWM_D_FOCUS, "ignoring focusevent\n");
+               break;
+       }
+#endif
 }
 
 void
-focusout(XEvent *e)
+mapnotify(XEvent *e)
 {
-       DNPRINTF(SWM_D_EVENT, "focusout: window: %lu\n", e->xfocus.window);
+       struct ws_win           *win;
+       XMapEvent               *ev = &e->xmap;
 
-       if (cur_focus && cur_focus->ws->r &&
-           cur_focus->id == e->xfocus.window) {
-               struct swm_screen       *s = cur_focus->ws->r->s;
-               Window                  rr, cr;
-               int                     x, y, wx, wy;
-               unsigned int            mask;
+       DNPRINTF(SWM_D_EVENT, "mapnotify: window: %lu\n", ev->window);
 
-               /* Try to detect synergy hiding the cursor.  */
-               if (XQueryPointer(display, cur_focus->id, 
-                   &rr, &cr, &x, &y, &wx, &wy, &mask) != False &&
-                   cr == 0 && !mask &&
-                   x == DisplayWidth(display, s->idx)/2 &&
-                   y == DisplayHeight(display, s->idx)/2) {
-                       unfocus_win(cur_focus);
-               }
-       }
+       win = manage_window(ev->window);
+       if (win)
+               set_win_state(win, NormalState);
 }
 
 void
@@ -3072,8 +5734,6 @@ mappingnotify(XEvent *e)
 {
        XMappingEvent           *ev = &e->xmapping;
 
-       DNPRINTF(SWM_D_EVENT, "mappingnotify: window: %lu\n", ev->window);
-
        XRefreshKeyboardMapping(ev);
        if (ev->request == MappingKeyboard)
                grabkeys();
@@ -3082,8 +5742,10 @@ mappingnotify(XEvent *e)
 void
 maprequest(XEvent *e)
 {
-       XMapRequestEvent        *ev = &e->xmaprequest;
+       struct ws_win           *win;
+       struct swm_region       *r;
        XWindowAttributes       wa;
+       XMapRequestEvent        *ev = &e->xmaprequest;
 
        DNPRINTF(SWM_D_EVENT, "maprequest: window: %lu\n",
            e->xmaprequest.window);
@@ -3092,9 +5754,17 @@ maprequest(XEvent *e)
                return;
        if (wa.override_redirect)
                return;
-       manage_window(e->xmaprequest.window);
+
+       win = manage_window(e->xmaprequest.window);
+       if (win == NULL)
+               return; /* can't happen */
 
        stack();
+
+       /* make new win focused */
+       r = root_to_region(win->wa.root);
+       if (win->ws == r->ws)
+               focus_magic(win);
 }
 
 void
@@ -3106,12 +5776,18 @@ propertynotify(XEvent *e)
        DNPRINTF(SWM_D_EVENT, "propertynotify: window: %lu\n",
            ev->window);
 
-       if (ev->state == PropertyDelete)
-               return; /* ignore */
        win = find_window(ev->window);
        if (win == NULL)
                return;
 
+       if (ev->state == PropertyDelete && ev->atom == a_swm_iconic) {
+               update_iconic(win, 0);
+               XMapRaised(display, win->id);
+               stack();
+               focus_win(win);
+               return;
+       }
+
        switch (ev->atom) {
        case XA_WM_NORMAL_HINTS:
 #if 0
@@ -3126,6 +5802,8 @@ propertynotify(XEvent *e)
                XMoveResizeWindow(display, win->id,
                    win->g.x, win->g.y, win->g.w, win->g.h);
 #endif
+               if (window_name_enabled)
+                       bar_update();
                break;
        default:
                break;
@@ -3135,14 +5813,37 @@ propertynotify(XEvent *e)
 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);
+       /* determine if we need to help unmanage this window */
+       win = find_window(e->xunmap.window);
+       if (win == NULL)
+               return;
+
+       if (getstate(e->xunmap.window) == NormalState) {
+               unmanage_window(win);
+               stack();
+
+               /* giant hack for apps that don't destroy transient windows */
+               /* eat a bunch of events to prevent remanaging the window */
+               XEvent                  cne;
+               while (XCheckWindowEvent(display, e->xunmap.window,
+                   EnterWindowMask, &cne))
+                       ;
+               while (XCheckWindowEvent(display, e->xunmap.window,
+                   StructureNotifyMask, &cne))
+                       ;
+               while (XCheckWindowEvent(display, e->xunmap.window,
+                   SubstructureNotifyMask, &cne))
+                       ;
+               /* resend unmap because we ated it */
+               XUnmapWindow(display, e->xunmap.window);
+       }
+
+       if (focus_mode == SWM_FOCUS_DEFAULT)
+               drain_enter_notify();
 }
 
 void
@@ -3154,12 +5855,67 @@ visibilitynotify(XEvent *e)
        DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: %lu\n",
            e->xvisibility.window);
        if (e->xvisibility.state == VisibilityUnobscured)
-               for (i = 0; i < ScreenCount(display); i++) 
+               for (i = 0; i < ScreenCount(display); i++)
                        TAILQ_FOREACH(r, &screens[i].rl, entry)
                                if (e->xvisibility.window == r->bar_window)
                                        bar_update();
 }
 
+void
+clientmessage(XEvent *e)
+{
+       XClientMessageEvent *ev;
+       struct ws_win *win;
+
+       ev = &e->xclient;
+
+       win = find_window(ev->window);
+       if (win == NULL)
+               return;
+
+       DNPRINTF(SWM_D_EVENT, "clientmessage: window: 0x%lx type: %ld \n",
+           ev->window, ev->message_type);
+
+       if (ev->message_type == ewmh[_NET_ACTIVE_WINDOW].atom) {
+               DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_ACTIVE_WINDOW \n");
+               focus_win(win);
+       }
+       if (ev->message_type == ewmh[_NET_CLOSE_WINDOW].atom) {
+               DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_CLOSE_WINDOW \n");
+               if (win->can_delete)
+                       client_msg(win, adelete);
+               else
+                       XKillClient(display, win->id);
+       }
+       if (ev->message_type == ewmh[_NET_MOVERESIZE_WINDOW].atom) {
+               DNPRINTF(SWM_D_EVENT,
+                   "clientmessage: _NET_MOVERESIZE_WINDOW \n");
+               if (win->floating) {
+                       if (ev->data.l[0] & (1<<8)) /* x */
+                               win->g.x = ev->data.l[1];
+                       if (ev->data.l[0] & (1<<9)) /* y */
+                               win->g.y = ev->data.l[2];
+                       if (ev->data.l[0] & (1<<10)) /* width */
+                               win->g.w = ev->data.l[3];
+                       if (ev->data.l[0] & (1<<11)) /* height */
+                               win->g.h = ev->data.l[4];
+               }
+               else {
+                       /* TODO: Change stack sizes */
+               }
+               config_win(win, NULL);
+       }
+       if (ev->message_type == ewmh[_NET_WM_STATE].atom) {
+               DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_WM_STATE \n");
+               ewmh_update_win_state(win, ev->data.l[1], ev->data.l[0]);
+               if (ev->data.l[2])
+                       ewmh_update_win_state(win, ev->data.l[2],
+                           ev->data.l[0]);
+
+               stack();
+       }
+}
+
 int
 xerror_start(Display *d, XErrorEvent *ee)
 {
@@ -3192,25 +5948,6 @@ active_wm(void)
        return (0);
 }
 
-long
-getstate(Window w)
-{
-       int                     format, status;
-       long                    result = -1;
-       unsigned char           *p = NULL;
-       unsigned long           n, extra;
-       Atom                    real;
-
-       status = XGetWindowProperty(display, w, astate, 0L, 2L, False, astate,
-           &real, &format, &n, &extra, (unsigned char **)&p);
-       if (status != Success)
-               return (-1);
-       if (n != 0)
-               result = *((long *)p);
-       XFree(p);
-       return (result);
-}
-
 void
 new_region(struct swm_screen *s, int x, int y, int w, int h)
 {
@@ -3230,6 +5967,9 @@ new_region(struct swm_screen *s, int x, int y, int w, int h)
                    (X(r) + WIDTH(r)) > x &&
                    Y(r) < (y + h) &&
                    (Y(r) + HEIGHT(r)) > y) {
+                       if (r->ws->r != NULL)
+                               r->ws->old_r = r->ws->r;
+                       r->ws->r = NULL;
                        XDestroyWindow(display, r->bar_window);
                        TAILQ_REMOVE(&s->rl, r, entry);
                        TAILQ_INSERT_TAIL(&s->orl, r, entry);
@@ -3276,7 +6016,9 @@ new_region(struct swm_screen *s, int x, int y, int w, int h)
        HEIGHT(r) = h;
        r->s = s;
        r->ws = ws;
+       r->ws_prior = NULL;
        ws->r = r;
+       outputs++;
        TAILQ_INSERT_TAIL(&s->rl, r, entry);
 }
 
@@ -3297,11 +6039,12 @@ scan_xrandr(int i)
 
        /* remove any old regions */
        while ((r = TAILQ_FIRST(&screens[i].rl)) != NULL) {
-               r->ws->r = NULL;
+               r->ws->old_r = r->ws->r = NULL;
                XDestroyWindow(display, r->bar_window);
                TAILQ_REMOVE(&screens[i].rl, r, entry);
                TAILQ_INSERT_TAIL(&screens[i].orl, r, entry);
        }
+       outputs = 0;
 
        /* map virtual screens onto physical screens */
 #ifdef SWM_XRR_HAS_CRTC
@@ -3310,8 +6053,8 @@ scan_xrandr(int i)
                if (sr == NULL)
                        new_region(&screens[i], 0, 0,
                            DisplayWidth(display, i),
-                           DisplayHeight(display, i)); 
-               else 
+                           DisplayHeight(display, i));
+               else
                        ncrtc = sr->ncrtc;
 
                for (c = 0, ci = NULL; c < ncrtc; c++) {
@@ -3322,7 +6065,7 @@ scan_xrandr(int i)
                        if (ci != NULL && ci->mode == None)
                                new_region(&screens[i], 0, 0,
                                    DisplayWidth(display, i),
-                                   DisplayHeight(display, i)); 
+                                   DisplayHeight(display, i));
                        else
                                new_region(&screens[i],
                                    ci->x, ci->y, ci->width, ci->height);
@@ -3334,7 +6077,7 @@ scan_xrandr(int i)
 #endif /* SWM_XRR_HAS_CRTC */
        {
                new_region(&screens[i], 0, 0, DisplayWidth(display, i),
-                   DisplayHeight(display, i)); 
+                   DisplayHeight(display, i));
        }
 }
 
@@ -3342,7 +6085,6 @@ 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);
@@ -3360,42 +6102,77 @@ screenchange(XEvent *e) {
        /* 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);
-
        /* add bars to all regions */
        for (i = 0; i < ScreenCount(display); i++)
                TAILQ_FOREACH(r, &screens[i].rl, entry)
                        bar_setup(r);
        stack();
+       if (focus_mode == SWM_FOCUS_DEFAULT)
+               drain_enter_notify();
 }
 
 void
-setup_screens(void)
+grab_windows(void)
 {
        Window                  d1, d2, *wins = NULL;
        XWindowAttributes       wa;
        unsigned int            no;
-        int                    i, j, k;
+       int                     i, j;
+       long                    state, manage;
+
+       for (i = 0; i < ScreenCount(display); i++) {
+               if (!XQueryTree(display, screens[i].root, &d1, &d2, &wins, &no))
+                       continue;
+
+               /* attach windows to a region */
+               /* normal windows */
+               for (j = 0; j < no; j++) {
+                       if (!XGetWindowAttributes(display, wins[j], &wa) ||
+                           wa.override_redirect ||
+                           XGetTransientForHint(display, wins[j], &d1))
+                               continue;
+
+                       state = getstate(wins[j]);
+                       manage = state == IconicState;
+                       if (wa.map_state == IsViewable || manage)
+                               manage_window(wins[j]);
+               }
+               /* transient windows */
+               for (j = 0; j < no; j++) {
+                       if (!XGetWindowAttributes(display, wins[j], &wa) ||
+                           wa.override_redirect)
+                               continue;
+
+                       state = getstate(wins[j]);
+                       manage = state == IconicState;
+                       if (XGetTransientForHint(display, wins[j], &d1) &&
+                           manage)
+                               manage_window(wins[j]);
+               }
+               if (wins) {
+                       XFree(wins);
+                       wins = NULL;
+               }
+       }
+}
+
+void
+setup_screens(void)
+{
+       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;
+                       xrandr_support = 0;
 
        /* map physical screens */
        for (i = 0; i < ScreenCount(display); i++) {
@@ -3412,68 +6189,61 @@ setup_screens(void)
                setscreencolor("black", i + 1, SWM_S_COLOR_BAR);
                setscreencolor("rgb:a0/a0/a0", i + 1, SWM_S_COLOR_BAR_FONT);
 
+               /* set default cursor */
+               XDefineCursor(display, screens[i].root,
+                   XCreateFontCursor(display, XC_left_ptr));
+
                /* 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;
+                       ws->old_r = NULL;
                        TAILQ_INIT(&ws->winlist);
+                       TAILQ_INIT(&ws->unmanagedlist);
 
                        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];
+                       ws->cur_layout->l_string(ws);
                }
-               /* 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;
-               }
        }
 }
 
 void
+setup_globals(void)
+{
+       if ((bar_fonts[0] = strdup("-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*"))
+           == NULL)
+               err(1, "setup_globals: strdup");
+       if ((bar_fonts[1] = strdup("-*-times-medium-r-*-*-*-*-*-*-*-*-*-*"))
+           == NULL)
+               err(1, "setup_globals: strdup");
+       if ((bar_fonts[2] = strdup("-misc-fixed-medium-r-*-*-*-*-*-*-*-*-*-*"))
+           == NULL)
+               err(1, "setup_globals: strdup");
+       if ((spawn_term[0] = strdup("xterm")) == NULL)
+               err(1, "setup_globals: strdup");
+       if ((clock_format = strdup("%a %b %d %R %Z %Y")) == NULL)
+               errx(1, "strdup");
+}
+
+void
 workaround(void)
 {
        int                     i;
        Atom                    netwmcheck, netwmname, utf8_string;
-       Window                  root;
+       Window                  root, win;
 
        /* work around sun jdk bugs, code from wmname */
        netwmcheck = XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", False);
@@ -3481,10 +6251,16 @@ workaround(void)
        utf8_string = XInternAtom(display, "UTF8_STRING", False);
        for (i = 0; i < ScreenCount(display); i++) {
                root = screens[i].root;
+               win = XCreateSimpleWindow(display,root, 0, 0, 1, 1, 0,
+                   screens[i].c[SWM_S_COLOR_UNFOCUS].color,
+                   screens[i].c[SWM_S_COLOR_UNFOCUS].color);
+
                XChangeProperty(display, root, netwmcheck, XA_WINDOW, 32,
-                   PropModeReplace, (unsigned char *)&root, 1);
-               XChangeProperty(display, root, netwmname, utf8_string, 8,
-                   PropModeReplace, "LG3D", strlen("LG3D"));
+                   PropModeReplace, (unsigned char *)&win,1);
+               XChangeProperty(display, win, netwmcheck, XA_WINDOW, 32,
+                   PropModeReplace, (unsigned char *)&win,1);
+               XChangeProperty(display, win, netwmname, utf8_string, 8,
+                   PropModeReplace, (unsigned char*)"LG3D", strlen("LG3D"));
        }
 }
 
@@ -3492,12 +6268,16 @@ int
 main(int argc, char *argv[])
 {
        struct passwd           *pwd;
-       struct swm_region       *r;
+       struct swm_region       *r, *rr;
+       struct ws_win           *winfocus = NULL;
+       struct timeval          tv;
+       union arg               a;
        char                    conf[PATH_MAX], *cfile = NULL;
        struct stat             sb;
        XEvent                  e;
        int                     xfd, i;
        fd_set                  rd;
+       struct sigaction        sact;
 
        start_argv = argv;
        fprintf(stderr, "Welcome to scrotwm V%s cvs tag: %s\n",
@@ -3511,9 +6291,28 @@ main(int argc, char *argv[])
        if (active_wm())
                errx(1, "other wm running");
 
+       /* handle some signals */
+       bzero(&sact, sizeof(sact));
+       sigemptyset(&sact.sa_mask);
+       sact.sa_flags = 0;
+       sact.sa_handler = sighdlr;
+       sigaction(SIGINT, &sact, NULL);
+       sigaction(SIGQUIT, &sact, NULL);
+       sigaction(SIGTERM, &sact, NULL);
+       sigaction(SIGHUP, &sact, NULL);
+
+       sact.sa_handler = sighdlr;
+       sact.sa_flags = SA_NOCLDSTOP;
+       sigaction(SIGCHLD, &sact, NULL);
+
        astate = XInternAtom(display, "WM_STATE", False);
        aprot = XInternAtom(display, "WM_PROTOCOLS", False);
        adelete = XInternAtom(display, "WM_DELETE_WINDOW", False);
+       takefocus = XInternAtom(display, "WM_TAKE_FOCUS", False);
+       a_wmname = XInternAtom(display, "WM_NAME", False);
+       a_utf8_string = XInternAtom(display, "UTF8_STRING", False);
+       a_string = XInternAtom(display, "STRING", False);
+       a_swm_iconic = XInternAtom(display, "_SWM_ICONIC", False);
 
        /* look for local and global conf file */
        pwd = getpwuid(getuid());
@@ -3521,9 +6320,12 @@ main(int argc, char *argv[])
                errx(1, "invalid user %d", getuid());
 
        setup_screens();
+       setup_globals();
        setup_keys();
        setup_quirks();
+       setup_spawn();
 
+       /* load config */
        snprintf(conf, sizeof conf, "%s/.%s", pwd->pw_dir, SWM_CONF_FILE);
        if (stat(conf, &sb) != -1) {
                if (S_ISREG(sb.st_mode))
@@ -3538,31 +6340,38 @@ main(int argc, char *argv[])
        if (cfile)
                conf_load(cfile);
 
+       setup_ewmh();
+       /* set some values to work around bad programs */
+       workaround();
+       /* grab existing windows (before we build the bars) */
+       grab_windows();
+
+       if (getenv("SWM_STARTED") == NULL)
+               setenv("SWM_STARTED", "YES", 1);
+
        /* setup all bars */
        for (i = 0; i < ScreenCount(display); i++)
-               TAILQ_FOREACH(r, &screens[i].rl, entry)
+               TAILQ_FOREACH(r, &screens[i].rl, entry) {
+                       if (winfocus == NULL)
+                               winfocus = TAILQ_FIRST(&r->ws->winlist);
                        bar_setup(r);
+               }
 
-       /* set some values to work around bad programs */
-       workaround();
+       unfocus_all();
 
        grabkeys();
        stack();
+       if (focus_mode == SWM_FOCUS_DEFAULT)
+               drain_enter_notify();
 
        xfd = ConnectionNumber(display);
        while (running) {
-               FD_ZERO(&rd);
-               FD_SET(xfd, &rd);
-               if (select(xfd + 1, &rd, NULL, NULL, NULL) == -1)
-                       if (errno != EINTR)
-                               errx(1, "select failed");
-               if (bar_alarm) {
-                       bar_alarm = 0;
-                       bar_update();
-               }
                while (XPending(display)) {
                        XNextEvent(display, &e);
+                       if (running == 0)
+                               goto done;
                        if (e.type < LASTEvent) {
+                               dumpevent(&e);
                                if (handler[e.type])
                                        handler[e.type](&e);
                                else
@@ -3582,8 +6391,49 @@ main(int argc, char *argv[])
                                }
                        }
                }
-       }
 
+               /* if we are being restarted go focus on first window */
+               if (winfocus) {
+                       rr = winfocus->ws->r;
+                       if (rr == NULL) {
+                               /* not a visible window */
+                               winfocus = NULL;
+                               continue;
+                       }
+                       /* move pointer to first screen if multi screen */
+                       if (ScreenCount(display) > 1 || outputs > 1)
+                               XWarpPointer(display, None, rr->s[0].root,
+                                   0, 0, 0, 0, rr->g.x,
+                                   rr->g.y + (bar_enabled ? bar_height : 0));
+
+                       a.id = SWM_ARG_ID_FOCUSCUR;
+                       focus(rr, &a);
+                       winfocus = NULL;
+                       continue;
+               }
+
+               FD_ZERO(&rd);
+               FD_SET(xfd, &rd);
+               tv.tv_sec = 1;
+               tv.tv_usec = 0;
+               if (select(xfd + 1, &rd, NULL, NULL, &tv) == -1)
+                       if (errno != EINTR)
+                               DNPRINTF(SWM_D_MISC, "select failed");
+               if (restart_wm == 1)
+                       restart(NULL, NULL);
+               if (search_resp == 1)
+                       search_do_resp();
+               if (running == 0)
+                       goto done;
+               if (bar_alarm) {
+                       bar_alarm = 0;
+                       bar_update();
+               }
+       }
+done:
+       teardown_ewmh();
+       bar_extra_stop();
+       XFreeGC(display, bar_gc);
        XCloseDisplay(display);
 
        return (0);