static const char *cvstag = "$scrotwm$";
-#define SWM_VERSION "0.9.17"
+#define SWM_VERSION "0.9.19"
#include <stdio.h>
#include <stdlib.h>
#define WIDTH(r) (r)->g.w
#define HEIGHT(r) (r)->g.h
#define SWM_MAX_FONT_STEPS (3)
+#define WINID(w) (w ? w->id : 0)
#ifndef SWM_LIB
#define SWM_LIB "/usr/local/lib/libswmhack.so"
void (*l_stack)(struct workspace *, struct swm_geometry *);
void (*l_config)(struct workspace *, int);
u_int32_t flags;
-#define SWM_L_MAPONFOCUS (1<<0)
+#define SWM_L_FOCUSPREV (1<<0)
+#define SWM_L_MAPONFOCUS (1<<1)
char *name;
} layouts[] = {
/* stack, configure */
{ vertical_stack, vertical_config, 0, "[|]" },
{ horizontal_stack, horizontal_config, 0, "[-]" },
{ max_stack, NULL,
- SWM_L_MAPONFOCUS, "[ ]"},
+ SWM_L_MAPONFOCUS | SWM_L_FOCUSPREV, "[ ]"},
{ NULL, NULL, 0, NULL },
};
};
void focus(struct swm_region *, union arg *);
-void focus_magic(struct ws_win *);
-
+void focus_magic(struct ws_win *, int);
+#define SWM_F_GENERIC (0)
+#define SWM_F_TRANSIENT (1)
/* quirks */
struct quirk {
char *class;
void
unfocus_win(struct ws_win *win)
{
+ DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %lu\n", WINID(win));
+
if (win == NULL)
return;
if (win->ws == NULL)
}
void
-unfocus_all(void)
+unfocus_all_except(struct ws_win *except)
{
struct ws_win *win;
int i, j;
- DNPRINTF(SWM_D_FOCUS, "unfocus_all:\n");
+ DNPRINTF(SWM_D_FOCUS, "unfocus_all_except: id: %lu\n", except->id);
for (i = 0; i < ScreenCount(display); i++)
for (j = 0; j < SWM_WS_MAX; j++)
TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
- unfocus_win(win);
+ if (win != except)
+ unfocus_win(win);
}
void
focus_win(struct ws_win *win)
{
+ int rtr;
+ Window wf;
+
DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win ? win->id : 0);
if (win == NULL)
}
/* use big hammer to make sure it works under all use cases */
- unfocus_all();
+ unfocus_all_except(win);
if (validate_win(win)) {
kill_refs(win);
win->ws->focus = win;
if (win->ws->r != NULL) {
- grabbuttons(win, 1);
- if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS)
- XMapRaised(display, win->id);
+ XGetInputFocus(display, &wf, &rtr);
+ if (wf != win->id) {
+ grabbuttons(win, 1);
+ if (win->java == 0)
+ XSetInputFocus(display, win->id,
+ RevertToParent, CurrentTime);
+ }
XSetWindowBorder(display, win->id,
win->ws->r->s->c[SWM_S_COLOR_FOCUS].color);
- if (win->java == 0)
- XSetInputFocus(display, win->id,
- RevertToPointerRoot, CurrentTime);
+ if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS)
+ XMapRaised(display, win->id);
}
}
}
void
+focus_prev(struct ws_win *win)
+{
+ struct ws_win *winfocus = NULL, *winlostfocus = NULL;
+ struct ws_win *cur_focus = NULL;
+ struct ws_win_list *wl = NULL;
+ struct workspace *ws = NULL;
+
+ DNPRINTF(SWM_D_FOCUS, "focus_prev: id %lu\n", WINID(win));
+
+ if (!(win && win->ws))
+ return;
+
+ ws = win->ws;
+ wl = &ws->winlist;
+ cur_focus = ws->focus;
+ winlostfocus = cur_focus;
+
+ /* pickle, just focus on whatever */
+ if (cur_focus == NULL) {
+ /* use prev_focus if valid */
+ if (ws->focus_prev && ws->focus_prev != cur_focus &&
+ find_window(WINID(ws->focus_prev)))
+ winfocus = ws->focus_prev;
+ if (winfocus == NULL)
+ winfocus = TAILQ_FIRST(wl);
+ goto done;
+ }
+
+ /* if transient focus on parent */
+ if (cur_focus->transient) {
+ winfocus = find_window(cur_focus->transient);
+ goto done;
+ }
+
+ /* if in max_stack try harder */
+ if (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)
+ goto done;
+ }
+
+ if (cur_focus == win)
+ winfocus = TAILQ_PREV(win, ws_win_list, entry);
+ if (winfocus == NULL)
+ winfocus = TAILQ_LAST(wl, ws_win_list);
+ if (winfocus == NULL || winfocus == win)
+ winfocus = TAILQ_NEXT(cur_focus, entry);
+done:
+ if (winfocus == winlostfocus || winfocus == NULL)
+ return;
+
+ focus_magic(winfocus, SWM_F_GENERIC);
+}
+
+void
focus(struct swm_region *r, union arg *args)
{
- struct ws_win *winfocus, *winlostfocus;
- struct ws_win_list *wl;
- struct ws_win *cur_focus;
+ struct ws_win *winfocus = NULL, *winlostfocus = NULL;
+ struct ws_win *cur_focus = NULL;
+ struct ws_win_list *wl = NULL;
+ struct workspace *ws = NULL;
if (!(r && r->ws))
return;
winfocus = r->ws->focus_prev;
else
winfocus = TAILQ_FIRST(&r->ws->winlist);
-
- focus_magic(winfocus);
+
+ focus_magic(winfocus, SWM_F_GENERIC);
return;
}
- cur_focus = r->ws->focus;
- if (cur_focus == NULL)
+ if ((cur_focus = r->ws->focus) == NULL)
return;
-
- wl = &cur_focus->ws->winlist;
+ ws = r->ws;
+ wl = &ws->winlist;
winlostfocus = cur_focus;
switch (args->id) {
- case SWM_ARG_ID_FOCUSPREV:
+ case SWM_ARG_ID_FOCUSPREV:
winfocus = TAILQ_PREV(cur_focus, ws_win_list, entry);
if (winfocus == NULL)
winfocus = TAILQ_LAST(wl, ws_win_list);
winfocus = TAILQ_FIRST(wl);
if (winfocus == cur_focus)
winfocus = cur_focus->ws->focus_prev;
- if (winfocus == NULL)
- return;
break;
default:
if (winfocus == winlostfocus || winfocus == NULL)
return;
- focus_magic(winfocus);
+ focus_magic(winfocus, SWM_F_GENERIC);
}
void
stack();
a.id = SWM_ARG_ID_FOCUSCUR;
focus(r, &a);
+ bar_update();
}
void
if (parent)
XMapRaised(display, parent->id);
stack_floater(wintrans, ws->r);
- focus_magic(wintrans);
+ focus_magic(wintrans, SWM_F_TRANSIENT);
}
}
return;
if (win == NULL)
return;
+ if (win->ws->idx == wsid)
+ return;
DNPRINTF(SWM_D_MOVE, "send_to_ws: win: %lu\n", win->id);
parent->child_trans = NULL;
}
+ focus_prev(win);
TAILQ_REMOVE(&win->ws->winlist, win, entry);
TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry);
}
void
-focus_magic(struct ws_win *win)
+focus_magic(struct ws_win *win, int do_trans)
{
+ DNPRINTF(SWM_D_FOCUS, "focus_magic: %lu %d\n", WINID(win), do_trans);
+
if (win == NULL)
return;
- if (win->child_trans) {
+ if (do_trans == SWM_F_TRANSIENT && win->child_trans) {
/* win = parent & has a transient so focus on that */
if (win->java) {
focus_win(win->child_trans);
if ((win = find_window(ev->window)) == NULL)
return;
- focus_magic(win);
+ focus_magic(win, SWM_F_TRANSIENT);
action = client_click;
for (i = 0; i < LENGTH(buttons); i++)
{
struct ws_win *win;
XDestroyWindowEvent *ev = &e->xdestroywindow;
- union arg a;
DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window);
return;
}
- a.id = SWM_ARG_ID_FOCUSPREV;
- focus(win->ws->r, &a);
unmanage_window(win);
- free_window(win);
stack();
+ free_window(win);
}
void
enternotify(XEvent *e)
{
XCrossingEvent *ev = &e->xcrossing;
+ XEvent cne;
struct ws_win *win;
- DNPRINTF(SWM_D_EVENT, "enternotify: window: %lu\n", ev->window);
+ DNPRINTF(SWM_D_FOCUS, "enternotify: window: %lu mode %d detail %d root "
+ "%lu subwindow %lu same_screen %d focus %d state %d\n",
+ ev->window, ev->mode, ev->detail, ev->root, ev->subwindow,
+ ev->same_screen, ev->focus, ev->state);
/*
+ * all these checks need to be in this order because the
+ * XCheckTypedWindowEvent relies on weeding out the previous events
+ *
+ * making this code an option would enable a follow mouse for focus
+ * feature
+ */
+
+ /*
+ * state is set when we are switching workspaces and focus is set when
+ * scrotwm launches via a restart
+ */
+ if (ev->state || ev->focus)
+ return;
+ /*
* happens when a window is created or destroyed and the border
- * crosses the mouse pointer
+ * crosses the mouse pointer and when switching ws
+ *
+ * we need the subwindow test to see if we came from root in order
+ * to give focus to floaters
*/
- if (QLength(display))
+ if (ev->mode == NotifyNormal && ev->detail == NotifyVirtual &&
+ ev->subwindow == 0)
return;
+ /* this window already has focus */
+ if (ev->mode == NotifyNormal && ev->detail == NotifyInferior)
+ return;
+
+ /* this window is being deleted or moved to another ws */
+ if (XCheckTypedWindowEvent(display, ev->window, ConfigureNotify,
+ &cne) == True) {
+ XPutBackEvent(display, &cne);
+ return;
+ }
+
if ((win = find_window(ev->window)) == NULL)
return;
- focus_magic(win);
+ /* in fullstack kill all enters */
+ if (win->ws->cur_layout->flags & SWM_L_FOCUSPREV)
+ return;
+
+ focus_magic(win, SWM_F_TRANSIENT);
}
void
/* make new win focused */
r = root_to_region(win->wa.root);
if (win->ws == r->ws)
- focus_magic(win);
+ focus_magic(win, SWM_F_GENERIC);
}
void
unmapnotify(XEvent *e)
{
struct ws_win *win;
- union arg a;
DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %lu\n", e->xunmap.window);
if (win == NULL)
return;
+ /*
+ * XXX this is a work around for going fullscreen on mplayer
+ * remove this and find a better heuristic
+ */
+ if (win->floating)
+ return;
+
if (getstate(e->xunmap.window) == NormalState) {
- /* trash window and refocus */
- a.id = SWM_ARG_ID_FOCUSPREV;
- focus(win->ws->r, &a);
unmanage_window(win);
stack();
}