X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=29d22e9bab1267b2d637474d98f3a3ac567af261;hb=2a214e3e6cab1e778ec552e6f45330c9ccbe2664;hp=969655c8cbcdad14e82ab82e770e05765527cc93;hpb=7088da1fd1c181fdfd05a38bc5a24c4e1758aac7;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index 969655c..29d22e9 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 }; @@ -291,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; }; @@ -445,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; @@ -741,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; } @@ -776,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"); @@ -1369,7 +1390,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 +1413,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 +1437,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 +1511,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,7 +1683,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) @@ -1643,15 +1694,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 +1732,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);