Commit 76e4af51 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Merge pull request #129 from 0ion9/master 

Add %L format code (temporary copy of filelist)
parents 8c199f28 4b2a378e

man/feh.pre

+4 −0
Original line number Diff line number Diff line
@@ -830,6 +830,10 @@ Image height 
.

Total number of files in filelist

.

.It %L

.

Temporary copy of filelist. Multiple uses of %L within the same format string will return the same copy.

.

.It %m

.

Current mode

src/slideshow.c

+13 −0
Original line number Diff line number Diff line
@@ -467,8 +467,10 @@ char *feh_printf(char *str, feh_file * file, winwidget winwid) 
	char *c;

	char buf[20];

	static char ret[4096];

	char *filelist_tmppath;



	ret[0] = '\0';

	filelist_tmppath = NULL;



	for (c = str; *c != '\0'; c++) {

		if ((*c == '%') && (*(c+1) != '\0')) {
@@ -492,6 +494,15 @@ char *feh_printf(char *str, feh_file * file, winwidget winwid) 
				snprintf(buf, sizeof(buf), "%d", gib_list_length(filelist));

				strcat(ret, buf);

				break;

			case 'L':

				if (filelist_tmppath != NULL) {

					strcat(ret, filelist_tmppath);

				} else {

					filelist_tmppath = feh_unique_filename("/tmp/","filelist");

					feh_write_filelist(filelist, filelist_tmppath);

					strcat(ret, filelist_tmppath);

				}

				break;

			case 'm':

				strcat(ret, mode);

				break;
@@ -589,6 +600,8 @@ char *feh_printf(char *str, feh_file * file, winwidget winwid) 
		} else

			strncat(ret, c, 1);

	}

	if (filelist_tmppath != NULL)

		free(filelist_tmppath);

	return(ret);

}