X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=fbcbff3112b3cb55282a9be998f704870c79a6de;hb=6d08df47448f7f544d1814df558057cc45e845bd;hp=b5e2ffb2ec79aa9747f4dace990741853690a74e;hpb=166a233babe7d2adf2d07a8fc2602d9f7ae424c6;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index b5e2ffb..fbcbff3 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -99,6 +100,9 @@ #define SWM_D_FOCUS 0x0008 #define SWM_D_MOVE 0x0010 #define SWM_D_STACK 0x0020 +#define SWM_D_MOUSE 0x0040 +#define SWM_D_PROP 0x0080 + u_int32_t swm_debug = 0 | SWM_D_MISC @@ -107,21 +111,29 @@ u_int32_t swm_debug = 0 | SWM_D_FOCUS | SWM_D_MOVE | SWM_D_STACK + | SWM_D_PROP ; #else #define DPRINTF(x...) #define DNPRINTF(n,x...) #endif -#define LENGTH(x) (sizeof x / sizeof x[0]) +#define LENGTH(x) (sizeof x / sizeof x[0]) #define MODKEY Mod1Mask -#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) +#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) +#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) #define X(r) (r)->g.x #define Y(r) (r)->g.y #define WIDTH(r) (r)->g.w #define HEIGHT(r) (r)->g.h +#ifndef SWM_LIB +#define SWM_LIB "/usr/X11R6/lib/swmhack.so" +#endif + +#define SWM_PROPLEN (16) + char **start_argv; Atom astate; int (*xerrorxlib)(Display *, XErrorEvent *); @@ -139,12 +151,20 @@ int cycle_visible = 0; double dialog_ratio = .6; /* status bar */ #define SWM_BAR_MAX (128) +char *bar_argv[] = { NULL, NULL }; +int bar_pipe[2]; +char bar_ext[SWM_BAR_MAX]; sig_atomic_t bar_alarm = 0; +int bar_delay = 30; int bar_enabled = 1; +int bar_extra = 1; +int bar_extra_running = 0; int bar_verbose = 1; int bar_height = 0; +pid_t bar_pid; GC bar_gc; XGCValues bar_gcv; +int bar_fidx = 0; XFontStruct *bar_fs; char *bar_fonts[] = { "-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*", @@ -153,8 +173,15 @@ char *bar_fonts[] = { }; /* terminal + args */ -char *spawn_term[] = { "xterm", NULL }; -char *spawn_menu[] = { "dmenu_run", NULL }; +char *spawn_term[] = { "xterm", NULL }; +char *spawn_menu[] = { "dmenu_run", "-fn", NULL, + "-nb", NULL, "-nf", NULL, "-sb", NULL, "-sf", NULL, NULL }; + +#define SWM_MENU_FN (2) +#define SWM_MENU_NB (4) +#define SWM_MENU_NF (6) +#define SWM_MENU_SB (8) +#define SWM_MENU_SF (10) /* layout manager data */ struct swm_geometry { @@ -177,7 +204,6 @@ struct swm_region { }; TAILQ_HEAD(swm_region_list, swm_region); - struct ws_win { TAILQ_ENTRY(ws_win) entry; Window id; @@ -199,6 +225,8 @@ void horizontal_config(struct workspace *, int); void horizontal_stack(struct workspace *, struct swm_geometry *); void max_stack(struct workspace *, struct swm_geometry *); +void grabbuttons(struct ws_win *, int); + struct layout { void (*l_stack)(struct workspace *, struct swm_geometry *); void (*l_config)(struct workspace *, int); @@ -231,6 +259,9 @@ struct workspace { } l_state; }; +enum { SWM_S_COLOR_BAR, SWM_S_COLOR_BAR_BORDER, SWM_S_COLOR_BAR_FONT, + SWM_S_COLOR_FOCUS, SWM_S_COLOR_UNFOCUS, SWM_S_COLOR_MAX }; + /* physical screen mapping */ #define SWM_WS_MAX (10) /* XXX Too small? */ struct swm_screen { @@ -241,15 +272,13 @@ struct swm_screen { struct workspace ws[SWM_WS_MAX]; /* colors */ - unsigned long bar_border; - unsigned long bar_color; - unsigned long bar_font_color; - unsigned long color_focus; /* XXX should this be per ws? */ - unsigned long color_unfocus; + struct { + unsigned long color; + char *name; + } c[SWM_S_COLOR_MAX]; }; struct swm_screen *screens; int num_screens; -Window rootclick = 0; struct ws_win *cur_focus = NULL; @@ -298,6 +327,23 @@ name_to_color(char *colorname) return (result); } +void +setscreencolor(char *val, int i, int c) +{ + if (i > 0 && i <= ScreenCount(display)) { + screens[i - 1].c[c].color = name_to_color(val); + if ((screens[i - 1].c[c].name = strdup(val)) == NULL) + errx(1, "strdup"); + } else if (i == -1) { + for (i = 0; i < ScreenCount(display); i++) + screens[i].c[c].color = name_to_color(val); + if ((screens[i - 1].c[c].name = strdup(val)) == NULL) + errx(1, "strdup"); + } else + errx(1, "invalid screen index: %d out of bounds (maximum %d)\n", + i, ScreenCount(display)); +} + int varmatch(char *var, char *name, int *index) { @@ -366,63 +412,26 @@ conf_load(char *filename) if (!strncmp(var, "bar_enabled", strlen("bar_enabled"))) bar_enabled = atoi(val); else if (!varmatch(var, "bar_border", &i)) - if (i > 0 && i <= sc) - screens[i - 1].bar_border = - name_to_color(val); - else if (i == -1) - for (i = 0; i < sc; i++) - screens[i].bar_border = - name_to_color(val); - else - goto badidx; + setscreencolor(val, i, SWM_S_COLOR_BAR_BORDER); else if (!varmatch(var, "bar_color", &i)) - if (i > 0 && i <= sc) - screens[i - 1].bar_color = - name_to_color(val); - else if (i == -1) - for (i = 0; i < sc; i++) - screens[i].bar_color = - name_to_color(val); - else - goto badidx; + setscreencolor(val, i, SWM_S_COLOR_BAR); else if (!varmatch(var, "bar_font_color", &i)) - if (i > 0 && i <= sc) - screens[i - 1].bar_font_color = - name_to_color(val); - else if (i == -1) - for (i = 0; i < sc; i++) - screens[i].bar_font_color = - name_to_color(val); - else - goto badidx; - + setscreencolor(val, i, SWM_S_COLOR_BAR_FONT); else if (!strncmp(var, "bar_font", strlen("bar_font"))) asprintf(&bar_fonts[0], "%s", val); + else if (!strncmp(var, "bar_action", strlen("bar_action"))) + asprintf(&bar_argv[0], "%s", val); + else if (!strncmp(var, "bar_delay", strlen("bar_delay"))) + bar_delay = atoi(val); else goto bad; break; case 'c': if (!varmatch(var, "color_focus", &i)) - if (i > 0 && i <= sc) - screens[i - 1].color_focus = - name_to_color(val); - else if (i == -1) - for (i = 0; i < sc; i++) - screens[i].color_focus = - name_to_color(val); - else - goto badidx; + setscreencolor(val, i, SWM_S_COLOR_FOCUS); else if (!varmatch(var, "color_unfocus", &i)) - if (i > 0 && i <= sc) - screens[i - 1].color_unfocus = - name_to_color(val); - else if (i == -1) - for (i = 0; i < sc; i++) - screens[i].color_unfocus = - name_to_color(val); - else - goto badidx; + setscreencolor(val, i, SWM_S_COLOR_UNFOCUS); else if (!strncmp(var, "cycle_empty", strlen("cycle_empty"))) cycle_visible = atoi(val); else if (!strncmp(var, "cycle_visible", strlen("cycle_visible"))) @@ -453,47 +462,90 @@ conf_load(char *filename) fclose(config); return (0); + bad: errx(1, "invalid conf file entry: %s=%s", var, val); -badidx: - errx(1, "invalid screen index: %s out of bounds", var); +} + +void +socket_setnonblock(int fd) +{ + int flags; + + if ((flags = fcntl(fd, F_GETFL, 0)) == -1) + err(1, "fcntl F_GETFL"); + flags |= O_NONBLOCK; + if ((flags = fcntl(fd, F_SETFL, flags)) == -1) + err(1, "fcntl F_SETFL"); } void bar_print(struct swm_region *r, char *s) { XClearWindow(display, r->bar_window); - XSetForeground(display, bar_gc, r->s->bar_font_color); + XSetForeground(display, bar_gc, r->s->c[SWM_S_COLOR_BAR_FONT].color); XDrawString(display, r->bar_window, bar_gc, 4, bar_fs->ascent, s, strlen(s)); } void +bar_extra_stop(void) +{ + if (bar_pipe[0]) { + close(bar_pipe[0]); + bzero(bar_pipe, sizeof bar_pipe); + } + if (bar_pid) { + kill(bar_pid, SIGTERM); + bar_pid = 0; + } + strlcpy(bar_ext, "", sizeof bar_ext); + bar_extra = 0; +} + +void bar_update(void) { time_t tmt; struct tm tm; struct swm_region *r; int i, x; + size_t len; char s[SWM_BAR_MAX]; - char e[SWM_BAR_MAX]; - + char loc[SWM_BAR_MAX]; + char *b; + if (bar_enabled == 0) return; + if (bar_extra && bar_extra_running) { + /* ignore short reads; it'll correct itself */ + while ((b = fgetln(stdin, &len)) != NULL) + if (b && b[len - 1] == '\n') { + b[len - 1] = '\0'; + strlcpy(bar_ext, b, sizeof bar_ext); + } + if (b == NULL && errno != EAGAIN) { + fprintf(stderr, "bar_extra failed: errno: %d %s\n", + errno, strerror(errno)); + bar_extra_stop(); + } + } else + strlcpy(bar_ext, "", sizeof bar_ext); + time(&tmt); localtime_r(&tmt, &tm); strftime(s, sizeof s, "%a %b %d %R %Z %Y", &tm); for (i = 0; i < ScreenCount(display); i++) { x = 1; TAILQ_FOREACH(r, &screens[i].rl, entry) { - snprintf(e, sizeof e, "%s %d:%d", - s, x++, r->ws->idx + 1); - bar_print(r, e); + snprintf(loc, sizeof loc, "%s %d:%d %s", + s, x++, r->ws->idx + 1, bar_ext); + bar_print(r, loc); } } XSync(display, False); - alarm(60); + alarm(bar_delay); } void @@ -533,14 +585,65 @@ bar_toggle(struct swm_region *r, union arg *args) } void +bar_refresh(void) +{ + XSetWindowAttributes wa; + struct swm_region *r; + int i; + + /* do this here because the conf file is in memory */ + if (bar_extra && bar_extra_running == 0 && bar_argv[0]) { + /* launch external status app */ + bar_extra_running = 1; + if (pipe(bar_pipe) == -1) + err(1, "pipe error"); + socket_setnonblock(bar_pipe[0]); + socket_setnonblock(bar_pipe[1]); /* XXX hmmm, really? */ + if (dup2(bar_pipe[0], 0) == -1) + errx(1, "dup2"); + if (dup2(bar_pipe[1], 1) == -1) + errx(1, "dup2"); + if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) + err(1, "could not disable SIGPIPE"); + switch (bar_pid = fork()) { + case -1: + err(1, "cannot fork"); + break; + case 0: /* child */ + close(bar_pipe[0]); + execvp(bar_argv[0], bar_argv); + err(1, "%s external app failed", bar_argv[0]); + break; + default: /* parent */ + close(bar_pipe[1]); + break; + } + } + + bzero(&wa, sizeof wa); + for (i = 0; i < ScreenCount(display); i++) + TAILQ_FOREACH(r, &screens[i].rl, entry) { + wa.border_pixel = + screens[i].c[SWM_S_COLOR_BAR_BORDER].color; + wa.background_pixel = + screens[i].c[SWM_S_COLOR_BAR].color; + XChangeWindowAttributes(display, r->bar_window, + CWBackPixel | CWBorderPixel, &wa); + } + bar_update(); +} + +void bar_setup(struct swm_region *r) { int i; for (i = 0; bar_fonts[i] != NULL; i++) { bar_fs = XLoadQueryFont(display, bar_fonts[i]); - if (bar_fs) + if (bar_fs) { + bar_fidx = i; break; + } } if (bar_fonts[i] == NULL) errx(1, "couldn't load font"); @@ -548,7 +651,8 @@ bar_setup(struct swm_region *r) r->bar_window = XCreateSimpleWindow(display, r->s->root, X(r), Y(r), WIDTH(r) - 2, bar_height - 2, - 1, r->s->bar_border, r->s->bar_color); + 1, r->s->c[SWM_S_COLOR_BAR_BORDER].color, + r->s->c[SWM_S_COLOR_BAR].color); bar_gc = XCreateGC(display, r->bar_window, 0, &bar_gcv); XSetFont(display, bar_gc, bar_fs->fid); XSelectInput(display, r->bar_window, VisibilityChangeMask); @@ -558,25 +662,7 @@ bar_setup(struct swm_region *r) if (signal(SIGALRM, bar_signal) == SIG_ERR) err(1, "could not install bar_signal"); - bar_update(); -} - -void -bar_refresh(void) -{ - XSetWindowAttributes wa; - struct swm_region *r; - int i; - - bzero(&wa, sizeof wa); - for (i = 0; i < ScreenCount(display); i++) - TAILQ_FOREACH(r, &screens[i].rl, entry) { - wa.border_pixel = screens[i].bar_border; - wa.background_pixel = screens[i].bar_color; - XChangeWindowAttributes(display, r->bar_window, - CWBackPixel | CWBorderPixel, &wa); - } - bar_update(); + bar_refresh(); } void @@ -635,6 +721,8 @@ restart(struct swm_region *r, union arg *args) if (signal(SIGALRM, SIG_IGN) == SIG_ERR) errx(1, "can't disable alarm"); + bar_extra_stop(); + bar_extra = 1; XCloseDisplay(display); execvp(start_argv[0], start_argv); fprintf(stderr, "execvp failed\n"); @@ -654,23 +742,20 @@ root_to_region(Window root) if (screens[i].root == root) break; - if (rootclick != root && /* if root was just clicked in, use cursor */ - cur_focus && cur_focus->ws->r && cur_focus->s == &screens[i]) - r = cur_focus->ws->r; - else { - if (XQueryPointer(display, screens[i].root, - &rr, &cr, &x, &y, &wx, &wy, &mask) == False) { - r = TAILQ_FIRST(&screens[i].rl); - } else { - TAILQ_FOREACH(r, &screens[i].rl, entry) { - if (x > X(r) && x < X(r) + WIDTH(r) && - y > Y(r) && y < Y(r) + HEIGHT(r)) - break; - } - - if (r == NULL) - r = TAILQ_FIRST(&screens[i].rl); + if (XQueryPointer(display, screens[i].root, + &rr, &cr, &x, &y, &wx, &wy, &mask) == False) { + /* if we can't query the pointer, grab the first region */ + r = TAILQ_FIRST(&screens[i].rl); + } else { + /* otherwise, choose a region based on pointer location */ + TAILQ_FOREACH(r, &screens[i].rl, entry) { + if (x >= X(r) && x <= X(r) + WIDTH(r) && + y >= Y(r) && y <= Y(r) + HEIGHT(r)) + break; } + + if (r == NULL) + r = TAILQ_FIRST(&screens[i].rl); } return (r); } @@ -699,8 +784,14 @@ spawn(struct swm_region *r, union arg *args) */ if (fork() == 0) { if (fork() == 0) { + char *ret; if (display) close(ConnectionNumber(display)); + setenv("LD_PRELOAD", SWM_LIB, 1); + if (asprintf(&ret, "%d", r->ws->idx)) + setenv("_SWM_WS", ret, 1); + if (asprintf(&ret, "%d", getpid())) + setenv("_SWM_PID", ret, 1); setsid(); execvp(args->argv[0], args->argv); fprintf(stderr, "execvp failed\n"); @@ -712,6 +803,20 @@ spawn(struct swm_region *r, union arg *args) } void +spawnmenu(struct swm_region *r, union arg *args) +{ + DNPRINTF(SWM_D_MISC, "spawnmenu\n"); + + spawn_menu[SWM_MENU_FN] = bar_fonts[bar_fidx]; + spawn_menu[SWM_MENU_NB] = r->s->c[SWM_S_COLOR_BAR].name; + spawn_menu[SWM_MENU_NF] = r->s->c[SWM_S_COLOR_BAR_FONT].name; + spawn_menu[SWM_MENU_SB] = r->s->c[SWM_S_COLOR_BAR_BORDER].name; + spawn_menu[SWM_MENU_SF] = r->s->c[SWM_S_COLOR_BAR].name; + + spawn(r, args); +} + +void unfocus_all(void) { struct ws_win *win; @@ -724,8 +829,9 @@ unfocus_all(void) TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) { if (win->ws->r == NULL) continue; + grabbuttons(win, 0); XSetWindowBorder(display, win->id, - win->ws->r->s->color_unfocus); + win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); win->got_focus = 0; win->ws->focus = NULL; cur_focus = NULL; @@ -740,14 +846,15 @@ focus_win(struct ws_win *win) if (win == NULL) return; - rootclick = 0; unfocus_all(); win->ws->focus = win; if (win->ws->r != NULL) { cur_focus = win; - if (!win->got_focus) + if (!win->got_focus) { XSetWindowBorder(display, win->id, - win->ws->r->s->color_focus); + win->ws->r->s->c[SWM_S_COLOR_FOCUS].color); + grabbuttons(win, 1); + } win->got_focus = 1; XSetInputFocus(display, win->id, RevertToPointerRoot, CurrentTime); @@ -1015,7 +1122,6 @@ stack_floater(struct ws_win *win, struct swm_region *r) XConfigureWindow(display, win->id, mask, &wc); } - void vertical_config(struct workspace *ws, int id) { @@ -1108,6 +1214,9 @@ vertical_stack(struct workspace *ws, struct swm_geometry *g) { win->g.h = wc.height = gg.h; mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth; XConfigureWindow(display, win->id, mask, &wc); + /* + fprintf(stderr, "vertical_stack: win %d x %d y %d w %d h %d bw %d\n", win->id, win->g.x, win->g.y, win->g.w , win->g.h, wc.border_width); + */ } XMapRaised(display, win->id); @@ -1119,7 +1228,6 @@ vertical_stack(struct workspace *ws, struct swm_geometry *g) { focus_win(winfocus); /* has to be done outside of the loop */ } - void horizontal_config(struct workspace *ws, int id) { @@ -1274,6 +1382,8 @@ send_to_ws(struct swm_region *r, union arg *args) int wsid = args->id; struct ws_win *win = cur_focus; struct workspace *ws, *nws; + Atom ws_idx_atom = 0; + unsigned char ws_idx_str[SWM_PROPLEN]; DNPRINTF(SWM_D_MOVE, "send_to_ws: win: %lu\n", win->id); @@ -1294,6 +1404,16 @@ send_to_ws(struct swm_region *r, union arg *args) TAILQ_INSERT_TAIL(&nws->winlist, win, entry); win->ws = nws; + /* Try to update the window's workspace property */ + ws_idx_atom = XInternAtom(display, "_SWM_WS", False); + if (ws_idx_atom && + snprintf(ws_idx_str, SWM_PROPLEN, "%d", nws->idx) < SWM_PROPLEN) { + DNPRINTF(SWM_D_PROP, "setting property _SWM_WS to %s\n", + ws_idx_str); + XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8, + PropModeReplace, ws_idx_str, SWM_PROPLEN); + } + if (count_win(nws, 1) == 1) nws->focus = win; ws->restack = 1; @@ -1302,6 +1422,14 @@ send_to_ws(struct swm_region *r, union arg *args) stack(); } +void +wkill(struct swm_region *r, union arg *args) +{ + DNPRINTF(SWM_D_MISC, "wkill\n"); + if(r->ws->focus != NULL) + XKillClient(display, r->ws->focus->id); +} + /* key definitions */ struct key { unsigned int mod; @@ -1322,7 +1450,7 @@ struct key { { MODKEY | ShiftMask, XK_j, swapwin, {.id = SWM_ARG_ID_SWAPNEXT} }, { MODKEY | ShiftMask, XK_k, swapwin, {.id = SWM_ARG_ID_SWAPPREV} }, { MODKEY | ShiftMask, XK_Return, spawn, {.argv = spawn_term} }, - { MODKEY, XK_p, spawn, {.argv = spawn_menu} }, + { MODKEY, XK_p, spawnmenu, {.argv = spawn_menu} }, { MODKEY | ShiftMask, XK_q, quit, {0} }, { MODKEY, XK_q, restart, {0} }, { MODKEY, XK_m, focus, {.id = SWM_ARG_ID_FOCUSMAIN} }, @@ -1351,22 +1479,38 @@ struct key { { 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} }, + { MODKEY | ShiftMask, XK_x, wkill, {0} }, }; -#if 0 +void +click(struct swm_region *r, union arg *args) +{ + DNPRINTF(SWM_D_MOUSE, "click: button: %d\n", args->id); + + switch (args->id) { + case Button1: + break; + case Button2: + break; + case Button3: + break; + default: + return; + } +} + /* mouse */ enum { client_click, root_click }; struct button { - unsigned int click; + unsigned int action; unsigned int mask; unsigned int button; void (*func)(struct swm_region *r, union arg *); union arg args; } buttons[] = { /* action key mouse button func args */ - { client_click, MODKEY, Button2, NULL, {0} }, + { client_click, MODKEY, Button1, click, {.id=Button1} }, }; -#endif void updatenumlockmask(void) @@ -1411,6 +1555,30 @@ grabkeys(void) } } } + +void +grabbuttons(struct ws_win *win, int focused) +{ + unsigned int i, j; + unsigned int modifiers[] = + { 0, LockMask, numlockmask, numlockmask|LockMask }; + + updatenumlockmask(); + XUngrabButton(display, AnyButton, AnyModifier, win->id); + if(focused) { + for (i = 0; i < LENGTH(buttons); i++) + if (buttons[i].action == client_click) + for (j = 0; j < LENGTH(modifiers); j++) + XGrabButton(display, buttons[i].button, + buttons[i].mask | modifiers[j], + win->id, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, + None); + } else + XGrabButton(display, AnyButton, AnyModifier, win->id, False, + BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); +} + void expose(XEvent *e) { @@ -1439,35 +1607,26 @@ void buttonpress(XEvent *e) { XButtonPressedEvent *ev = &e->xbutton; -#ifdef SWM_CLICKTOFOCUS + struct ws_win *win; - struct workspace *ws; - struct swm_region *r; -#endif + int i, action; DNPRINTF(SWM_D_EVENT, "buttonpress: window: %lu\n", ev->window); - if (ev->window == ev->root) { - rootclick = ev->root; - return; - } - if (ev->window == cur_focus->id) + action = root_click; + if ((win = find_window(ev->window)) == NULL) return; -#ifdef SWM_CLICKTOFOCUS - r = root_to_region(ev->root); - ws = r->ws; - TAILQ_FOREACH(win, &ws->winlist, entry) - if (win->id == ev->window) { - /* focus in the clicked window */ - XSetWindowBorder(display, ev->window, 0xff0000); - XSetWindowBorder(display, ws->focus->id, 0x888888); - XSetInputFocus(display, ev->window, RevertToPointerRoot, - CurrentTime); - ws->focus = win; - XSync(display, False); - break; + else { + focus_win(win); + action = client_click; } -#endif + + for (i = 0; i < LENGTH(buttons); i++) + if (action == buttons[i].action && buttons[i].func && + buttons[i].button == ev->button && + CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) + buttons[i].func(root_to_region(ev->root), + &buttons[i].args); } void @@ -1482,23 +1641,48 @@ set_win_state(struct ws_win *win, long state) } struct ws_win * -manage_window(Window id, struct workspace *ws) +manage_window(Window id) { Window trans; + struct workspace *ws; struct ws_win *win; XClassHint ch; + int format; + unsigned long nitems, bytes; + Atom ws_idx_atom = 0, type; + unsigned char ws_idx_str[SWM_PROPLEN], *prop = NULL; + struct swm_region *r; - TAILQ_FOREACH(win, &ws->winlist, entry) { - if (win->id == id) + if ((win = find_window(id)) != NULL) return (win); /* already being managed */ - } if ((win = calloc(1, sizeof(struct ws_win))) == NULL) errx(1, "calloc: failed to allocate memory for new window"); + ws_idx_atom = XInternAtom(display, "_SWM_WS", False); + if (ws_idx_atom) + XGetWindowProperty(display, id, ws_idx_atom, 0, SWM_PROPLEN, + False, XA_STRING, &type, &format, &nitems, &bytes, &prop); + + XGetWindowAttributes(display, id, &win->wa); + r = root_to_region(win->wa.root); + /* If the window was managed before, put it in the same workspace */ + if (prop) { + int ws_idx; + const char *errstr; + + DNPRINTF(SWM_D_PROP, "got property _SWM_WS=%s\n", prop); + ws_idx = strtonum(prop, 0, 9, &errstr); + if (errstr) + DNPRINTF(SWM_D_EVENT, "window idx is %s: %s", + errstr, prop); + ws = &r->s->ws[ws_idx]; + } else + ws = r->ws; + win->id = id; win->ws = ws; - win->s = ws->r->s; /* this never changes */ + win->s = r->s; /* this never changes */ TAILQ_INSERT_TAIL(&ws->winlist, win, entry); /* make new win focused */ @@ -1510,12 +1694,24 @@ manage_window(Window id, struct workspace *ws) DNPRINTF(SWM_D_MISC, "manage_window: win %u transient %u\n", (unsigned)win->id, win->transient); } - XGetWindowAttributes(display, id, &win->wa); win->g.w = win->wa.width; win->g.h = win->wa.height; win->g.x = win->wa.x; win->g.y = win->wa.y; + if (ws_idx_atom && prop == NULL && + snprintf(ws_idx_str, SWM_PROPLEN, "%d", ws->idx) < SWM_PROPLEN) { + DNPRINTF(SWM_D_PROP, "setting property _SWM_WS to %s\n", + ws_idx_str); + XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8, + PropModeReplace, ws_idx_str, SWM_PROPLEN); + } + XFree(prop); + + /* + fprintf(stderr, "manage window: %d x %d y %d w %d h %d\n", win->id, win->g.x, win->g.y, win->g.w, win->g.h); + */ + /* XXX make this a table */ bzero(&ch, sizeof ch); if (XGetClassHint(display, win->id, &ch)) { @@ -1542,7 +1738,7 @@ configurerequest(XEvent *e) { XConfigureRequestEvent *ev = &e->xconfigurerequest; struct ws_win *win; - int new = 1; + int new = 0; XWindowChanges wc; if ((win = find_window(ev->window)) == NULL) @@ -1551,6 +1747,10 @@ configurerequest(XEvent *e) if (new) { DNPRINTF(SWM_D_EVENT, "configurerequest: new window: %lu\n", ev->window); + /* + fprintf(stderr, "configurerequest: new window: %lu x %d y %d w %d h %d bw %d s %d sm %d\n", + ev->window, ev->x, ev->y, ev->width, ev->height, ev->border_width, ev->above, ev->detail); + */ bzero(&wc, sizeof wc); wc.x = ev->x; wc.y = ev->y; @@ -1561,6 +1761,10 @@ configurerequest(XEvent *e) wc.stack_mode = ev->detail; XConfigureWindow(display, ev->window, ev->value_mask, &wc); } else { + /* + fprintf(stderr, "configurerequest: change window: %lu\n", + ev->window); + */ DNPRINTF(SWM_D_EVENT, "configurerequest: change window: %lu\n", ev->window); if (win->floating) { @@ -1652,20 +1856,6 @@ void focusin(XEvent *e) { DNPRINTF(SWM_D_EVENT, "focusin: window: %lu\n", e->xfocus.window); - - /* XXX this probably needs better handling now. - if (ev->window == ev->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: %lu grabbing\n", ev->window); - XGrabButton(display, Button1, AnyModifier, ev->window, False, - ButtonPress, GrabModeAsync, GrabModeSync, None, None); - */ } void @@ -1685,7 +1875,6 @@ maprequest(XEvent *e) { XMapRequestEvent *ev = &e->xmaprequest; XWindowAttributes wa; - struct swm_region *r; DNPRINTF(SWM_D_EVENT, "maprequest: window: %lu\n", e->xmaprequest.window); @@ -1694,8 +1883,7 @@ maprequest(XEvent *e) return; if (wa.override_redirect) return; - r = root_to_region(wa.root); - manage_window(e->xmaprequest.window, r->ws); + manage_window(e->xmaprequest.window); stack(); } @@ -1834,27 +2022,29 @@ setup_screens(void) int ncrtc = 0, w = 0; int i, j, k; struct workspace *ws; + int ws_idx_atom; + if ((screens = calloc(ScreenCount(display), sizeof(struct swm_screen))) == NULL) errx(1, "calloc: screens"); + ws_idx_atom = XInternAtom(display, "_SWM_WS", False); + + /* map physical screens */ for (i = 0; i < ScreenCount(display); i++) { DNPRINTF(SWM_D_WS, "setup_screens: init screen %d\n", i); screens[i].idx = i; TAILQ_INIT(&screens[i].rl); screens[i].root = RootWindow(display, i); - XGetWindowAttributes(display, screens[i].root, &wa); - XSelectInput(display, screens[i].root, - EnterWindowMask | ButtonPressMask | wa.your_event_mask); /* set default colors */ - screens[i].color_focus = name_to_color("red"); - screens[i].color_unfocus = name_to_color("rgb:88/88/88"); - screens[i].bar_border = name_to_color("rgb:00/80/80"); - screens[i].bar_color = name_to_color("black"); - screens[i].bar_font_color = name_to_color("rgb:a0/a0/a0"); + setscreencolor("red", i + 1, SWM_S_COLOR_FOCUS); + setscreencolor("rgb:88/88/88", i + 1, SWM_S_COLOR_UNFOCUS); + setscreencolor("rgb:00/80/80", i + 1, SWM_S_COLOR_BAR_BORDER); + setscreencolor("black", i + 1, SWM_S_COLOR_BAR); + setscreencolor("rgb:a0/a0/a0", i + 1, SWM_S_COLOR_BAR_FONT); /* init all workspaces */ for (j = 0; j < SWM_WS_MAX; j++) { @@ -1900,7 +2090,7 @@ setup_screens(void) else ncrtc = sr->ncrtc; - for (c = 0; c < ncrtc; c++) { + for (c = 0, ci = NULL; c < ncrtc; c++) { ci = XRRGetCrtcInfo(display, sr, sr->crtcs[c]); if (ci->noutput == 0) continue; @@ -1914,7 +2104,8 @@ setup_screens(void) ci->x, ci->y, ci->width, ci->height); w++; } - XRRFreeCrtcInfo(ci); + if (ci) + XRRFreeCrtcInfo(ci); XRRFreeScreenResources(sr); #else new_region(&screens[i], &screens[i].ws[w], 0, 0, @@ -1936,7 +2127,7 @@ setup_screens(void) if (wa.map_state == IsViewable || getstate(wins[i]) == NormalState) - manage_window(wins[i], r->ws); + manage_window(wins[i]); } /* transient windows */ for (i = 0; i < no; i++) { @@ -1946,7 +2137,7 @@ setup_screens(void) if (XGetTransientForHint(display, wins[i], &d1) && (wa.map_state == IsViewable || getstate(wins[i]) == NormalState)) - manage_window(wins[i], r->ws); + manage_window(wins[i]); } if (wins) { XFree(wins); @@ -2007,6 +2198,7 @@ main(int argc, char *argv[]) xfd = ConnectionNumber(display); while (running) { + FD_ZERO(&rd); FD_SET(xfd, &rd); if (select(xfd + 1, &rd, NULL, NULL, NULL) == -1) if (errno != EINTR)