Merge branch 'master' of opensource.conformal.com:/git/scrotwm

diff --combined scrotwm.c
index 9e4b770,9f7ea21..55bf753
--- 1/scrotwm.c
--- 2/scrotwm.c
+++ b/scrotwm.c
@@@ -3353,10 -3353,13 +3353,13 @@@ resize(struct ws_win *win, union arg *a
  {
        XEvent                  ev;
        Time                    time = 0;
-       struct swm_region       *r = win->ws->r;
+       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 %lu\n",
            win->id, win->floating, win->transient);
@@@ -3471,7 -3474,7 +3474,7 @@@ resize_step(struct swm_region *r, unio
  {
        struct ws_win           *win = NULL;
  
-       if (r && r->ws)
+       if (r && r->ws && r->ws->focus)
                win = r->ws->focus;
        else
                return;
@@@ -3508,7 -3511,11 +3511,11 @@@ move(struct ws_win *win, union arg *arg
        XEvent                  ev;
        Time                    time = 0;
        int                     move_step = 0;
-       struct swm_region       *r = win->ws->r;
+       struct swm_region       *r = NULL;
+ 
+       if (win == NULL)
+               return;
+       r = win->ws->r;
  
        DNPRINTF(SWM_D_MOUSE, "move: win %lu floating %d trans %lu\n",
            win->id, win->floating, win->transient);
@@@ -3605,7 -3612,7 +3612,7 @@@ move_step(struct swm_region *r, union a
  {
        struct ws_win           *win = NULL;
  
-       if (r && r->ws)
+       if (r && r->ws && r->ws->focus)
                win = r->ws->focus;
        else
                return;
@@@ -4821,8 -4828,7 +4828,8 @@@ setautorun(char *selector, char *value
  int
  setlayout(char *selector, char *value, int flags)
  {
 -      int                     ws_id, st, i, x, mg, ma, si, raise;
 +      int                     ws_id, i, x, mg, ma, si, raise;
 +      int                     st = SWM_V_STACK;
        char                    s[1024];
        struct workspace        *ws;
  
@@@ -5462,6 -5468,7 +5469,6 @@@ buttonpress(XEvent *e
  
        DNPRINTF(SWM_D_EVENT, "buttonpress: window: %lu\n", ev->window);
  
 -      action = root_click;
        if ((win = find_window(ev->window)) == NULL)
                return;