Commit 216ad81

nsxiv216ad81

Pass file paths to key handler via stdin; fixes issue #187

Author: Bert Münnich
Date: 2014-11-27 22:37 +0100
Parent: 51854c6
Commit: 216ad81b59a7b3a9a4d1f83a26fa2a23ff17a0e0

+71 −55

3 files changed

Browse files Patch

−Context 3+

M exec/key-handler +20 −16
M main.c +48 −37
M sxiv.1 +3 −2

M exec/key-handler View

M main.c View

M sxiv.1 View

		@@ -2,8 +2,9 @@
2	2
3	3		# Example for $XDG_CONFIG_HOME/sxiv/exec/key-handler
4	4		# Called by sxiv(1) after the external prefix key (C-x by default) is pressed.
5		−	# The next key combo is passed as its first argument, followed by the paths of
6		−	# all marked images or the path of the current image, if no image is marked.
	5	+	# The next key combo is passed as its first argument. The paths of all marked
	6	+	# images--or of the current image, if no image is marked--are passed via stdin,
	7	+	# one file path per line.
7	8		# sxiv(1) blocks until this script terminates. It then checks which images
8	9		# have been modified and reloads them.
9	10
		@@ -11,12 +12,13 @@
11	12		# where C/M/S indicate Ctrl/Meta(Alt)/Shift modifier states and KEY is the X
12	13		# keysym as listed in /usr/include/X11/keysymdef.h without the "XK_" prefix.
13	14
14		−	readonly KEY="$1"; shift
	15	+	readonly KEY="$1";
15	16		readonly TAGFILE="$HOME/.config/sxiv/tags"
	17	+	readonly TMPFILE="/tmp/sxiv.$$"
16	18
17	19		rotate() {
18		−	degree="$1"; shift
19		−	for file in "$@"; do
	20	+	degree="$1"
	21	+	while read file; do
20	22		case "$(file -b -i "$file")" in
21	23		image/jpeg*) jpegtran -rotate "$degree" -copy all -outfile "$file" "$file" ;;
22	24		*) mogrify -rotate "$degree" "$file" ;;
		@@ -28,25 +30,27 @@ tag_add() {
28	30		>>"$TAGFILE"
29	31		tags=$(dmenu <"$TAGFILE" \| tr '\n' ',')
30	32		[ -z "$tags" ] && return
31		−	iptckwed -a "$tags" "$@"
	33	+	iptckwed -i -a "$tags"
32	34		echo -n "$tags" \| tr ',' '\n' \| sort - "$TAGFILE" \| uniq >"$TAGFILE.new"
33	35		mv -f "$TAGFILE"{.new,}
34	36		}
35	37
36	38		tag_del() {
37		−	tags=$(iptckwed -ql "$@" \| cut -f 2 \| tr ',' '\n' \| sort \| uniq \| dmenu \| tr '\n' ',')
	39	+	cat >"$TMPFILE"
	40	+	tags=$(iptckwed -iql <"$TMPFILE" \| cut -f 2 \| tr ',' '\n' \| sort \| uniq \| dmenu \| tr '\n' ',')
38	41		[ -z "$tags" ] && return
39		−	iptckwed -r "$tags" "$@"
	42	+	iptckwed -i -r "$tags" <"$TMPFILE"
	43	+	rm -f "$TMPFILE"
40	44		}
41	45
42	46		case "$KEY" in
43		−	"C-c") echo -n "$@" \| xsel -i ;;
44		−	"C-e") for file in "$@"; do urxvt -bg "#444" -fg "#eee" -sl 0 -title "$file" -e sh -c "exiv2 pr -q -pa '$file' \| less" & done ;;
45		−	"C-g") gimp "$@" & ;;
46		−	"C-comma") rotate 270 "$@" ;;
47		−	"C-period") rotate 90 "$@" ;;
48		−	"C-slash") rotate 180 "$@" ;;
49		−	"C-t") tag_add "$@" ;;
50		−	"M-T") tag_del "$@" ;;
	47	+	"C-c") tr '\n' ' ' \| xsel -i ;;
	48	+	"C-e") while read file; do urxvt -bg "#444" -fg "#eee" -sl 0 -title "$file" -e sh -c "exiv2 pr -q -pa '$file' \| less" & done ;;
	49	+	"C-g") tr '\n' '\0' \| xargs -0 gimp & ;;
	50	+	"C-comma") rotate 270 ;;
	51	+	"C-period") rotate 90 ;;
	52	+	"C-slash") rotate 180 ;;
	53	+	"C-t") tag_add ;;
	54	+	"M-T") tag_del ;;
51	55		esac
52	56

		@@ -481,12 +481,13 @@ void clear_resize(void)
481	481		void run_key_handler(const char *key, unsigned int mask)
482	482		{
483	483		pid_t pid;
484		−	int i, j, retval, status;
485		−	int fcnt = mode == MODE_THUMB && markcnt > 0 ? markcnt : 1;
	484	+	FILE *pfs;
	485	+	bool marked = mode == MODE_THUMB && markcnt > 0;
486	486		bool changed = false;
487		−	char **args, kstr[32], oldbar[BAR_L_LEN];
488		−	struct stat *oldst, newst;
489		−	struct { int fn; struct stat st; } *finfo;
	487	+	int f, i, pfd[2], retval, status;
	488	+	int fcnt = marked ? markcnt : 1;
	489	+	char kstr[32], oldbar[BAR_L_LEN];
	490	+	struct stat *oldst, st;
490	491
491	492		if (keyhandler.cmd == NULL) {
492	493		if (!keyhandler.warned) {
		@@ -498,55 +499,66 @@ void run_key_handler(const char *key, unsigned int mask)
498	499		if (key == NULL)
499	500		return;
500	501
501		−	finfo = s_malloc(fcnt * sizeof(*finfo));
502		−	args = s_malloc((fcnt + 3) * sizeof(*args));
503		−	args[0] = keyhandler.cmd;
504		−	args[1] = kstr;
505		−	args[fcnt+2] = NULL;
506		−	if (mode == MODE_IMAGE \|\| markcnt == 0) {
507		−	finfo[0].fn = fileidx;
508		−	stat(files[fileidx].path, &finfo[0].st);
509		−	args[2] = (char*) files[fileidx].path;
510		−	} else for (i = j = 0; i < filecnt; i++) {
511		−	if (files[i].marked) {
512		−	finfo[j].fn = i;
513		−	stat(files[i].path, &finfo[j++].st);
514		−	args[j+1] = (char*) files[i].path;
515		−	}
	502	+	if (pipe(pfd) < 0) {
	503	+	warn("could not create pipe for key handler");
	504	+	return;
516	505		}
517		−	snprintf(kstr, sizeof(kstr), "%s%s%s%s",
518		−	mask & ControlMask ? "C-" : "",
519		−	mask & Mod1Mask ? "M-" : "",
520		−	mask & ShiftMask ? "S-" : "", key);
	506	+	if ((pfs = fdopen(pfd[1], "w")) == NULL) {
	507	+	close(pfd[0]), close(pfd[1]);
	508	+	warn("could not open pipe for key handler");
	509	+	return;
	510	+	}
	511	+	oldst = s_malloc(fcnt * sizeof(*oldst));
521	512
522	513		memcpy(oldbar, win.bar.l.buf, sizeof(oldbar));
523	514		strncpy(win.bar.l.buf, "Running key handler...", win.bar.l.size);
524	515		win_draw(&win);
525	516		win_set_cursor(&win, CURSOR_WATCH);
526	517
	518	+	snprintf(kstr, sizeof(kstr), "%s%s%s%s",
	519	+	mask & ControlMask ? "C-" : "",
	520	+	mask & Mod1Mask ? "M-" : "",
	521	+	mask & ShiftMask ? "S-" : "", key);
	522	+
527	523		if ((pid = fork()) == 0) {
528		−	execv(keyhandler.cmd, args);
	524	+	close(pfd[1]);
	525	+	dup2(pfd[0], 0);
	526	+	execl(keyhandler.cmd, keyhandler.cmd, kstr, NULL);
529	527		warn("could not exec key handler");
530	528		exit(EXIT_FAILURE);
531		−	} else if (pid < 0) {
	529	+	}
	530	+	close(pfd[0]);
	531	+	if (pid < 0) {
	532	+	fclose(pfs);
532	533		warn("could not fork key handler");
533	534		goto end;
534	535		}
	536	+
	537	+	for (f = i = 0; f < fcnt; i++) {
	538	+	if ((marked && files[i].marked) \|\| (!marked && i == fileidx)) {
	539	+	stat(files[i].path, &oldst[f]);
	540	+	fprintf(pfs, "%s\n", files[i].name);
	541	+	f++;
	542	+	}
	543	+	}
	544	+	fclose(pfs);
535	545		waitpid(pid, &status, 0);
536	546		retval = WEXITSTATUS(status);
537	547		if (WIFEXITED(status) == 0 \|\| retval != 0)
538	548		warn("key handler exited with non-zero return value: %d", retval);
539	549
540		−	for (i = 0; i < fcnt; i++) {
541		−	oldst = &finfo[i].st;
542		−	if (stat(files[finfo[i].fn].path, &newst) != 0 \|\|
543		−	memcmp(&oldst->st_mtime, &newst.st_mtime, sizeof(newst.st_mtime)) != 0)
544		−	{
545		−	if (tns.thumbs != NULL) {
546		−	tns_unload(&tns, finfo[i].fn);
547		−	tns.loadnext = MIN(tns.loadnext, finfo[i].fn);
	550	+	for (f = i = 0; f < fcnt; i++) {
	551	+	if ((marked && files[i].marked) \|\| (!marked && i == fileidx)) {
	552	+	if (stat(files[i].path, &st) != 0 \|\|
	553	+	memcmp(&oldst[f].st_mtime, &st.st_mtime, sizeof(st.st_mtime)) != 0)
	554	+	{
	555	+	if (tns.thumbs != NULL) {
	556	+	tns_unload(&tns, i);
	557	+	tns.loadnext = MIN(tns.loadnext, i);
	558	+	}
	559	+	changed = true;
548	560		}
549		−	changed = true;
	561	+	f++;
550	562		}
551	563		}
552	564		end:
		@@ -558,10 +570,9 @@ end:
558	570		memcpy(win.bar.l.buf, oldbar, win.bar.l.size);
559	571		}
560	572		}
	573	+	free(oldst);
561	574		reset_cursor();
562	575		redraw();
563		−	free(finfo);
564		−	free(args);
565	576		}
566	577
567	578		#define MODMASK(mask) ((mask) & (ShiftMask\|ControlMask\|Mod1Mask))

		@@ -358,8 +358,9 @@ located in
358	358		.IR $XDG_CONFIG_HOME/sxiv/exec/key-handler .
359	359		The handler is invoked by pressing
360	360		.BR Ctrl-x .
361		−	The next key combo is then passed as its first argument, followed by the paths
362		−	of all marked images or the path of the current image, if no image is marked.
	361	+	The next key combo is passed as its first argument. The paths of all marked
	362	+	images--or of the current image, if no image is marked--are passed via stdin,
	363	+	one file path per line.
363	364		sxiv(1) will block until the handler terminates. It then checks which images
364	365		have been modified and reloads them.
365	366

nsxiv/216ad81

Pass file paths to key handler via stdin; fixes issue #187

nsxiv216ad81