diff options
author | Daniel Friesel <derf@derf.homelinux.org> | 2010-07-26 13:02:55 +0200 |
---|---|---|
committer | Daniel Friesel <derf@derf.homelinux.org> | 2010-07-26 13:02:55 +0200 |
commit | cc2b74229f3755b2d748f2739492b265c442d18a (patch) | |
tree | fc68396de80ec66ac5bb483dd40789583edef359 | |
parent | ae46674dd69cc4e65f595dc364a8c35c8d6aee30 (diff) |
Set correct window title when starting feh in paused mode
-rw-r--r-- | src/keyevents.c | 2 | ||||
-rw-r--r-- | src/winwidget.c | 8 | ||||
-rwxr-xr-x | 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; @@ -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]'); |