X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=6a73a7f5f1f726c6f231cec057e7c58107bc6288;hb=ececcd0a8e8744a3e31daa9c0f8c885187489a42;hp=969655c8cbcdad14e82ab82e770e05765527cc93;hpb=7088da1fd1c181fdfd05a38bc5a24c4e1758aac7;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index 969655c..6a73a7f 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -91,7 +91,6 @@ #endif /* #define SWM_DEBUG */ -/* #define SWM_DEBUG */ #ifdef SWM_DEBUG #define DPRINTF(x...) do { if (swm_debug) fprintf(stderr, x); } while(0) #define DNPRINTF(n,x...) do { if (swm_debug & n) fprintf(stderr, x); } while(0) @@ -102,6 +101,8 @@ #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 @@ -110,6 +111,7 @@ u_int32_t swm_debug = 0 | SWM_D_FOCUS | SWM_D_MOVE | SWM_D_STACK + | SWM_D_PROP ; #else #define DPRINTF(x...) @@ -126,11 +128,18 @@ u_int32_t swm_debug = 0 #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 *); int other_wm; int running = 1; +int ss_enabled = 0; int xrandr_eventbase; int ignore_enter = 0; unsigned int numlockmask = 0; @@ -166,6 +175,7 @@ char *bar_fonts[] = { /* terminal + args */ char *spawn_term[] = { "xterm", NULL }; +char *spawn_screenshot[] = { "scrot", NULL, NULL }; /* XXX get from conf */ char *spawn_menu[] = { "dmenu_run", "-fn", NULL, "-nb", NULL, "-nf", NULL, "-sb", NULL, "-sf", NULL, NULL }; @@ -206,6 +216,7 @@ struct ws_win { struct workspace *ws; /* always valid */ struct swm_screen *s; /* always valid, never changes */ XWindowAttributes wa; + XSizeHints sh; }; TAILQ_HEAD(ws_win_list, ws_win); @@ -291,6 +302,8 @@ union arg { #define SWM_ARG_ID_STACKINIT (11) #define SWM_ARG_ID_CYCLEWS_UP (12) #define SWM_ARG_ID_CYCLEWS_DOWN (13) +#define SWM_ARG_ID_SS_ALL (0) +#define SWM_ARG_ID_SS_WINDOW (1) char **argv; }; @@ -445,6 +458,9 @@ conf_load(char *filename) case 's': if (!strncmp(var, "spawn_term", strlen("spawn_term"))) asprintf(&spawn_term[0], "%s", val); /* XXX args? */ + if (!strncmp(var, "screenshot_enabled", + strlen("screenshot_enabled"))) + ss_enabled = atoi(val); break; default: goto bad; @@ -741,8 +757,8 @@ root_to_region(Window root) } 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)) + if (x >= X(r) && x <= X(r) + WIDTH(r) && + y >= Y(r) && y <= Y(r) + HEIGHT(r)) break; } @@ -769,6 +785,8 @@ find_window(Window id) void spawn(struct swm_region *r, union arg *args) { + char *ret; + DNPRINTF(SWM_D_MISC, "spawn: %s\n", args->argv[0]); /* * The double-fork construct avoids zombie processes and keeps the code @@ -778,6 +796,15 @@ spawn(struct swm_region *r, union arg *args) if (fork() == 0) { if (display) close(ConnectionNumber(display)); + setenv("LD_PRELOAD", SWM_LIB, 1); + if (asprintf(&ret, "%d", r->ws->idx)) { + setenv("_SWM_WS", ret, 1); + free(ret); + } + if (asprintf(&ret, "%d", getpid())) { + setenv("_SWM_PID", ret, 1); + free(ret); + } setsid(); execvp(args->argv[0], args->argv); fprintf(stderr, "execvp failed\n"); @@ -1020,6 +1047,7 @@ focus(struct swm_region *r, union arg *args) if (winfocus == winlostfocus) return; + XMapRaised(display, winfocus->id); focus_win(winfocus); XSync(display, False); } @@ -1108,46 +1136,25 @@ stack_floater(struct ws_win *win, struct swm_region *r) XConfigureWindow(display, win->id, mask, &wc); } +#define SWAPXY(g) do { \ + int tmp; \ + tmp = (g)->y; (g)->y = (g)->x; (g)->x = tmp; \ + tmp = (g)->h; (g)->h = (g)->w; (g)->w = tmp; \ +} while (0) void -vertical_config(struct workspace *ws, int id) +stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) { - DNPRINTF(SWM_D_STACK, "vertical_resize: workspace: %d\n", ws->idx); - - switch (id) { - case SWM_ARG_ID_STACKRESET: - case SWM_ARG_ID_STACKINIT: - ws->l_state.vertical_msize = SWM_V_SLICE / 2; - ws->l_state.vertical_mwin = 1; - break; - case SWM_ARG_ID_MASTERSHRINK: - if (ws->l_state.vertical_msize > 1) - ws->l_state.vertical_msize--; - break; - case SWM_ARG_ID_MASTERGROW: - if (ws->l_state.vertical_msize < SWM_V_SLICE - 1) - ws->l_state.vertical_msize++; - break; - case SWM_ARG_ID_MASTERADD: - ws->l_state.vertical_mwin++; - break; - case SWM_ARG_ID_MASTERDEL: - if (ws->l_state.vertical_mwin > 0) - ws->l_state.vertical_mwin--; - break; - default: - return; - } -} - -void -vertical_stack(struct workspace *ws, struct swm_geometry *g) { XWindowChanges wc; - struct swm_geometry gg = *g; + struct swm_geometry win_g, r_g = *g; struct ws_win *win, *winfocus; - int i, j, split, colno, hrh, winno, main_width; + int i, j, w_inc, h_inc, w_base, h_base; + int hrh, extra, h_slice, last_h = 0; + int split, colno, winno, mwin, msize, mscale; + int remain, missing, v_slice;; unsigned int mask; - DNPRINTF(SWM_D_STACK, "vertical_stack: workspace: %d\n", ws->idx); + DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d\n rot=%s flip=%s", + ws->idx, rot ? "yes" : "no", flip ? "yes" : "no"); if ((winno = count_win(ws, 0)) == 0) return; @@ -1156,48 +1163,112 @@ vertical_stack(struct workspace *ws, struct swm_geometry *g) { ws->focus = TAILQ_FIRST(&ws->winlist); winfocus = cur_focus ? cur_focus : ws->focus; - if (ws->l_state.vertical_mwin && - winno > ws->l_state.vertical_mwin) { - split = ws->l_state.vertical_mwin; + win = TAILQ_FIRST(&ws->winlist); + if (rot) { + w_inc = win->sh.width_inc; + w_base = win->sh.base_width; + mwin = ws->l_state.horizontal_mwin; + mscale = ws->l_state.horizontal_msize; + SWAPXY(&r_g); + } else { + w_inc = win->sh.height_inc; + w_base = win->sh.base_height; + mwin = ws->l_state.vertical_mwin; + mscale = ws->l_state.vertical_msize; + } + win_g = r_g; + + h_slice = r_g.h / SWM_H_SLICE; + if (mwin && winno > mwin) { + v_slice = r_g.w / SWM_V_SLICE; + + split = mwin; colno = split; - main_width = (g->w / SWM_V_SLICE) * - ws->l_state.vertical_msize; - gg.w = main_width; + msize = v_slice * mscale; + + if (w_inc > 1 && w_inc < v_slice) { + /* adjust for window's requested size increment */ + remain = (win_g.w - w_base) % w_inc; + missing = w_inc - remain; + + if (missing <= extra || j == 0) { + extra -= missing; + win_g.w += missing; + } else { + win_g.w -= remain; + extra += remain; + } + } + + win_g.w = msize; + if (flip) + win_g.x += r_g.w - msize; } else { colno = winno; split = 0; } - hrh = g->h / colno; - gg.h = hrh - 2; + hrh = r_g.h / colno; + extra = r_g.h - (colno * hrh); + win_g.h = hrh - 2; i = j = 0; TAILQ_FOREACH(win, &ws->winlist, entry) { if (split && i == split) { colno = winno - split; - hrh = (g->h / colno); - gg.x += main_width + 2; - gg.w = g->w - (main_width + 2); - gg.h = hrh - 2; + hrh = (r_g.h / colno); + extra = r_g.h - (colno * hrh); + if (flip) + win_g.x = r_g.x; + else + win_g.x += msize + 2; + win_g.w = r_g.w - (msize + 2); j = 0; } - if (j == colno - 1) - gg.h = (hrh + (g->h - (colno * hrh))); + win_g.h = hrh - 2; + if (rot) { + h_inc = win->sh.width_inc; + h_base = win->sh.base_width; + } else { + h_inc = win->sh.height_inc; + h_base = win->sh.base_height; + } + if (j == colno - 1) { + win_g.h = hrh + extra; + } else if (h_inc > 1 && h_inc < h_slice) { + /* adjust for window's requested size increment */ + remain = (win_g.h - h_base) % h_inc; + missing = h_inc - remain; + + if (missing <= extra || j == 0) { + extra -= missing; + win_g.h += missing; + } else { + win_g.h -= remain; + extra += remain; + } + } if (j == 0) - gg.y = g->y; + win_g.y = r_g.y; else - gg.y += hrh; - + win_g.y += last_h + 2; if (win->transient != 0 || win->floating != 0) stack_floater(win, ws->r); else { bzero(&wc, sizeof wc); wc.border_width = 1; - win->g.x = wc.x = gg.x; - win->g.y = wc.y = gg.y; - win->g.w = wc.width = gg.w; - win->g.h = wc.height = gg.h; + if (rot) { + win->g.x = wc.x = win_g.y; + win->g.y = wc.y = win_g.x; + win->g.w = wc.width = win_g.h; + win->g.h = wc.height = win_g.w; + } else { + win->g.x = wc.x = win_g.x; + win->g.y = wc.y = win_g.y; + win->g.w = wc.width = win_g.w; + win->g.h = wc.height = win_g.h; + } mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth; XConfigureWindow(display, win->id, mask, &wc); /* @@ -1206,6 +1277,7 @@ vertical_stack(struct workspace *ws, struct swm_geometry *g) { } XMapRaised(display, win->id); + last_h = win_g.h; i++; j++; } @@ -1215,6 +1287,45 @@ vertical_stack(struct workspace *ws, struct swm_geometry *g) { } void +vertical_config(struct workspace *ws, int id) +{ + DNPRINTF(SWM_D_STACK, "vertical_resize: workspace: %d\n", ws->idx); + + switch (id) { + case SWM_ARG_ID_STACKRESET: + case SWM_ARG_ID_STACKINIT: + ws->l_state.vertical_msize = SWM_V_SLICE / 2; + ws->l_state.vertical_mwin = 1; + break; + case SWM_ARG_ID_MASTERSHRINK: + if (ws->l_state.vertical_msize > 1) + ws->l_state.vertical_msize--; + break; + case SWM_ARG_ID_MASTERGROW: + if (ws->l_state.vertical_msize < SWM_V_SLICE - 1) + ws->l_state.vertical_msize++; + break; + case SWM_ARG_ID_MASTERADD: + ws->l_state.vertical_mwin++; + break; + case SWM_ARG_ID_MASTERDEL: + if (ws->l_state.vertical_mwin > 0) + ws->l_state.vertical_mwin--; + break; + default: + return; + } +} + +void +vertical_stack(struct workspace *ws, struct swm_geometry *g) +{ + DNPRINTF(SWM_D_STACK, "vertical_stack: workspace: %d\n", ws->idx); + + stack_master(ws, g, 0, 0); +} + +void horizontal_config(struct workspace *ws, int id) { DNPRINTF(SWM_D_STACK, "horizontal_config: workspace: %d\n", ws->idx); @@ -1246,74 +1357,11 @@ horizontal_config(struct workspace *ws, int id) } void -horizontal_stack(struct workspace *ws, struct swm_geometry *g) { - XWindowChanges wc; - struct swm_geometry gg = *g; - struct ws_win *win, *winfocus; - int i, j, split, rowno, hrw, winno, main_height; - unsigned int mask; - - DNPRINTF(SWM_D_STACK, "horizontal_stack: workspace: %d\n", ws->idx); - - if ((winno = count_win(ws, 0)) == 0) - return; - - if (ws->focus == NULL) - ws->focus = TAILQ_FIRST(&ws->winlist); - winfocus = cur_focus ? cur_focus : ws->focus; - - if (ws->l_state.horizontal_mwin && - winno > ws->l_state.horizontal_mwin) { - split = ws->l_state.horizontal_mwin; - rowno = split; - main_height = (g->h / SWM_V_SLICE) * - ws->l_state.horizontal_msize; - gg.h = main_height; - } else { - rowno = winno; - split = 0; - } - hrw = g->w / rowno; - gg.w = hrw - 2; - - i = j = 0; - TAILQ_FOREACH(win, &ws->winlist, entry) { - if (split && i == split) { - rowno = winno - split; - hrw = (g->w / rowno); - gg.y += main_height + 2; - gg.h = g->h - (main_height + 2); - gg.w = hrw - 2; - j = 0; - } - if (j == rowno - 1) - gg.w = (hrw + (g->w - (rowno * hrw))); - - if (j == 0) - gg.x = g->x; - else - gg.x += hrw; - - if (win->transient != 0 || win->floating != 0) - stack_floater(win, ws->r); - else { - bzero(&wc, sizeof wc); - wc.border_width = 1; - win->g.x = wc.x = gg.x; - win->g.y = wc.y = gg.y; - win->g.w = wc.width = gg.w; - win->g.h = wc.height = gg.h; - mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth; - XConfigureWindow(display, win->id, mask, &wc); - } - - XMapRaised(display, win->id); - j++; - i++; - } +horizontal_stack(struct workspace *ws, struct swm_geometry *g) +{ + DNPRINTF(SWM_D_STACK, "vertical_stack: workspace: %d\n", ws->idx); - if (winfocus) - focus_win(winfocus); /* this has to be done outside of the loop */ + stack_master(ws, g, 1, 0); } /* fullscreen view */ @@ -1369,7 +1417,7 @@ send_to_ws(struct swm_region *r, union arg *args) struct ws_win *win = cur_focus; struct workspace *ws, *nws; Atom ws_idx_atom = 0; - unsigned char ws_idx_str[1]; + unsigned char ws_idx_str[SWM_PROPLEN]; DNPRINTF(SWM_D_MOVE, "send_to_ws: win: %lu\n", win->id); @@ -1392,9 +1440,13 @@ send_to_ws(struct swm_region *r, union arg *args) /* Try to update the window's workspace property */ ws_idx_atom = XInternAtom(display, "_SWM_WS", False); - ws_idx_str[0] = (unsigned char)nws->idx; - XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8, - PropModeReplace, ws_idx_str, 1); + 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; @@ -1412,6 +1464,30 @@ wkill(struct swm_region *r, union arg *args) XKillClient(display, r->ws->focus->id); } +void +screenshot(struct swm_region *r, union arg *args) +{ + union arg a; + + DNPRINTF(SWM_D_MISC, "screenshot\n"); + + if (ss_enabled == 0) + return; + + switch (args->id) { + case SWM_ARG_ID_SS_ALL: + spawn_screenshot[1] = "-m"; + break; + case SWM_ARG_ID_SS_WINDOW: + spawn_screenshot[1] = "-s"; /* XXX doesn't work with scrot */ + break; + default: + return; + } + a.argv = spawn_screenshot; + spawn(r, &a); +} + /* key definitions */ struct key { unsigned int mod; @@ -1462,6 +1538,8 @@ struct key { { 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} }, + { MODKEY, XK_s, screenshot, {.id = SWM_ARG_ID_SS_ALL} }, + { MODKEY | ShiftMask, XK_s, screenshot, {.id = SWM_ARG_ID_SS_WINDOW} }, }; void @@ -1632,8 +1710,9 @@ manage_window(Window id) int format; unsigned long nitems, bytes; Atom ws_idx_atom = 0, type; - unsigned char ws_idx_str[1], *prop = NULL; + unsigned char ws_idx_str[SWM_PROPLEN], *prop = NULL; struct swm_region *r; + long mask; if ((win = find_window(id)) != NULL) return (win); /* already being managed */ @@ -1643,15 +1722,23 @@ manage_window(Window id) ws_idx_atom = XInternAtom(display, "_SWM_WS", False); if (ws_idx_atom) - XGetWindowProperty(display, id, ws_idx_atom, 0, 1, False, XA_STRING, - &type, &format, &nitems, &bytes, &prop); + 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) - ws = &r->s->ws[prop[0]]; - else + 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; @@ -1673,12 +1760,16 @@ manage_window(Window id) win->g.x = win->wa.x; win->g.y = win->wa.y; - if (ws_idx_atom && prop == NULL) { - /* set the window's workspace property if it wasn't there */ - ws_idx_str[0] = (unsigned char)ws->idx; - XChangeProperty(display, id, ws_idx_atom, XA_STRING, 1, - PropModeReplace, ws_idx_str, 1); + XGetWMNormalHints(display, win->id, &win->sh, &mask); + + 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);