X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=944c4db804ab5847646d45531fae85de9b781fb9;hb=5bdf52a032835ea7fa7dce6f2a7e3520025f0d66;hp=60c6161dde334221d5de8d6b2aad4d3295f02d63;hpb=7ab5dbd429c509a5c552c1f94a2e7753c8eacb82;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index 60c6161..944c4db 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; @@ -147,6 +156,7 @@ 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; @@ -165,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 }; @@ -290,6 +301,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; }; @@ -412,6 +425,8 @@ conf_load(char *filename) 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; @@ -442,6 +457,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; @@ -534,8 +552,7 @@ bar_update(void) } } XSync(display, False); - - alarm(60); + alarm(bar_delay); } void @@ -739,8 +756,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; } @@ -774,8 +791,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"); @@ -1018,6 +1041,7 @@ focus(struct swm_region *r, union arg *args) if (winfocus == winlostfocus) return; + XMapRaised(display, winfocus->id); focus_win(winfocus); XSync(display, False); } @@ -1106,46 +1130,23 @@ 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; + int split, colno, hrh, winno, mwin, msize, mscale; 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; @@ -1154,37 +1155,50 @@ 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; + if (rot) { + mwin = ws->l_state.horizontal_mwin; + mscale = ws->l_state.horizontal_msize; + SWAPXY(&r_g); + } else { + mwin = ws->l_state.vertical_mwin; + mscale = ws->l_state.vertical_msize; + } + win_g = r_g; + + if (mwin && winno > mwin) { + split = mwin; colno = split; - main_width = (g->w / SWM_V_SLICE) * - ws->l_state.vertical_msize; - gg.w = main_width; + msize = (r_g.w / SWM_V_SLICE) * mscale; + 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; + 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); + if (flip) + win_g.x = r_g.x; + else + win_g.x += msize + 2; + win_g.w = r_g.w - (msize + 2); + win_g.h = hrh - 2; j = 0; } if (j == colno - 1) - gg.h = (hrh + (g->h - (colno * hrh))); + win_g.h = (hrh + (r_g.h - (colno * hrh))); if (j == 0) - gg.y = g->y; + win_g.y = r_g.y; else - gg.y += hrh; + win_g.y += hrh; if (win->transient != 0 || win->floating != 0) @@ -1192,10 +1206,17 @@ vertical_stack(struct workspace *ws, struct swm_geometry *g) { 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); /* @@ -1213,6 +1234,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); @@ -1244,74 +1304,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 */ @@ -1367,7 +1364,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); @@ -1390,9 +1387,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; @@ -1410,6 +1411,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; @@ -1460,6 +1485,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 @@ -1630,7 +1657,7 @@ 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; if ((win = find_window(id)) != NULL) @@ -1641,15 +1668,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; @@ -1671,12 +1706,14 @@ 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); + 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);