Commit 72f1b1c

nsxiv72f1b1c

Removed command line option -F

Author: Bert Münnich
Date: 2014-02-05 09:58 +0100
Parent: 997c851
Commit: 72f1b1ca6f7936ecc5e80921d9dfe313f1f84465

+21 −52

7 files changed

Browse files Patch

−Context 3+

M Makefile +1 −1
M README.md +0 −1
M options.c +2 −6
M options.h +0 −1
M sxiv.1 +1 −5
M window.c +17 −36
M window.h +0 −2

M Makefile View

M README.md View

M options.c View

M options.h View

M sxiv.1 View

M window.c View

M window.h View

		@@ -1,4 +1,4 @@
1		−	VERSION = git-20140204
	1	+	VERSION = git-20140205
2	2
3	3		PREFIX = /usr/local
4	4		MANPREFIX = $(PREFIX)/share/man

		@@ -70,7 +70,6 @@ of small previews is displayed, making it easy to choose an image to open.
70	70
71	71		-b Do not show info bar on bottom of window
72	72		-c Remove all orphaned cache files from thumbnail cache and exit
73		−	-F Use size-hints to make the window fixed/floating
74	73		-f Start in fullscreen mode
75	74		-G GAMMA Set image gamma to GAMMA (-32..32)
76	75		-g GEOMETRY Set window position and size

		@@ -33,7 +33,7 @@ const options_t options = (const options_t) &_options;
33	33
34	34		void print_usage(void)
35	35		{
36		−	printf("usage: sxiv [-bcFfhioqrtvZ] [-G GAMMA] [-g GEOMETRY] [-n NUM] "
	36	+	printf("usage: sxiv [-bcfhioqrtvZ] [-G GAMMA] [-g GEOMETRY] [-n NUM] "
37	37		"[-N NAME] [-S DELAY] [-s MODE] [-z ZOOM] FILES...\n");
38	38		}
39	39
		@@ -58,7 +58,6 @@ void parse_options(int argc, char **argv)
58	58		_options.gamma = 0;
59	59		_options.slideshow = 0;
60	60
61		−	_options.fixed_win = false;
62	61		_options.fullscreen = false;
63	62		_options.hide_bar = false;
64	63		_options.geometry = NULL;
		@@ -68,7 +67,7 @@ void parse_options(int argc, char **argv)
68	67		_options.thumb_mode = false;
69	68		_options.clean_cache = false;
70	69
71		−	while ((opt = getopt(argc, argv, "bcFfG:g:hin:N:oqrS:s:tvZz:")) != -1) {
	70	+	while ((opt = getopt(argc, argv, "bcfG:g:hin:N:oqrS:s:tvZz:")) != -1) {
72	71		switch (opt) {
73	72		case '?':
74	73		print_usage();
		@@ -79,9 +78,6 @@ void parse_options(int argc, char **argv)
79	78		case 'c':
80	79		_options.clean_cache = true;
81	80		break;
82		−	case 'F':
83		−	_options.fixed_win = true;
84		−	break;
85	81		case 'f':
86	82		_options.fullscreen = true;
87	83		break;

		@@ -38,7 +38,6 @@ typedef struct {
38	38		int slideshow;
39	39
40	40		/* window: */
41		−	bool fixed_win;
42	41		bool fullscreen;
43	42		bool hide_bar;
44	43		char *geometry;

		@@ -3,7 +3,7 @@
3	3		sxiv \- Simple X Image Viewer
4	4		.SH SYNOPSIS
5	5		.B sxiv
6		−	.RB [ \-bcFfhioqrtvZ ]
	6	+	.RB [ \-bcfhioqrtvZ ]
7	7		.RB [ \-G
8	8		.IR GAMMA ]
9	9		.RB [ \-g
		@@ -40,10 +40,6 @@ Do not show info bar on bottom of window.
40	40		.B \-c
41	41		Remove all orphaned cache files from the thumbnail cache directory and exit.
42	42		.TP
43		−	.B \-F
44		−	Make the window fixed/floating by setting the minimum and maximum width/height
45		−	size-hints to the window width/height.
46		−	.TP
47	43		.B \-f
48	44		Start in fullscreen mode.
49	45		.TP

		@@ -171,12 +171,6 @@ void win_init(win_t *win)
171	171		win->bar.fgcol = win_alloc_color(win, BAR_FG_COLOR);
172	172		win->bar.h = options->hide_bar ? 0 : barheight;
173	173
174		−	win->sizehints.flags = PWinGravity;
175		−	win->sizehints.win_gravity = NorthWestGravity;
176		−	if (options->fixed_win)
177		−	/* actual min/max values set in win_update_sizehints() */
178		−	win->sizehints.flags \|= PMinSize \| PMaxSize;
179		−
180	174		INIT_ATOM_(WM_DELETE_WINDOW);
181	175		INIT_ATOM_(_NET_WM_NAME);
182	176		INIT_ATOM_(_NET_WM_ICON_NAME);
		@@ -188,26 +182,6 @@ void win_init(win_t *win)
188	182		win_check_wm_support(e->dpy, RootWindow(e->dpy, e->scr));
189	183		}
190	184
191		−	void win_update_sizehints(win_t *win)
192		−	{
193		−	if (win == NULL \|\| win->xwin == None)
194		−	return;
195		−
196		−	if ((win->sizehints.flags & USSize) != 0) {
197		−	win->sizehints.width = win->w;
198		−	win->sizehints.height = win->h + win->bar.h;
199		−	}
200		−	if ((win->sizehints.flags & USPosition) != 0) {
201		−	win->sizehints.x = win->x;
202		−	win->sizehints.y = win->y;
203		−	}
204		−	if (options->fixed_win) {
205		−	win->sizehints.min_width = win->sizehints.max_width = win->w;
206		−	win->sizehints.min_height = win->sizehints.max_height = win->h + win->bar.h;
207		−	}
208		−	XSetWMNormalHints(win->env.dpy, win->xwin, &win->sizehints);
209		−	}
210		−
211	185		void win_open(win_t *win)
212	186		{
213	187		int c, i, j, n;
		@@ -220,12 +194,16 @@ void win_open(win_t *win)
220	194		char none_data[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
221	195		Pixmap none;
222	196		int gmask;
	197	+	XSizeHints sizehints;
223	198
224	199		if (win == NULL)
225	200		return;
226	201
227	202		e = &win->env;
228	203
	204	+	sizehints.flags = PWinGravity;
	205	+	sizehints.win_gravity = NorthWestGravity;
	206	+
229	207		/* determine window offsets, width & height */
230	208		if (options->geometry == NULL)
231	209		gmask = 0;
		@@ -233,31 +211,29 @@ void win_open(win_t *win)
233	211		gmask = XParseGeometry(options->geometry, &win->x, &win->y,
234	212		&win->w, &win->h);
235	213		if ((gmask & WidthValue) != 0)
236		−	win->sizehints.flags \|= USSize;
	214	+	sizehints.flags \|= USSize;
237	215		else
238	216		win->w = WIN_WIDTH;
239	217		if ((gmask & HeightValue) != 0)
240		−	win->sizehints.flags \|= USSize;
	218	+	sizehints.flags \|= USSize;
241	219		else
242	220		win->h = WIN_HEIGHT;
243	221		if ((gmask & XValue) != 0) {
244	222		if ((gmask & XNegative) != 0) {
245	223		win->x += e->scrw - win->w;
246		−	win->sizehints.win_gravity = NorthEastGravity;
	224	+	sizehints.win_gravity = NorthEastGravity;
247	225		}
248		−	win->sizehints.flags \|= USPosition;
	226	+	sizehints.flags \|= USPosition;
249	227		} else {
250	228		win->x = (e->scrw - win->w) / 2;
251	229		}
252	230		if ((gmask & YValue) != 0) {
253	231		if ((gmask & YNegative) != 0) {
254	232		win->y += e->scrh - win->h;
255		−	if (win->sizehints.win_gravity == NorthEastGravity)
256		−	win->sizehints.win_gravity = SouthEastGravity;
257		−	else
258		−	win->sizehints.win_gravity = SouthWestGravity;
	233	+	sizehints.win_gravity = sizehints.win_gravity == NorthEastGravity
	234	+	? SouthEastGravity : SouthWestGravity;
259	235		}
260		−	win->sizehints.flags \|= USPosition;
	236	+	sizehints.flags \|= USPosition;
261	237		} else {
262	238		win->y = (e->scrh - win->h) / 2;
263	239		}
		@@ -316,8 +292,13 @@ void win_open(win_t *win)
316	292
317	293		XSetWMProtocols(e->dpy, win->xwin, &atoms[ATOM_WM_DELETE_WINDOW], 1);
318	294
	295	+	sizehints.width = win->w;
	296	+	sizehints.height = win->h;
	297	+	sizehints.x = win->x;
	298	+	sizehints.y = win->y;
	299	+	XSetWMNormalHints(win->env.dpy, win->xwin, &sizehints);
	300	+
319	301		win->h -= win->bar.h;
320		−	win_update_sizehints(win);
321	302
322	303		XMapWindow(e->dpy, win->xwin);
323	304		XFlush(e->dpy);

		@@ -65,8 +65,6 @@ typedef struct {
65	65		unsigned int h; /* = win height - bar height */
66	66		unsigned int bw;
67	67
68		−	XSizeHints sizehints;
69		−
70	68		bool fullscreen;
71	69
72	70		struct {

nsxiv/72f1b1c

Removed command line option -F

nsxiv72f1b1c