#5: feh-fmmode.patch - feh - Trac

feh/src/options.c

old	new
80	80	/* if we're using xinerama, then enable it by default */
81	81	opt.xinerama = 1;
82	82	#endif /* HAVE_LIBXINERAMA */
	83
	84	opt.fmmode = 0;
83	85
84	86	D(3, ("About to parse env options (if any)\n"));
85	87	/* Check for and parse any options in FEH_OPTIONS */
…	…
404	406	{"action7", 1, 0, 216},
405	407	{"action8", 1, 0, 217},
406	408	{"action9", 1, 0, 218},
	409	{"fmmode", 0, 0, 219},
407	410	{0, 0, 0, 0}
408	411	};
409	412	int optch = 0, cmdx = 0, i = 0;
…	…
719	722	case 221:
720	723	opt.hide_pointer = 1;
721	724	break;
	725	case 219:
	726	opt.fmmode = 1;
	727	opt.sort = SORT_FILENAME;
	728	break;
722	729	default:
723	730	break;
724	731	}

old	new
30	30	#include "options.h"
31	31	#include "events.h"
32	32	#include "support.h"
	33	#include "fmmode.h"
33	34
34	35	char **cmdargv = NULL;
35	36	int cmdargc = 0;
…	…
67	68	feh_wm_set_bg_file(opt.output_file, opt.bgmode);
68	69	exit(0);
69	70	}
	71	else if (opt.fmmode)
	72	{
	73	fmmode();
	74	opt.slideshow = 1;
	75	init_slideshow_mode();
	76	}
70	77	else
71	78	{
72	79	/* Slideshow mode is the default. Because it's spiffy */

old	new
	1	/* fmmode.h
	2
	3	Copyright (C) 2005 Falko Schmidt.
	4
	5	Permission is hereby granted, free of charge, to any person obtaining a copy
	6	of this software and associated documentation files (the "Software"), to
	7	deal in the Software without restriction, including without limitation the
	8	rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
	9	sell copies of the Software, and to permit persons to whom the Software is
	10	furnished to do so, subject to the following conditions:
	11
	12	The above copyright notice and this permission notice shall be included in
	13	all copies of the Software and its documentation and acknowledgment shall be
	14	given in the documentation and software packages that this Software was
	15	used.
	16
	17	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
	18	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
	19	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
	20	THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
	21	IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	22	CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
	23
	24	*/
	25
	26	#ifndef FMMODE_H
	27	#define FMMODE_H
	28
	29	void fmmode(void);
	30
	31	#endif

old	new
83	83	LIBOBJS = @LIBOBJS@
84	84
85	85	bin_PROGRAMS = feh
86		feh_SOURCES = main.c getopt.c getopt1.c getopt.h feh.h options.c options.h winwidget.c winwidget.h menu.c menu.h structs.h filelist.c filelist.h multiwindow.c imlib.c index.c slideshow.c utils.c utils.h keyevents.c timers.c timers.h list.c collage.c debug.h events.c events.h support.c support.h transupp.c transupp.h thumbnail.c thumbnail.h ipc.c ipc.h md5.c md5.h feh_png.c feh_png.h
	86	feh_SOURCES = main.c getopt.c getopt1.c getopt.h feh.h options.c options.h winwidget.c winwidget.h menu.c menu.h structs.h filelist.c filelist.h multiwindow.c imlib.c index.c slideshow.c utils.c utils.h keyevents.c timers.c timers.h list.c collage.c debug.h events.c events.h support.c support.h transupp.c transupp.h thumbnail.c thumbnail.h ipc.c ipc.h md5.c md5.h feh_png.c feh_png.h fmmode.c fmmode.h
87	87
88	88	feh_LDADD = -lX11 -lz -lpng @IMLIB_LIBS@ @GIBLIB_LIBS@
89	89
…	…
106	106	feh_OBJECTS = main.o getopt.o getopt1.o options.o winwidget.o menu.o \
107	107	filelist.o multiwindow.o imlib.o index.o slideshow.o utils.o \
108	108	keyevents.o timers.o list.o collage.o events.o support.o transupp.o \
109		thumbnail.o ipc.o md5.o feh_png.o
	109	thumbnail.o ipc.o md5.o feh_png.o fmmode.o
110	110	feh_DEPENDENCIES =
111	111	feh_LDFLAGS =
112	112	CFLAGS = @CFLAGS@