From cc2b74229f3755b2d748f2739492b265c442d18a Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@derf.homelinux.org>
Date: Mon, 26 Jul 2010 13:02:55 +0200
Subject: Set correct window title when starting feh in paused mode

---
 src/keyevents.c | 2 +-
 src/winwidget.c | 8 ++++++++
 test/feh.i      | 8 ++------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/keyevents.c b/src/keyevents.c
index 2c8890e..b3d48d1 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -340,7 +340,7 @@ void feh_event_handle_keypress(XEvent * ev)
 	case 'f':
 		if ((winwid->type == WIN_TYPE_THUMBNAIL)
 				|| (winwid->type == WIN_TYPE_THUMBNAIL_VIEWER))
-			weprintf("Filelist saving is not supported in thumbnail mode\n");
+			weprintf("Filelist saving is not supported in thumbnail mode");
 		else
 			feh_save_filelist();
 		break;
diff --git a/src/winwidget.c b/src/winwidget.c
index d1c9e80..beae5df 100644
--- a/src/winwidget.c
+++ b/src/winwidget.c
@@ -146,6 +146,7 @@ void winwidget_create_window(winwidget ret, int w, int h)
 	Atom prop = None;
 	int x = 0;
 	int y = 0;
+	char *tmpname;
 
 	D(("winwidget_create_window %dx%d\n", w, h));
 
@@ -196,6 +197,13 @@ void winwidget_create_window(winwidget ret, int w, int h)
 #endif				/* HAVE_LIBXINERAMA */
 	}
 
+	if (opt.paused) {
+		printf("name %s\n", ret->name);
+		tmpname = estrjoin(" ", ret->name, "[Paused]", NULL);
+		free(ret->name);
+		ret->name = tmpname;
+	}
+
 	ret->x = x;
 	ret->y = y;
 	ret->w = w;
diff --git a/test/feh.i b/test/feh.i
index ac99813..313dab8 100755
--- a/test/feh.i
+++ b/test/feh.i
@@ -4,7 +4,7 @@ use warnings;
 use 5.010;
 
 use Cwd;
-use Test::More tests => 71;
+use Test::More tests => 70;
 use Time::HiRes qw/sleep/;
 use X11::GUITest qw/:ALL/;
 
@@ -148,11 +148,7 @@ test_no_win('cycle-once + slideshow-delay -> window closed');
 $win = feh_start('--cycle-once --slideshow-delay -0.01',
 	'test/ok.png test/ok.jpg test/ok.gif');
 
-TODO: {
-	local $TODO = '"Paused" with negative delay broken for first window';
-	test_win_title($win, 'feh [1 of 3] - test/ok.png [Paused]');
-}
-test_win_title($win, 'feh [1 of 3] - test/ok.png');
+test_win_title($win, 'feh [1 of 3] - test/ok.png [Paused]');
 
 SendKeys('h');
 test_no_win('cycle-once + negative delay + [h]');
-- 
cgit v1.2.3