static const char *cvstag = "$scrotwm$";
-#define SWM_VERSION "0.9.19"
+#define SWM_VERSION "0.9.22"
#include <stdio.h>
#include <stdlib.h>
#include <X11/Xutil.h>
#include <X11/extensions/Xrandr.h>
+#ifdef __OSX__
+#include <osx.h>
+#endif
+
#if RANDR_MAJOR < 1
# error XRandR versions less than 1.0 are not supported
#endif
Atom takefocus;
volatile sig_atomic_t running = 1;
int outputs = 0;
-int last_focus_event = 0;
+int last_focus_event = FocusOut;
int (*xerrorxlib)(Display *, XErrorEvent *);
int other_wm;
int ss_enabled = 0;
set_win_state(win, IconicState);
XUnmapWindow(display, win->id);
+ if (win->ws->r)
+ XSetWindowBorder(display, win->id,
+ win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);
}
void
find_window(Window id)
{
struct ws_win *win;
- int i, j;
+ Window wrr, wpr, *wcr = NULL;
+ int i, j, nc;
for (i = 0; i < ScreenCount(display); i++)
for (j = 0; j < SWM_WS_MAX; j++)
TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
if (id == win->id)
return (win);
+
+ /* if we were looking for the parent return that window instead */
+ if (XQueryTree(display, id, &wrr, &wpr, &wcr, &nc) == 0)
+ return (NULL);
+ if (wcr)
+ XFree(wcr);
+
+ /* ignore not found and root */
+ if (wpr == 0 || wrr == wpr)
+ return (NULL);
+
+ /* look for parent */
+ for (i = 0; i < ScreenCount(display); i++)
+ for (j = 0; j < SWM_WS_MAX; j++)
+ TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
+ if (wpr == win->id)
+ return (win);
+
return (NULL);
}
void
unfocus_win(struct ws_win *win)
{
+ XEvent cne;
+
DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %lu\n", WINID(win));
if (win == NULL)
win->ws->focus_prev = NULL;
}
+ /* drain all previous unfocus events */
+ while (XCheckTypedEvent(display, FocusOut, &cne) == True)
+ ;
+
grabbuttons(win, 0);
XSetWindowBorder(display, win->id,
win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);
+
}
void
-unfocus_all_except(struct ws_win *except)
+unfocus_all(void)
{
struct ws_win *win;
int i, j;
- DNPRINTF(SWM_D_FOCUS, "unfocus_all_except: id: %lu\n", except->id);
+ DNPRINTF(SWM_D_FOCUS, "unfocus_all\n");
for (i = 0; i < ScreenCount(display); i++)
for (j = 0; j < SWM_WS_MAX; j++)
TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
- if (win != except)
- unfocus_win(win);
+ unfocus_win(win);
}
void
focus_win(struct ws_win *win)
{
- int rtr;
- Window wf;
+ XEvent cne;
+ Window cur_focus;
+ int rr;
+ struct ws_win *cfw = NULL;
+
DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win ? win->id : 0);
return;
}
- /* use big hammer to make sure it works under all use cases */
- unfocus_all_except(win);
-
if (validate_win(win)) {
kill_refs(win);
return;
}
+ XGetInputFocus(display, &cur_focus, &rr);
+ if ((cfw = find_window(cur_focus)) != NULL)
+ unfocus_win(cfw);
+
win->ws->focus = win;
if (win->ws->r != NULL) {
- XGetInputFocus(display, &wf, &rtr);
- if (wf != win->id) {
- grabbuttons(win, 1);
- if (win->java == 0)
- XSetInputFocus(display, win->id,
- RevertToParent, CurrentTime);
- }
+ /* drain all previous focus events */
+ while (XCheckTypedEvent(display, FocusIn, &cne) == True)
+ ;
+
+ if (win->java == 0)
+ XSetInputFocus(display, win->id,
+ RevertToParent, CurrentTime);
+ grabbuttons(win, 1);
XSetWindowBorder(display, win->id,
win->ws->r->s->c[SWM_S_COLOR_FOCUS].color);
if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS)
stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
{
XWindowChanges wc;
+ XWindowAttributes wa;
struct swm_geometry win_g, r_g = *g;
struct ws_win *win;
int i, j, s, stacks;
XConfigureWindow(display, win->id, mask, &wc);
configreq_win(win);
}
- XMapRaised(display, win->id);
+
+ if (XGetWindowAttributes(display, win->id, &wa))
+ if (wa.map_state == IsUnmapped)
+ XMapRaised(display, win->id);
last_h = win_g.h;
i++;
parent->child_trans = NULL;
}
- focus_prev(win);
+ /* work around for mplayer going full screen */
+ if (!win->floating)
+ focus_prev(win);
+
TAILQ_REMOVE(&win->ws->winlist, win, entry);
TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry);
return;
}
+ /* make sure we focus on something */
+ win->floating = 0;
+
unmanage_window(win);
stack();
free_window(win);
{
XCrossingEvent *ev = &e->xcrossing;
XEvent cne;
- struct ws_win *win, *w;
+ struct ws_win *win;
+#if 0
+ struct ws_win *w;
Window focus_return;
int revert_to_return;
-
-
+#endif
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);
+ goto focusme;
+#if 0
/*
* all these checks need to be in this order because the
* XCheckTypedWindowEvent relies on weeding out the previous events
return;
}
}
+#endif
+focusme:
+ if (QLength(display)) {
+ DNPRINTF(SWM_D_EVENT, "ignore enternotify %d\n",
+ QLength(display));
+ return;
+ }
+
+ if ((win = find_window(ev->window)) == NULL) {
+ DNPRINTF(SWM_D_EVENT, "ignoring enternotify: win == NULL\n");
+ return;
+ }
+
+ /*
+ * if we have more enternotifies let them handle it in due time
+ */
+ if (XCheckTypedEvent(display, EnterNotify, &cne) == True) {
+ DNPRINTF(SWM_D_EVENT,
+ "ignoring enternotify: got more enternotify\n");
+ XPutBackEvent(display, &cne);
+ return;
+ }
focus_magic(win, SWM_F_TRANSIENT);
}
void
focusevent(XEvent *e)
{
+ DNPRINTF(SWM_D_EVENT, "focusevent: %s window: %lu mode %d detail %d\n",
+ ev->type == FocusIn ? "entering" : "leaving",
+ ev->window, ev->mode, ev->detail);
+#if 0
struct ws_win *win;
u_int32_t mode_detail;
XFocusChangeEvent *ev = &e->xfocus;
ev->type == FocusIn ? "entering" : "leaving",
ev->window, ev->mode, ev->detail);
+ if (last_focus_event == ev->type) {
+ DNPRINTF(SWM_D_FOCUS, "ignoring focusevent: bad ordering\n");
+ return;
+ }
+
last_focus_event = ev->type;
mode_detail = MERGE_MEMBERS(ev->mode, ev->detail);
SWM_S_COLOR_FOCUS : SWM_S_COLOR_UNFOCUS].color);
break;
default:
+ fprintf(stderr, "ignoring focusevent\n");
DNPRINTF(SWM_D_FOCUS, "ignoring focusevent\n");
break;
}
+#endif
}
void
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) {
unmanage_window(win);
stack();
/* set some values to work around bad programs */
workaround();
+ unfocus_all();
+
grabkeys();
stack();