Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
spectrwm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
scrotwm_se.conf: Swedish keyboard_mapping file.
[spectrwm.git]
/
scrotwm.c
diff --git
a/scrotwm.c
b/scrotwm.c
index
44b614c
..
b0c116d
100644
(file)
--- a/
scrotwm.c
+++ b/
scrotwm.c
@@
-1945,12
+1945,12
@@
validate_win(struct ws_win *testwin)
struct ws_win *win;
struct workspace *ws;
struct swm_region *r;
struct ws_win *win;
struct workspace *ws;
struct swm_region *r;
- int i, x, foundit = 0;
+ int i, x;
if (testwin == NULL)
return (0);
if (testwin == NULL)
return (0);
- for (i = 0, foundit = 0; i < ScreenCount(display); i++)
+ 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];
TAILQ_FOREACH(r, &screens[i].rl, entry)
for (x = 0; x < SWM_WS_MAX; x++) {
ws = &r->s->ws[x];
@@
-1966,10
+1966,10
@@
validate_ws(struct workspace *testws)
{
struct swm_region *r;
struct workspace *ws;
{
struct swm_region *r;
struct workspace *ws;
- int foundit, i, x;
+ int i, x;
/* validate all ws */
/* validate all ws */
- for (i = 0, foundit = 0; i < ScreenCount(display); i++)
+ 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];
TAILQ_FOREACH(r, &screens[i].rl, entry)
for (x = 0; x < SWM_WS_MAX; x++) {
ws = &r->s->ws[x];
@@
-2523,13
+2523,10
@@
void
cycle_layout(struct swm_region *r, union arg *args)
{
struct workspace *ws = r->ws;
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);
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];
ws->cur_layout++;
if (ws->cur_layout->l_stack == NULL)
ws->cur_layout = &layouts[0];
@@
-3266,14
+3263,11
@@
uniconify(struct swm_region *r, union arg *args)
void
name_workspace(struct swm_region *r, union arg *args)
{
void
name_workspace(struct swm_region *r, union arg *args)
{
- struct workspace *ws;
FILE *lfile;
DNPRINTF(SWM_D_MISC, "name_workspace\n");
FILE *lfile;
DNPRINTF(SWM_D_MISC, "name_workspace\n");
- if (r && r->ws)
- ws = r->ws;
- else
+ if (r == NULL)
return;
search_r = r;
return;
search_r = r;
@@
-3820,9
+3814,7
@@
move_window(struct ws_win *win)
{
unsigned int mask;
XWindowChanges wc;
{
unsigned int mask;
XWindowChanges wc;
- struct swm_region *r;
- r = root_to_region(win->wa.root);
bzero(&wc, sizeof wc);
mask = CWX | CWY;
wc.x = win->g.x;
bzero(&wc, sizeof wc);
mask = CWX | CWY;
wc.x = win->g.x;