Commit ef24ded

nsxivef24ded

Highlight selected thumbnail

Author: Bert
Date: 2011-02-17 16:22 +0100
Parent: 095217b
Commit: ef24ded6afeb185192e815868c28a31c4c2e6d97

+66 −20

5 files changed

Browse files Patch

−Context 3+

M config.h +2 −0
M thumbs.c +18 −2
M thumbs.h +1 −0
M window.c +42 −17
M window.h +3 −1

M config.h View

M thumbs.c View

M thumbs.h View

M window.c View

M window.h View

		@@ -6,6 +6,8 @@
6	6		/* default color to use for window background: *
7	7		* (see X(7) "COLOR NAMES" section for valid values) */
8	8		#define BG_COLOR "#999999"
	9	+	/* default color to use for selections: */
	10	+	#define SEL_COLOR "#0000BB"
9	11
10	12		/* how should images be scaled when they are loaded?: *
11	13		* (also controllable via -d/-s/-Z/-z options) *

		@@ -88,8 +88,8 @@ void tns_render(tns_t tns, win_t win) {
88	88		if (!tns \|\| !win)
89	89		return;
90	90
91		−	tns->cols = win->w / thumb_dim;
92		−	tns->rows = win->h / thumb_dim;
	91	+	tns->cols = MAX(1, win->w / thumb_dim);
	92	+	tns->rows = MAX(1, win->h / thumb_dim);
93	93
94	94		cnt = tns->cols * tns->rows;
95	95		if (tns->first && tns->first + cnt > tns->cnt)
		@@ -114,6 +114,22 @@ void tns_render(tns_t tns, win_t win) {
114	114		}
115	115		}
116	116
	117	+	tns_highlight(tns, win, -1);
117	118		win_draw(win);
118	119		}
119	120
	121	+	void tns_highlight(tns_t tns, win_t win, int old) {
	122	+	thumb_t *t;
	123	+
	124	+	if (!tns \|\| !win)
	125	+	return;
	126	+
	127	+	if (old >= 0 && old < tns->cnt) {
	128	+	t = &tns->thumbs[old];
	129	+	win_draw_rect(win, t->x - 2, t->y - 2, t->w + 4, t->h + 4, False);
	130	+	}
	131	+	if (tns->sel < tns->cnt) {
	132	+	t = &tns->thumbs[tns->sel];
	133	+	win_draw_rect(win, t->x - 2, t->y - 2, t->w + 4, t->h + 4, True);
	134	+	}
	135	+	}

		@@ -46,5 +46,6 @@ void tns_free(tns_t, win_t);
46	46		void tns_load(tns_t, win_t, const char*);
47	47
48	48		void tns_render(tns_t, win_t);
	49	+	void tns_highlight(tns_t, win_t, int);
49	50
50	51		#endif /* THUMBS_H */

		@@ -29,7 +29,7 @@
29	29		static Cursor carrow;
30	30		static Cursor chand;
31	31		static Cursor cwatch;
32		−	static GC bgc;
	32	+	static GC gc;
33	33
34	34		Atom wm_delete_win;
35	35
		@@ -50,7 +50,8 @@ void win_set_sizehints(win_t *win) {
50	50		void win_open(win_t *win) {
51	51		win_env_t *e;
52	52		XClassHint classhint;
53		−	XColor bgcol;
	53	+	XColor col;
	54	+	XGCValues gcval;
54	55		int gmask;
55	56
56	57		if (!win)
		@@ -67,13 +68,18 @@ void win_open(win_t *win) {
67	68		e->cmap = DefaultColormap(e->dpy, e->scr);
68	69		e->depth = DefaultDepth(e->dpy, e->scr);
69	70
70		−	if (!XAllocNamedColor(e->dpy, DefaultColormap(e->dpy, e->scr), BG_COLOR,
71		−	&bgcol, &bgcol))
	71	+	if (XAllocNamedColor(e->dpy, DefaultColormap(e->dpy, e->scr), BG_COLOR,
	72	+	&col, &col))
	73	+	win->bgcol = col.pixel;
	74	+	else
	75	+	die("could not allocate color: %s", BG_COLOR);
	76	+	if (XAllocNamedColor(e->dpy, DefaultColormap(e->dpy, e->scr), SEL_COLOR,
	77	+	&col, &col))
	78	+	win->selcol = col.pixel;
	79	+	else
72	80		die("could not allocate color: %s", BG_COLOR);
73	81
74		−	win->bgcol = bgcol.pixel;
75	82		win->pm = 0;
76		−
77	83		win->fullscreen = 0;
78	84
79	85		/* determine window offsets, width & height */
		@@ -112,7 +118,8 @@ void win_open(win_t *win) {
112	118		chand = XCreateFontCursor(e->dpy, XC_fleur);
113	119		cwatch = XCreateFontCursor(e->dpy, XC_watch);
114	120
115		−	bgc = XCreateGC(e->dpy, win->xwin, 0, None);
	121	+	gcval.line_width = 2;
	122	+	gc = XCreateGC(e->dpy, win->xwin, GCLineWidth, &gcval);
116	123
117	124		win_set_title(win, "sxiv");
118	125
		@@ -141,7 +148,7 @@ void win_close(win_t *win) {
141	148		XFreeCursor(win->env.dpy, chand);
142	149		XFreeCursor(win->env.dpy, cwatch);
143	150
144		−	XFreeGC(win->env.dpy, bgc);
	151	+	XFreeGC(win->env.dpy, gc);
145	152
146	153		XDestroyWindow(win->env.dpy, win->xwin);
147	154		XCloseDisplay(win->env.dpy);
		@@ -226,11 +233,6 @@ void win_free_pixmap(win_t *win, Pixmap pm) {
226	233		XFreePixmap(win->env.dpy, pm);
227	234		}
228	235
229		−	void win_draw_pixmap(win_t *win, Pixmap pm, int x, int y, int w, int h) {
230		−	if (win)
231		−	XCopyArea(win->env.dpy, pm, win->pm, bgc, 0, 0, w, h, x, y);
232		−	}
233		−
234	236		void win_clear(win_t *win) {
235	237		win_env_t *e;
236	238		XGCValues gcval;
		@@ -239,14 +241,37 @@ void win_clear(win_t *win) {
239	241		return;
240	242
241	243		e = &win->env;
242		−	gcval.foreground = win->fullscreen ? BlackPixel(e->dpy, e->scr) : win->bgcol;
243		−
	244	+	gcval.foreground = win->fullscreen ? BlackPixel(e->dpy, e->scr) :
	245	+	win->bgcol;
244	246		if (win->pm)
245	247		XFreePixmap(e->dpy, win->pm);
246	248		win->pm = XCreatePixmap(e->dpy, win->xwin, e->scrw, e->scrh, e->depth);
247	249
248		−	XChangeGC(e->dpy, bgc, GCForeground, &gcval);
249		−	XFillRectangle(e->dpy, win->pm, bgc, 0, 0, e->scrw, e->scrh);
	250	+	XChangeGC(e->dpy, gc, GCForeground, &gcval);
	251	+	XFillRectangle(e->dpy, win->pm, gc, 0, 0, e->scrw, e->scrh);
	252	+	}
	253	+
	254	+	void win_draw_pixmap(win_t *win, Pixmap pm, int x, int y, int w, int h) {
	255	+	if (win)
	256	+	XCopyArea(win->env.dpy, pm, win->pm, gc, 0, 0, w, h, x, y);
	257	+	}
	258	+
	259	+	void win_draw_rect(win_t *win, int x, int y, int w, int h, Bool sel) {
	260	+	win_env_t *e;
	261	+	XGCValues gcval;
	262	+
	263	+	if (!win)
	264	+	return;
	265	+
	266	+	e = &win->env;
	267	+
	268	+	if (sel)
	269	+	gcval.foreground = win->selcol;
	270	+	else
	271	+	gcval.foreground = win->fullscreen ? BlackPixel(e->dpy, e->scr) :
	272	+	win->bgcol;
	273	+	XChangeGC(e->dpy, gc, GCForeground, &gcval);
	274	+	XDrawRectangle(e->dpy, win->pm, gc, x, y, w, h);
250	275		}
251	276
252	277		void win_draw(win_t *win) {

		@@ -43,6 +43,7 @@ typedef struct win_s {
43	43		win_env_t env;
44	44
45	45		unsigned long bgcol;
	46	+	unsigned long selcol;
46	47		Pixmap pm;
47	48
48	49		int x;
		@@ -66,9 +67,10 @@ void win_toggle_fullscreen(win_t*);
66	67
67	68		Pixmap win_create_pixmap(win_t*, int, int);
68	69		void win_free_pixmap(win_t*, Pixmap);
69		−	void win_draw_pixmap(win_t*, Pixmap, int, int, int, int);
70	70
71	71		void win_clear(win_t*);
	72	+	void win_draw_pixmap(win_t*, Pixmap, int, int, int, int);
	73	+	void win_draw_rect(win_t*, int, int, int, int, Bool);
72	74		void win_draw(win_t*);
73	75
74	76		void win_set_title(win_t, const char);

nsxiv/ef24ded

Highlight selected thumbnail

nsxivef24ded