Commit 8081cbe

nsxiv8081cbe

Improve mouse support

None of the mouse mappings uses a keyboard modifier, making it possible to
access the most basic features by only using the mouse.

Next/previous image with left button depending on cursor position, middle
button for dragging, right button for switching to thumnail mode and wheel for
zooming.

Users can keep the old behaviour by simply not adapting the changes to the
buttons array in config.def.h to their config.h file.

Author: Bert Münnich
Date: 2017-10-05 13:53 +0200
Committer: Bert Münnich · 2017-10-06 10:15 +0200
Parent: ee908ca
Commit: 8081cbebf36e48297a589af02db400687c4ef261

+52 −34

8 files changed

Browse files Patch

−Context 3+

M Makefile +1 −1
M commands.c +6 −0
M commands.lst +1 −0
M config.def.h +4 −10
M main.c +27 −3
M sxiv.1 +9 −19
M types.h +2 −0
M window.c +2 −1

M Makefile View

M commands.c View

M commands.lst View

M config.def.h View

M main.c View

M sxiv.1 View

M types.h View

M window.c View

		@@ -1,4 +1,4 @@
1		−	VERSION := git-20171005
	1	+	VERSION := git-20171006
2	2
3	3		all: sxiv
4	4

		@@ -33,6 +33,7 @@
33	33		void remove_file(int, bool);
34	34		void load_image(int);
35	35		void open_info(void);
	36	+	int ptr_third_x(void);
36	37		void redraw(void);
37	38		void reset_cursor(void);
38	39		void animate(void);
		@@ -281,6 +282,11 @@ bool ci_navigate(arg_t n)
281	282		}
282	283		}
283	284
	285	+	bool ci_cursor_navigate(arg_t _)
	286	+	{
	287	+	return ci_navigate(ptr_third_x() - 1);
	288	+	}
	289	+
284	290		bool ci_alternate(arg_t _)
285	291		{
286	292		load_image(alternate);

		@@ -16,6 +16,7 @@ G_CMD(navigate_marked)
16	16		G_CMD(change_gamma)
17	17
18	18		I_CMD(navigate)
	19	+	I_CMD(cursor_navigate)
19	20		I_CMD(alternate)
20	21		I_CMD(navigate_frame)
21	22		I_CMD(toggle_animation)

		@@ -150,17 +150,11 @@ static const keymap_t keys[] = {
150	150		/* mouse button mappings for image mode: */
151	151		static const button_t buttons[] = {
152	152		/* modifiers button function argument */
153		−	{ 0, 1, i_navigate, +1 },
154		−	{ 0, 3, i_navigate, -1 },
	153	+	{ 0, 1, i_cursor_navigate, None },
155	154		{ 0, 2, i_drag, None },
156		−	{ 0, 4, i_scroll, DIR_UP },
157		−	{ 0, 5, i_scroll, DIR_DOWN },
158		−	{ ShiftMask, 4, i_scroll, DIR_LEFT },
159		−	{ ShiftMask, 5, i_scroll, DIR_RIGHT },
160		−	{ 0, 6, i_scroll, DIR_LEFT },
161		−	{ 0, 7, i_scroll, DIR_RIGHT },
162		−	{ ControlMask, 4, g_zoom, +1 },
163		−	{ ControlMask, 5, g_zoom, -1 },
	155	+	{ 0, 3, g_switch_mode, None },
	156	+	{ 0, 4, g_zoom, +1 },
	157	+	{ 0, 5, g_zoom, -1 },
164	158		};
165	159
166	160		#endif

		@@ -98,6 +98,10 @@ timeout_t timeouts[] = {
98	98		{ { 0, 0 }, false, clear_resize },
99	99		};
100	100
	101	+	cursor_t imgcursor[3] = {
	102	+	CURSOR_ARROW, CURSOR_ARROW, CURSOR_ARROW
	103	+	};
	104	+
101	105		void cleanup(void)
102	106		{
103	107		img_close(&img, false);
		@@ -405,6 +409,14 @@ void update_info(void)
405	409		}
406	410		}
407	411
	412	+	int ptr_third_x(void)
	413	+	{
	414	+	int x, y;
	415	+
	416	+	win_cursor_pos(&win, &x, &y);
	417	+	return MAX(0, MIN(2, (x / (win.w * 0.33))));
	418	+	}
	419	+
408	420		void redraw(void)
409	421		{
410	422		int t;
		@@ -428,14 +440,18 @@ void redraw(void)
428	440
429	441		void reset_cursor(void)
430	442		{
431		−	int i;
	443	+	int c, i;
432	444		cursor_t cursor = CURSOR_NONE;
433	445
434	446		if (mode == MODE_IMAGE) {
435	447		for (i = 0; i < ARRLEN(timeouts); i++) {
436	448		if (timeouts[i].handler == reset_cursor) {
437		−	if (timeouts[i].active)
438		−	cursor = CURSOR_ARROW;
	449	+	if (timeouts[i].active) {
	450	+	c = ptr_third_x();
	451	+	c = MAX(fileidx > 0 ? 0 : 1, c);
	452	+	c = MIN(fileidx + 1 < filecnt ? 2 : 1, c);
	453	+	cursor = imgcursor[c];
	454	+	}
439	455		break;
440	456		}
441	457		}
		@@ -872,6 +888,14 @@ int main(int argc, char **argv)
872	888		filecnt = fileidx;
873	889		fileidx = options->startnum < filecnt ? options->startnum : 0;
874	890
	891	+	for (i = 0; i < ARRLEN(buttons); i++) {
	892	+	if (buttons[i].cmd == i_cursor_navigate) {
	893	+	imgcursor[0] = CURSOR_LEFT;
	894	+	imgcursor[2] = CURSOR_RIGHT;
	895	+	break;
	896	+	}
	897	+	}
	898	+
875	899		win_init(&win);
876	900		img_init(&img, &win);
877	901		arl_init(&arl);

		@@ -348,37 +348,27 @@ seconds.
348	348		.SH MOUSE COMMANDS
349	349		The following mouse mappings are available in image mode:
350	350		.TP
	351	+	General:
	352	+	.TP
	353	+	.B Button3
351	354		Navigate image list:
352	355		.TP
353	356		.B Button1
354		−	Go to next image.
355		−	.TP
356		−	.B Button3
357		−	Go to the previous image.
	357	+	Go to the next image if the mouse cursor is in the right part of the window or
	358	+	to the previous image if it is in the left part.
358	359		.TP
359	360		Panning:
360	361		.TP
361	362		.B Button2
362		−	Drag the image with the mouse while keeping this button pressed down.
363		−	.TP
364		−	.B ScrollUp
365		−	Scroll image up.
366		−	.TP
367		−	.B ScrollDown
368		−	Scroll image down.
369		−	.TP
370		−	.B Shift+ScrollUp
371		−	Scroll image left.
372		−	.TP
373		−	.B Shift+ScrollDown
374		−	Scroll image right.
	363	+	Pan the image according to the mouse cursor position in the window while
	364	+	keeping this button pressed down.
375	365		.TP
376	366		Zooming:
377	367		.TP
378		−	.B Ctrl+ScrollUp
	368	+	.B ScrollUp
379	369		Zoom in.
380	370		.TP
381		−	.B Ctrl+ScrollDown
	371	+	.B ScrollDown
382	372		Zoom out.
383	373		.SH STATUS BAR
384	374		The information displayed on the left side of the status bar can be replaced

		@@ -67,6 +67,8 @@ typedef enum {
67	67		CURSOR_ARROW,
68	68		CURSOR_DRAG,
69	69		CURSOR_WATCH,
	70	+	CURSOR_LEFT,
	71	+	CURSOR_RIGHT,
70	72		CURSOR_NONE,
71	73
72	74		CURSOR_COUNT

		@@ -39,7 +39,8 @@ static struct {
39	39		int name;
40	40		Cursor icon;
41	41		} cursors[CURSOR_COUNT] = {
42		−	{ XC_left_ptr }, { XC_dotbox }, { XC_watch }
	42	+	{ XC_left_ptr }, { XC_dotbox }, { XC_watch },
	43	+	{ XC_sb_left_arrow }, { XC_sb_right_arrow }
43	44		};
44	45
45	46		static GC gc;

nsxiv/8081cbe

Improve mouse support

nsxiv8081cbe