From 918edfaa6254fcd7d328ced434f361b19a636576 Mon Sep 17 00:00:00 2001
From: reiseb <48870100+reiseb@users.noreply.github.com>
Date: Sun, 12 Jan 2020 15:48:57 +0100
Subject: add option 'a' to show play/paused information in slideshow mode

---
 src/slideshow.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/slideshow.c')

diff --git a/src/slideshow.c b/src/slideshow.c
index 00425d1..2cc8c4f 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -397,6 +397,14 @@ char *feh_printf(char *str, feh_file * file, winwidget winwid)
 		if ((*c == '%') && (*(c+1) != '\0')) {
 			c++;
 			switch (*c) {
+	        case 'a':
+	           	if (opt.paused == 1) {
+	               strncat(ret, "pause", sizeof(ret) - strlen(ret) - 1);
+	            }
+	            else {
+	               strncat(ret, "play", sizeof(ret) - strlen(ret) - 1);
+	            }
+	            break;
 			case 'f':
 				if (file)
 					strncat(ret, file->filename, sizeof(ret) - strlen(ret) - 1);
-- 
cgit v1.2.3


From b393f3758ab5ead64cf027f09ab3471f4f8e2cc1 Mon Sep 17 00:00:00 2001
From: reiseb <48870100+reiseb@users.noreply.github.com>
Date: Tue, 16 Jun 2020 16:20:47 +0200
Subject: fix indentation (all tabs)

---
 src/slideshow.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/slideshow.c')

diff --git a/src/slideshow.c b/src/slideshow.c
index 2cc8c4f..d9f33de 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -397,14 +397,14 @@ char *feh_printf(char *str, feh_file * file, winwidget winwid)
 		if ((*c == '%') && (*(c+1) != '\0')) {
 			c++;
 			switch (*c) {
-	        case 'a':
-	           	if (opt.paused == 1) {
-	               strncat(ret, "pause", sizeof(ret) - strlen(ret) - 1);
-	            }
-	            else {
-	               strncat(ret, "play", sizeof(ret) - strlen(ret) - 1);
-	            }
-	            break;
+			case 'a':
+				if (opt.paused == 1) {
+				   strncat(ret, "pause", sizeof(ret) - strlen(ret) - 1);
+				}
+				else {
+				   strncat(ret, "play", sizeof(ret) - strlen(ret) - 1);
+				}
+				break;
 			case 'f':
 				if (file)
 					strncat(ret, file->filename, sizeof(ret) - strlen(ret) - 1);
-- 
cgit v1.2.3


From 5dc616eadfd3e66cb89e9fc22c714c2edd2a77f2 Mon Sep 17 00:00:00 2001
From: reiseb <48870100+reiseb@users.noreply.github.com>
Date: Tue, 16 Jun 2020 16:21:03 +0200
Subject: change play/pause to playing/paused to improve UX

---
 man/feh.pre     | 2 +-
 src/help.raw    | 2 +-
 src/slideshow.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/slideshow.c')

diff --git a/man/feh.pre b/man/feh.pre
index b70d948..faedce1 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -1206,7 +1206,7 @@ file
 .
 .It %a
 .
-Information about slideshow state (play/pause)
+Information about slideshow state (playing/paused)
 .
 .It %f
 .
diff --git a/src/help.raw b/src/help.raw
index 0a87b70..e0fb62a 100644
--- a/src/help.raw
+++ b/src/help.raw
@@ -124,7 +124,7 @@ INDEX MODE OPTIONS
                            font is specified, a title will not be printed
 
 FORMAT SPECIFIERS
- %a     information about slideshow state (play/pause)
+ %a     information about slideshow state (playing/paused)
  %f     image path/filename
  %F     image path/filename (shell-escaped)
  %g     window dimensions (\"width,height\") in pixels
diff --git a/src/slideshow.c b/src/slideshow.c
index d9f33de..03e8e06 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -399,10 +399,10 @@ char *feh_printf(char *str, feh_file * file, winwidget winwid)
 			switch (*c) {
 			case 'a':
 				if (opt.paused == 1) {
-				   strncat(ret, "pause", sizeof(ret) - strlen(ret) - 1);
+				   strncat(ret, "paused", sizeof(ret) - strlen(ret) - 1);
 				}
 				else {
-				   strncat(ret, "play", sizeof(ret) - strlen(ret) - 1);
+				   strncat(ret, "playing", sizeof(ret) - strlen(ret) - 1);
 				}
 				break;
 			case 'f':
-- 
cgit v1.2.3