static const char *cvstag = "$scrotwm$";
-#define SWM_VERSION "0.9.17"
+#define SWM_VERSION "0.9.18"
#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 focus(struct swm_region *, union arg *);
void focus_magic(struct ws_win *, int);
-
+#define SWM_F_GENERIC (0)
+#define SWM_F_TRANSIENT (1)
/* quirks */
struct quirk {
char *class;
}
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
}
/* 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);
}
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 */
+ /* XXX needs more love */
+ 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;
+ goto done;
+ }
+
+ if (cur_focus == win)
+ winfocus = TAILQ_PREV(win, ws_win_list, entry);
+ if (winfocus == NULL)
+ winfocus = TAILQ_FIRST(wl);
+ 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 = NULL, *winlostfocus = NULL;
else
winfocus = TAILQ_FIRST(&r->ws->winlist);
- focus_magic(winfocus, 0);
+ focus_magic(winfocus, SWM_F_GENERIC);
return;
}
- if (r->ws->focus == NULL)
+ if ((cur_focus = r->ws->focus) == NULL)
return;
-
- cur_focus = r->ws->focus;
ws = r->ws;
wl = &ws->winlist;
winlostfocus = cur_focus;
switch (args->id) {
- case SWM_ARG_ID_FOCUSPREV:
- if (cur_focus->transient)
- winfocus = find_window(cur_focus->transient);
- else if (ws->focus == cur_focus) {
- /* 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;
- }
-
- /* fallback and normal handling */
- if (winfocus == NULL) {
- if (TAILQ_FIRST(wl) == cur_focus)
- winfocus = TAILQ_NEXT(cur_focus, entry);
- else {
- winfocus = TAILQ_PREV(ws->focus,
- ws_win_list, entry);
- if (winfocus == NULL)
- winfocus = TAILQ_LAST(wl,
- ws_win_list);
- }
- }
- }
+ case SWM_ARG_ID_FOCUSPREV:
+ winfocus = TAILQ_PREV(cur_focus, ws_win_list, entry);
+ if (winfocus == NULL)
+ winfocus = TAILQ_LAST(wl, ws_win_list);
break;
+
case SWM_ARG_ID_FOCUSNEXT:
winfocus = TAILQ_NEXT(cur_focus, entry);
if (winfocus == NULL)
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, 0);
+ 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, 1);
+ 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, int do_trans)
{
+ DNPRINTF(SWM_D_FOCUS, "focus_magic: %lu %d\n", WINID(win), do_trans);
+
if (win == NULL)
return;
- if (do_trans && 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, 1);
+ 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
if ((win = find_window(ev->window)) == NULL)
return;
- focus_magic(win, 1);
+ 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, 0);
+ 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();
}
Got questions, comments, patches, etc.? Contact Jason Woofenden