static const char *cvstag = "$scrotwm$";
-#define SWM_VERSION "0.9.11"
+#define SWM_VERSION "0.9.15"
#include <stdio.h>
#include <stdlib.h>
#endif
#endif
+#define SWM_DEBUG
/* #define SWM_DEBUG */
#ifdef SWM_DEBUG
#define DPRINTF(x...) do { if (swm_debug) fprintf(stderr, x); } while (0)
kf_screenshot_wind,
kf_float_toggle,
kf_version,
+ kf_dumpwins,
kf_spawn_lock,
kf_spawn_initscr,
kf_spawn_custom,
void grabbuttons(struct ws_win *, int);
void new_region(struct swm_screen *, int, int, int, int);
void unmanage_window(struct ws_win *);
+long getstate(Window);
struct layout {
void (*l_stack)(struct workspace *, struct swm_geometry *);
{ horizontal_stack, horizontal_config, 0, "[-]" },
{ max_stack, NULL,
SWM_L_FOCUSPREV | SWM_L_MAPONFOCUS, "[ ]"},
- { NULL, NULL, 0},
+ { NULL, NULL, 0, NULL },
};
#define SWM_H_SLICE (32)
/* define work spaces */
struct workspace {
int idx; /* workspace index */
- int restack; /* restack on switch */
struct layout *cur_layout; /* current layout handlers */
struct ws_win *focus; /* may be NULL */
struct ws_win *focus_prev; /* may be NULL */
struct swm_region *r; /* may be NULL */
struct swm_region *old_r; /* may be NULL */
struct ws_win_list winlist; /* list of windows in ws */
+ struct ws_win_list unmanagedlist; /* list of dead windows in ws */
/* stacker state */
struct {
SWM_S_COLOR_FOCUS, SWM_S_COLOR_UNFOCUS, SWM_S_COLOR_MAX };
/* physical screen mapping */
-#define SWM_WS_MAX (10) /* XXX Too small? */
+#define SWM_WS_MAX (10)
struct swm_screen {
- int idx; /* screen index */
+ int idx; /* screen index */
struct swm_region_list rl; /* list of regions on this screen */
struct swm_region_list orl; /* list of old regions */
Window root;
"remaining\n",
e->xany.window, e->type, QLength(display));
}
+
+void
+dumpwins(struct swm_region *r, union arg *args)
+{
+ struct ws_win *win;
+ unsigned int state;
+ XWindowAttributes wa;
+
+ if (r->ws == NULL) {
+ fprintf(stderr, "invalid workspace\n");
+ return;
+ }
+
+ fprintf(stderr, "=== managed window list ws %02d ===\n", r->ws->idx);
+
+ TAILQ_FOREACH(win, &r->ws->winlist, entry) {
+ state = getstate(win->id);
+ if (!XGetWindowAttributes(display, win->id, &wa))
+ fprintf(stderr, "window: %lu failed "
+ "XGetWindowAttributes\n", win->id);
+ fprintf(stderr, "window: %lu map_state: %d state: %d\n",
+ win->id, wa.map_state, state);
+ }
+
+ fprintf(stderr, "===== unmanaged window list =====\n");
+ TAILQ_FOREACH(win, &r->ws->unmanagedlist, entry) {
+ state = getstate(win->id);
+ if (!XGetWindowAttributes(display, win->id, &wa))
+ fprintf(stderr, "window: %lu failed "
+ "XGetWindowAttributes\n", win->id);
+ fprintf(stderr, "window: %lu map_state: %d state: %d\n",
+ win->id, wa.map_state, state);
+ }
+
+ fprintf(stderr, "=================================\n");
+}
#else
#define dumpevent(e)
+void
+dumpwins(struct swm_region *r, union arg *args)
+{
+}
#endif /* SWM_DEBUG */
void expose(XEvent *);
bar_toggle(struct swm_region *r, union arg *args)
{
struct swm_region *tmpr;
- int i, j, sc = ScreenCount(display);
+ int i, sc = ScreenCount(display);
DNPRINTF(SWM_D_MISC, "bar_toggle\n");
XMapRaised(display, tmpr->bar_window);
bar_enabled = !bar_enabled;
- for (i = 0; i < sc; i++)
- for (j = 0; j < SWM_WS_MAX; j++)
- screens[i].ws[j].restack = 1;
stack();
/* must be after stack */
bar_refresh();
}
-Bool
-set_win_notify_cb(Display *d, XEvent *e, char *arg)
-{
- struct ws_win *win = (struct ws_win *)arg;
-
- if (win && win->id == e->xany.window && e->xany.type == PropertyNotify)
- return (True);
- return (False);
-}
-
void
set_win_state(struct ws_win *win, long state)
{
long data[] = {state, None};
- XEvent ev;
- XWindowAttributes wa;
- int putback;
DNPRINTF(SWM_D_EVENT, "set_win_state: window: %lu\n", win->id);
if (win == NULL)
return;
- /* make sure we drain everything */
- XSync(display, True);
-
- /* make sure we still exist too */
- if (XGetWindowAttributes(display, win->id, &wa) == BadWindow)
- return;
XChangeProperty(display, win->id, astate, astate, 32, PropModeReplace,
(unsigned char *)data, 2);
-
- /* wait for completion of XChangeProperty */
- putback = 0;
- while (XCheckIfEvent(display, &ev, set_win_notify_cb, (char *)win))
- putback = 1;
- if (putback)
- XPutBackEvent(display, &ev);
}
long
}
void
+configreq_win(struct ws_win *win)
+{
+ XConfigureRequestEvent cr;
+
+ if (win == NULL)
+ return;
+
+ bzero(&cr, sizeof cr);
+ cr.type = ConfigureRequest;
+ cr.display = display;
+ cr.parent = win->id;
+ cr.window = win->id;
+ cr.x = win->g.x;
+ cr.y = win->g.y;
+ cr.width = win->g.w;
+ cr.height = win->g.h;
+ cr.border_width = 1;
+
+ XSendEvent(display, win->id, False, StructureNotifyMask, (XEvent *)&cr);
+}
+
+void
config_win(struct ws_win *win)
{
XConfigureEvent ce;
{
struct ws_win *win;
int count = 0;
- int state;
-
- /*
- * Under stress conditions windows sometimes do not get removed from
- * the managed list quickly enough. Use a very large hammer to get rid
- * of them. A smaller hammer would be nice.
- */
- TAILQ_FOREACH(win, &ws->winlist, entry) {
- state = getstate(win->id);
- if (state == -1) {
- DNPRINTF(SWM_D_MISC, "count_win:removing: %lu\n",
- win->id);
- unmanage_window(win);
- }
- }
TAILQ_FOREACH(win, &ws->winlist, entry) {
if (count_transient == 0 && win->floating)
running = 0;
}
-Bool
-unmap_window_cb(Display *d, XEvent *e, char *arg)
-{
- struct ws_win *win = (struct ws_win *)arg;
-
- if (win && win->id == e->xany.window && e->xany.type == UnmapNotify)
- return (True);
- return (False);
-}
-
void
unmap_window(struct ws_win *win)
{
- XEvent ev;
- XWindowAttributes wa;
- int putback;
-
if (win == NULL)
return;
- /* make sure we still exist too */
- if (XGetWindowAttributes(display, win->id, &wa) == BadWindow)
- return;
-
/* don't unmap again */
- if (wa.map_state == IsUnmapped && getstate(win->id) == IconicState)
+ if (getstate(win->id) == IconicState)
return;
- /* java shits itself when windows are set to iconic state */
- if (win->java == 0)
- set_win_state(win, IconicState);
+ set_win_state(win, IconicState);
XUnmapWindow(display, win->id);
-
- /* make sure we wait for XUnmapWindow completion */
- putback = 0;
- while (XCheckIfEvent(display, &ev, unmap_window_cb, (char *)win))
- putback = 1;
- if (putback)
- XPutBackEvent(display, &ev);
}
void
}
struct ws_win *
+find_unmanaged_window(Window id)
+{
+ struct ws_win *win;
+ int i, j;
+
+ for (i = 0; i < ScreenCount(display); i++)
+ for (j = 0; j < SWM_WS_MAX; j++)
+ TAILQ_FOREACH(win, &screens[i].ws[j].unmanagedlist,
+ entry)
+ if (id == win->id)
+ return (win);
+ return (NULL);
+}
+
+struct ws_win *
find_window(Window id)
{
struct ws_win *win;
win->ws->focus = win;
if (win->ws->r != NULL) {
- XSetWindowBorder(display, win->id,
- win->ws->r->s->c[SWM_S_COLOR_FOCUS].color);
grabbuttons(win, 1);
if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS)
XMapRaised(display, win->id);
+ XSetWindowBorder(display, win->id,
+ win->ws->r->s->c[SWM_S_COLOR_FOCUS].color);
if (win->java == 0)
XSetInputFocus(display, win->id,
RevertToPointerRoot, CurrentTime);
struct ws_win *win, *winfocus = NULL, *parent = NULL;
struct workspace *new_ws, *old_ws;
- if (!(r && r->s)) {
- fprintf(stderr, "r && r->s failed\n");
- abort();
- }
- if (wsid < 0 || wsid > SWM_WS_MAX) {
- fprintf(stderr, "illegal wsid\n");
- abort();
- }
+ if (!(r && r->s))
+ return;
this_r = r;
old_ws = this_r->ws;
"%d -> %d\n", r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r),
old_ws->idx, wsid);
- if (new_ws == NULL || old_ws == NULL) {
- fprintf(stderr, "new_ws = %p old_ws = %p\n", new_ws, old_ws);
- abort();
- }
-
+ if (new_ws == NULL || old_ws == NULL)
+ return;
if (new_ws == old_ws)
return;
if (old_ws->r != NULL)
old_ws->old_r = old_ws->r;
old_ws->r = NULL;
- old_ws->restack = 1;
-
- /*
- * Map new windows first if they were here before
- * to minimize ugly blinking.
- */
- if (new_ws->old_r == this_r)
- TAILQ_FOREACH(win, &new_ws->winlist, entry)
- if (!(win->ws->cur_layout->flags &
- SWM_L_MAPONFOCUS))
- XMapRaised(display, win->id);
TAILQ_FOREACH(win, &old_ws->winlist, entry)
unmap_window(win);
else
return;
}
+ if (target == NULL || source == NULL)
+ return;
source->ws->focus_prev = target;
TAILQ_REMOVE(wl, target, entry);
TAILQ_INSERT_BEFORE(source, target, entry);
"(screen %d, region %d)\n", r->ws->idx, i, j++);
/* start with screen geometry, adjust for bar */
- if (r == NULL) {
- fprintf(stderr, "illegal r\n");
- abort();
- }
g = r->g;
g.w -= 2;
g.h -= 2;
g.y += bar_height;
g.h -= bar_height;
}
- if (r->ws == NULL) {
- fprintf(stderr, "illegal ws\n");
- abort();
- }
- if (r->ws->cur_layout == NULL) {
- fprintf(stderr, "illegal cur_layout\n");
- abort();
- }
- r->ws->restack = 0;
- if (r->ws->cur_layout->l_stack == NULL) {
- fprintf(stderr, "illegal l_stack\n");
- abort();
- }
r->ws->cur_layout->l_stack(r->ws, &g);
}
}
bzero(&wc, sizeof wc);
mask = CWX | CWY | CWBorderWidth | CWWidth | CWHeight;
- if ((win->quirks & SWM_Q_FULLSCREEN) && (win->g.w == WIDTH(r)) &&
- (win->g.h == HEIGHT(r)))
+ if ((win->quirks & SWM_Q_FULLSCREEN) && (win->g.w >= WIDTH(r)) &&
+ (win->g.h >= HEIGHT(r)))
wc.border_width = 0;
else
wc.border_width = 1;
}
/* adjust for region */
- wc.x += r->g.x;
- wc.y += r->g.y;
+ if (wc.x < r->g.x)
+ wc.x += r->g.x;
+ if (wc.y < r->g.y)
+ wc.y += r->g.y;
+
+ win->g.x = wc.x;
+ win->g.y = wc.y;
+ win->g.w = wc.width;
+ win->g.h = wc.height;
- DNPRINTF(SWM_D_STACK, "stack_floater: win %lu x %d y %d w %d h %d\n",
+ DNPRINTF(SWM_D_MISC, "stack_floater: win %lu x %d y %d w %d h %d\n",
win->id, wc.x, wc.y, wc.width, wc.height);
XConfigureWindow(display, win->id, mask, &wc);
+ configreq_win(win);
}
/*
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, reconfigure;
unsigned int mask;
DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d\n rot=%s flip=%s",
bzero(&wc, sizeof wc);
wc.border_width = 1;
+ reconfigure = 0;
if (rot) {
- win->g.x = wc.x = win_g.y;
- win->g.y = wc.y = win_g.x;
- win->g.w = wc.width = win_g.h;
- win->g.h = wc.height = win_g.w;
+ if (win->g.x != win_g.y || win->g.y != win_g.x ||
+ win->g.w != win_g.h || win->g.h != win_g.w) {
+ reconfigure = 1;
+ win->g.x = wc.x = win_g.y;
+ win->g.y = wc.y = win_g.x;
+ win->g.w = wc.width = win_g.h;
+ win->g.h = wc.height = win_g.w;
+ }
} else {
- win->g.x = wc.x = win_g.x;
- win->g.y = wc.y = win_g.y;
- win->g.w = wc.width = win_g.w;
- win->g.h = wc.height = win_g.h;
+ if (win->g.x != win_g.x || win->g.y != win_g.y ||
+ win->g.w != win_g.w || win->g.h != win_g.h) {
+ reconfigure = 1;
+ win->g.x = wc.x = win_g.x;
+ win->g.y = wc.y = win_g.y;
+ win->g.w = wc.width = win_g.w;
+ win->g.h = wc.height = win_g.h;
+ }
+ }
+ if (reconfigure) {
+ adjust_font(win);
+ mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
+ XConfigureWindow(display, win->id, mask, &wc);
+ configreq_win(win);
}
- adjust_font(win);
- mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
- XConfigureWindow(display, win->id, mask, &wc);
XMapRaised(display, win->id);
last_h = win_g.h;
return;
TAILQ_FOREACH(win, &ws->winlist, entry) {
- if (win->transient != 0) {
+ if (win->transient) {
wintrans = win;
- } else {
+ continue;
+ }
+
+ /* only reconfigure if necessary */
+ if (win->g.x != gg.x || win->g.y != gg.y || win->g.w != gg.w ||
+ win->g.h != gg.h) {
bzero(&wc, sizeof wc);
wc.border_width = 1;
win->g.x = wc.x = gg.x;
win->g.h = wc.height = gg.h;
mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
XConfigureWindow(display, win->id, mask, &wc);
-
- /* unmap only if we don't have multi screen */
- if (win != ws->focus)
- if (!(ScreenCount(display) > 1 || outputs > 1))
- unmap_window(win);
+ configreq_win(win);
}
+ /* unmap only if we don't have multi screen */
+ if (win != ws->focus)
+ if (!(ScreenCount(display) > 1 || outputs > 1))
+ unmap_window(win);
}
/* put the last transient on top */
if (count_win(nws, 1) == 1)
nws->focus = win;
- ws->restack = 1;
- nws->restack = 1;
stack();
if (winfocus)
win->id, wc.x, wc.y, wc.width, wc.height);
XConfigureWindow(display, win->id, mask, &wc);
- config_win(win);
+ configreq_win(win);
}
void
{
XEvent ev;
Time time = 0;
+ struct swm_region *r = win->ws->r;
DNPRINTF(SWM_D_MOUSE, "resize: win %lu floating %d trans %d\n",
win->id, win->floating, win->transient);
handler[ev.type](&ev);
break;
case MotionNotify:
+ /* do not allow resize outside of region */
+ if (ev.xmotion.y_root < r->g.y ||
+ ev.xmotion.y_root >= r->g.y + r->g.h - 1)
+ continue;
+ if (ev.xmotion.x_root < r->g.x ||
+ ev.xmotion.x_root >= r->g.x + r->g.w - 1)
+ continue;
+
if (ev.xmotion.x <= 1)
ev.xmotion.x = 1;
if (ev.xmotion.y <= 1)
win->id, wc.x, wc.y, wc.width, wc.height);
XConfigureWindow(display, win->id, mask, &wc);
- config_win(win);
+ configreq_win(win);
}
void
XEvent ev;
Time time = 0;
int restack = 0;
+ struct swm_region *r = win->ws->r;
DNPRINTF(SWM_D_MOUSE, "move: win %lu floating %d trans %d\n",
win->id, win->floating, win->transient);
handler[ev.type](&ev);
break;
case MotionNotify:
+ /* don't allow to move window out of region */
+ if (ev.xmotion.y_root < r->g.y ||
+ ev.xmotion.y_root + win->g.h >= r->g.y + r->g.h - 1)
+ continue;
+ if (ev.xmotion.x_root < r->g.x ||
+ ev.xmotion.x_root + win->g.w >= r->g.x + r->g.w - 1)
+ continue;
+
win->g.x = ev.xmotion.x_root;
win->g.y = ev.xmotion.y_root;
{ "spawn_lock", legacyfunc, {0} },
{ "spawn_initscr", legacyfunc, {0} },
{ "spawn_custom", dummykeyfunc, {0} },
+ { "dumpwins", dumpwins, {0} },
{ "invalid key func", NULL, {0} },
};
struct key {
setkeybinding(MODKEY|ShiftMask, XK_v, kf_version, NULL);
setkeybinding(MODKEY|ShiftMask, XK_Delete, kf_spawn_custom, "lock");
setkeybinding(MODKEY|ShiftMask, XK_i, kf_spawn_custom, "initscr");
+#ifdef SWM_DEBUG
+ setkeybinding(MODKEY|ShiftMask, XK_d, kf_dumpwins, NULL);
+#endif
}
void
XWindowChanges wc;
if ((win = find_window(id)) != NULL)
- return (win); /* already being managed */
+ return (win); /* already being managed */
+
+ /* see if we are on the unmanaged list */
+ if ((win = find_unmanaged_window(id)) != NULL) {
+ DNPRINTF(SWM_D_MISC, "manage previously unmanaged window "
+ "%lu\n", win->id);
+ TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry);
+ TAILQ_INSERT_TAIL(&win->ws->winlist, win, entry);
+ return (win);
+ }
if ((win = calloc(1, sizeof(struct ws_win))) == NULL)
errx(1, "calloc: failed to allocate memory for new window");
!strcmp(win->ch.res_name, quirks[i].name)) {
DNPRINTF(SWM_D_CLASS, "found: %s name: %s\n",
win->ch.res_class, win->ch.res_name);
- if (quirks[i].quirk & SWM_Q_FLOAT)
+ if (quirks[i].quirk & SWM_Q_FLOAT) {
win->floating = 1;
+ border_me = 1;
+ }
win->quirks = quirks[i].quirk;
}
}
wc.border_width = 1;
mask = CWBorderWidth;
XConfigureWindow(display, win->id, mask, &wc);
+ configreq_win(win);
}
XSelectInput(display, id, EnterWindowMask | FocusChangeMask |
}
void
+free_window(struct ws_win *win)
+{
+ DNPRINTF(SWM_D_MISC, "free_window: %lu\n", win->id);
+
+ if (win == NULL)
+ return;
+
+ /* needed for restart wm */
+ set_win_state(win, WithdrawnState);
+
+ TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry);
+
+ if (win->ch.res_class)
+ XFree(win->ch.res_class);
+ if (win->ch.res_name)
+ XFree(win->ch.res_name);
+ free(win);
+}
+
+void
unmanage_window(struct ws_win *win)
{
- struct workspace *ws;
struct ws_win *parent;
if (win == NULL)
DNPRINTF(SWM_D_MISC, "unmanage_window: %lu\n", win->id);
- /* needed for restart wm */
- set_win_state(win, WithdrawnState);
-
if (win->transient) {
parent = find_window(win->transient);
if (parent)
parent->child_trans = NULL;
}
- ws = win->ws;
TAILQ_REMOVE(&win->ws->winlist, win, entry);
- if (win->ch.res_class)
- XFree(win->ch.res_class);
- if (win->ch.res_name)
- XFree(win->ch.res_name);
- free(win);
+ TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry);
}
void
}
}
+Bool
+destroy_notify_cb(Display *d, XEvent *e, char *arg)
+{
+ struct ws_win *win = (struct ws_win *)arg;
+ if (win && win->id == e->xany.window && e->xany.type == DestroyNotify)
+ return (True);
+ return (False);
+}
+
void
expose(XEvent *e)
{
XWindowChanges wc;
if ((win = find_window(ev->window)) == NULL)
- new = 1;
+ if ((win = find_unmanaged_window(ev->window)) == NULL)
+ new = 1;
if (new) {
DNPRINTF(SWM_D_EVENT, "configurerequest: new window: %lu\n",
win->g.w = ev->width;
if (ev->value_mask & CWHeight)
win->g.h = ev->height;
- if (win->ws->r != NULL) {
- /* this seems to be full screen */
- if (win->g.w >= WIDTH(win->ws->r)) {
- win->g.x = 0;
- win->g.w = WIDTH(win->ws->r);
- ev->value_mask |= CWX | CWWidth;
- }
- if (win->g.h >= HEIGHT(win->ws->r)) {
- /* kill border */
- win->g.y = 0;
- win->g.h = HEIGHT(win->ws->r);
- ev->value_mask |= CWY | CWHeight;
- }
- }
- if ((ev->value_mask & (CWX | CWY)) &&
- !(ev->value_mask & (CWWidth | CWHeight)))
- config_win(win);
- XMoveResizeWindow(display, win->id,
- win->g.x, win->g.y, win->g.w, win->g.h);
- } else
- config_win(win);
+ }
+ config_win(win);
}
}
DNPRINTF(SWM_D_EVENT, "configurenotify: window: %lu\n",
e->xconfigure.window);
- XMapWindow(display, e->xconfigure.window);
win = find_window(e->xconfigure.window);
if (win) {
XGetWMNormalHints(display, win->id, &win->sh, &mask);
adjust_font(win);
- XMapWindow(display, win->id);
if (font_adjusted)
stack();
}
void
destroynotify(XEvent *e)
{
- struct ws_win *win, *winfocus = NULL;
+ struct ws_win *win, *w, *wn, *winfocus = NULL;
struct workspace *ws;
struct ws_win_list *wl;
XDestroyWindowEvent *ev = &e->xdestroywindow;
DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window);
- if ((win = find_window(ev->window)) != NULL) {
- /* find a window to focus */
- ws = win->ws;
- wl = &ws->winlist;
-
- /* if we are transient give focus to parent */
- if (win->transient)
- winfocus = find_window(win->transient);
- else if (ws->focus == win) {
- /* if in max_stack try harder */
- if (ws->cur_layout->flags & SWM_L_FOCUSPREV) {
- if (win != ws->focus_prev)
- winfocus = ws->focus_prev;
- else if (win != ws->focus)
- winfocus = ws->focus;
- }
+ if ((win = find_window(ev->window)) == NULL) {
+ if ((win = find_unmanaged_window(ev->window)) == NULL)
+ return;
+ free_window(win);
+ return;
+ }
- /* fallback and normal handling */
- if (winfocus == NULL) {
- if (TAILQ_FIRST(wl) == win)
- winfocus = TAILQ_NEXT(win, entry);
- else {
- winfocus = TAILQ_PREV(ws->focus,
- ws_win_list, entry);
- if (winfocus == NULL)
- winfocus = TAILQ_LAST(wl,
- ws_win_list);
- }
- }
+ /* find a window to focus */
+ ws = win->ws;
+ wl = &ws->winlist;
+
+ for (w = TAILQ_FIRST(&ws->winlist); w != TAILQ_END(&ws->winlist);
+ w = wn) {
+ wn = TAILQ_NEXT(w, entry);
+ if (win == w)
+ continue; /* can't happen but oh well */
+
+ if (getstate(w->id) != -1)
+ continue;
+ unmanage_window(w);
+ }
+ /* if we are transient give focus to parent */
+ if (win->transient)
+ winfocus = find_window(win->transient);
+ else if (ws->focus == win) {
+ /* if in max_stack try harder */
+ if (ws->cur_layout->flags & SWM_L_FOCUSPREV) {
+ if (win != ws->focus_prev)
+ winfocus = ws->focus_prev;
+ else if (win != ws->focus)
+ winfocus = ws->focus;
}
- unmanage_window(win);
- ignore_enter = 1;
- stack();
- if (winfocus)
- focus_win(winfocus);
- ignore_enter = 0;
+ /* fallback and normal handling */
+ if (winfocus == NULL) {
+ if (TAILQ_FIRST(wl) == win)
+ winfocus = TAILQ_NEXT(win, entry);
+ else {
+ winfocus = TAILQ_PREV(ws->focus,
+ ws_win_list, entry);
+ if (winfocus == NULL)
+ winfocus = TAILQ_LAST(wl,
+ ws_win_list);
+ }
+ }
}
+ unmanage_window(win);
+ free_window(win);
+
+ ignore_enter = 1;
+ stack();
+ if (winfocus)
+ focus_win(winfocus);
+ ignore_enter = 0;
}
void
DNPRINTF(SWM_D_EVENT, "mapnotify: window: %lu\n", ev->window);
- win = find_window(ev->window);
+ win = manage_window(ev->window);
if (win)
set_win_state(win, NormalState);
}
for (j = 0; j < SWM_WS_MAX; j++) {
ws = &screens[i].ws[j];
ws->idx = j;
- ws->restack = 1;
ws->focus = NULL;
ws->r = NULL;
ws->old_r = NULL;
TAILQ_INIT(&ws->winlist);
+ TAILQ_INIT(&ws->unmanagedlist);
for (k = 0; layouts[k].l_stack != NULL; k++)
if (layouts[k].l_config != NULL)
continue;
state = getstate(wins[j]);
- manage = state == NormalState || state == IconicState;
+ manage = state == IconicState;
if (wa.map_state == IsViewable || manage)
manage_window(wins[j]);
}
continue;
state = getstate(wins[j]);
- manage = state == NormalState || state == IconicState;
+ manage = state == IconicState;
if (XGetTransientForHint(display, wins[j], &d1) &&
manage)
manage_window(wins[j]);
struct passwd *pwd;
struct swm_region *r, *rr;
struct ws_win *winfocus = NULL;
+ struct timeval tv;
char conf[PATH_MAX], *cfile = NULL;
struct stat sb;
XEvent e;
int xfd, i;
fd_set rd;
+swm_debug = 0;
start_argv = argv;
fprintf(stderr, "Welcome to scrotwm V%s cvs tag: %s\n",
SWM_VERSION, cvstag);
FD_ZERO(&rd);
FD_SET(xfd, &rd);
- if (select(xfd + 1, &rd, NULL, NULL, NULL) == -1)
+ tv.tv_sec = 1;
+ tv.tv_usec = 0;
+ if (select(xfd + 1, &rd, NULL, NULL, &tv) == -1)
if (errno != EINTR)
DNPRINTF(SWM_D_MISC, "select failed");
if (running == 0)
Got questions, comments, patches, etc.? Contact Jason Woofenden