Commit fde9f5b

nsxivfde9f5b

Hide cursor on redraw or after 1.5s mouse inactivity

Author: Bert
Date: 2011-02-21 18:26 +0100
Parent: 280fcf6
Commit: fde9f5bf859e582fb85d43831b90b7588ebfc3d3

+67 −17

3 files changed

Browse files Patch

−Context 3+

M main.c +50 −14
M window.c +16 −3
M window.h +1 −0

M main.c View

M window.c View

M window.h View

		@@ -255,13 +255,21 @@ void read_dir_rec(const char *dirname) {
255	255		/* event handling */
256	256
257	257		int timeout;
	258	+	unsigned char hidecur;
	259	+
258	260		int mox, moy;
	261	+	unsigned char drag;
259	262
260	263		void redraw() {
261		−	if (mode == MODE_NORMAL)
	264	+	if (mode == MODE_NORMAL) {
	265	+	if (!drag && hidecur) {
	266	+	win_set_cursor(&win, CURSOR_NONE);
	267	+	hidecur = 0;
	268	+	}
262	269		img_render(&img, &win);
263		−	else
	270	+	} else {
264	271		tns_render(&tns, &win);
	272	+	}
265	273		update_title();
266	274		timeout = 0;
267	275		}
		@@ -377,11 +385,12 @@ void on_keypress(XKeyEvent *kev) {
377	385		}
378	386		break;
379	387
380		−	/* switch to thumnail mode */
	388	+	/* switch to thumbnail mode */
381	389		case XK_Return:
382	390		if (!tns.thumbs)
383	391		tns_init(&tns, filecnt);
384	392		mode = MODE_THUMBS;
	393	+	win_set_cursor(&win, CURSOR_ARROW);
385	394		tns.sel = fileidx;
386	395		changed = tns.dirty = 1;
387	396		break;
		@@ -403,7 +412,7 @@ void on_keypress(XKeyEvent *kev) {
403	412		fileidx = tns.sel;
404	413		load_image();
405	414		mode = MODE_NORMAL;
406		−	win_set_cursor(&win, CURSOR_ARROW);
	415	+	win_set_cursor(&win, CURSOR_NONE);
407	416		changed = 1;
408	417		break;
409	418
		@@ -479,6 +488,8 @@ void on_buttonpress(XButtonEvent *bev) {
479	488		mox = bev->x;
480	489		moy = bev->y;
481	490		win_set_cursor(&win, CURSOR_HAND);
	491	+	hidecur = 0;
	492	+	drag = 1;
482	493		break;
483	494		case Button3:
484	495		if (fileidx > 0) {
		@@ -518,7 +529,7 @@ void on_buttonpress(XButtonEvent *bev) {
518	529		fileidx = tns.sel;
519	530		load_image();
520	531		mode = MODE_NORMAL;
521		−	win_set_cursor(&win, CURSOR_ARROW);
	532	+	win_set_cursor(&win, CURSOR_NONE);
522	533		} else {
523	534		tns_highlight(&tns, &win, tns.sel, False);
524	535		tns_highlight(&tns, &win, sel, True);
		@@ -542,7 +553,7 @@ void on_buttonpress(XButtonEvent *bev) {
542	553		}
543	554
544	555		void on_motionnotify(XMotionEvent *mev) {
545		−	if (!mev \|\| mode != MODE_NORMAL)
	556	+	if (!mev)
546	557		return;
547	558
548	559		if (mev->x >= 0 && mev->x <= win.w && mev->y >= 0 && mev->y <= win.h) {
		@@ -560,7 +571,12 @@ void run() {
560	571		struct timeval t, t0;
561	572		XEvent ev;
562	573
563		−	timeout = 0;
	574	+	drag = timeout = 0;
	575	+
	576	+	if (mode == MODE_NORMAL) {
	577	+	hidecur = 1;
	578	+	timeout = 1500000;
	579	+	}
564	580
565	581		while (1) {
566	582		if (mode == MODE_THUMBS && tns.cnt < filecnt) {
		@@ -582,15 +598,21 @@ void run() {
582	598		timeout = 75000;
583	599		}
584	600		} else if (timeout) {
585		−	t.tv_sec = 0;
586		−	t.tv_usec = timeout;
	601	+	t.tv_sec = timeout / 1000000;
	602	+	t.tv_usec = timeout % 1000000;
587	603		xfd = ConnectionNumber(win.env.dpy);
588	604		FD_ZERO(&fds);
589	605		FD_SET(xfd, &fds);
590	606
591		−	if (!XPending(win.env.dpy) && !select(xfd + 1, &fds, 0, 0, &t))
	607	+	if (!XPending(win.env.dpy) && !select(xfd + 1, &fds, 0, 0, &t)) {
592	608		/* timeout fired */
593		−	redraw();
	609	+	if (hidecur) {
	610	+	win_set_cursor(&win, CURSOR_NONE);
	611	+	hidecur = 0;
	612	+	} else {
	613	+	redraw();
	614	+	}
	615	+	}
594	616		}
595	617
596	618		if (!XNextEvent(win.env.dpy, &ev)) {
		@@ -602,11 +624,25 @@ void run() {
602	624		on_buttonpress(&ev.xbutton);
603	625		break;
604	626		case ButtonRelease:
605		−	if (ev.xbutton.button == Button2)
606		−	win_set_cursor(&win, CURSOR_ARROW);
	627	+	if (ev.xbutton.button == Button2) {
	628	+	drag = 0;
	629	+	if (mode == MODE_NORMAL) {
	630	+	win_set_cursor(&win, CURSOR_ARROW);
	631	+	hidecur = 1;
	632	+	timeout = 1500000;
	633	+	}
	634	+	}
607	635		break;
608	636		case MotionNotify:
609		−	on_motionnotify(&ev.xmotion);
	637	+	if (drag) {
	638	+	on_motionnotify(&ev.xmotion);
	639	+	} else if (mode == MODE_NORMAL) {
	640	+	if (!hidecur) {
	641	+	win_set_cursor(&win, CURSOR_ARROW);
	642	+	hidecur = 1;
	643	+	}
	644	+	timeout = 1500000;
	645	+	}
610	646		break;
611	647		case ConfigureNotify:
612	648		if (win_configure(&win, &ev.xconfigure)) {

		@@ -27,6 +27,7 @@
27	27		#include "window.h"
28	28
29	29		static Cursor carrow;
	30	+	static Cursor cnone;
30	31		static Cursor chand;
31	32		static Cursor cwatch;
32	33		static GC gc;
		@@ -52,6 +53,8 @@ void win_open(win_t *win) {
52	53		XClassHint classhint;
53	54		XColor col;
54	55		XGCValues gcval;
	56	+	char none_data[] = {0, 0, 0, 0, 0, 0, 0, 0};
	57	+	Pixmap none;
55	58		int gmask;
56	59
57	60		if (!win)
		@@ -69,12 +72,12 @@ void win_open(win_t *win) {
69	72		e->depth = DefaultDepth(e->dpy, e->scr);
70	73
71	74		if (XAllocNamedColor(e->dpy, DefaultColormap(e->dpy, e->scr), BG_COLOR,
72		−	&col, &col))
	75	+	&col, &col))
73	76		win->bgcol = col.pixel;
74	77		else
75	78		die("could not allocate color: %s", BG_COLOR);
76	79		if (XAllocNamedColor(e->dpy, DefaultColormap(e->dpy, e->scr), SEL_COLOR,
77		−	&col, &col))
	80	+	&col, &col))
78	81		win->selcol = col.pixel;
79	82		else
80	83		die("could not allocate color: %s", BG_COLOR);
		@@ -112,12 +115,18 @@ void win_open(win_t *win) {
112	115		die("could not create window");
113	116
114	117		XSelectInput(e->dpy, win->xwin, StructureNotifyMask \| KeyPressMask \|
115		−	ButtonPressMask \| ButtonReleaseMask \| Button2MotionMask);
	118	+	ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask);
116	119
117	120		carrow = XCreateFontCursor(e->dpy, XC_left_ptr);
118	121		chand = XCreateFontCursor(e->dpy, XC_fleur);
119	122		cwatch = XCreateFontCursor(e->dpy, XC_watch);
120	123
	124	+	if (!XAllocNamedColor(e->dpy, DefaultColormap(e->dpy, e->scr), "black",
	125	+	&col, &col))
	126	+	die("could not allocate color: black");
	127	+	none = XCreateBitmapFromData(e->dpy, win->xwin, none_data, 8, 8);
	128	+	cnone = XCreatePixmapCursor(e->dpy, none, none, &col, &col, 0, 0);
	129	+
121	130		gcval.line_width = 2;
122	131		gc = XCreateGC(e->dpy, win->xwin, GCLineWidth, &gcval);
123	132
		@@ -145,6 +154,7 @@ void win_close(win_t *win) {
145	154		return;
146	155
147	156		XFreeCursor(win->env.dpy, carrow);
	157	+	XFreeCursor(win->env.dpy, cnone);
148	158		XFreeCursor(win->env.dpy, chand);
149	159		XFreeCursor(win->env.dpy, cwatch);
150	160
		@@ -307,6 +317,9 @@ void win_set_cursor(win_t *win, win_cur_t cursor) {
307	317		return;
308	318
309	319		switch (cursor) {
	320	+	case CURSOR_NONE:
	321	+	XDefineCursor(win->env.dpy, win->xwin, cnone);
	322	+	break;
310	323		case CURSOR_HAND:
311	324		XDefineCursor(win->env.dpy, win->xwin, chand);
312	325		break;

		@@ -25,6 +25,7 @@
25	25
26	26		typedef enum win_cur_e {
27	27		CURSOR_ARROW = 0,
	28	+	CURSOR_NONE,
28	29		CURSOR_HAND,
29	30		CURSOR_WATCH
30	31		} win_cur_t;

nsxiv/fde9f5b

Hide cursor on redraw or after 1.5s mouse inactivity

nsxivfde9f5b