11 files changed, 54 insertions, 5 deletions

diff --git a/test/feh-scr.i b/test/feh-scr.i
index 05960a2..5067ba7 100755
--- a/test/feh-scr.i
+++ b/test/feh-scr.i
@@ -6,7 +6,7 @@ use autodie qw/:all/;
 
 use Cwd;
 use GD qw/:DEFAULT :cmp/;
-use Test::More tests => 27;
+use Test::More tests => 38;
 use Time::HiRes qw/sleep/;
 use X11::GUITest qw/:ALL/;
 
@@ -14,6 +14,7 @@ my ($pid_xnest, $pid_twm);
 my $win;
 my ($width, $height);
 my $pwd = getcwd();
+my $test_id = 0;
 
 sub waitfor(&) {
 	my ($sub) = @_;
@@ -62,6 +63,10 @@ sub same_files {
 	my $img_one = GD::Image->new($one);
 	my $img_two = GD::Image->new($two);
 
+	if (not defined $img_one or not defined $img_two) {
+		return 0;
+	}
+
 	return( ! ($img_one->compare($img_two) & GD_CMP_IMAGE));
 }
 
@@ -75,11 +80,17 @@ sub check_scr {
 
 sub test_scr {
 	my ($file) = @_;
+	my $msg = "X root window is test/scr/${file}";
+
+	$test_id++;
 
-	ok(
-		waitfor { check_scr($file) },
-		"X root window is test/scr/${file}",
-	);
+	if (waitfor { check_scr($file) }) {
+		pass($msg);
+	}
+	else {
+		fail($msg);
+		rename("/tmp/feh_${$}.png", "/tmp/feh_${$}_${test_id}_${file}.png");
+	}
 }
 
 if (FindWindowLike(qr{^feh})) {
@@ -216,6 +227,44 @@ test_scr('draw_nothing');
 
 feh_stop();
 
+feh_start(q{}, 'test/bg/large/h/in');
+test_scr('feh_lhi');
+
+SendKeys('{UP}');
+test_scr('feh_lhi_i');
+
+SendKeys('{UP}');
+test_scr('feh_lhi_ii');
+
+SendKeys('^({RIG})');
+test_scr('feh_lhi_iir');
+
+SendKeys('^({RIG})');
+test_scr('feh_lhi_iirr');
+
+SendKeys('{UP}');
+test_scr('feh_lhi_iirri');
+
+SendKeys('{DOW}');
+test_scr('feh_lhi_iirrio');
+
+feh_stop();
+
+feh_start(q{}, 'test/bg/large/h/in');
+test_scr('feh_lhi');
+
+SendKeys('{DOW}');
+test_scr('feh_lhi_o');
+
+SendKeys('{DOW}');
+test_scr('feh_lhi_oo');
+
+SendKeys('{DOW}');
+test_scr('feh_lhi_ooo');
+
+feh_stop();
+
+
 unlink('test/bg/exact/.tc/in.txt');
 rmdir('test/bg/exact/.tc');
 unlink("/tmp/feh_${$}.png");
diff --git a/test/scr/feh_lhi b/test/scr/feh_lhi
new file mode 100644
index 0000000..f16d150
--- /dev/null
+++ b/test/scr/feh_lhi
diff --git a/test/scr/feh_lhi_i b/test/scr/feh_lhi_i
new file mode 100644
index 0000000..108dfb6
--- /dev/null
+++ b/test/scr/feh_lhi_i
diff --git a/test/scr/feh_lhi_ii b/test/scr/feh_lhi_ii
new file mode 100644
index 0000000..1fb695f
--- /dev/null
+++ b/test/scr/feh_lhi_ii
diff --git a/test/scr/feh_lhi_iir b/test/scr/feh_lhi_iir
new file mode 100644
index 0000000..396ee99
--- /dev/null
+++ b/test/scr/feh_lhi_iir
diff --git a/test/scr/feh_lhi_iirr b/test/scr/feh_lhi_iirr
new file mode 100644
index 0000000..81748a3
--- /dev/null
+++ b/test/scr/feh_lhi_iirr
diff --git a/test/scr/feh_lhi_iirri b/test/scr/feh_lhi_iirri
new file mode 100644
index 0000000..43b8fa1
--- /dev/null
+++ b/test/scr/feh_lhi_iirri
diff --git a/test/scr/feh_lhi_iirrio b/test/scr/feh_lhi_iirrio
new file mode 100644
index 0000000..c9e287b
--- /dev/null
+++ b/test/scr/feh_lhi_iirrio
diff --git a/test/scr/feh_lhi_o b/test/scr/feh_lhi_o
new file mode 100644
index 0000000..ec48c01
--- /dev/null
+++ b/test/scr/feh_lhi_o
diff --git a/test/scr/feh_lhi_oo b/test/scr/feh_lhi_oo
new file mode 100644
index 0000000..784d7d7
--- /dev/null
+++ b/test/scr/feh_lhi_oo
diff --git a/test/scr/feh_lhi_ooo b/test/scr/feh_lhi_ooo
new file mode 100644
index 0000000..ad14384
--- /dev/null
+++ b/test/scr/feh_lhi_ooo