From: <enl...@li...> - 2003-04-11 10:39:42
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : feh Dir : misc/feh/src Modified Files: menu.c options.c options.h Log Message: Fri Apr 11 11:34:41 BST 2003 Tom Gilbert <to...@li...> * Patch from Rami Lehti <ra...@va...> * New option not to jump to start of filelist when it's re-sorted. =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/menu.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -3 -r1.58 -r1.59 --- menu.c 23 Feb 2003 16:35:46 -0000 1.58 +++ menu.c 11 Apr 2003 10:39:38 -0000 1.59 @@ -1786,7 +1786,9 @@ { D_ENTER(4); filelist = gib_list_sort(filelist, feh_cmp_filename); - slideshow_change_image(m->fehwin, SLIDE_FIRST); + if(!opt.no_jump_on_resort){ + slideshow_change_image(m->fehwin, SLIDE_FIRST); + }; D_RETURN_(4); i = NULL; data = NULL; @@ -1799,7 +1801,9 @@ { D_ENTER(4); filelist = gib_list_sort(filelist, feh_cmp_name); - slideshow_change_image(m->fehwin, SLIDE_FIRST); + if(!opt.no_jump_on_resort){ + slideshow_change_image(m->fehwin, SLIDE_FIRST); + }; D_RETURN_(4); i = NULL; data = NULL; @@ -1812,7 +1816,9 @@ { D_ENTER(4); filelist = gib_list_sort(filelist, feh_cmp_size); - slideshow_change_image(m->fehwin, SLIDE_FIRST); + if(!opt.no_jump_on_resort){ + slideshow_change_image(m->fehwin, SLIDE_FIRST); + }; D_RETURN_(4); i = NULL; data = NULL; @@ -1825,7 +1831,9 @@ { D_ENTER(4); filelist = gib_list_randomize(filelist); - slideshow_change_image(m->fehwin, SLIDE_FIRST); + if(!opt.no_jump_on_resort){ + slideshow_change_image(m->fehwin, SLIDE_FIRST); + }; D_RETURN_(4); i = NULL; data = NULL; =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/options.c,v retrieving revision 1.151 retrieving revision 1.152 diff -u -3 -r1.151 -r1.152 --- options.c 23 Feb 2003 16:35:46 -0000 1.151 +++ options.c 11 Apr 2003 10:39:38 -0000 1.152 @@ -70,6 +70,7 @@ opt.blur_button = 1; opt.no_blur_ctrl_mask = 0; + opt.no_jump_on_resort = 0; opt.builtin_http = 0; @@ -391,6 +392,7 @@ {"screen-clip", 1, 0, 207}, {"menu-border", 1, 0, 208}, {"caption-path", 1, 0, 209}, + {"no-jump-on-resort",0,0,210}, {0, 0, 0, 0} }; int optch = 0, cmdx = 0, i = 0; @@ -674,6 +676,9 @@ case 209: opt.caption_path = estrdup(optarg); break; + case 210: + opt.no_jump_on_resort = 1; + break; default: break; } @@ -789,6 +794,8 @@ " the content of those directories. (Take it easy)\n" " -z, --randomize When viewing multiple files in a slideshow,\n" " randomise the file list before displaying\n" + " --no-jump-on-resort Don't jump to the first image when the filelist\n" + " is resorted.\n" " -g, --geometry STRING Limit (and don't change) the window size. Takes\n" " an X-style geometry string like 640x480.\n" " Note that larger images will be zoomed out to fit\n" =================================================================== RCS file: /cvsroot/enlightenment/misc/feh/src/options.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -3 -r1.39 -r1.40 --- options.h 23 Feb 2003 16:35:47 -0000 1.39 +++ options.h 11 Apr 2003 10:39:38 -0000 1.40 @@ -49,6 +49,7 @@ unsigned char keep_http; unsigned char borderless; unsigned char randomize; + unsigned char no_jump_on_resort; unsigned char full_screen; unsigned char auto_zoom; unsigned char draw_filename; |