Commit c58307b

nsxivc58307b

Merged commands.h into config.h

Author: Bert
Date: 2011-04-14 12:00 +0200
Parent: 75c79be
Commit: c58307ba38e568c9851749ee8e2c721ed4741ca1

+33 −29

3 files changed

Browse files Patch

−Context 3+

D commands.h +0 −13
M config.h +24 −11
M main.c +9 −5

D commands.h View

M config.h View

M main.c View

		@@ -2,27 +2,40 @@
2	2		#define WIN_WIDTH 800
3	3		#define WIN_HEIGHT 600
4	4
5		−	/* default color for window background: *
6		−	* (see X(7) "COLOR NAMES" section for valid values) */
	5	+	/* default color for window background: *
	6	+	* (see X(7) "COLOR NAMES" section for valid values) */
7	7		#define BG_COLOR "#999999"
8		−	/* default color for thumbnail selection: */
	8	+	/* default color for thumbnail selection: */
9	9		#define SEL_COLOR "#0040FF"
10	10
11		−	/* how should images be scaled when they are loaded?: *
12		−	* (also controllable via -d/-s/-Z/-z options) *
13		−	* SCALE_DOWN: 100%, but fit large images into window, *
14		−	* SCALE_FIT: fit all images into window, *
15		−	* SCALE_ZOOM: use current zoom level, 100% at startup */
	11	+	/* how should images be scaled when they are loaded?: *
	12	+	* (also controllable via -d/-s/-Z/-z options) *
	13	+	* SCALE_DOWN: 100%, but fit large images into window, *
	14	+	* SCALE_FIT: fit all images into window, *
	15	+	* SCALE_ZOOM: use current zoom level, 100% at startup */
16	16		#define SCALE_MODE SCALE_DOWN
17	17
18		−	/* levels (percent) to use when zooming via '-' and '+': */
	18	+	/* levels (percent) to use when zooming via '-' and '+': */
19	19		static const float zoom_levels[] = {
20	20		12.5, 25.0, 50.0, 75.0,
21	21		100.0, 150.0, 200.0, 400.0, 800.0
22	22		};
23	23
24		−	/* default dimension of thumbnails (width == height): */
	24	+	/* default dimension of thumbnails (width == height): */
25	25		#define THUMB_SIZE 60
26	26
27		−	/* support for external commands (defined in commands.h): */
	27	+	/* enable support for external commands (see below)?: */
28	28		#define EXT_COMMANDS 0
	29	+
	30	+	/* external commands and corresponding key mappings: */
	31	+	#ifdef MAIN_C
	32	+	#if EXT_COMMANDS
	33	+	static const command_t commands[] = {
	34	+	/* ctrl-... reload? command, '#' is replaced by filename */
	35	+	{ XK_comma, True, "jpegtran -rotate 270 -copy all -outfile # #" },
	36	+	{ XK_period, True, "jpegtran -rotate 90 -copy all -outfile # #" },
	37	+	{ XK_less, True, "mogrify -rotate -90 #" },
	38	+	{ XK_greater, True, "mogrify -rotate +90 #" }
	39	+	};
	40	+	#endif
	41	+	#endif

		@@ -29,17 +29,12 @@
29	29		#include <X11/Xutil.h>
30	30		#include <X11/keysym.h>
31	31
32		−	#include "config.h"
33	32		#include "image.h"
34	33		#include "options.h"
35	34		#include "thumbs.h"
36	35		#include "util.h"
37	36		#include "window.h"
38	37
39		−	#if EXT_COMMANDS
40		−	#include "commands.h"
41		−	#endif
42		−
43	38		#define FNAME_CNT 1024
44	39		#define TITLE_LEN 256
45	40
		@@ -48,11 +43,20 @@
48	43		#define TO_CURSOR_HIDE 1500000
49	44		#define TO_THUMBS_LOAD 75000
50	45
	46	+	typedef struct {
	47	+	KeySym ksym;
	48	+	Bool reload;
	49	+	const char *cmdline;
	50	+	} command_t;
	51	+
51	52		typedef enum {
52	53		MODE_NORMAL = 0,
53	54		MODE_THUMBS
54	55		} appmode_t;
55	56
	57	+	#define MAIN_C
	58	+	#include "config.h"
	59	+
56	60		void run();
57	61
58	62		appmode_t mode;

	@@ -1,13 +0,0 @@
1	−	typedef struct {
2	−	KeySym ksym;
3	−	Bool reload;
4	−	const char *cmdline;
5	−	} command_t;
6	−
7	−	static command_t commands[] = {
8	−	/* ctrl-... reload? command, '#' is replaced by filename */
9	−	{ XK_comma, True, "jpegtran -rotate 270 -copy all -outfile # #" },
10	−	{ XK_period, True, "jpegtran -rotate 90 -copy all -outfile # #" },
11	−	{ XK_less, True, "mogrify -rotate -90 #" },
12	−	{ XK_greater, True, "mogrify -rotate +90 #" }
13	−	};

nsxiv/c58307b

Merged commands.h into config.h

nsxivc58307b