Change global variable to local.

[spectrwm.git] / spectrwm.c

diff --git a/spectrwm.c b/spectrwm.c
index a6ef35f..93b4244 100644 (file)
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -5,10 +5,10 @@
  * 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>
- * Copyright (c) 2011-2012 Reginald Kennedy <rk@rejii.com>
+ * Copyright (c) 2011-2013 Reginald Kennedy <rk@rejii.com>
  * Copyright (c) 2011-2012 Lawrence Teo <lteo@lteo.net>
  * Copyright (c) 2011-2012 Tiago Cunha <tcunha@gmx.com>
- * Copyright (c) 2012 David Hill <dhill@mindcry.org>
+ * Copyright (c) 2012-2013 David Hill <dhill@mindcry.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -1989,12 +1989,12 @@ bar_window_name(char *s, size_t sz, struct swm_region *r)
        free(title);
 }
 
-int            urgent[SWM_WS_MAX];
 void
 bar_urgent(char *s, size_t sz)
 {
        struct ws_win           *win;
        int                     i, j, num_screens;
+       int                     urgent[SWM_WS_MAX];
        char                    b[8];
        xcb_get_property_cookie_t       c;
        xcb_icccm_wm_hints_t    hints;
@@ -3465,8 +3465,9 @@ switchws(struct swm_region *r, union arg *args)
        this_r->ws = new_ws;
        new_ws->r = this_r;
 
-       /* Set focus_pending before stacking. */
-       if (focus_mode != SWM_FOCUS_FOLLOW)
+       /* Set focus_pending before stacking, if needed. */
+       if (focus_mode != SWM_FOCUS_FOLLOW && (!new_ws->focus_pending ||
+           validate_win(new_ws->focus_pending)))
                new_ws->focus_pending = get_region_focus(new_ws->r);
 
        stack();
@@ -4258,20 +4259,24 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
                        colno = (winno - mwin) / stacks;
                        if (s <= (winno - mwin) % stacks)
                                colno++;
-                       split = split + colno;
-                       hrh = (r_g.h / colno);
+                       split += colno;
+                       hrh = r_g.h / colno;
                        extra = r_g.h - (colno * hrh);
-                       if (flip)
-                               win_g.x = r_g.x;
-                       else
+
+                       if (!flip)
                                win_g.x += win_g.w + 2 * border_width +
                                    tile_gap;
+
                        win_g.w = (r_g.w - msize -
                            (stacks * (2 * border_width + tile_gap))) / stacks;
                        if (s == 1)
                                win_g.w += (r_g.w - msize -
                                    (stacks * (2 * border_width + tile_gap))) %
                                    stacks;
+
+                       if (flip)
+                               win_g.x -= win_g.w + 2 * border_width +
+                                   tile_gap;
                        s--;
                        j = 0;
                }