* 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) 2012 Lawrence Teo <lteo@lteo.net>
- * Copyright (c) 2012 Tiago Cunha <tcunha@gmx.com>
+ * Copyright (c) 2011-2012 Lawrence Teo <lteo@lteo.net>
+ * Copyright (c) 2011-2012 Tiago Cunha <tcunha@gmx.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
#elif defined(__FreeBSD__)
#include <sys/tree.h>
#else
-#include <sys/tree.h>
+#include "tree.h"
#endif
#include <X11/cursorfont.h>
if (r->ws->name)
snprintf(ws, sizeof ws, "<%s>",
r->ws->name);
+ if (stack_enabled)
+ stack = r->ws->stacker;
+
+ snprintf(loc, sizeof loc,
+ "%d:%d %s %s %s%s %s %s",
+ x++, r->ws->idx + 1, stack, ws, s, cn,
+ bar_ext, bar_vertext);
+ bar_print(r, loc);
}
- if (stack_enabled)
- stack = r->ws->stacker;
-
- snprintf(loc, sizeof loc, "%d:%d %s %s %s%s %s "
- "%s", x++, r->ws->idx + 1, stack, ws, s, cn,
- bar_ext, bar_vertext);
- bar_print(r, loc);
}
}
alarm(bar_delay);
(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)
if (w_inc > 1 && w_inc < v_slice) {
/* adjust for window's requested size increment */
remain = (win_g.w - w_base) % w_inc;
- missing = w_inc - remain;
win_g.w -= remain;
- extra += remain;
}
msize = win_g.w;
void
raise_toggle(struct swm_region *r, union arg *args)
{
- if (r && r->ws == NULL)
+ if (r == NULL || r->ws == NULL)
return;
r->ws->always_raise = !r->ws->always_raise;
DNPRINTF(SWM_D_MISC, "uniconify\n");
- if (r && r->ws == NULL)
+ if (r == NULL || r->ws == NULL)
return;
/* make sure we have anything to uniconify */
/* load config */
for (i = 0; ; i++) {
+ conf[0] = '\0';
switch (i) {
case 0:
/* ~ */
snprintf(conf, sizeof conf, "%s/.%s",
pwd->pw_dir, SWM_CONF_FILE);
- if (stat(conf, &sb) != -1)
- if (S_ISREG(sb.st_mode))
- cfile = conf;
break;
case 1:
/* global */
snprintf(conf, sizeof conf, "/etc/%s",
SWM_CONF_FILE);
- if (stat(conf, &sb) != -1)
- if (S_ISREG(sb.st_mode))
- cfile = conf;
break;
case 2:
/* ~ compat */
snprintf(conf, sizeof conf, "%s/.%s",
pwd->pw_dir, SWM_CONF_FILE_OLD);
- if (stat(conf, &sb) != -1)
- if (S_ISREG(sb.st_mode))
- cfile = conf;
break;
case 3:
/* global compat */
snprintf(conf, sizeof conf, "/etc/%s",
SWM_CONF_FILE_OLD);
- if (stat(conf, &sb) != -1)
- if (S_ISREG(sb.st_mode))
- cfile = conf;
break;
default:
- cfile = NULL;
- break;
+ goto noconfig;
}
+
+ if (strlen(conf) && stat(conf, &sb) != -1)
+ if (S_ISREG(sb.st_mode)) {
+ cfile = conf;
+ break;
+ }
}
+noconfig:
/* load conf (if any) and refresh font color in bar graphics contexts */
if (cfile && conf_load(cfile, SWM_CONF_DEFAULT) == 0)