X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=aab81c03c13a80b791d98328f2cd832968049961;hb=339122673e2325f5e0a303eb6b34cc5c68f676ea;hp=6fab546b48fd6835396d13a616fdd6f90ff89937;hpb=5140afe339098eb03d913f633223ddbed2391eb5;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index 6fab546..aab81c0 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -1,9 +1,10 @@ /* $scrotwm$ */ /* - * Copyright (c) 2009-2010 Marco Peereboom - * Copyright (c) 2009 Ryan McBride + * Copyright (c) 2009-2010-2011 Marco Peereboom + * Copyright (c) 2009-2010-2011 Ryan McBride * Copyright (c) 2009 Darrin Chandler * Copyright (c) 2009 Pierre-Yves Ritschard + * Copyright (c) 2011 Jason L. Wright * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -52,7 +53,7 @@ static const char *cvstag = "$scrotwm$"; -#define SWM_VERSION "0.9.29" +#define SWM_VERSION "0.9.30" #include #include @@ -99,7 +100,7 @@ static const char *cvstag = "$scrotwm$"; #endif #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) @@ -168,6 +169,10 @@ Atom astate; Atom aprot; Atom adelete; Atom takefocus; +Atom a_wmname; +Atom a_utf8_string; +Atom a_string; +Atom a_swm_iconic; volatile sig_atomic_t running = 1; volatile sig_atomic_t restart_wm = 0; int outputs = 0; @@ -186,6 +191,13 @@ int term_width = 0; int font_adjusted = 0; unsigned int mod_key = MODKEY; +/* dmenu search */ +struct swm_region *search_r; +int select_list_pipe[2]; +int select_resp_pipe[2]; +pid_t searchpid; +volatile sig_atomic_t search_resp; + /* dialog windows */ double dialog_ratio = .6; /* status bar */ @@ -261,6 +273,7 @@ struct ws_win { int floatmaxed; /* flag: floater was maxed in max_stack */ int floating; int manual; + int iconic; unsigned int ewmh_flags; int font_size_boundary[SWM_MAX_FONT_STEPS]; int font_steps; @@ -268,7 +281,6 @@ struct ws_win { int can_delete; int take_focus; int java; - int init_configreq_tweak_done; unsigned long quirks; struct workspace *ws; /* always valid */ struct swm_screen *s; /* always valid, never changes */ @@ -391,9 +403,8 @@ union arg { }; void focus(struct swm_region *, union arg *); -void focus_magic(struct ws_win *, int); -#define SWM_F_GENERIC (0) -#define SWM_F_TRANSIENT (1) +void focus_magic(struct ws_win *); + /* quirks */ struct quirk { char *class; @@ -404,10 +415,6 @@ struct quirk { #define SWM_Q_ANYWHERE (1<<2) /* don't position this window */ #define SWM_Q_XTERM_FONTADJ (1<<3) /* adjust xterm fonts when resizing */ #define SWM_Q_FULLSCREEN (1<<4) /* remove border */ -#define SWM_Q_HONOR_CONFREQ (1<<5) /* Accomodate applications that - need the dimensions in configuration - requests to be honored. - */ }; int quirks_size = 0, quirks_length = 0; struct quirk *quirks = NULL; @@ -461,6 +468,7 @@ struct ewmh_hint { void store_float_geom(struct ws_win *win, struct swm_region *r); int floating_toggle_win(struct ws_win *win); +void spawn_select(struct swm_region *, union arg *, char *, int *); int get_property(Window id, Atom atom, long count, Atom type, @@ -484,6 +492,52 @@ get_property(Window id, Atom atom, long count, Atom type, } void +update_iconic(struct ws_win *win, int newv) +{ + int32_t v = newv; + Atom iprop; + + win->iconic = newv; + + iprop = XInternAtom(display, "_SWM_ICONIC", False); + if (!iprop) + return; + if (newv) + XChangeProperty(display, win->id, iprop, XA_INTEGER, 32, + PropModeReplace, (unsigned char *)&v, 1); + else + XDeleteProperty(display, win->id, iprop); +} + +int +get_iconic(struct ws_win *win) +{ + int32_t v = 0; + int retfmt, status; + Atom iprop, rettype; + unsigned long nitems, extra; + unsigned char *prop = NULL; + + iprop = XInternAtom(display, "_SWM_ICONIC", False); + if (!iprop) + goto out; + status = XGetWindowProperty(display, win->id, iprop, 0L, 1L, + False, XA_INTEGER, &rettype, &retfmt, &nitems, &extra, &prop); + if (status != Success) + goto out; + if (rettype != XA_INTEGER || retfmt != 32) + goto out; + if (nitems != 1) + goto out; + v = *((int32_t *)prop); + +out: + if (prop != NULL) + XFree(prop); + return (v); +} + +void setup_ewmh(void) { int i,j; @@ -602,7 +656,7 @@ ewmh_set_win_fullscreen(struct ws_win *win, int fs) win->g.y = rg.y; win->g.w = rg.w; win->g.h = rg.h; - } else { + } else { if (win->g_floatvalid) { /* refloat at last floating relative position */ win->g.x = win->g_float.x - win->rg_float.x + rg.x; @@ -958,6 +1012,8 @@ sighdlr(int sig) #endif /* SWM_DEBUG */ break; } + if (pid == searchpid) + search_resp = 1; #ifdef SWM_DEBUG if (WIFEXITED(status)) { @@ -1382,56 +1438,44 @@ client_msg(struct ws_win *win, Atom a) } void -configreq_win(struct ws_win *win) -{ - XConfigureRequestEvent cr; - - /* This function may be of dubious value; it is always called - immediately after a call to XConfigureWindow, which generates a - ConfigureRequestEvent of its own. The event generated here seems - redundant and prevents XEmacs from completely filling the window - frame. Simply eliminating confreq_win appeared to have no ill - effects, but my testing was limited. As such, I've retained it. - */ - if (win == NULL || (win->quirks & SWM_Q_HONOR_CONFREQ)) - return; - - bzero(&cr, sizeof cr); - cr.type = ConfigureRequest; - cr.display = display; - cr.parent = win->id; - cr.window = win->id; - cr.x = win->g.x; - cr.y = win->g.y; - cr.width = win->g.w; - cr.height = win->g.h; - cr.border_width = border_width; - - XSendEvent(display, win->id, False, StructureNotifyMask, (XEvent *)&cr); -} - -void -config_win(struct ws_win *win) +config_win(struct ws_win *win, XConfigureRequestEvent *ev) { XConfigureEvent ce; - DNPRINTF(SWM_D_MISC, "config_win: win %lu x %d y %d w %d h %d\n", - win->id, win->g.x, win->g.y, win->g.w, win->g.h); - if (win == NULL) return; - ce.type = ConfigureNotify; - ce.display = display; - ce.event = win->id; - ce.window = win->id; - ce.x = win->g.x; - ce.y = win->g.y; - ce.width = win->g.w; - ce.height = win->g.h; - ce.border_width = border_width; /* XXX store this! */ - ce.above = None; - ce.override_redirect = False; + if (ev == NULL) { + DNPRINTF(SWM_D_MISC, "config_win: win %lu x %d y %d w %d h %d\n", + win->id, win->g.x, win->g.y, win->g.w, win->g.h); + + ce.type = ConfigureNotify; + ce.display = display; + ce.event = win->id; + ce.window = win->id; + ce.x = win->g.x; + ce.y = win->g.y; + ce.width = win->g.w; + ce.height = win->g.h; + ce.border_width = border_width; + ce.above = None; + ce.override_redirect = False; + } else { + DNPRINTF(SWM_D_MISC, "config_win: ev win %lu x %d y %d w %d h %d\n", + ev->window, ev->x, ev->y, ev->width, ev->height); + ce.type = ConfigureNotify; + ce.display = ev->display; + ce.event = ev->window; + ce.window = ev->window; + ce.x = ev->x; + ce.y = ev->y; + ce.width = ev->width; + ce.height = ev->height; + ce.border_width = ev->border_width; + ce.above = ev->above; + ce.override_redirect = False; + } + XSendEvent(display, win->id, False, StructureNotifyMask, (XEvent *)&ce); } @@ -1446,6 +1490,8 @@ count_win(struct workspace *ws, int count_transient) continue; if (count_transient == 0 && win->transient) continue; + if (win->iconic) + continue; count++; } DNPRINTF(SWM_D_MISC, "count_win: %d\n", count); @@ -1617,40 +1663,40 @@ find_window(Window id) } void -spawn(struct swm_region *r, union arg *args) +spawn(struct swm_region *r, union arg *args, int close_fd) { int fd; char *ret = NULL; DNPRINTF(SWM_D_MISC, "spawn: %s\n", args->argv[0]); - if (fork() == 0) { - if (display) - close(ConnectionNumber(display)); + if (display) + close(ConnectionNumber(display)); - setenv("LD_PRELOAD", SWM_LIB, 1); + setenv("LD_PRELOAD", SWM_LIB, 1); - if (asprintf(&ret, "%d", r->ws->idx) == -1) { - perror("_SWM_WS"); - _exit(1); - } - setenv("_SWM_WS", ret, 1); - free(ret); - ret = NULL; + if (asprintf(&ret, "%d", r->ws->idx) == -1) { + perror("_SWM_WS"); + _exit(1); + } + setenv("_SWM_WS", ret, 1); + free(ret); + ret = NULL; - if (asprintf(&ret, "%d", getpid()) == -1) { - perror("_SWM_PID"); - _exit(1); - } - setenv("_SWM_PID", ret, 1); - free(ret); - ret = NULL; + if (asprintf(&ret, "%d", getpid()) == -1) { + perror("_SWM_PID"); + _exit(1); + } + setenv("_SWM_PID", ret, 1); + free(ret); + ret = NULL; - if (setsid() == -1) { - perror("setsid"); - _exit(1); - } + if (setsid() == -1) { + perror("setsid"); + _exit(1); + } + if (close_fd) { /* * close stdin and stdout to prevent interaction between apps * and the baraction script @@ -1664,12 +1710,12 @@ spawn(struct swm_region *r, union arg *args) dup2(fd, STDOUT_FILENO); if (fd > 2) close(fd); + } - execvp(args->argv[0], args->argv); + execvp(args->argv[0], args->argv); - perror("execvp"); - _exit(1); - } + perror("execvp"); + _exit(1); } void @@ -1679,7 +1725,8 @@ spawnterm(struct swm_region *r, union arg *args) if (term_width) setenv("_SWM_XTERM_FONTADJ", "", 1); - spawn(r, args); + if (fork() == 0) + spawn(r, args, 1); } void @@ -1851,6 +1898,7 @@ focus_win(struct ws_win *win) if (win->java == 0) XSetInputFocus(display, win->id, RevertToParent, CurrentTime); + XMapRaised(display, win->id); grabbuttons(win, 1); XSetWindowBorder(display, win->id, win->ws->r->s->c[SWM_S_COLOR_FOCUS].color); @@ -2139,13 +2187,13 @@ done: if (winfocus == winlostfocus || winfocus == NULL) return; - focus_magic(winfocus, SWM_F_GENERIC); + focus_magic(winfocus); } void focus(struct swm_region *r, union arg *args) { - struct ws_win *winfocus = NULL, *winlostfocus = NULL; + struct ws_win *winfocus = NULL, *winlostfocus = NULL, *head; struct ws_win *cur_focus = NULL; struct ws_win_list *wl = NULL; struct workspace *ws = NULL; @@ -2157,14 +2205,16 @@ focus(struct swm_region *r, union arg *args) /* treat FOCUS_CUR special */ if (args->id == SWM_ARG_ID_FOCUSCUR) { - if (r->ws->focus) + if (r->ws->focus && r->ws->focus->iconic == 0) winfocus = r->ws->focus; - else if (r->ws->focus_prev) + else if (r->ws->focus_prev && r->ws->focus_prev->iconic == 0) winfocus = r->ws->focus_prev; else - winfocus = TAILQ_FIRST(&r->ws->winlist); + TAILQ_FOREACH(winfocus, &r->ws->winlist, entry) + if (winfocus->iconic == 0) + break; - focus_magic(winfocus, SWM_F_GENERIC); + focus_magic(winfocus); return; } @@ -2177,15 +2227,37 @@ focus(struct swm_region *r, union arg *args) switch (args->id) { case SWM_ARG_ID_FOCUSPREV: - winfocus = TAILQ_PREV(cur_focus, ws_win_list, entry); - if (winfocus == NULL) - winfocus = TAILQ_LAST(wl, ws_win_list); + head = TAILQ_PREV(cur_focus, ws_win_list, entry); + if (head == NULL) + head = TAILQ_LAST(wl, ws_win_list); + winfocus = head; + if (WINID(winfocus) == cur_focus->transient) { + head = TAILQ_PREV(winfocus, ws_win_list, entry); + if (head == NULL) + head = TAILQ_LAST(wl, ws_win_list); + winfocus = head; + } + + /* skip iconics */ + if (winfocus && winfocus->iconic) { + TAILQ_FOREACH_REVERSE(winfocus, wl, ws_win_list, entry) + if (winfocus->iconic == 0) + break; + } break; case SWM_ARG_ID_FOCUSNEXT: - winfocus = TAILQ_NEXT(cur_focus, entry); - if (winfocus == NULL) - winfocus = TAILQ_FIRST(wl); + head = TAILQ_NEXT(cur_focus, entry); + if (head == NULL) + head = TAILQ_FIRST(wl); + winfocus = head; + + /* skip iconics */ + if (winfocus && winfocus->iconic) { + TAILQ_FOREACH(winfocus, wl, entry) + if (winfocus->iconic == 0) + break; + } break; case SWM_ARG_ID_FOCUSMAIN: @@ -2201,7 +2273,7 @@ focus(struct swm_region *r, union arg *args) if (winfocus == winlostfocus || winfocus == NULL) return; - focus_magic(winfocus, SWM_F_GENERIC); + focus_magic(winfocus); } void @@ -2334,22 +2406,22 @@ stack_floater(struct ws_win *win, struct swm_region *r) * floaters and transients are auto-centred unless moved * or resized */ - win->g.x = r->g.x + (WIDTH(r) - win->g.w) / 2 - border_width; - win->g.y = r->g.y + (HEIGHT(r) - win->g.h) / 2 - border_width; + win->g.x = r->g.x + (WIDTH(r) - win->g.w) / 2 - wc.border_width; + win->g.y = r->g.y + (HEIGHT(r) - win->g.h) / 2 - wc.border_width; } /* win can be outside r if new r smaller than old r */ /* Ensure top left corner inside r (move probs otherwise) */ - if (win->g.x < r->g.x - border_width) - win->g.x = r->g.x - border_width; + if (win->g.x < r->g.x - wc.border_width) + win->g.x = r->g.x - wc.border_width; if (win->g.x > r->g.x + r->g.w - 1) win->g.x = (win->g.w > r->g.w) ? r->g.x : - (r->g.x + r->g.w - win->g.w - 2 * border_width); - if (win->g.y < r->g.y - border_width) - win->g.y = r->g.y - border_width; + (r->g.x + r->g.w - win->g.w - 2 * wc.border_width); + if (win->g.y < r->g.y - wc.border_width) + win->g.y = r->g.y - wc.border_width; if (win->g.y > r->g.y + r->g.h - 1) win->g.y = (win->g.h > r->g.h) ? r->g.y : - (r->g.y + r->g.h - win->g.h - 2 * border_width); + (r->g.y + r->g.h - win->g.h - 2 * wc.border_width); wc.x = win->g.x; wc.y = win->g.y; @@ -2367,7 +2439,6 @@ stack_floater(struct ws_win *win, struct swm_region *r) win->id, wc.x, wc.y, wc.width, wc.height); XConfigureWindow(display, win->id, mask, &wc); - configreq_win(win); } /* @@ -2426,7 +2497,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) return; TAILQ_FOREACH(win, &ws->winlist, entry) - if (win->transient == 0 && win->floating == 0) + if (win->transient == 0 && win->floating == 0 && win->iconic == 0) break; if (win == NULL) @@ -2486,6 +2557,8 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) TAILQ_FOREACH(win, &ws->winlist, entry) { if (win->transient != 0 || win->floating != 0) continue; + if (win->iconic != 0) + continue; if (win->ewmh_flags & EWMH_F_FULLSCREEN) { fs_win = win; @@ -2570,7 +2643,6 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) adjust_font(win); mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth; XConfigureWindow(display, win->id, mask, &wc); - configreq_win(win); } if (XGetWindowAttributes(display, win->id, &wa)) @@ -2582,12 +2654,13 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) j++; } - notiles: +notiles: /* now, stack all the floaters and transients */ TAILQ_FOREACH(win, &ws->winlist, entry) { if (win->transient == 0 && win->floating == 0) continue; - + if (win->iconic == 1) + continue; if (win->ewmh_flags & EWMH_F_FULLSCREEN) { fs_win = win; continue; @@ -2749,7 +2822,6 @@ max_stack(struct workspace *ws, struct swm_geometry *g) } mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth; XConfigureWindow(display, win->id, mask, &wc); - configreq_win(win); } /* unmap only if we don't have multi screen */ if (win != ws->focus) @@ -2762,7 +2834,7 @@ max_stack(struct workspace *ws, struct swm_geometry *g) if (parent) XMapRaised(display, parent->id); stack_floater(wintrans, ws->r); - focus_magic(wintrans, SWM_F_TRANSIENT); + focus_magic(wintrans); } } @@ -2811,6 +2883,151 @@ send_to_ws(struct swm_region *r, union arg *args) } void +iconify(struct swm_region *r, union arg *args) +{ + union arg a; + + if (r->ws->focus == NULL) + return; + unmap_window(r->ws->focus); + update_iconic(r->ws->focus, 1); + stack(); + r->ws->focus = NULL; + a.id = SWM_ARG_ID_FOCUSCUR; + focus(r, &a); +} + +unsigned char * +get_win_name(Display *dpy, Window win, Atom wname, Atom stype, + unsigned long *slen) +{ + int status, retfmt; + unsigned long nitems, nbytes, nextra; + unsigned char *prop = NULL; + Atom rettype; + + status = XGetWindowProperty(dpy, win, wname, 0L, 0L, False, stype, + &rettype, &retfmt, &nitems, &nbytes, &prop); + if (status != Success) + return (NULL); + XFree(prop); + + status = XGetWindowProperty(dpy, win, wname, 0L, nbytes, False, + stype, &rettype, &retfmt, &nitems, &nextra, &prop); + if (status != Success) { + XFree(prop); + return (NULL); + } + if (rettype != stype) { + XFree(prop); + return (NULL); + } + *slen = nitems; + return (prop); +} + +void +uniconify(struct swm_region *r, union arg *args) +{ + struct ws_win *win; + FILE *lfile; + char *name; + int count = 0; + unsigned long len; + + DNPRINTF(SWM_D_MISC, "uniconify\n"); + + if (r && r->ws == NULL) + return; + + /* make sure we have anything to uniconify */ + TAILQ_FOREACH(win, &r->ws->winlist, entry) { + if (win->ws == NULL) + continue; /* should never happen */ + if (win->iconic == 0) + continue; + count++; + } + if (count == 0) + return; + + search_r = r; + + spawn_select(r, args, "uniconify", &searchpid); + + if ((lfile = fdopen(select_list_pipe[1], "w")) == NULL) + return; + + TAILQ_FOREACH(win, &r->ws->winlist, entry) { + if (win->ws == NULL) + continue; /* should never happen */ + if (win->iconic == 0) + continue; + + name = get_win_name(display, win->id, a_wmname, a_string, + &len); + if (name == NULL) + continue; + fprintf(lfile, "%s.%lu\n", name, win->id); + XFree(name); + } + + fclose(lfile); +} + +#define MAX_RESP_LEN 1024 + +void +search_do_resp(void) +{ + ssize_t rbytes; + struct ws_win *win; + char *name, *resp, *s; + unsigned long len; + + DNPRINTF(SWM_D_MISC, "search_do_resp:\n"); + + search_resp = 0; + searchpid = 0; + + if ((resp = calloc(1, MAX_RESP_LEN + 1)) == NULL) { + fprintf(stderr, "search: calloc\n"); + return; + } + + rbytes = read(select_resp_pipe[0], resp, MAX_RESP_LEN); + if (rbytes <= 0) { + fprintf(stderr, "search: read error: %s\n", strerror(errno)); + goto done; + } + resp[rbytes] = '\0'; + len = strlen(resp); + + DNPRINTF(SWM_D_MISC, "search_do_resp: resp %s\n", resp); + TAILQ_FOREACH(win, &search_r->ws->winlist, entry) { + if (win->iconic == 0) + continue; + name = get_win_name(display, win->id, a_wmname, a_string, &len); + if (name == NULL) + continue; + if (asprintf(&s, "%s.%lu", name, win->id) == -1) { + XFree(name); + continue; + } + XFree(name); + if (strncmp(s, resp, len) == 0) { + /* XXX this should be a callback to generalize */ + update_iconic(win, 0); + free(s); + break; + } + free(s); + } +done: + free(resp); +} + +void wkill(struct swm_region *r, union arg *args) { DNPRINTF(SWM_D_MISC, "wkill %d\n", args->id); @@ -2908,7 +3125,6 @@ resize_window(struct ws_win *win, int center) win->id, wc.x, wc.y, wc.width, wc.height); XConfigureWindow(display, win->id, mask, &wc); - configreq_win(win); } void @@ -3014,12 +3230,12 @@ move_window(struct ws_win *win) mask = CWX | CWY; wc.x = win->g.x; wc.y = win->g.y; + wc.border_width = border_width; DNPRINTF(SWM_D_STACK, "move_window: win %lu x %d y %d w %d h %d\n", win->id, wc.x, wc.y, wc.width, wc.height); XConfigureWindow(display, win->id, mask, &wc); - configreq_win(win); } void @@ -3151,7 +3367,9 @@ enum keyfuncid { kf_spawn_lock, kf_spawn_initscr, kf_spawn_custom, - kf_dumpwins, + kf_iconify, + kf_uniconify, + kf_dumpwins, /* MUST BE LAST */ kf_invalid }; @@ -3225,7 +3443,9 @@ struct keyfunc { { "spawn_lock", legacyfunc, {0} }, { "spawn_initscr", legacyfunc, {0} }, { "spawn_custom", dummykeyfunc, {0} }, - { "dumpwins", dumpwins, {0} }, + { "iconify", iconify, {0} }, + { "uniconify", uniconify, {0} }, + { "dumpwins", dumpwins, {0} }, /* MUST BE LAST */ { "invalid key func", NULL, {0} }, }; struct key { @@ -3281,15 +3501,15 @@ struct spawn_prog { int spawns_size = 0, spawns_length = 0; struct spawn_prog *spawns = NULL; -void -spawn_custom(struct swm_region *r, union arg *args, char *spawn_name) +int +spawn_expand(struct swm_region *r, union arg *args, char *spawn_name, + char ***ret_args) { - union arg a; struct spawn_prog *prog = NULL; int i; char *ap, **real_args; - DNPRINTF(SWM_D_SPAWN, "spawn_custom %s\n", spawn_name); + DNPRINTF(SWM_D_SPAWN, "spawn_expand %s\n", spawn_name); /* find program */ for (i = 0; i < spawns_length; i++) { @@ -3299,7 +3519,7 @@ spawn_custom(struct swm_region *r, union arg *args, char *spawn_name) if (prog == NULL) { fprintf(stderr, "spawn_custom: program %s not found\n", spawn_name); - return; + return (-1); } /* make room for expanded args */ @@ -3356,10 +3576,66 @@ spawn_custom(struct swm_region *r, union arg *args, char *spawn_name) fprintf(stderr, "\n"); } #endif + *ret_args = real_args; + return (prog->argc); +} + +void +spawn_custom(struct swm_region *r, union arg *args, char *spawn_name) +{ + union arg a; + char **real_args; + int spawn_argc, i; + if ((spawn_argc = spawn_expand(r, args, spawn_name, &real_args)) < 0) + return; a.argv = real_args; - spawn(r, &a); - for (i = 0; i < prog->argc; i++) + if (fork() == 0) + spawn(r, &a, 1); + + for (i = 0; i < spawn_argc; i++) + free(real_args[i]); + free(real_args); +} + +void +spawn_select(struct swm_region *r, union arg *args, char *spawn_name, int *pid) +{ + union arg a; + char **real_args; + int i, spawn_argc; + + if ((spawn_argc = spawn_expand(r, args, spawn_name, &real_args)) < 0) + return; + a.argv = real_args; + + if (pipe(select_list_pipe) == -1) + err(1, "pipe error"); + if (pipe(select_resp_pipe) == -1) + err(1, "pipe error"); + + if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) + err(1, "could not disable SIGPIPE"); + switch (*pid = fork()) { + case -1: + err(1, "cannot fork"); + break; + case 0: /* child */ + if (dup2(select_list_pipe[0], 0) == -1) + errx(1, "dup2"); + if (dup2(select_resp_pipe[1], 1) == -1) + errx(1, "dup2"); + close(select_list_pipe[1]); + close(select_resp_pipe[0]); + spawn(r, &a, 0); + break; + default: /* parent */ + close(select_list_pipe[0]); + close(select_resp_pipe[1]); + break; + } + + for (i = 0; i < spawn_argc; i++) free(real_args[i]); free(real_args); } @@ -3500,6 +3776,13 @@ setup_spawn(void) " -nf $bar_font_color" " -sb $bar_border" " -sf $bar_color", 0); + setconfspawn("uniconify", "dmenu" + " -i" + " -fn $bar_font" + " -nb $bar_color" + " -nf $bar_font_color" + " -sb $bar_border" + " -sf $bar_color", 0); } /* key bindings */ @@ -3749,6 +4032,8 @@ setup_keys(void) setkeybinding(MODKEY|ShiftMask, XK_v, kf_version, NULL); setkeybinding(MODKEY|ShiftMask, XK_Delete, kf_spawn_custom, "lock"); setkeybinding(MODKEY|ShiftMask, XK_i, kf_spawn_custom, "initscr"); + setkeybinding(MODKEY, XK_w, kf_iconify, NULL); + setkeybinding(MODKEY|ShiftMask, XK_w, kf_uniconify, NULL); #ifdef SWM_DEBUG setkeybinding(MODKEY|ShiftMask, XK_d, kf_dumpwins, NULL); #endif @@ -3828,7 +4113,6 @@ const char *quirkname[] = { "ANYWHERE", "XTERM_FONTADJ", "FULLSCREEN", - "HONOR_CONFREQ", }; /* SWM_Q_WS: retain '|' for back compat for now (2009-08-11) */ @@ -3975,8 +4259,6 @@ setup_quirks(void) setquirk("Xitk", "Xine Window", SWM_Q_FLOAT | SWM_Q_ANYWHERE); setquirk("xine", "xine Video Fullscreen Window", SWM_Q_FULLSCREEN | SWM_Q_FLOAT); setquirk("pcb", "pcb", SWM_Q_FLOAT); - setquirk("Emacs", "emacs", SWM_Q_HONOR_CONFREQ); - setquirk("Emacs", "Ediff", SWM_Q_FLOAT); } /* conf file stuff */ @@ -4287,9 +4569,12 @@ manage_window(Window id) DNPRINTF(SWM_D_MISC, "manage previously unmanaged window " "%lu\n", win->id); TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry); - TAILQ_INSERT_TAIL(&win->ws->winlist, win, entry); if (win->transient) set_child_transient(win); + if (trans && (ww = find_window(trans))) + TAILQ_INSERT_AFTER(&win->ws->winlist, ww, win, entry); + else + TAILQ_INSERT_TAIL(&win->ws->winlist, win, entry); ewmh_update_actions(win); return (win); } @@ -4297,6 +4582,8 @@ manage_window(Window id) if ((win = calloc(1, sizeof(struct ws_win))) == NULL) errx(1, "calloc: failed to allocate memory for new window"); + win->id = id; + /* Get all the window data in one shot */ ws_idx_atom = XInternAtom(display, "_SWM_WS", False); if (ws_idx_atom) @@ -4324,6 +4611,8 @@ manage_window(Window id) XFree(prot); } + win->iconic = get_iconic(win); + /* * Figure out where to put the window. If it was previously assigned to * a workspace (either by spawn() or manually moving), and isn't @@ -4358,7 +4647,10 @@ manage_window(Window id) win->id = id; win->ws = ws; win->s = r->s; /* this never changes */ - TAILQ_INSERT_TAIL(&ws->winlist, win, entry); + if (trans && (ww = find_window(trans))) + TAILQ_INSERT_AFTER(&ws->winlist, ww, win, entry); + else + TAILQ_INSERT_TAIL(&ws->winlist, win, entry); win->g.w = win->wa.width; win->g.h = win->wa.height; @@ -4367,7 +4659,6 @@ manage_window(Window id) win->g_floatvalid = 0; win->floatmaxed = 0; win->ewmh_flags = 0; - win->init_configreq_tweak_done = 0; /* Set window properties so we can remember this after reincarnation */ if (ws_idx_atom && prop == NULL && @@ -4440,13 +4731,14 @@ manage_window(Window id) wc.border_width = border_width; mask = CWBorderWidth; XConfigureWindow(display, win->id, mask, &wc); - configreq_win(win); } XSelectInput(display, id, EnterWindowMask | FocusChangeMask | PropertyChangeMask | StructureNotifyMask); - - set_win_state(win, NormalState); + if (win->iconic) + set_win_state(win, IconicState); + else + set_win_state(win, NormalState); /* floaters need to be mapped if they are in the current workspace */ if ((win->floating || win->transient) && (ws->idx == r->ws->idx)) @@ -4500,8 +4792,7 @@ unmanage_window(struct ws_win *win) /* focus on root just in case */ XSetInputFocus(display, PointerRoot, PointerRoot, CurrentTime); - if (!win->floating) - focus_prev(win); + focus_prev(win); TAILQ_REMOVE(&win->ws->winlist, win, entry); TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry); @@ -4510,14 +4801,14 @@ unmanage_window(struct ws_win *win) } void -focus_magic(struct ws_win *win, int do_trans) +focus_magic(struct ws_win *win) { - DNPRINTF(SWM_D_FOCUS, "focus_magic: %lu %d\n", WINID(win), do_trans); + DNPRINTF(SWM_D_FOCUS, "focus_magic: %lu\n", WINID(win)); if (win == NULL) return; - if (do_trans == SWM_F_TRANSIENT && win->child_trans) { + if (win->child_trans) { /* win = parent & has a transient so focus on that */ if (win->java) { focus_win(win->child_trans); @@ -4591,7 +4882,7 @@ buttonpress(XEvent *e) if ((win = find_window(ev->window)) == NULL) return; - focus_magic(win, SWM_F_TRANSIENT); + focus_magic(win); action = client_click; for (i = 0; i < LENGTH(buttons); i++) @@ -4601,55 +4892,6 @@ buttonpress(XEvent *e) buttons[i].func(win, &buttons[i].args); } -/* - * honor_configreq: allow fussy windows to work in scrotwm - * - * XEmacs (and maybe other applications) expects ConfigureNotify - * events that exactly match the ConfigureRequests that it generates. - * Because Scrotwm specifies both the location *and* size of new - * windows, these applications will not be satisfied and will repeat - * the request forever. This bogs down the system and makes the - * application unusable. - * - * To resolve this conflict, this function responds to ConfigureRequest - * by sending a ConfigureNotify that contains the requested dimensions. - * It then resizes the window to the dimensions computed by scrotwm. - * And then it gets stranger still: after the initial response, the - * height stored in window manager's dimensions needs to be different - * than the value initially computed. If it's not, the window contents - * aren't resized to fill the frame. - * - */ -void honor_configreq ( - struct ws_win* win, - XConfigureRequestEvent* ev - ) -{ - XConfigureEvent ce; - - ce.type = ConfigureNotify; - ce.display = ev->display; - ce.event = ev->window; - ce.window = ev->window; - ce.x = ev->x; - ce.y = ev->y; - ce.width = ev->width; - ce.height = ev->height; - ce.border_width = ev->border_width; - ce.above = ev->above; - ce.override_redirect = False; - - XSendEvent(ev->display, ev->window, False, StructureNotifyMask, - (XEvent *)&ce); - - XResizeWindow(display, ev->window, win->g.w, win->g.h); - - if (win->init_configreq_tweak_done == 0) { - win->init_configreq_tweak_done = 1; - win->g.h--; - } -} - void configurerequest(XEvent *e) { @@ -4677,21 +4919,7 @@ configurerequest(XEvent *e) } else { DNPRINTF(SWM_D_EVENT, "configurerequest: change window: %lu\n", ev->window); - if (win->floating) { - if (ev->value_mask & CWX) - win->g.x = ev->x; - if (ev->value_mask & CWY) - win->g.y = ev->y; - if (ev->value_mask & CWWidth) - win->g.w = ev->width; - if (ev->value_mask & CWHeight) - win->g.h = ev->height; - config_win(win); - } else if (win->quirks & SWM_Q_HONOR_CONFREQ) { - honor_configreq(win, ev); - } else { - config_win(win); - } + config_win(win, ev); } } @@ -4849,7 +5077,7 @@ enternotify(XEvent *e) return; } - focus_magic(win, SWM_F_TRANSIENT); + focus_magic(win); } /* lets us use one switch statement for arbitrary mode/detail combinations */ @@ -4947,7 +5175,7 @@ maprequest(XEvent *e) /* make new win focused */ r = root_to_region(win->wa.root); if (win->ws == r->ws) - focus_magic(win, SWM_F_GENERIC); + focus_magic(win); } void @@ -4959,12 +5187,18 @@ propertynotify(XEvent *e) DNPRINTF(SWM_D_EVENT, "propertynotify: window: %lu\n", ev->window); - if (ev->state == PropertyDelete) - return; /* ignore */ win = find_window(ev->window); if (win == NULL) return; + if (ev->state == PropertyDelete && ev->atom == a_swm_iconic) { + update_iconic(win, 0); + XMapRaised(display, win->id); + stack(); + focus_win(win); + return; + } + switch (ev->atom) { case XA_WM_NORMAL_HINTS: #if 0 @@ -4982,10 +5216,6 @@ propertynotify(XEvent *e) if (window_name_enabled) bar_update(); break; - case XA_WM_NAME: - /* Be responsive to clients that change the application name. */ - bar_update(); - break; default: break; } @@ -5065,7 +5295,7 @@ clientmessage(XEvent *e) else { /* TODO: Change stack sizes */ } - config_win(win); + config_win(win, NULL); } if (ev->message_type == ewmh[_NET_WM_STATE].atom) { DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_WM_STATE \n"); @@ -5128,7 +5358,7 @@ new_region(struct swm_screen *s, int x, int y, int w, int h) (X(r) + WIDTH(r)) > x && Y(r) < (y + h) && (Y(r) + HEIGHT(r)) > y) { - if (r->ws->r != NULL) + if (r->ws->r != NULL) r->ws->old_r = r->ws->r; r->ws->r = NULL; XDestroyWindow(display, r->bar_window); @@ -5470,6 +5700,10 @@ main(int argc, char *argv[]) aprot = XInternAtom(display, "WM_PROTOCOLS", False); adelete = XInternAtom(display, "WM_DELETE_WINDOW", False); takefocus = XInternAtom(display, "WM_TAKE_FOCUS", False); + a_wmname = XInternAtom(display, "WM_NAME", False); + a_utf8_string = XInternAtom(display, "UTF8_STRING", False); + a_string = XInternAtom(display, "STRING", False); + a_swm_iconic = XInternAtom(display, "_SWM_ICONIC", False); /* look for local and global conf file */ pwd = getpwuid(getuid()); @@ -5574,6 +5808,8 @@ main(int argc, char *argv[]) DNPRINTF(SWM_D_MISC, "select failed"); if (restart_wm == 1) restart(NULL, NULL); + if (search_resp == 1) + search_do_resp(); if (running == 0) goto done; if (bar_alarm) {