diff options
| author | Dennis Real <github@tildepipe.org> | 2012-11-26 21:13:17 +0100 | 
|---|---|---|
| committer | Dennis Real <github@tildepipe.org> | 2012-11-26 21:13:17 +0100 | 
| commit | 39f3eab40c73ddc7d7058eadb136f58880538f0e (patch) | |
| tree | 8008ec8e5d50d9031f10ed058b5ae7b70dcf7651 | |
| parent | a3d28a957f8b4a24cbc102a8dca77bb78b568ab4 (diff) | |
| parent | f9609945e76eef4ce36be9926e18b2383fbb67f3 (diff) | |
Merge branch 'master' of git://github.com/derf/feh
| -rw-r--r-- | man/feh.pre | 4 | ||||
| -rw-r--r-- | src/slideshow.c | 4 | 
2 files changed, 8 insertions, 0 deletions
| diff --git a/man/feh.pre b/man/feh.pre index c60e15a..701e399 100644 --- a/man/feh.pre +++ b/man/feh.pre @@ -873,6 +873,10 @@ Image width  .Nm  version  . +.It %V +. +Process ID +.  .It %z  .  current image zoom diff --git a/src/slideshow.c b/src/slideshow.c index 60bd99c..7dcf791 100644 --- a/src/slideshow.c +++ b/src/slideshow.c @@ -508,6 +508,10 @@ char *feh_printf(char *str, feh_file * file, winwidget winwid)  			case 'v':  				strcat(ret, VERSION);  				break; +			case 'V': +				snprintf(buf, sizeof(buf), "%d", getpid()); +				strcat(ret, buf); +				break;  			case 'w':  				if (file && (file->info || !feh_file_info_load(file, NULL))) {  					snprintf(buf, sizeof(buf), "%d", file->info->width); | 
