static const char *cvstag = "$scrotwm$";
-#define SWM_VERSION "0.9.9"
+#define SWM_VERSION "1.0"
#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 SWM_EV_PROLOGUE(x) do { XGrabServer(x); } while (0)
-#define SWM_EV_EPILOGUE(x) do { XUngrabServer(x); XFlush(x); } while (0)
#ifndef SWM_LIB
#define SWM_LIB "/usr/local/lib/libswmhack.so"
Atom astate;
Atom aprot;
Atom adelete;
+Atom takefocus;
volatile sig_atomic_t running = 1;
int outputs = 0;
int (*xerrorxlib)(Display *, XErrorEvent *);
struct ws_win {
TAILQ_ENTRY(ws_win) entry;
Window id;
+ Window transient;
+ struct ws_win *child_trans; /* transient child window */
struct swm_geometry g;
int floating;
- int transient;
int manual;
int font_size_boundary[SWM_MAX_FONT_STEPS];
int font_steps;
int last_inc;
int can_delete;
+ int take_focus;
+ int java;
unsigned long quirks;
struct workspace *ws; /* always valid */
struct swm_screen *s; /* always valid, never changes */
void grabbuttons(struct ws_win *, int);
void new_region(struct swm_screen *, int, int, int, int);
+void unmanage_window(struct ws_win *);
struct layout {
void (*l_stack)(struct workspace *, struct swm_geometry *);
{
long data[] = {state, None};
XEvent ev;
+ XWindowAttributes wa;
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);
- if (state != WithdrawnState)
- XIfEvent(display, &ev, set_win_notify_cb, (char *)win);
+ /* wait for completion of XChangeProperty */
+ while (XCheckIfEvent(display, &ev, set_win_notify_cb, (char *)win))
+ ;
}
long
{
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)
unmap_window(struct ws_win *win)
{
XEvent ev;
+ XWindowAttributes wa;
if (win == NULL)
return;
- set_win_state(win, IconicState);
+ /* 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)
+ return;
+
+ /* java shits itself when windows are set to iconic state */
+ if (win->java == 0)
+ set_win_state(win, IconicState);
+
XUnmapWindow(display, win->id);
- XIfEvent(display, &ev, unmap_window_cb, (char *)win);
+ /* make sure we wait for XUnmapWindow completion */
+ while (XCheckIfEvent(display, &ev, unmap_window_cb, (char *)win))
+ ;
}
void
}
exit(0);
}
- wait(0);
}
void
grabbuttons(win, 1);
if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS)
XMapRaised(display, win->id);
- XSetInputFocus(display, win->id,
- RevertToPointerRoot, CurrentTime);
+ 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))
+ return;
+
this_r = r;
old_ws = this_r->ws;
new_ws = &this_r->s->ws[wsid];
"%d -> %d\n", r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r),
old_ws->idx, wsid);
- if (new_ws == old_ws)
+ if (new_ws == NULL || old_ws == NULL || new_ws == old_ws)
return;
/* get focus window */
DNPRINTF(SWM_D_KEY, "parsekeys: leave ok\n");
return (0);
}
+
char *
strdupsafe(char *str)
{
else
return (strdup(str));
}
+
void
setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid, char *spawn_name)
{
}
DNPRINTF(SWM_D_KEY, "setkeybinding: leave\n");
}
+
int
setconfbinding(char *selector, char *value, int flags)
{
DNPRINTF(SWM_D_KEY, "setconfbinding: no match\n");
return (1);
}
+
void
setup_keys(void)
{
setkeybinding(MODKEY|ShiftMask, XK_Delete, kf_spawn_custom, "lock");
setkeybinding(MODKEY|ShiftMask, XK_i, kf_spawn_custom, "initscr");
}
+
void
updatenumlockmask(void)
{
}
return (0);
}
+
void
setquirk(const char *class, const char *name, const int quirk)
{
}
}
}
+
int
setconfquirk(char *selector, char *value, int flags)
{
{
Window trans = 0;
struct workspace *ws;
- struct ws_win *win, *ww;
+ struct ws_win *win, *ww, *parent;
int format, i, ws_idx, n, border_me = 0;
unsigned long nitems, bytes;
Atom ws_idx_atom = 0, type;
XGetTransientForHint(display, id, &trans);
if (trans) {
win->transient = trans;
+ parent = find_window(win->transient);
+ if (parent)
+ parent->child_trans = win;
DNPRINTF(SWM_D_MISC, "manage_window: win %u transient %u\n",
(unsigned)win->id, win->transient);
}
/* get supported protocols */
if (XGetWMProtocols(display, id, &prot, &n)) {
- for (i = 0, pp = prot; i < n; i++, pp++)
+ for (i = 0, pp = prot; i < n; i++, pp++) {
+ if (*pp == takefocus)
+ win->take_focus = 1;
if (*pp == adelete)
win->can_delete = 1;
+ }
if (prot)
XFree(prot);
}
if (XGetClassHint(display, win->id, &win->ch)) {
DNPRINTF(SWM_D_CLASS, "class: %s name: %s\n",
win->ch.res_class, win->ch.res_name);
+
+ /* java is retarded so treat it special */
+ if (strstr(win->ch.res_name, "sun-awt"))
+ win->java = 1;
+
for (i = 0; i < quirks_length; i++){
if (!strcmp(win->ch.res_class, quirks[i].class) &&
!strcmp(win->ch.res_name, quirks[i].name)) {
unmanage_window(struct ws_win *win)
{
struct workspace *ws;
+ struct ws_win *parent;
if (win == NULL)
return;
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);
- set_win_state(win, WithdrawnState);
if (win->ch.res_class)
XFree(win->ch.res_class);
if (win->ch.res_name)
}
void
+focus_magic(struct ws_win *win)
+{
+ if (win->child_trans) {
+ /* win = parent & has a transient so focus on that */
+ if (win->java) {
+ focus_win(win->child_trans);
+ if (win->child_trans->take_focus)
+ client_msg(win, takefocus);
+ } else {
+ focus_win(win->child_trans);
+ if (win->child_trans->take_focus)
+ client_msg(win->child_trans, takefocus);
+ }
+ } else {
+ /* regular focus */
+ focus_win(win);
+ if (win->take_focus)
+ client_msg(win, takefocus);
+ }
+}
+
+void
expose(XEvent *e)
{
DNPRINTF(SWM_D_EVENT, "expose: window: %lu\n", e->xexpose.window);
action = root_click;
if ((win = find_window(ev->window)) == NULL)
return;
- else {
- focus_win(win);
- action = client_click;
- }
+
+ focus_magic(win);
+ action = client_click;
for (i = 0; i < LENGTH(buttons); i++)
if (action == buttons[i].action && buttons[i].func &&
struct ws_win *win, *winfocus = NULL;
struct workspace *ws;
struct ws_win_list *wl;
-
XDestroyWindowEvent *ev = &e->xdestroywindow;
DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window);
- SWM_EV_PROLOGUE(display);
-
if ((win = find_window(ev->window)) != NULL) {
/* find a window to focus */
ws = win->ws;
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 && win != ws->focus_prev)
+ 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;
+ }
/* fallback and normal handling */
if (winfocus == NULL) {
}
}
}
- ignore_enter = 1;
unmanage_window(win);
+
+ ignore_enter = 1;
stack();
if (winfocus)
focus_win(winfocus);
ignore_enter = 0;
}
-
- SWM_EV_EPILOGUE(display);
}
void
if (QLength(display))
return;
- if ((win = find_window(ev->window)) != NULL) {
- if (win->ws->focus == win)
- return;
- focus_win(win);
- }
+ if ((win = find_window(ev->window)) == NULL)
+ return;
+
+ focus_magic(win);
}
void
DNPRINTF(SWM_D_EVENT, "mapnotify: window: %lu\n", ev->window);
- SWM_EV_PROLOGUE(display);
-
win = find_window(ev->window);
if (win)
set_win_state(win, NormalState);
-
- SWM_EV_EPILOGUE(display);
}
void
DNPRINTF(SWM_D_EVENT, "maprequest: window: %lu\n",
e->xmaprequest.window);
- SWM_EV_PROLOGUE(display);
-
if (!XGetWindowAttributes(display, ev->window, &wa))
- goto done;
+ return;
if (wa.override_redirect)
- goto done;
+ return;
- manage_window(e->xmaprequest.window);
+ win = manage_window(e->xmaprequest.window);
+ if (win == NULL)
+ return; /* can't happen */
+ ignore_enter = 1;
stack();
+ ignore_enter = 0;
/* make new win focused */
- win = find_window(ev->window);
r = root_to_region(win->wa.root);
-
if (win->ws == r->ws)
focus_win(win);
-
-done:
- SWM_EV_EPILOGUE(display);
}
void
DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %lu\n", e->xunmap.window);
- SWM_EV_PROLOGUE(display);
-
/* determine if we need to help unmanage this window */
win = find_window(e->xunmap.window);
if (win == NULL)
- goto done;
+ return;
+
+ /* java can not deal with this heuristic */
+ if (win->java)
+ return;
if (getstate(e->xunmap.window) == NormalState) {
/*
* this window does not have a destroy event but but it is no
* longer visible due to the app unmapping it so unmanage it
*/
-
ws = win->ws;
/* if we are max_stack try harder to focus on something */
if (ws->cur_layout->flags & SWM_L_FOCUSPREV) {
if (win->transient)
winfocus = find_window(win->transient);
- else if (win != ws->focus && win != ws->focus_prev)
+ else if (win != ws->focus_prev)
winfocus = ws->focus_prev;
+ else if (win != ws->focus)
+ winfocus = ws->focus;
}
/* normal and fallback if haven't found anything to focus on */
focus_win(winfocus);
ignore_enter = 0;
}
-
-done:
- SWM_EV_EPILOGUE(display);
}
void
/* attach windows to a region */
/* normal windows */
for (j = 0; j < no; j++) {
- XGetWindowAttributes(display, wins[j], &wa);
if (!XGetWindowAttributes(display, wins[j], &wa) ||
wa.override_redirect ||
XGetTransientForHint(display, wins[j], &d1))
}
/* transient windows */
for (j = 0; j < no; j++) {
- if (!XGetWindowAttributes(display, wins[j], &wa))
+ if (!XGetWindowAttributes(display, wins[j], &wa) ||
+ wa.override_redirect)
continue;
state = getstate(wins[j]);
}
}
}
+
void
setup_globals(void)
{
astate = XInternAtom(display, "WM_STATE", False);
aprot = XInternAtom(display, "WM_PROTOCOLS", False);
adelete = XInternAtom(display, "WM_DELETE_WINDOW", False);
+ takefocus = XInternAtom(display, "WM_TAKE_FOCUS", False);
/* look for local and global conf file */
pwd = getpwuid(getuid());
Got questions, comments, patches, etc.? Contact Jason Woofenden