JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
Fix crash on NULL class/name strings in bar. Reported by and similar diff
[spectrwm.git] / scrotwm.c
index 2902935..045bc53 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -2,6 +2,8 @@
 /*
  * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com>
+ * Copyright (c) 2009 Darrin Chandler <dwchandler@stilyagin.com>
+ * Copyright (c) 2009 Pierre-Yves Ritschard <pyr@spootnik.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -50,7 +52,7 @@
 
 static const char      *cvstag = "$scrotwm$";
 
-#define        SWM_VERSION     "0.9"
+#define        SWM_VERSION     "0.9.5"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -105,6 +107,8 @@ static const char   *cvstag = "$scrotwm$";
 #define        SWM_D_MOUSE             0x0040
 #define        SWM_D_PROP              0x0080
 #define        SWM_D_CLASS             0x0100
+#define SWM_D_KEY              0x0200
+#define SWM_D_QUIRK            0x0400
 
 u_int32_t              swm_debug = 0
                            | SWM_D_MISC
@@ -116,6 +120,8 @@ u_int32_t           swm_debug = 0
                            | SWM_D_MOUSE
                            | SWM_D_PROP
                            | SWM_D_CLASS
+                           | SWM_D_KEY
+                           | SWM_D_QUIRK
                            ;
 #else
 #define DPRINTF(x...)
@@ -128,6 +134,9 @@ u_int32_t           swm_debug = 0
 #define BUTTONMASK             (ButtonPressMask|ButtonReleaseMask)
 #define MOUSEMASK              (BUTTONMASK|PointerMotionMask)
 #define SWM_PROPLEN            (16)
+#define SWM_FUNCNAME_LEN       (32)
+#define SWM_KEYS_LEN           (255)
+#define SWM_QUIRK_LEN          (64)
 #define X(r)                   (r)->g.x
 #define Y(r)                   (r)->g.y
 #define WIDTH(r)               (r)->g.w
@@ -156,6 +165,7 @@ int                 cycle_empty = 0;
 int                    cycle_visible = 0;
 int                    term_width = 0;
 int                    font_adjusted = 0;
+unsigned int           mod_key = MODKEY;
 
 /* dialog windows */
 double                 dialog_ratio = .6;
@@ -174,6 +184,8 @@ int                 bar_extra_running = 0;
 int                    bar_verbose = 1;
 int                    bar_height = 0;
 int                    clock_enabled = 1;
+int                    title_name_enabled = 0;
+int                    title_class_enabled = 0;
 pid_t                  bar_pid;
 GC                     bar_gc;
 XGCValues              bar_gcv;
@@ -241,6 +253,62 @@ struct ws_win {
 };
 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
+};
+
 /* layout handlers */
 void   stack(void);
 void   vertical_config(struct workspace *, int);
@@ -251,7 +319,6 @@ void        max_stack(struct workspace *, struct swm_geometry *);
 
 void   grabbuttons(struct ws_win *, int);
 void   new_region(struct swm_screen *, int, int, int, int);
-void   update_modkey(unsigned int);
 
 struct layout {
        void            (*l_stack)(struct workspace *, struct swm_geometry *);
@@ -351,22 +418,9 @@ struct quirk {
 #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 */
-} quirks[] = {
-       { "MPlayer",            "xv",           SWM_Q_FLOAT | SWM_Q_FULLSCREEN },
-       { "OpenOffice.org 2.4", "VCLSalFrame",  SWM_Q_FLOAT },
-       { "OpenOffice.org 3.0", "VCLSalFrame",  SWM_Q_FLOAT },
-       { "Firefox-bin",        "firefox-bin",  SWM_Q_TRANSSZ },
-       { "Firefox",            "Dialog",       SWM_Q_FLOAT },
-       { "Gimp",               "gimp",         SWM_Q_FLOAT | SWM_Q_ANYWHERE },
-       { "XTerm",              "xterm",        SWM_Q_XTERM_FONTADJ },
-       { "xine",               "Xine Window",  SWM_Q_FLOAT | SWM_Q_ANYWHERE },
-       { "Xitk",               "Xitk Combo",   SWM_Q_FLOAT | SWM_Q_ANYWHERE },
-       { "xine",               "xine Panel",   SWM_Q_FLOAT | SWM_Q_ANYWHERE },
-       { "Xitk",               "Xine Window",  SWM_Q_FLOAT | SWM_Q_ANYWHERE },
-       { "xine",               "xine Video Fullscreen Window", SWM_Q_FULLSCREEN | SWM_Q_FLOAT },
-       { "pcb",                "pcb",          SWM_Q_FLOAT },
-       { NULL,                 NULL,           0},
 };
+int                            quirks_size = 0, quirks_length = 0;
+struct quirk                   *quirks = NULL;
 
 /* events */
 void                   expose(XEvent *);
@@ -377,6 +431,7 @@ void                        configurenotify(XEvent *);
 void                   destroynotify(XEvent *);
 void                   enternotify(XEvent *);
 void                   focusin(XEvent *);
+void                   focusout(XEvent *);
 void                   mappingnotify(XEvent *);
 void                   maprequest(XEvent *);
 void                   propertynotify(XEvent *);
@@ -392,6 +447,7 @@ void                        (*handler[LASTEvent])(XEvent *) = {
                                [DestroyNotify] = destroynotify,
                                [EnterNotify] = enternotify,
                                [FocusIn] = focusin,
+                               [FocusOut] = focusout,
                                [MappingNotify] = mappingnotify,
                                [MapRequest] = maprequest,
                                [PropertyNotify] = propertynotify,
@@ -468,171 +524,6 @@ custom_region(char *val)
        new_region(&screens[sidx], x, y, w, h);
 }
 
-int
-varmatch(char *var, char *name, int *index)
-{
-       char                    *p, buf[5];
-       int                     i;
-
-       i = strncmp(var, name, 255);
-       if (index == NULL)
-               return (i);
-
-       *index = -1;
-       if (i <= 0)
-               return (i);
-       p = var + strlen(name);
-       if (*p++ != '[')
-               return (i);
-       bzero(buf, sizeof buf);
-       i = 0;
-       while (isdigit(*p) && i < sizeof buf)
-               buf[i++] = *p++;
-       if (i == 0 || i >= sizeof buf || *p != ']')
-               return (1);
-       *index = strtonum(buf, 0, 99, NULL);
-       return (0);
-}
-
-/* conf file stuff */
-#define        SWM_CONF_WS     "\n= \t"
-#define SWM_CONF_FILE  "scrotwm.conf"
-int
-conf_load(char *filename)
-{
-       FILE                    *config;
-       char                    *line, *cp, *var, *val;
-       size_t                  len, lineno = 0;
-       int                     i, sc;
-       unsigned int            modkey;
-
-       DNPRINTF(SWM_D_MISC, "conf_load: filename %s\n", filename);
-
-       if (filename == NULL)
-               return (1);
-
-       if ((config = fopen(filename, "r")) == NULL)
-               return (1);
-
-       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)
-                       break;
-               cp += (long)strspn(cp, SWM_CONF_WS);
-               if ((val = strsep(&cp, SWM_CONF_WS)) == NULL)
-                       break;
-
-               DNPRINTF(SWM_D_MISC, "conf_load: %s=%s\n",var ,val);
-               switch (var[0]) {
-               case 'b':
-                       if (!strncmp(var, "bar_enabled", strlen("bar_enabled")))
-                               bar_enabled = atoi(val);
-                       else if (!varmatch(var, "bar_border", &i))
-                               setscreencolor(val, i, SWM_S_COLOR_BAR_BORDER);
-                       else if (!varmatch(var, "bar_color", &i))
-                               setscreencolor(val, i, SWM_S_COLOR_BAR);
-                       else if (!varmatch(var, "bar_font_color", &i))
-                               setscreencolor(val, i, SWM_S_COLOR_BAR_FONT);
-                       else if (!strncmp(var, "bar_font", strlen("bar_font")))
-                               asprintf(&bar_fonts[0], "%s", val);
-                       else if (!strncmp(var, "bar_action", strlen("bar_action")))
-                               asprintf(&bar_argv[0], "%s", val);
-                       else if (!strncmp(var, "bar_delay", strlen("bar_delay")))
-                               bar_delay = atoi(val);
-                       else
-                               goto bad;
-                       break;
-
-               case 'c':
-                       if (!strncmp(var, "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;
-
-               case 'd':
-                       if (!strncmp(var, "dialog_ratio",
-                           strlen("dialog_ratio"))) {
-                               dialog_ratio = atof(val);
-                               if (dialog_ratio > 1.0 || dialog_ratio <= .3)
-                                       dialog_ratio = .6;
-                       } else
-                               goto bad;
-                       break;
-
-               case '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;
-
-               case 'r':
-                       if (!strncmp(var, "region", strlen("region")))
-                               custom_region(val);
-                       else
-                               goto bad;
-                       break;
-
-               case 's':
-                       if (!strncmp(var, "spawn_term", strlen("spawn_term")))
-                               asprintf(&spawn_term[0], "%s", val);
-                       else if (!strncmp(var, "screenshot_enabled",
-                           strlen("screenshot_enabled")))
-                               ss_enabled = atoi(val);
-                       else if (!strncmp(var, "screenshot_app",
-                           strlen("screenshot_app")))
-                               asprintf(&spawn_screenshot[0], "%s", val);
-                       else
-                               goto bad;
-                       break;
-
-               case 't':
-                       if (!strncmp(var, "term_width", strlen("term_width")))
-                               term_width = atoi(val);
-                       else
-                               goto bad;
-                       break;
-
-               default:
-                       goto bad;
-               }
-               free(line);
-       }
-
-       fclose(config);
-       return (0);
-
-bad:
-       errx(1, "invalid conf file entry: %s=%s", var, val);
-}
-
 void
 socket_setnonblock(int fd)
 {
@@ -675,11 +566,13 @@ bar_update(void)
        time_t                  tmt;
        struct tm               tm;
        struct swm_region       *r;
-       int                     i, x;
+       int                     i, x, do_class, do_name;
        size_t                  len;
        char                    s[SWM_BAR_MAX];
        char                    loc[SWM_BAR_MAX];
        char                    *b;
+       XClassHint              *xch;
+       Status                   status;
 
        if (bar_enabled == 0)
                return;
@@ -705,10 +598,30 @@ bar_update(void)
                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;
+               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, sizeof s);
+               if (do_class && do_name)
+                       strlcat(s, ":", sizeof s);
+               if (do_name)
+                       strlcat(s, xch->res_name, 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",
+                       snprintf(loc, sizeof loc, "%d:%d    %s %s    %s",
                            x++, r->ws->idx + 1, s, bar_ext, bar_vertext);
                        bar_print(r, loc);
                }
@@ -836,7 +749,8 @@ version(struct swm_region *r, union arg *args)
 {
        bar_version = !bar_version;
        if (bar_version)
-               strlcpy(bar_vertext, cvstag, sizeof bar_vertext);
+               snprintf(bar_vertext, sizeof bar_vertext, "Version: %s CVS: %s",
+                   SWM_VERSION, cvstag);
        else
                strlcpy(bar_vertext, "", sizeof bar_vertext);
        bar_update();
@@ -1069,6 +983,28 @@ spawnmenu(struct swm_region *r, union arg *args)
 }
 
 void
+unfocus_win(struct ws_win *win)
+{
+       if (win == NULL)
+               return;
+
+       if (win->ws->focus != win && win->ws->focus != NULL)
+               win->ws->focus_prev = win->ws->focus;
+
+       if (win->ws->r == NULL)
+               return;
+
+       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;
+}
+
+void
 unfocus_all(void)
 {
        struct ws_win           *win;
@@ -1078,16 +1014,8 @@ unfocus_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) {
-                               if (win->ws->r == NULL)
-                                       continue;
-                               grabbuttons(win, 0);
-                               XSetWindowBorder(display, win->id,
-                                   win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);
-                               win->got_focus = 0;
-                               win->ws->focus = NULL;
-                               cur_focus = NULL;
-                       }
+                       TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
+                               unfocus_win(win);
 }
 
 void
@@ -1098,10 +1026,14 @@ focus_win(struct ws_win *win)
        if (win == NULL)
                return;
 
-       if (win->ws->focus != win && win->ws->focus != NULL)
-               win->ws->focus_prev = win->ws->focus;
-
-       unfocus_all();
+       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);
+       }
        win->ws->focus = win;
        if (win->ws->r != NULL) {
                cur_focus = win;
@@ -1156,6 +1088,8 @@ switchws(struct swm_region *r, union arg *args)
 
        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);
        stack();
@@ -1470,7 +1404,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
        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;
        unsigned int            mask;
 
        DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d\n rot=%s flip=%s",
@@ -1871,69 +1805,6 @@ floating_toggle(struct swm_region *r, union arg *args)
        focus_win(win);
 }
 
-/* key definitions */
-struct key {
-       unsigned int            mod;
-       KeySym                  keysym;
-       void                    (*func)(struct swm_region *r, union arg *);
-       union arg               args;
-} keys[] = {
-       /* modifier             key     function                argument */
-       { MODKEY,               XK_space,       cycle_layout,   {0} }, 
-       { MODKEY | ShiftMask,   XK_space,       stack_config,   {.id = SWM_ARG_ID_STACKRESET} }, 
-       { MODKEY,               XK_h,           stack_config,   {.id = SWM_ARG_ID_MASTERSHRINK} },
-       { MODKEY,               XK_l,           stack_config,   {.id = SWM_ARG_ID_MASTERGROW} },
-       { MODKEY,               XK_comma,       stack_config,   {.id = SWM_ARG_ID_MASTERADD} },
-       { MODKEY,               XK_period,      stack_config,   {.id = SWM_ARG_ID_MASTERDEL} },
-       { MODKEY | ShiftMask,   XK_comma,       stack_config,   {.id = SWM_ARG_ID_STACKINC} },
-       { MODKEY | ShiftMask,   XK_period,      stack_config,   {.id = SWM_ARG_ID_STACKDEC} },
-       { MODKEY,               XK_Return,      swapwin,        {.id = SWM_ARG_ID_SWAPMAIN} },
-       { MODKEY,               XK_j,           focus,          {.id = SWM_ARG_ID_FOCUSNEXT} },
-       { MODKEY,               XK_k,           focus,          {.id = SWM_ARG_ID_FOCUSPREV} },
-       { MODKEY | ShiftMask,   XK_j,           swapwin,        {.id = SWM_ARG_ID_SWAPNEXT} },
-       { MODKEY | ShiftMask,   XK_k,           swapwin,        {.id = SWM_ARG_ID_SWAPPREV} },
-       { MODKEY | ShiftMask,   XK_Return,      spawnterm,      {.argv = spawn_term} },
-       { MODKEY,               XK_p,           spawnmenu,      {.argv = spawn_menu} },
-       { MODKEY | ShiftMask,   XK_q,           quit,           {0} },
-       { MODKEY,               XK_q,           restart,        {0} },
-       { MODKEY,               XK_m,           focus,          {.id = SWM_ARG_ID_FOCUSMAIN} },
-       { MODKEY,               XK_1,           switchws,       {.id = 0} },
-       { MODKEY,               XK_2,           switchws,       {.id = 1} },
-       { MODKEY,               XK_3,           switchws,       {.id = 2} },
-       { MODKEY,               XK_4,           switchws,       {.id = 3} },
-       { MODKEY,               XK_5,           switchws,       {.id = 4} },
-       { MODKEY,               XK_6,           switchws,       {.id = 5} },
-       { MODKEY,               XK_7,           switchws,       {.id = 6} },
-       { MODKEY,               XK_8,           switchws,       {.id = 7} },
-       { MODKEY,               XK_9,           switchws,       {.id = 8} },
-       { MODKEY,               XK_0,           switchws,       {.id = 9} },
-       { MODKEY,               XK_Right,       cyclews,        {.id = SWM_ARG_ID_CYCLEWS_UP} }, 
-       { MODKEY,               XK_Left,        cyclews,        {.id = SWM_ARG_ID_CYCLEWS_DOWN} }, 
-       { MODKEY | ShiftMask,   XK_Right,       cyclescr,       {.id = SWM_ARG_ID_CYCLESC_UP} }, 
-       { MODKEY | ShiftMask,   XK_Left,        cyclescr,       {.id = SWM_ARG_ID_CYCLESC_DOWN} }, 
-       { MODKEY | ShiftMask,   XK_1,           send_to_ws,     {.id = 0} },
-       { MODKEY | ShiftMask,   XK_2,           send_to_ws,     {.id = 1} },
-       { MODKEY | ShiftMask,   XK_3,           send_to_ws,     {.id = 2} },
-       { MODKEY | ShiftMask,   XK_4,           send_to_ws,     {.id = 3} },
-       { MODKEY | ShiftMask,   XK_5,           send_to_ws,     {.id = 4} },
-       { MODKEY | ShiftMask,   XK_6,           send_to_ws,     {.id = 5} },
-       { MODKEY | ShiftMask,   XK_7,           send_to_ws,     {.id = 6} },
-       { MODKEY | ShiftMask,   XK_8,           send_to_ws,     {.id = 7} },
-       { MODKEY | ShiftMask,   XK_9,           send_to_ws,     {.id = 8} },
-       { MODKEY | ShiftMask,   XK_0,           send_to_ws,     {.id = 9} },
-       { MODKEY,               XK_b,           bar_toggle,     {0} },
-       { MODKEY,               XK_Tab,         focus,          {.id = SWM_ARG_ID_FOCUSNEXT} },
-       { MODKEY | ShiftMask,   XK_Tab,         focus,          {.id = SWM_ARG_ID_FOCUSPREV} },
-       { MODKEY | ShiftMask,   XK_x,           wkill,          {.id = SWM_ARG_ID_KILLWINDOW} },
-       { MODKEY,               XK_x,           wkill,          {.id = SWM_ARG_ID_DELETEWINDOW} },
-       { MODKEY,               XK_s,           screenshot,     {.id = SWM_ARG_ID_SS_ALL} },
-       { MODKEY | ShiftMask,   XK_s,           screenshot,     {.id = SWM_ARG_ID_SS_WINDOW} },
-       { MODKEY,               XK_t,           floating_toggle,{0} },
-       { MODKEY | ShiftMask,   XK_v,           version,        {0} },
-       { MODKEY | ShiftMask,   XK_Delete,      spawn,          {.argv = spawn_lock} },
-       { MODKEY | ShiftMask,   XK_i,           spawn,          {.argv = spawn_initscr} },
-};
-
 void
 resize_window(struct ws_win *win, int center)
 {
@@ -2089,6 +1960,73 @@ move(struct ws_win *win, union arg *args)
        while (XCheckMaskEvent(display, EnterWindowMask, &ev));
 }
 
+/* key definitions */
+struct keyfunc {
+       char                    name[SWM_FUNCNAME_LEN];
+       void                    (*func)(struct swm_region *r, union arg *);
+       union arg               args;
+} keyfuncs[kf_invalid] = {
+       /* name                 function        argument */
+       { "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} },
+       { "master_del",         stack_config,   {.id = SWM_ARG_ID_MASTERDEL} },
+       { "stack_inc",          stack_config,   {.id = SWM_ARG_ID_STACKINC} },
+       { "stack_dec",          stack_config,   {.id = SWM_ARG_ID_STACKDEC} },
+       { "swap_main",          swapwin,        {.id = SWM_ARG_ID_SWAPMAIN} },
+       { "focus_next",         focus,          {.id = SWM_ARG_ID_FOCUSNEXT} },
+       { "focus_prev",         focus,          {.id = SWM_ARG_ID_FOCUSPREV} },
+       { "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} },
+       { "quit",               quit,           {0} },
+       { "restart",            restart,        {0} },
+       { "focus_main",         focus,          {.id = SWM_ARG_ID_FOCUSMAIN} },
+       { "ws_1",               switchws,       {.id = 0} },
+       { "ws_2",               switchws,       {.id = 1} },
+       { "ws_3",               switchws,       {.id = 2} },
+       { "ws_4",               switchws,       {.id = 3} },
+       { "ws_5",               switchws,       {.id = 4} },
+       { "ws_6",               switchws,       {.id = 5} },
+       { "ws_7",               switchws,       {.id = 6} },
+       { "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} }, 
+       { "mvws_1",             send_to_ws,     {.id = 0} },
+       { "mvws_2",             send_to_ws,     {.id = 1} },
+       { "mvws_3",             send_to_ws,     {.id = 2} },
+       { "mvws_4",             send_to_ws,     {.id = 3} },
+       { "mvws_5",             send_to_ws,     {.id = 4} },
+       { "mvws_6",             send_to_ws,     {.id = 5} },
+       { "mvws_7",             send_to_ws,     {.id = 6} },
+       { "mvws_8",             send_to_ws,     {.id = 7} },
+       { "mvws_9",             send_to_ws,     {.id = 8} },
+       { "mvws_10",            send_to_ws,     {.id = 9} },
+       { "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} },
+       { "float_toggle",       floating_toggle,{0} },
+       { "version",            version,        {0} },
+       { "spawn_lock",         spawn,          {.argv = spawn_lock} },
+       { "spawn_initscr",      spawn,          {.argv = spawn_initscr} },
+};
+struct key {
+       unsigned int            mod;
+       KeySym                  keysym;
+       enum keyfuncid          funcid;
+};
+int                            keys_size = 0, keys_length = 0;
+struct key                     *keys = NULL;
+
 /* mouse */
 enum { client_click, root_click };
 struct button {
@@ -2109,7 +2047,8 @@ update_modkey(unsigned int mod)
 {
        int                     i;
 
-       for (i = 0; i < LENGTH(keys); i++)
+       mod_key = mod;
+       for (i = 0; i < keys_length; i++)
                if (keys[i].mod & ShiftMask)
                        keys[i].mod = mod | ShiftMask;
                else
@@ -2122,6 +2061,190 @@ update_modkey(unsigned int mod)
                        buttons[i].mask = mod;
 }
 
+#define SWM_MODNAME_SIZE       32
+#define        SWM_KEY_WS              "\n+ \t"
+int
+parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks)
+{
+       char                    *cp, *name;
+       KeySym                  uks;
+       if (mod == NULL || ks == NULL)
+               return (0);
+       cp = keystr;
+       *mod = 0;
+       while ((name = strsep(&cp, SWM_KEY_WS)) != NULL) {
+               if (cp)
+                       cp += (long)strspn(cp, SWM_KEY_WS);
+               if (strncasecmp(name, "MOD", SWM_MODNAME_SIZE) == 0)
+                       *mod |= currmod;
+               else if (!strncasecmp(name, "Mod1", SWM_MODNAME_SIZE))
+                       *mod |= Mod1Mask;
+               else if (!strncasecmp(name, "Mod2", SWM_MODNAME_SIZE))
+                       *mod += Mod2Mask;
+               else if (!strncmp(name, "Mod3", SWM_MODNAME_SIZE))
+                       *mod |= Mod3Mask;
+               else if (!strncmp(name, "Mod4", SWM_MODNAME_SIZE))
+                       *mod |= Mod4Mask;
+               else if (strncasecmp(name, "SHIFT", SWM_MODNAME_SIZE) == 0)
+                       *mod |= ShiftMask;
+               else if (strncasecmp(name, "CONTROL", SWM_MODNAME_SIZE) == 0)
+                       *mod |= ControlMask;
+               else {
+                       *ks = XStringToKeysym(name);
+                       XConvertCase(*ks, ks, &uks);
+                       if (ks == NoSymbol) {
+                               DNPRINTF(SWM_D_KEY,
+                                   "parsekeys: invalid key %s\n",
+                                   name);
+                               return (0);
+                       }
+               }
+       }
+       return (1);
+}
+void
+setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid)
+{
+       int                     i, j;
+       /* find existing */
+       for (i = 0; i < keys_length; i++) {
+               if (keys[i].mod == mod && keys[i].keysym == ks) {
+                       if (kfid == kf_invalid) {
+                               /* found: delete */
+                               DNPRINTF(SWM_D_KEY,
+                                   "setkeybinding: delete #%d %s\n",
+                                   i, keyfuncs[keys[i].funcid].name);
+                               j = keys_length - 1;
+                               if (i < j)
+                                       keys[i] = keys[j];
+                               keys_length--;
+                               return;
+                       } else {
+                               /* found: replace */
+                               DNPRINTF(SWM_D_KEY,
+                                   "setkeybinding: replace #%d %s\n",
+                                   i, keyfuncs[keys[i].funcid].name);
+                               keys[i].mod = mod;
+                               keys[i].keysym = ks;
+                               keys[i].funcid = kfid;
+                               return;
+                       }
+               }
+       }
+       if (kfid == kf_invalid) {
+               fprintf(stderr,
+                   "error: setkeybinding: cannot find mod/key combination");
+               return;
+       }
+       /* not found: add */
+       if (keys_size == 0 || keys == NULL) {
+               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) {
+                       fprintf(stderr, "malloc failed\n");
+                       perror(" failed");
+                       quit(NULL, NULL);
+               }
+       } else if (keys_length == keys_size) {
+               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) {
+                       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);
+               }
+       }
+}
+int
+setconfbinding(char *selector, char *value, int flags)
+{
+       enum keyfuncid          kfid;
+       unsigned int            mod;
+       KeySym                  ks;
+       for (kfid = 0; kfid < kf_invalid; (kfid)++) {
+               if (strncasecmp(selector, keyfuncs[kfid].name,
+                   SWM_FUNCNAME_LEN) == 0) {
+                       if (parsekeys(value, mod_key, &mod, &ks))
+                               setkeybinding(mod, ks, kfid);
+                       else
+                               return (0);
+               }
+
+       }
+       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);
+}
 void
 updatenumlockmask(void)
 {
@@ -2155,7 +2278,7 @@ grabkeys(void)
                if (TAILQ_EMPTY(&screens[k].rl))
                        continue;
                XUngrabKey(display, AnyKey, AnyModifier, screens[k].root);
-               for (i = 0; i < LENGTH(keys); i++) {
+               for (i = 0; i < keys_length; i++) {
                        if ((code = XKeysymToKeycode(display, keys[i].keysym)))
                                for (j = 0; j < LENGTH(modifiers); j++)
                                        XGrabKey(display, code,
@@ -2205,12 +2328,14 @@ keypress(XEvent *e)
        DNPRINTF(SWM_D_EVENT, "keypress: window: %lu\n", ev->window);
 
        keysym = XKeycodeToKeysym(display, (KeyCode)ev->keycode, 0);
-       for (i = 0; i < LENGTH(keys); i++)
+       for (i = 0; i < keys_length; i++)
                if (keysym == keys[i].keysym
                   && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
-                  && keys[i].func)
-                       keys[i].func(root_to_region(ev->root),
-                           &(keys[i].args));
+                  && keyfuncs[keys[i].funcid].func)
+                       keyfuncs[keys[i].funcid].func(
+                           root_to_region(ev->root),
+                           &(keyfuncs[keys[i].funcid].args)
+                           );
 }
 
 void
@@ -2249,6 +2374,362 @@ set_win_state(struct ws_win *win, long state)
            (unsigned char *)data, 2);
 }
 
+const char *quirkname[] = {
+       "NONE",         /* config string for "no value" */
+       "FLOAT",
+       "TRANSSZ",
+       "ANYWHERE",
+       "XTERM_FONTADJ",
+       "FULLSCREEN",
+};
+
+/* 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)
+{
+       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;
+                                       return (1);
+                               }
+                               *quirk |= 1 << (i-1);
+                               break;
+                       }
+               }
+               if (i >= LENGTH(quirkname)) {
+                       DNPRINTF(SWM_D_QUIRK,
+                           "parsequirks: invalid quirk [%s]\n", name);
+                       return (0);
+               }
+       }
+       return (1);
+}
+void
+setquirk(const char *class, const char *name, const int quirk)
+{
+       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);
+                               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) {
+                       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);
+               }
+       }
+       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) {
+                       fprintf(stderr, "quirks array problem!\n");
+                       quit(NULL, NULL);
+               }
+       }
+}
+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)))
+               setquirk(class, name, quirks);
+       return (retval);
+}
+
+void
+setup_quirks(void)
+{
+       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);
+}
+
+/* conf file stuff */
+#define SWM_CONF_FILE  "scrotwm.conf"
+
+enum   { SWM_S_BAR_DELAY, SWM_S_BAR_ENABLED, SWM_S_CLOCK_ENABLED,
+         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_BAR_FONT, SWM_S_BAR_ACTION, SWM_S_SPAWN_TERM, SWM_S_SS_APP,
+         SWM_S_DIALOG_RATIO };
+
+int
+setconfvalue(char *selector, char *value, int flags)
+{
+       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_CLOCK_ENABLED:
+               clock_enabled = atoi(value);
+               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_TITLE_NAME_ENABLED:
+               title_name_enabled = atoi(value);
+               break;
+       case SWM_S_BAR_FONT:
+               bar_fonts[0] = strdup(value);
+               break;
+       case SWM_S_BAR_ACTION:
+               bar_argv[0] = strdup(value);
+               break;
+       case SWM_S_SPAWN_TERM:
+               spawn_term[0] = strdup(value);
+               break;
+       case SWM_S_SS_APP:
+               spawn_screenshot[0] = strdup(value);
+               break;
+       case SWM_S_DIALOG_RATIO:
+               dialog_ratio = atof(value);
+               if (dialog_ratio > 1.0 || dialog_ratio <= .3)
+                       dialog_ratio = .6;
+               break;
+       default:
+               return (0);
+       }
+       return (1);
+}
+
+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 (0);
+       return (1);
+}
+
+int
+setconfcolor(char *selector, char *value, int flags)
+{
+       setscreencolor(value, ((selector == NULL)?-1:atoi(selector)), flags);
+       return (1);
+}
+
+int
+setconfregion(char *selector, char *value, int flags)
+{
+       custom_region(value);
+       return (1);
+}
+
+/* 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_border",                 setconfcolor,   SWM_S_COLOR_BAR_BORDER },
+       { "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 },
+       { "clock_enabled",              setconfvalue,   SWM_S_CLOCK_ENABLED },
+       { "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 },
+       { "modkey",                     setconfmodkey,  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 },
+       { "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 }
+};
+
+
+int
+conf_load(char *filename)
+{
+       FILE                    *config;
+       char                    *line, *cp, *optsub, *optval;
+       size_t                  linelen, lineno = 0;
+       int                     wordlen, i, optind;
+       struct config_option    *opt;
+       if (filename == NULL)
+               return (0);
+       if ((config = fopen(filename, "r")) == NULL)
+               return (0);
+       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) {
+                       warnx("%s: line %zd: no option found",
+                           filename, lineno);
+                       return (0);
+               }
+               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 (0);
+               }
+               cp += wordlen;
+               cp += strspn(cp, " \t\n"); /* eat whitespace */
+               /* get [selector] if any */
+               optsub = NULL;
+               if (*cp == '[') {
+                       cp++;
+                       wordlen = strcspn(cp, "]");
+                       if (!wordlen) {
+                               warnx("%s: line %zd: syntax error",
+                                   filename, lineno);
+                               return (0);
+                       }
+                       asprintf(&optsub, "%.*s", wordlen, cp);
+                       cp += wordlen;
+                       cp += strspn(cp, "] \t\n"); /* eat trailing */
+               }
+               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))
+                       errx(1, "%s: line %zd: invalid data for %s",
+                           filename, lineno, configopt[optind].optname);
+               free(optval);
+               free(optsub);
+               free(line);
+       }
+       return (1);
+}
+
 struct ws_win *
 manage_window(Window id)
 {
@@ -2334,8 +2815,7 @@ manage_window(Window id)
        if (XGetClassHint(display, win->id, &win->ch)) {
                DNPRINTF(SWM_D_CLASS, "class: %s name: %s\n",
                    win->ch.res_class, win->ch.res_name);
-               for (i = 0; quirks[i].class != NULL && quirks[i].name != NULL &&
-                   quirks[i].quirk != 0; i++){
+               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",
@@ -2410,7 +2890,7 @@ unmanage_window(struct ws_win *win)
                ws->focus = TAILQ_FIRST(&ws->winlist);
        if (ws->focus == NULL || ws->focus == win) {
                ws->focus = NULL;
-               unfocus_all();
+               unfocus_win(win);
        } else
                focus_win(ws->focus);
        if (ws->focus_prev == win)
@@ -2543,6 +3023,29 @@ focusin(XEvent *e)
 }
 
 void
+focusout(XEvent *e)
+{
+       DNPRINTF(SWM_D_EVENT, "focusout: window: %lu\n", e->xfocus.window);
+
+       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;
+
+               /* 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);
+               }
+       }
+}
+
+void
 mappingnotify(XEvent *e)
 {
        XMappingEvent           *ev = &e->xmapping;
@@ -2996,6 +3499,8 @@ main(int argc, char *argv[])
                errx(1, "invalid user %d", getuid());
 
        setup_screens();
+       setup_keys();
+       setup_quirks();
 
        snprintf(conf, sizeof conf, "%s/.%s", pwd->pw_dir, SWM_CONF_FILE);
        if (stat(conf, &sb) != -1) {