-/* cc -O2 -I /usr/X11R6/include/ scrotwm.c -L /usr/X11R6/lib/ -lX11 -o scrotwm */
-/* then add to .xinitrc */
+/* $scrotwm$ */
/*
* Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com>
#include <err.h>
#include <locale.h>
#include <unistd.h>
+#include <time.h>
+#include <signal.h>
+#include <string.h>
+#include <util.h>
+#include <pwd.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/queue.h>
+#include <sys/param.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
#define DNPRINTF(n,x...) do { if (swm_debug & n) fprintf(stderr, x); } while(0)
#define SWM_D_EVENT 0x0001
#define SWM_D_WS 0x0002
+#define SWM_D_FOCUS 0x0004
+#define SWM_D_MISC 0x0008
uint32_t swm_debug = 0
| SWM_D_EVENT
| SWM_D_WS
+ | SWM_D_FOCUS
+ | SWM_D_MISC
;
#else
#define DPRINTF(x...)
int running = 1;
int ignore_enter = 0;
unsigned int numlockmask = 0;
+unsigned long color_focus = 0xff0000; /* XXX should this be per ws? */
+unsigned long color_unfocus = 0x888888;
Display *display;
Window root;
+/* status bar */
+int bar_enabled = 1;
+int bar_height = 0;
+unsigned long bar_border = 0x008080;
+unsigned long bar_color = 0x000000;
+unsigned long bar_font_color = 0xa0a0a0;
+Window bar_window;
+GC bar_gc;
+XGCValues bar_gcv;
+XFontStruct *bar_fs;
+char bar_text[128];
+char *bar_fonts[] = {
+ "-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*",
+ "-*-times-medium-r-*-*-*-*-*-*-*-*-*-*",
+ NULL
+};
+
+/* terminal + args */
+char *spawn_term[] = { "xterm", NULL };
+char *spawn_menu[] = { "dmenu_run", NULL };
+
struct ws_win {
TAILQ_ENTRY(ws_win) entry;
Window id;
+ int x;
+ int y;
+ int width;
+ int height;
+ int floating;
+ int transient;
};
TAILQ_HEAD(ws_win_list, ws_win);
/* define work spaces */
#define SWM_WS_MAX (10)
struct workspace {
- int visible; /* workspace visible */
+ int visible; /* workspace visible */
+ int restack; /* restack on switch */
struct ws_win *focus; /* which win has focus */
- int winno; /* total nr of windows */
- struct ws_win_list winlist;
+ struct ws_win_list winlist; /* list of windows in ws */
} ws[SWM_WS_MAX];
int current_ws = 0;
/* args to functions */
union arg {
- int id;
+ int id;
#define SWM_ARG_ID_FOCUSNEXT (0)
#define SWM_ARG_ID_FOCUSPREV (1)
#define SWM_ARG_ID_FOCUSMAIN (2)
+ char **argv;
};
+
+void stack(void);
+
+#define SWM_CONF_WS "\n= \t"
+#define SWM_CONF_FILE "scrotwm.conf"
+int
+conf_load(char *filename)
+{
+ FILE *config;
+ char *line, *cp, *var, *val;
+ size_t len, lineno = 0;
+
+ DNPRINTF(SWM_D_MISC, "conf_load: filename %s\n", filename);
+
+ if (filename == NULL)
+ return (1);
+
+ if ((config = fopen(filename, "r")) == NULL)
+ return (1);
+
+ for (;;) {
+ if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL)
+ if (feof(config))
+ break;
+ cp = line;
+ cp += (long)strspn(cp, SWM_CONF_WS);
+ if (cp[0] == '\0') {
+ /* empty line */
+ free(line);
+ continue;
+ }
+ if ((var = strsep(&cp, SWM_CONF_WS)) == NULL || cp == NULL)
+ break;
+ cp += (long)strspn(cp, SWM_CONF_WS);
+ if ((val = strsep(&cp, SWM_CONF_WS)) == NULL)
+ break;
+
+ DNPRINTF(SWM_D_MISC, "conf_load: %s=%s\n",var ,val);
+ switch (var[0]) {
+ case 'b':
+ if (!strncmp(var, "bar_enabled", strlen("bar_enabled")))
+ bar_enabled = atoi(val);
+ else if (!strncmp(var, "bar_border",
+ strlen("bar_border")))
+ bar_border = strtol(val, NULL, 16);
+ else if (!strncmp(var, "bar_color",
+ strlen("bar_color")))
+ bar_color = strtol(val, NULL, 16);
+ else if (!strncmp(var, "bar_font_color",
+ strlen("bar_font_color")))
+ bar_font_color = strtol(val, NULL, 16);
+ else if (!strncmp(var, "bar_font", strlen("bar_font")))
+ asprintf(&bar_fonts[0], "%s", val);
+ else
+ goto bad;
+ break;
+
+ case 'c':
+ if (!strncmp(var, "color_focus", strlen("color_focus")))
+ color_focus = strtol(val, NULL, 16);
+ else if (!strncmp(var, "color_unfocus",
+ strlen("color_unfocus")))
+ color_unfocus = strtol(val, NULL, 16);
+ else
+ goto bad;
+ break;
+
+ case 's':
+ if (!strncmp(var, "spawn_term", strlen("spawn_term")))
+ asprintf(&spawn_term[0], "%s", val); /* XXX args? */
+ break;
+ default:
+ goto bad;
+ }
+ free(line);
+ }
+
+ fclose(config);
+ return (0);
+bad:
+ errx(1, "invalid conf file entry: %s=%s", var, val);
+}
+
+void
+bar_print(void)
+{
+ time_t tmt;
+ struct tm tm;
+
+ if (bar_enabled == 0)
+ return;
+
+ /* clear old text */
+ XSetForeground(display, bar_gc, bar_color);
+ XDrawString(display, bar_window, bar_gc, 4, bar_fs->ascent, bar_text,
+ strlen(bar_text));
+
+ /* draw new text */
+ time(&tmt);
+ localtime_r(&tmt, &tm);
+ strftime(bar_text, sizeof bar_text, "%a %b %d %R %Z %Y", &tm);
+ XSetForeground(display, bar_gc, bar_font_color);
+ XDrawString(display, bar_window, bar_gc, 4, bar_fs->ascent, bar_text,
+ strlen(bar_text));
+ XSync(display, False);
+
+ alarm(60);
+}
+
+void
+bar_signal(int sig)
+{
+ /* XXX yeah yeah byte me */
+ bar_print();
+}
+
+void
+bar_toggle(union arg *args)
+{
+ int i;
+
+ DNPRINTF(SWM_D_MISC, "bar_toggle\n");
+
+ if (bar_enabled) {
+ bar_enabled = 0;
+ height += bar_height; /* correct screen height */
+ XUnmapWindow(display, bar_window);
+ } else {
+ bar_enabled = 1;
+ height -= bar_height; /* correct screen height */
+ XMapWindow(display, bar_window);
+ }
+ XSync(display, False);
+ for (i = 0; i < SWM_WS_MAX; i++)
+ ws[i].restack = 1;
+
+ stack();
+ bar_print(); /* must be after stack */
+}
+
+void
+bar_setup(void)
+{
+ int i;
+
+ for (i = 0; bar_fonts[i] != NULL; i++) {
+ bar_fs = XLoadQueryFont(display, bar_fonts[i]);
+ if (bar_fs)
+ break;
+ }
+ if (bar_fonts[i] == NULL)
+ errx(1, "couldn't load font");
+ bar_height = bar_fs->ascent + bar_fs->descent + 3;
+
+ bar_window = XCreateSimpleWindow(display, root, 0, 0, width,
+ bar_height - 2, 1, bar_border, bar_color);
+ bar_gc = XCreateGC(display, bar_window, 0, &bar_gcv);
+ XSetFont(display, bar_gc, bar_fs->fid);
+ XSelectInput(display, bar_window, VisibilityChangeMask);
+ if (bar_enabled) {
+ height -= bar_height; /* correct screen height */
+ XMapWindow(display, bar_window);
+ }
+ DNPRINTF(SWM_D_MISC, "bar_setup: bar_window %d\n", (int)bar_window);
+
+ if (signal(SIGALRM, bar_signal) == SIG_ERR)
+ err(1, "could not install bar_signal");
+ bar_print();
+}
+
+int
+count_win(int wsid, int count_transient)
+{
+ struct ws_win *win;
+ int count = 0;
+
+ TAILQ_FOREACH (win, &ws[wsid].winlist, entry) {
+ if (count_transient == 0 && win->transient)
+ continue;
+ count++;
+ }
+ DNPRINTF(SWM_D_MISC, "count_win: %d\n", count);
+
+ return (count);
+}
void
quit(union arg *args)
{
+ DNPRINTF(SWM_D_MISC, "quit\n");
running = 0;
}
void
spawn(union arg *args)
{
- char *argv[] = { "xterm", NULL }; /* XXX make this in args */
-
+ DNPRINTF(SWM_D_MISC, "spawn: %s\n", args->argv[0]);
/*
* The double-fork construct avoids zombie processes and keeps the code
* clean from stupid signal handlers.
if(display)
close(ConnectionNumber(display));
setsid();
- execvp(argv[0], argv);
+ execvp(args->argv[0], args->argv);
fprintf(stderr, "execvp failed\n");
perror(" failed");
}
}
void
+focus_win(struct ws_win *win)
+{
+ DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win->id);
+ XSetWindowBorder(display, win->id, color_focus);
+ XSetInputFocus(display, win->id, RevertToPointerRoot, CurrentTime);
+ ws[current_ws].focus = win;
+}
+
+void
+unfocus_win(struct ws_win *win)
+{
+ DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %lu\n", win->id);
+ XSetWindowBorder(display, win->id, color_unfocus);
+ if (ws[current_ws].focus == win)
+ ws[current_ws].focus = NULL;
+}
+
+void
switchws(union arg *args)
{
int wsid = args->id;
struct ws_win *win;
- Window winfocus;
DNPRINTF(SWM_D_WS, "switchws: %d\n", wsid + 1);
/* map new window first to prevent ugly blinking */
TAILQ_FOREACH (win, &ws[wsid].winlist, entry)
- XMapWindow(display, win->id);
+ XMapRaised(display, win->id);
ws[wsid].visible = 1;
TAILQ_FOREACH (win, &ws[current_ws].winlist, entry)
current_ws = wsid;
ignore_enter = 1;
- if (ws[wsid].focus != NULL) {
- DNPRINTF(SWM_D_WS, "switchws: focus %d\n", ws[wsid].focus);
- XSetInputFocus(display, ws[wsid].focus->id, RevertToPointerRoot,
- CurrentTime);
+ if (ws[wsid].restack) {
+ stack();
+ bar_print();
+ } else {
+ if (ws[wsid].focus != NULL)
+ focus_win(ws[wsid].focus);
+ XSync(display, False);
}
- XSync(display, False);
}
void
focus(union arg *args)
{
- Window winfocus, winlostfocus;
+ struct ws_win *winfocus, *winlostfocus;
- if (ws[current_ws].focus == NULL || ws[current_ws].winno == 0)
+ DNPRINTF(SWM_D_FOCUS, "focus: id %d\n", args->id);
+ if (ws[current_ws].focus == NULL || count_win(current_ws, 1) == 0)
return;
- winlostfocus = ws[current_ws].focus->id;
+ winlostfocus = ws[current_ws].focus;
switch (args->id) {
case SWM_ARG_ID_FOCUSPREV:
- if (ws[current_ws].focus ==
- TAILQ_FIRST(&ws[current_ws].winlist))
+ ws[current_ws].focus =
+ TAILQ_PREV(ws[current_ws].focus, ws_win_list, entry);
+ if (ws[current_ws].focus == NULL)
ws[current_ws].focus =
TAILQ_LAST(&ws[current_ws].winlist, ws_win_list);
- else
- ws[current_ws].focus =TAILQ_PREV(ws[current_ws].focus,
- ws_win_list, entry);
break;
case SWM_ARG_ID_FOCUSNEXT:
- if (ws[current_ws].focus == TAILQ_LAST(&ws[current_ws].winlist,
- ws_win_list))
+ ws[current_ws].focus = TAILQ_NEXT(ws[current_ws].focus, entry);
+ if (ws[current_ws].focus == NULL)
ws[current_ws].focus =
TAILQ_FIRST(&ws[current_ws].winlist);
- else
- ws[current_ws].focus =
- TAILQ_NEXT(ws[current_ws].focus, entry);
break;
case SWM_ARG_ID_FOCUSMAIN:
- ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist);;
+ ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist);
break;
default:
return;
}
- winfocus = ws[current_ws].focus->id;
- XSetWindowBorder(display, winlostfocus, 0x888888);
- XSetWindowBorder(display, winfocus, 0xff0000);
- XSetInputFocus(display, winfocus, RevertToPointerRoot, CurrentTime);
+ winfocus = ws[current_ws].focus;
+ unfocus_win(winlostfocus);
+ focus_win(winfocus);
XSync(display, False);
}
stack(void)
{
XWindowChanges wc;
- struct ws_win *win;
- Window winfocus = root;
- int i, h, w, x, y, winno, hrh;
+ struct ws_win wf, *win, *winfocus = &wf;
+ int i, h, w, x, y, hrh, winno;
+ int floater = 0;
+ unsigned int mask;
DNPRINTF(SWM_D_EVENT, "stack: workspace: %d\n", current_ws);
- if (ws[current_ws].winno == 0)
+ winfocus->id = root;
+
+ ws[current_ws].restack = 0;
+
+ winno = count_win(current_ws, 0);
+ if (winno == 0)
return;
- if (ws[current_ws].winno > 1)
+ if (winno > 1)
w = width / 2;
else
w = width;
- if (ws[current_ws].winno > 2)
- hrh = height / (ws[current_ws].winno - 1);
+ if (winno > 2)
+ hrh = height / (winno - 1);
else
hrh = 0;
x = 0;
- y = 0;
+ y = bar_enabled ? bar_height : 0;
h = height;
i = 0;
TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
}
}
+ if (win->transient != 0 || win->floating != 0)
+ floater = 1;
+ else
+ floater = 0;
+
bzero(&wc, sizeof wc);
- wc.x = x;
- wc.y = y;
- wc.width = w;
- wc.height = h;
wc.border_width = 1;
- XConfigureWindow(display, win->id, CWX | CWY | CWWidth |
- CWHeight | CWBorderWidth, &wc);
- if (win == ws[current_ws].focus) {
- winfocus = win->id;
- XSetWindowBorder(display, win->id, 0xff0000);
- } else
- XSetWindowBorder(display, win->id, 0x888888);
- XMapWindow(display, win->id);
+ if (floater == 0) {
+ win->x = wc.x = x;
+ win->y = wc.y = y;
+ win->width = wc.width = w;
+ win->height = wc.height = h;
+ mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
+ } else {
+ win->x = wc.x = width / 2;
+ win->y = wc.y = height / 2;
+ mask = CWX | CWY | CWBorderWidth;
+ }
+ XConfigureWindow(display, win->id, mask, &wc);
+
+ if (win == ws[current_ws].focus)
+ winfocus = win;
+ else
+ unfocus_win(win);
+ XMapRaised(display, win->id);
i++;
}
- XSetInputFocus(display, winfocus, RevertToPointerRoot, CurrentTime);
+ focus_win(winfocus); /* this has to be done outside of the loop */
XSync(display, False);
}
{
struct ws_win *tmpwin = TAILQ_FIRST(&ws[current_ws].winlist);
+ DNPRINTF(SWM_D_MISC, "swap_to_main: win: %lu\n",
+ ws[current_ws].focus ? ws[current_ws].focus->id : 0);
+
+ if (ws[current_ws].focus == NULL || ws[current_ws].focus == tmpwin)
+ return;
+
TAILQ_REMOVE(&ws[current_ws].winlist, tmpwin, entry);
TAILQ_INSERT_AFTER(&ws[current_ws].winlist, ws[current_ws].focus,
tmpwin, entry);
stack();
}
+void
+send_to_ws(union arg *args)
+{
+ int wsid = args->id;
+ struct ws_win *win = ws[current_ws].focus;
+
+ DNPRINTF(SWM_D_WS, "send_to_ws: win: %lu\n", win->id);
+
+ XUnmapWindow(display, win->id);
+
+ /* find a window to focus */
+ ws[current_ws].focus = TAILQ_PREV(win, ws_win_list,entry);
+ if (ws[current_ws].focus == NULL)
+ ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist);
+
+ TAILQ_REMOVE(&ws[current_ws].winlist, win, entry);
+
+ TAILQ_INSERT_TAIL(&ws[wsid].winlist, win, entry);
+ if (count_win(wsid, 1) == 0)
+ ws[wsid].focus = win;
+ ws[wsid].restack = 1;
+
+ stack();
+}
+
/* key definitions */
struct key {
unsigned int mod;
} keys[] = {
/* modifier key function argument */
{ MODKEY, XK_Return, swap_to_main, {0} },
- { MODKEY | ShiftMask, XK_Return, spawn, {0} },
+ { MODKEY | ShiftMask, XK_Return, spawn, {.argv = spawn_term} },
+ { MODKEY, XK_p, spawn, {.argv = spawn_menu} },
{ MODKEY | ShiftMask, XK_q, quit, {0} },
{ MODKEY, XK_m, focus, {.id = SWM_ARG_ID_FOCUSMAIN} },
{ MODKEY, XK_1, switchws, {.id = 0} },
{ MODKEY, XK_8, switchws, {.id = 7} },
{ MODKEY, XK_9, switchws, {.id = 8} },
{ MODKEY, XK_0, switchws, {.id = 9} },
+ { MODKEY | ShiftMask, XK_1, send_to_ws, {.id = 0} },
+ { MODKEY | ShiftMask, XK_2, send_to_ws, {.id = 1} },
+ { MODKEY | ShiftMask, XK_3, send_to_ws, {.id = 2} },
+ { MODKEY | ShiftMask, XK_4, send_to_ws, {.id = 3} },
+ { MODKEY | ShiftMask, XK_5, send_to_ws, {.id = 4} },
+ { MODKEY | ShiftMask, XK_6, send_to_ws, {.id = 5} },
+ { MODKEY | ShiftMask, XK_7, send_to_ws, {.id = 6} },
+ { MODKEY | ShiftMask, XK_8, send_to_ws, {.id = 7} },
+ { MODKEY | ShiftMask, XK_9, send_to_ws, {.id = 8} },
+ { MODKEY | ShiftMask, XK_0, send_to_ws, {.id = 9} },
+ { MODKEY, XK_b, bar_toggle, {0} },
{ MODKEY, XK_Tab, focus, {.id = SWM_ARG_ID_FOCUSNEXT} },
{ MODKEY | ShiftMask, XK_Tab, focus, {.id = SWM_ARG_ID_FOCUSPREV} },
};
unsigned int i, j;
XModifierKeymap *modmap;
+ DNPRINTF(SWM_D_MISC, "updatenumlockmask\n");
numlockmask = 0;
modmap = XGetModifierMapping(display);
for (i = 0; i < 8; i++)
unsigned int modifiers[] =
{ 0, LockMask, numlockmask, numlockmask | LockMask };
+ DNPRINTF(SWM_D_MISC, "grabkeys\n");
updatenumlockmask();
XUngrabKey(display, AnyKey, AnyModifier, root);
void
expose(XEvent *e)
{
- XExposeEvent *ev = &e->xexpose;
-
- DNPRINTF(SWM_D_EVENT, "expose: window: %d\n", ev->window);
+ DNPRINTF(SWM_D_EVENT, "expose: window: %lu\n", e->xexpose.window);
}
void
KeySym keysym;
XKeyEvent *ev = &e->xkey;
- DNPRINTF(SWM_D_EVENT, "keypress: window: %d\n", ev->window);
+ DNPRINTF(SWM_D_EVENT, "keypress: window: %lu\n", ev->window);
keysym = XKeycodeToKeysym(display, (KeyCode)ev->keycode, 0);
for(i = 0; i < LENGTH(keys); i++)
buttonpress(XEvent *e)
{
XButtonPressedEvent *ev = &e->xbutton;
+#ifdef SWM_CLICKTOFOCUS
struct ws_win *win;
+#endif
+
- DNPRINTF(SWM_D_EVENT, "buttonpress: window: %d\n", ev->window);
+ DNPRINTF(SWM_D_EVENT, "buttonpress: window: %lu\n", ev->window);
if (ev->window == root)
return;
if (ev->window == ws[current_ws].focus->id)
return;
-
+#ifdef SWM_CLICKTOFOCUS
TAILQ_FOREACH(win, &ws[current_ws].winlist, entry)
if (win->id == ev->window) {
/* focus in the clicked window */
XSync(display, False);
break;
}
+#endif
}
void
configurerequest(XEvent *e)
{
XConfigureRequestEvent *ev = &e->xconfigurerequest;
+ Window trans;
struct ws_win *win;
- DNPRINTF(SWM_D_EVENT, "configurerequest: window: %d\n", ev->window);
+ DNPRINTF(SWM_D_EVENT, "configurerequest: window: %lu\n", ev->window);
+
+ TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
+ if (ev->window == win->id)
+ return;
+ }
XSelectInput(display, ev->window, ButtonPressMask | EnterWindowMask |
- FocusChangeMask);
+ FocusChangeMask | ExposureMask);
if ((win = calloc(1, sizeof(struct ws_win))) == NULL)
errx(1, "calloc: failed to allocate memory for new window");
win->id = ev->window;
TAILQ_INSERT_TAIL(&ws[current_ws].winlist, win, entry);
ws[current_ws].focus = win; /* make new win focused */
- ws[current_ws].winno++;
+
+ XGetTransientForHint(display, win->id, &trans);
+ if (trans) {
+ win->transient = trans;
+ DNPRINTF(SWM_D_MISC, "configurerequest: win %u transient %u\n",
+ (unsigned)win->id, win->transient);
+ }
+#if 0
+ XClassHint ch = { 0 };
+ if(XGetClassHint(display, win->id, &ch)) {
+ fprintf(stderr, "class: %s name: %s\n", ch.res_class, ch.res_name);
+ if (!strcmp(ch.res_class, "Gvim") && !strcmp(ch.res_name, "gvim")) {
+ win->floating = 0;
+ }
+ if(ch.res_class)
+ XFree(ch.res_class);
+ if(ch.res_name)
+ XFree(ch.res_name);
+ }
+#endif
stack();
}
void
configurenotify(XEvent *e)
{
- XConfigureEvent *ev = &e->xconfigure;
-
- DNPRINTF(SWM_D_EVENT, "configurenotify: window: %d\n", ev->window);
+ DNPRINTF(SWM_D_EVENT, "configurenotify: window: %lu\n",
+ e->xconfigure.window);
}
void
destroynotify(XEvent *e)
{
- size_t sz;
struct ws_win *win;
XDestroyWindowEvent *ev = &e->xdestroywindow;
- DNPRINTF(SWM_D_EVENT, "destroynotify: window %d\n", ev->window);
+ DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window);
TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
- DNPRINTF(SWM_D_EVENT, "trying: %x\n", win->id);
if (ev->window == win->id) {
/* find a window to focus */
ws[current_ws].focus =
TAILQ_REMOVE(&ws[current_ws].winlist, win, entry);
free(win);
- ws[current_ws].winno--;
break;
}
}
XCrossingEvent *ev = &e->xcrossing;
struct ws_win *win;
- DNPRINTF(SWM_D_EVENT, "enternotify: window: %d\n", ev->window);
+ DNPRINTF(SWM_D_EVENT, "enternotify: window: %lu\n", ev->window);
if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) &&
ev->window != root)
return;
}
TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
- if (win->id == ev->window) {
- XSetInputFocus(display, ev->window, RevertToPointerRoot,
- CurrentTime);
- XSetWindowBorder(display, ev->window, 0xff0000);
- ws[current_ws].focus = win;
- } else
- XSetWindowBorder(display, win->id, 0x888888);
+ if (win->id == ev->window)
+ focus_win(win);
+ else
+ unfocus_win(win);
}
}
{
XFocusChangeEvent *ev = &e->xfocus;
- DNPRINTF(SWM_D_EVENT, "focusin: window: %d\n", ev->window);
+ DNPRINTF(SWM_D_EVENT, "focusin: window: %lu\n", ev->window);
+
+ XSync(display, False); /* not sure this helps redrawing graphic apps */
if (ev->window == root)
return;
-
/*
* kill grab for now so that we can cut and paste , this screws up
* click to focus
*/
/*
- DNPRINTF(SWM_D_EVENT, "focusin: window: %d grabbing\n", ev->window);
+ DNPRINTF(SWM_D_EVENT, "focusin: window: %lu grabbing\n", ev->window);
XGrabButton(display, Button1, AnyModifier, ev->window, False,
ButtonPress, GrabModeAsync, GrabModeSync, None, None);
*/
{
XMappingEvent *ev = &e->xmapping;
- DNPRINTF(SWM_D_EVENT, "mappingnotify: window: %d\n", ev->window);
+ DNPRINTF(SWM_D_EVENT, "mappingnotify: window: %lu\n", ev->window);
XRefreshKeyboardMapping(ev);
if(ev->request == MappingKeyboard)
void
maprequest(XEvent *e)
{
- XMapRequestEvent *ev = &e->xmaprequest;
-
- DNPRINTF(SWM_D_EVENT, "maprequest: window: %d\n", ev->window);
+ DNPRINTF(SWM_D_EVENT, "maprequest: window: %lu\n",
+ e->xmaprequest.window);
}
void
propertynotify(XEvent *e)
{
- XPropertyEvent *ev = &e->xproperty;
-
- DNPRINTF(SWM_D_EVENT, "propertynotify: window: %d\n", ev->window);
+ DNPRINTF(SWM_D_EVENT, "propertynotify: window: %lu\n",
+ e->xproperty.window);
}
void
unmapnotify(XEvent *e)
{
- XUnmapEvent *ev = &e->xunmap;
+ DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %lu\n", e->xunmap.window);
+}
+
+void
+visibilitynotify(XEvent *e)
+{
+ DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: %lu\n", e->xvisibility.window);
- DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %d\n", ev->window);
+ if (e->xvisibility.window == bar_window &&
+ e->xvisibility.state == VisibilityUnobscured)
+ bar_print();
}
void (*handler[LASTEvent])(XEvent *) = {
[MapRequest] = maprequest,
[PropertyNotify] = propertynotify,
[UnmapNotify] = unmapnotify,
+ [VisibilityNotify] = visibilitynotify,
};
int
int
main(int argc, char *argv[])
{
+ struct passwd *pwd;
+ char conf[PATH_MAX], *cfile = NULL;
+ struct stat sb;
XEvent e;
int i;
width = DisplayWidth(display, screen) - 2;
height = DisplayHeight(display, screen) - 2;
+ /* look for local and global conf file */
+ pwd = getpwuid(getuid());
+ if (pwd == NULL)
+ errx(1, "invalid user %d", getuid());
+
+ snprintf(conf, sizeof conf, "%s/.%s", pwd->pw_dir, SWM_CONF_FILE);
+ if (stat(conf, &sb) != -1) {
+ if (S_ISREG(sb.st_mode))
+ cfile = conf;
+ } else {
+ /* try global conf file */
+ snprintf(conf, sizeof conf, "/etc/%s", SWM_CONF_FILE);
+ if (!stat(conf, &sb))
+ if (S_ISREG(sb.st_mode))
+ cfile = conf;
+ }
+ if (cfile)
+ conf_load(cfile);
+
/* make work space 1 active */
ws[0].visible = 1;
+ ws[0].restack = 0;
ws[0].focus = NULL;
- ws[0].winno = 0;
TAILQ_INIT(&ws[0].winlist);
for (i = 1; i < SWM_WS_MAX; i++) {
ws[i].visible = 0;
+ ws[i].restack = 0;
ws[i].focus = NULL;
- ws[i].winno = 0;
TAILQ_INIT(&ws[i].winlist);
}
+ /* setup status bar */
+ bar_setup();
+
XSelectInput(display, root, SubstructureRedirectMask |
SubstructureNotifyMask | ButtonPressMask | KeyPressMask |
EnterWindowMask | LeaveWindowMask | StructureNotifyMask |
- FocusChangeMask | PropertyChangeMask);
+ FocusChangeMask | PropertyChangeMask | ExposureMask);
grabkeys();
Got questions, comments, patches, etc.? Contact Jason Woofenden