static const char *cvstag = "$scrotwm$";
-#define SWM_VERSION "0.9.8"
+#define SWM_VERSION "0.9.9"
#include <stdio.h>
#include <stdlib.h>
Atom astate;
Atom aprot;
Atom adelete;
+volatile sig_atomic_t running = 1;
+int outputs = 0;
int (*xerrorxlib)(Display *, XErrorEvent *);
int other_wm;
-int running = 1;
int ss_enabled = 0;
int xrandr_support;
int xrandr_eventbase;
XGCValues bar_gcv;
int bar_fidx = 0;
XFontStruct *bar_fs;
-char *bar_fonts[] = { NULL, NULL, NULL }; /* XXX Make fully dynamic */
+char *bar_fonts[] = { NULL, NULL, NULL, NULL };/* XXX Make fully dynamic */
char *spawn_term[] = { NULL, NULL }; /* XXX Make fully dynamic */
#define SWM_MENU_FN (2)
TAILQ_ENTRY(ws_win) entry;
Window id;
struct swm_geometry g;
- int got_focus;
int floating;
int transient;
int manual;
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 */
/* stacker state */
struct swm_screen *screens;
int num_screens;
-struct ws_win *cur_focus = NULL;
-
/* args to functions */
union arg {
int id;
void enternotify(XEvent *);
void focusin(XEvent *);
void focusout(XEvent *);
-void mappingnotify(XEvent *);
+void mapnotify(XEvent *);
void maprequest(XEvent *);
void propertynotify(XEvent *);
void unmapnotify(XEvent *);
[EnterNotify] = enternotify,
[FocusIn] = focusin,
[FocusOut] = focusout,
- [MappingNotify] = mappingnotify,
+ [MapNotify] = mapnotify,
[MapRequest] = maprequest,
[PropertyNotify] = propertynotify,
[UnmapNotify] = unmapnotify,
[VisibilityNotify] = visibilitynotify,
};
+void
+sighdlr(int sig)
+{
+ pid_t pid;
+
+ switch (sig) {
+ case SIGCHLD:
+ while ((pid = waitpid(WAIT_ANY, NULL, WNOHANG)) != -1) {
+ DNPRINTF(SWM_D_MISC, "reaping: %d\n", pid);
+ if (pid <= 0)
+ break;
+ }
+ break;
+ case SIGINT:
+ case SIGTERM:
+ case SIGHUP:
+ case SIGQUIT:
+ running = 0;
+ break;
+ }
+}
+
+void
+installsignal(int sig, char *name)
+{
+ struct sigaction sa;
+
+ sa.sa_handler = sighdlr;
+ sigemptyset(&sa.sa_mask);
+ sa.sa_flags = 0;
+ if (sigaction(sig, &sa, NULL) == -1)
+ err(1, "could not install %s handler", name);
+}
+
unsigned long
name_to_color(char *colorname)
{
}
void
+bar_class_name(char *s, ssize_t sz, struct ws_win *cur_focus)
+{
+ int do_class, do_name;
+ Status status;
+ XClassHint *xch = NULL;
+
+ if ((title_name_enabled == 1 || title_class_enabled == 1) &&
+ cur_focus != NULL) {
+ if ((xch = XAllocClassHint()) == NULL)
+ goto out;
+ status = XGetClassHint(display, cur_focus->id, xch);
+ if (status == BadWindow || status == BadAlloc)
+ goto out;
+ do_class = (title_class_enabled && xch->res_class != NULL);
+ do_name = (title_name_enabled && xch->res_name != NULL);
+ if (do_class)
+ strlcat(s, xch->res_class, sz);
+ if (do_class && do_name)
+ strlcat(s, ":", sz);
+ if (do_name)
+ strlcat(s, xch->res_name, sz);
+ strlcat(s, " ", sz);
+ }
+out:
+ if (xch)
+ XFree(xch);
+}
+
+void
bar_update(void)
{
time_t tmt;
struct tm tm;
struct swm_region *r;
- int i, x, do_class, do_name;
+ int i, x;
size_t len;
char s[SWM_BAR_MAX];
char loc[SWM_BAR_MAX];
char *b;
- XClassHint *xch;
- Status status;
if (bar_enabled == 0)
return;
localtime_r(&tmt, &tm);
strftime(s, sizeof s, "%a %b %d %R %Z %Y ", &tm);
}
- xch = NULL;
- if ((title_name_enabled == 1 || title_class_enabled == 1) &&
- cur_focus != NULL) {
- if ((xch = XAllocClassHint()) == NULL)
- goto out;
- status = XGetClassHint(display, cur_focus->id, xch);
- if (status == BadWindow || status == BadAlloc)
- goto out;
- do_class = (title_class_enabled && xch->res_class != NULL);
- do_name = (title_name_enabled && xch->res_name != NULL);
- if (do_class)
- strlcat(s, xch->res_class, sizeof s);
- if (do_class && do_name)
- strlcat(s, ":", sizeof s);
- if (do_name)
- strlcat(s, xch->res_name, sizeof s);
- }
-out:
- if (xch)
- XFree(xch);
+
for (i = 0; i < ScreenCount(display); i++) {
x = 1;
TAILQ_FOREACH(r, &screens[i].rl, entry) {
+ if (r && r->ws)
+ bar_class_name(s, sizeof s, r->ws->focus);
+
snprintf(loc, sizeof loc, "%d:%d %s %s %s",
x++, r->ws->idx + 1, s, bar_ext, bar_vertext);
bar_print(r, loc);
}
void
+set_win_state(struct ws_win *win, long state)
+{
+ long data[] = {state, None};
+
+ DNPRINTF(SWM_D_EVENT, "set_win_state: window: %lu\n", win->id);
+
+ XChangeProperty(display, win->id, astate, astate, 32, PropModeReplace,
+ (unsigned char *)data, 2);
+}
+
+long
+getstate(Window w)
+{
+ int format, status;
+ long result = -1;
+ unsigned char *p = NULL;
+ unsigned long n, extra;
+ Atom real;
+
+ status = XGetWindowProperty(display, w, astate, 0L, 2L, False, astate,
+ &real, &format, &n, &extra, (unsigned char **)&p);
+ if (status != Success)
+ return (-1);
+ if (n != 0)
+ result = *((long *)p);
+ XFree(p);
+ return (result);
+}
+
+void
version(struct swm_region *r, union arg *args)
{
bar_version = !bar_version;
}
void
+unmap_window(struct ws_win *win)
+{
+ if (win == NULL)
+ return;
+
+ set_win_state(win, IconicState);
+ XUnmapWindow(display, win->id);
+}
+
+void
unmap_all(void)
{
struct ws_win *win;
for (i = 0; i < ScreenCount(display); i++)
for (j = 0; j < SWM_WS_MAX; j++)
TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
- XUnmapWindow(display, win->id);
+ unmap_window(win);
}
void
if (win == NULL)
return;
- if (win->ws->focus != win && win->ws->focus != NULL)
- win->ws->focus_prev = win->ws->focus;
-
if (win->ws->r == NULL)
return;
grabbuttons(win, 0);
XSetWindowBorder(display, win->id,
win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);
- win->got_focus = 0;
- if (win->ws->focus == win)
+
+ if (win->ws->focus == win) {
win->ws->focus = NULL;
- if (cur_focus == win)
- cur_focus = NULL;
+ win->ws->focus_prev = win;
+ }
}
void
for (j = 0; j < SWM_WS_MAX; j++)
TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
unfocus_win(win);
+ XSync(display, False);
}
void
if (win == NULL)
return;
- if (cur_focus)
- unfocus_win(cur_focus);
- if (win->ws->focus) {
- /* probably shouldn't happen due to the previous unfocus_win */
- DNPRINTF(SWM_D_FOCUS, "unfocusing win->ws->focus: %lu\n",
- win->ws->focus->id);
- unfocus_win(win->ws->focus);
- }
+ /* use big hammer to make sure it works under all use cases */
+ unfocus_all();
win->ws->focus = win;
+
if (win->ws->r != NULL) {
- cur_focus = win;
- if (!win->got_focus) {
- XSetWindowBorder(display, win->id,
- win->ws->r->s->c[SWM_S_COLOR_FOCUS].color);
- grabbuttons(win, 1);
- }
- win->got_focus = 1;
+ XSetWindowBorder(display, win->id,
+ win->ws->r->s->c[SWM_S_COLOR_FOCUS].color);
+ grabbuttons(win, 1);
XSetInputFocus(display, win->id,
RevertToPointerRoot, CurrentTime);
+ XSync(display, False);
}
}
{
int wsid = args->id;
struct swm_region *this_r, *other_r;
- struct ws_win *win;
+ struct ws_win *win, *winfocus = NULL;
struct workspace *new_ws, *old_ws;
this_r = r;
if (new_ws == old_ws)
return;
+ /* get focus window */
+ if (new_ws->focus)
+ winfocus = new_ws->focus;
+ else if (new_ws->focus_prev)
+ winfocus = new_ws->focus_prev;
+ else
+ winfocus = TAILQ_FIRST(&new_ws->winlist);
+
other_r = new_ws->r;
- if (!other_r) {
+ if (other_r == NULL) {
/* if the other workspace is hidden, switch windows */
- /* map new window first to prevent ugly blinking */
+ if (old_ws->r != NULL)
+ old_ws->old_r = old_ws->r;
old_ws->r = NULL;
old_ws->restack = 1;
- TAILQ_FOREACH(win, &new_ws->winlist, entry)
- XMapRaised(display, win->id);
+ /*
+ * 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)
+ XMapRaised(display, win->id);
TAILQ_FOREACH(win, &old_ws->winlist, entry)
- XUnmapWindow(display, win->id);
+ unmap_window(win);
} else {
other_r->ws = old_ws;
old_ws->r = other_r;
new_ws->r = this_r;
ignore_enter = 1;
- /* set focus */
- if (new_ws->focus == NULL)
- new_ws->focus = TAILQ_FIRST(&new_ws->winlist);
- if (new_ws->focus)
- focus_win(new_ws->focus);
stack();
+ focus_win(winfocus);
bar_update();
}
swapwin(struct swm_region *r, union arg *args)
{
struct ws_win *target, *source;
+ struct ws_win *cur_focus;
struct ws_win_list *wl;
DNPRINTF(SWM_D_WS, "swapwin id %d "
"in screen %d region %dx%d+%d+%d ws %d\n", args->id,
r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r), r->ws->idx);
+
+ cur_focus = r->ws->focus;
if (cur_focus == NULL)
return;
{
struct ws_win *winfocus, *winlostfocus;
struct ws_win_list *wl;
+ struct ws_win *cur_focus;
DNPRINTF(SWM_D_FOCUS, "focus: id %d\n", args->id);
+
+ cur_focus = r->ws->focus;
if (cur_focus == NULL)
return;
cycle_layout(struct swm_region *r, union arg *args)
{
struct workspace *ws = r->ws;
+ struct ws_win *winfocus;
DNPRINTF(SWM_D_EVENT, "cycle_layout: workspace: %d\n", ws->idx);
+ winfocus = ws->focus;
+
ws->cur_layout++;
if (ws->cur_layout->l_stack == NULL)
ws->cur_layout = &layouts[0];
+
+ /*
+ * do the ignore enter dance but undo or sometimes an unwanted
+ * enter gets discarded
+ */
ignore_enter = 1;
+
stack();
+ focus_win(winfocus);
+
+ ignore_enter = 0;
}
void
unsigned int mask;
XWindowChanges wc;
+ if (win == NULL)
+ return;
+
bzero(&wc, sizeof wc);
mask = CWX | CWY | CWBorderWidth | CWWidth | CWHeight;
if ((win->quirks & SWM_Q_FULLSCREEN) && (win->g.w == WIDTH(r)) &&
wc.y = (HEIGHT(r) - win->g.h) / 2;
}
+ /* adjust for region */
+ wc.x += r->g.x;
+ wc.y += r->g.y;
+
DNPRINTF(SWM_D_STACK, "stack_floater: win %lu x %d y %d w %d h %d\n",
win->id, wc.x, wc.y, wc.width, wc.height);
{
XWindowChanges wc;
struct swm_geometry win_g, r_g = *g;
- struct ws_win *win, *winfocus;
+ struct ws_win *win;
int i, j, s, stacks;
int w_inc = 1, h_inc, w_base = 1, h_base;
int hrh, extra = 0, h_slice, last_h = 0;
if (winno == 0 && count_win(ws, 1) == 0)
return;
- if (ws->focus == NULL)
- ws->focus = TAILQ_FIRST(&ws->winlist);
- winfocus = cur_focus ? cur_focus : ws->focus;
-
TAILQ_FOREACH(win, &ws->winlist, entry)
if (win->transient == 0 && win->floating == 0)
break;
stack_floater(win, ws->r);
XMapRaised(display, win->id);
}
-
- if (winfocus)
- focus_win(winfocus); /* has to be done outside of the loop */
}
void
{
XWindowChanges wc;
struct swm_geometry gg = *g;
- struct ws_win *win, *winfocus;
+ struct ws_win *win, *wintrans = NULL;
unsigned int mask;
int winno;
- /* XXX this function needs to be rewritten it sucks crap */
-
DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx);
winno = count_win(ws, 0);
if (winno == 0 && count_win(ws, 1) == 0)
return;
- if (ws->focus == NULL)
- ws->focus = TAILQ_FIRST(&ws->winlist);
- winfocus = cur_focus ? cur_focus : ws->focus;
-
TAILQ_FOREACH(win, &ws->winlist, entry) {
- if (win->transient != 0 || win->floating != 0) {
- if (win == ws->focus) {
- /* XXX maximize? */
- stack_floater(win, ws->r);
- XMapRaised(display, win->id);
- } else {
- /* XXX this sucks */
- XUnmapWindow(display, win->id);
- }
+ if (win->transient != 0) {
+ wintrans = win;
} else {
bzero(&wc, sizeof wc);
wc.border_width = 1;
win->g.h = wc.height = gg.h;
mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
XConfigureWindow(display, win->id, mask, &wc);
-
- if (win == ws->focus) {
- XMapRaised(display, win->id);
- } else
- XUnmapWindow(display, win->id);
+ if (win != ws->focus)
+ unmap_window(win);
}
}
- if (winfocus)
- focus_win(winfocus); /* has to be done outside of the loop */
+ /* put the last transient on top */
+ if (wintrans) {
+ stack_floater(wintrans, ws->r);
+ XMapRaised(display, wintrans->id);
+ focus_win(wintrans); /* override */
+ }
}
void
send_to_ws(struct swm_region *r, union arg *args)
{
int wsid = args->id;
- struct ws_win *win = cur_focus;
+ struct ws_win *win = r->ws->focus, *winfocus = NULL;
struct workspace *ws, *nws;
Atom ws_idx_atom = 0;
unsigned char ws_idx_str[SWM_PROPLEN];
ws = win->ws;
nws = &win->s->ws[wsid];
- XUnmapWindow(display, win->id);
-
/* find a window to focus */
- ws->focus = TAILQ_PREV(win, ws_win_list, entry);
- if (ws->focus == NULL)
- ws->focus = TAILQ_FIRST(&ws->winlist);
- if (ws->focus == win)
- ws->focus = NULL;
+ winfocus = TAILQ_PREV(win, ws_win_list, entry);
+ if (TAILQ_FIRST(&ws->winlist) == win)
+ winfocus = TAILQ_NEXT(win, entry);
+ else {
+ winfocus = TAILQ_PREV(ws->focus, ws_win_list, entry);
+ if (winfocus == NULL)
+ winfocus = TAILQ_LAST(&ws->winlist, ws_win_list);
+ }
+ /* out of windows in ws so focus on nws instead */
+ if (winfocus == NULL)
+ winfocus = win;
+
+ unmap_window(win);
TAILQ_REMOVE(&ws->winlist, win, entry);
nws->restack = 1;
stack();
+ focus_win(winfocus);
}
void
void
floating_toggle(struct swm_region *r, union arg *args)
{
- struct ws_win *win = cur_focus;
+ struct ws_win *win = r->ws->focus;
if (win == NULL)
return;
buttons[i].func(win, &buttons[i].args);
}
-void
-set_win_state(struct ws_win *win, long state)
-{
- long data[] = {state, None};
-
- DNPRINTF(SWM_D_EVENT, "set_win_state: window: %lu\n", win->id);
-
- XChangeProperty(display, win->id, astate, astate, 32, PropModeReplace,
- (unsigned char *)data, 2);
-}
-
const char *quirkname[] = {
"NONE", /* config string for "no value" */
"FLOAT",
struct ws_win *
manage_window(Window id)
{
- Window trans;
+ Window trans = 0;
struct workspace *ws;
- struct ws_win *win;
- int format, i, ws_idx, n;
+ struct ws_win *win, *ww;
+ int format, i, ws_idx, n, border_me = 0;
unsigned long nitems, bytes;
Atom ws_idx_atom = 0, type;
Atom *prot = NULL, *pp;
XGetWindowProperty(display, id, ws_idx_atom, 0, SWM_PROPLEN,
False, XA_STRING, &type, &format, &nitems, &bytes, &prop);
XGetWindowAttributes(display, id, &win->wa);
+ XGetWMNormalHints(display, id, &win->sh, &mask);
XGetTransientForHint(display, id, &trans);
- XGetWMNormalHints(display, id, &win->sh, &mask); /* XXX function? */
if (trans) {
win->transient = trans;
DNPRINTF(SWM_D_MISC, "manage_window: win %u transient %u\n",
errstr, prop);
}
ws = &r->s->ws[ws_idx];
- } else
+ } else {
ws = r->ws;
+ /* this should launch transients in the same ws as parent */
+ if (id && trans)
+ if ((ww = find_window(trans)) != NULL)
+ if (ws->r) {
+ ws = ww->ws;
+ if (ww->ws->r)
+ r = ww->ws->r;
+ else
+ fprintf(stderr,
+ "fix this bug mcbride\n");
+ border_me = 1;
+ }
+ }
/* set up the window layout */
win->id = id;
mask |= CWY;
}
if (win->g.w + win->g.x > WIDTH(r)) {
- win->g.x = wc.x = WIDTH(win->ws->r) - win->g.w - 2;
+ win->g.x = wc.x = WIDTH(r) - win->g.w - 2;
mask |= CWX;
}
- wc.border_width = 1;
- mask |= CWBorderWidth;
- XConfigureWindow(display, win->id, mask, &wc);
+ border_me = 1;
}
/* Reset font sizes (the bruteforce way; no default keybinding). */
fake_keypress(win, XK_KP_Add, ShiftMask);
}
+ /* border me */
+ if (border_me) {
+ bzero(&wc, sizeof wc);
+ wc.border_width = 1;
+ mask = CWBorderWidth;
+ XConfigureWindow(display, win->id, mask, &wc);
+ }
+
XSelectInput(display, id, EnterWindowMask | FocusChangeMask |
PropertyChangeMask | StructureNotifyMask);
set_win_state(win, NormalState);
/* floaters need to be mapped if they are in the current workspace */
- if (win->floating && (ws->idx == r->ws->idx))
+ if ((win->floating || win->transient) && (ws->idx == r->ws->idx))
XMapRaised(display, win->id);
- /* make new win focused */
- focus_win(win);
-
return (win);
}
DNPRINTF(SWM_D_MISC, "unmanage_window: %lu\n", win->id);
ws = win->ws;
-
- /* find a window to focus */
- if (ws->focus == win)
- ws->focus = TAILQ_PREV(win, ws_win_list, entry);
- if (ws->focus == NULL)
- ws->focus = TAILQ_FIRST(&ws->winlist);
- if (ws->focus == NULL || ws->focus == win) {
- ws->focus = NULL;
- unfocus_win(win);
- } else
- focus_win(ws->focus);
- if (ws->focus_prev == win)
- ws->focus_prev = NULL;
-
TAILQ_REMOVE(&win->ws->winlist, win, entry);
set_win_state(win, WithdrawnState);
if (win->ch.res_class)
void
destroynotify(XEvent *e)
{
- struct ws_win *win;
+ 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);
if ((win = find_window(ev->window)) != NULL) {
+ /* find a window to focus */
+ ws = win->ws;
+ wl = &ws->winlist;
+ if (ws->focus == win) {
+ 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);
stack();
+ if (winfocus)
+ focus_win(winfocus);
}
}
ignore_enter--;
return;
}
+ /*
+ * happens when a window is created or destroyed and the border
+ * crosses the mouse pointer
+ */
+ if (QLength(display))
+ return;
if ((win = find_window(ev->window)) != NULL)
focus_win(win);
void
focusout(XEvent *e)
{
- struct swm_screen *s;
- Window rr, cr;
- int x, y, wx, wy;
- unsigned int mask;
-
DNPRINTF(SWM_D_EVENT, "focusout: window: %lu\n", e->xfocus.window);
-
- if (cur_focus && cur_focus->ws->r &&
- cur_focus->id == e->xfocus.window) {
- s = cur_focus->ws->r->s;
- if (XQueryPointer(display, cur_focus->id,
- &rr, &cr, &x, &y, &wx, &wy, &mask) != False &&
- cr == 0 && !mask &&
- x == DisplayWidth(display, s->idx) / 2 &&
- y == DisplayHeight(display, s->idx) / 2)
- unfocus_win(cur_focus);
- }
}
void
-mappingnotify(XEvent *e)
+mapnotify(XEvent *e)
{
+ struct ws_win *win;
XMappingEvent *ev = &e->xmapping;
- DNPRINTF(SWM_D_EVENT, "mappingnotify: window: %lu\n", ev->window);
+ DNPRINTF(SWM_D_EVENT, "mapnotify: window: %lu\n", ev->window);
+
+ win = find_window(ev->window);
+ if (win)
+ set_win_state(win, NormalState);
XRefreshKeyboardMapping(ev);
if (ev->request == MappingKeyboard)
void
maprequest(XEvent *e)
{
+ struct ws_win *win;
+ struct swm_region *r;
+
XMapRequestEvent *ev = &e->xmaprequest;
XWindowAttributes wa;
return;
if (wa.override_redirect)
return;
+
manage_window(e->xmaprequest.window);
stack();
+
+ /* make new win focused */
+ win = find_window(ev->window);
+ r = root_to_region(win->wa.root);
+
+ if (win->ws == r->ws)
+ focus_win(win);
}
void
void
unmapnotify(XEvent *e)
{
+ struct ws_win *win, *winfocus;
+ struct workspace *ws;
+
DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %lu\n", e->xunmap.window);
+
+ /* determine if we need to help unmanage this window */
+ win = find_window(e->xunmap.window);
+ if (win == NULL)
+ return;
+ if (win->transient)
+ 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
+ */
+
+ /* find something to focus */
+ ws = win->ws;
+ winfocus = TAILQ_PREV(win, ws_win_list, entry);
+ if (TAILQ_FIRST(&ws->winlist) == win)
+ winfocus = TAILQ_NEXT(win, entry);
+ else {
+ winfocus = TAILQ_PREV(ws->focus, ws_win_list, entry);
+ if (winfocus == NULL)
+ winfocus = TAILQ_LAST(&ws->winlist, ws_win_list);
+ }
+
+ /* trash window and refocus */
+ unmanage_window(win);
+ stack();
+ focus_win(winfocus);
+ }
}
void
return (0);
}
-long
-getstate(Window w)
-{
- int format, status;
- long result = -1;
- unsigned char *p = NULL;
- unsigned long n, extra;
- Atom real;
-
- status = XGetWindowProperty(display, w, astate, 0L, 2L, False, astate,
- &real, &format, &n, &extra, (unsigned char **)&p);
- if (status != Success)
- return (-1);
- if (n != 0)
- result = *((long *)p);
- XFree(p);
- return (result);
-}
-
void
new_region(struct swm_screen *s, int x, int y, int w, int h)
{
/* remove any old regions */
while ((r = TAILQ_FIRST(&screens[i].rl)) != NULL) {
- r->ws->r = NULL;
+ r->ws->old_r = r->ws->r = NULL;
XDestroyWindow(display, r->bar_window);
TAILQ_REMOVE(&screens[i].rl, r, entry);
TAILQ_INSERT_TAIL(&screens[i].orl, r, entry);
/* map virtual screens onto physical screens */
#ifdef SWM_XRR_HAS_CRTC
+ outputs = 0;
if (xrandr_support) {
sr = XRRGetScreenResources(display, screens[i].root);
if (sr == NULL)
ci = XRRGetCrtcInfo(display, sr, sr->crtcs[c]);
if (ci->noutput == 0)
continue;
+ outputs++;
if (ci != NULL && ci->mode == None)
new_region(&screens[i], 0, 0,
/* hide any windows that went away */
TAILQ_FOREACH(r, &screens[i].rl, entry)
TAILQ_FOREACH(win, &r->ws->winlist, entry)
- XUnmapWindow(display, win->id);
+ unmap_window(win);
/* add bars to all regions */
for (i = 0; i < ScreenCount(display); i++)
int errorbase, major, minor;
struct workspace *ws;
int ws_idx_atom;
-
+ long state, manage;
if ((screens = calloc(ScreenCount(display),
sizeof(struct swm_screen))) == NULL)
ws->restack = 1;
ws->focus = NULL;
ws->r = NULL;
+ ws->old_r = NULL;
TAILQ_INIT(&ws->winlist);
for (k = 0; layouts[k].l_stack != NULL; k++)
XGetTransientForHint(display, wins[j], &d1))
continue;
- if (wa.map_state == IsViewable ||
- getstate(wins[j]) == NormalState)
+ state = getstate(wins[j]);
+ manage = state == NormalState || state == IconicState;
+ if (wa.map_state == IsViewable || manage)
manage_window(wins[j]);
}
/* transient windows */
if (!XGetWindowAttributes(display, wins[j], &wa))
continue;
+ state = getstate(wins[j]);
+ manage = state == NormalState || state == IconicState;
if (XGetTransientForHint(display, wins[j], &d1) &&
- (wa.map_state == IsViewable || getstate(wins[j]) ==
- NormalState))
+ manage)
manage_window(wins[j]);
}
if (wins) {
if ((bar_fonts[1] = strdup("-*-times-medium-r-*-*-*-*-*-*-*-*-*-*"))
== NULL)
err(1, "setup_globals: strdup");
+ if ((bar_fonts[2] = strdup("-misc-fixed-medium-r-*-*-*-*-*-*-*-*-*-*"))
+ == NULL)
+ err(1, "setup_globals: strdup");
if ((spawn_term[0] = strdup("xterm")) == NULL)
err(1, "setup_globals: strdup");
}
main(int argc, char *argv[])
{
struct passwd *pwd;
- struct swm_region *r;
+ struct swm_region *r, *rr;
+ struct ws_win *winfocus = NULL;
char conf[PATH_MAX], *cfile = NULL;
struct stat sb;
XEvent e;
if (active_wm())
errx(1, "other wm running");
+ /* handle some signale */
+ installsignal(SIGINT, "INT");
+ installsignal(SIGHUP, "HUP");
+ installsignal(SIGQUIT, "QUIT");
+ installsignal(SIGTERM, "TERM");
+ installsignal(SIGCHLD, "CHLD");
+
astate = XInternAtom(display, "WM_STATE", False);
aprot = XInternAtom(display, "WM_PROTOCOLS", False);
adelete = XInternAtom(display, "WM_DELETE_WINDOW", False);
/* setup all bars */
for (i = 0; i < ScreenCount(display); i++)
- TAILQ_FOREACH(r, &screens[i].rl, entry)
+ TAILQ_FOREACH(r, &screens[i].rl, entry) {
+ if (winfocus == NULL)
+ winfocus = TAILQ_FIRST(&r->ws->winlist);
bar_setup(r);
+ }
/* set some values to work around bad programs */
workaround();
xfd = ConnectionNumber(display);
while (running) {
- FD_ZERO(&rd);
- FD_SET(xfd, &rd);
- if (select(xfd + 1, &rd, NULL, NULL, NULL) == -1)
- if (errno != EINTR)
- errx(1, "select failed");
- if (bar_alarm) {
- bar_alarm = 0;
- bar_update();
- }
while (XPending(display)) {
XNextEvent(display, &e);
+ if (running == 0)
+ goto done;
if (e.type < LASTEvent) {
dumpevent(&e);
if (handler[e.type])
}
}
}
+
+ /* if we are being restarted go focus on first window */
+ if (winfocus) {
+ rr = TAILQ_FIRST(&screens[0].rl);
+ /* move pointer to first screen if multi screen */
+ if (ScreenCount(display) > 1 || outputs > 1)
+ XWarpPointer(display, None, rr->s[0].root,
+ 0, 0, 0, 0, rr->g.x,
+ rr->g.y + bar_enabled ? bar_height : 0);
+
+ focus_win(winfocus);
+ winfocus = NULL;
+ continue;
+ }
+
+ FD_ZERO(&rd);
+ FD_SET(xfd, &rd);
+ if (select(xfd + 1, &rd, NULL, NULL, NULL) == -1)
+ if (errno != EINTR)
+ DNPRINTF(SWM_D_MISC, "select failed");
+ if (running == 0)
+ goto done;
+ if (bar_alarm) {
+ bar_alarm = 0;
+ bar_update();
+ }
}
+done:
+ bar_extra_stop();
XCloseDisplay(display);
Got questions, comments, patches, etc.? Contact Jason Woofenden