Commit 0155223

nsxiv0155223

Merge branch 'newdraw'

Author: Bert Münnich
Date: 2012-12-01 18:50 +0100
Parents: 1ae06ff 22a8b66
Commit: 0155223a1a609e44cd9532f19ae1713b9d68606e

+48 −19

3 files changed

Browse files Patch

−Context 3+

M main.c +18 −6
M window.c +29 −13
M window.h +1 −0

M main.c View

M window.c View

M window.h View

		@@ -420,7 +420,7 @@ void run(void) {
420	420		fd_set fds;
421	421		struct timeval timeout;
422	422		XEvent ev, nextev;
423		−	unsigned int qlen;
	423	+	bool discard;
424	424
425	425		redraw();
426	426
		@@ -453,10 +453,20 @@ void run(void) {
453	453
454	454		do {
455	455		XNextEvent(win.env.dpy, &ev);
456		−	qlen = XEventsQueued(win.env.dpy, QueuedAlready);
457		−	if (qlen > 0)
	456	+	discard = false;
	457	+	if (XEventsQueued(win.env.dpy, QueuedAlready) > 0) {
458	458		XPeekEvent(win.env.dpy, &nextev);
459		−	} while (qlen > 0 && ev.type == nextev.type);
	459	+	switch (ev.type) {
	460	+	case ConfigureNotify:
	461	+	discard = ev.type == nextev.type;
	462	+	break;
	463	+	case KeyPress:
	464	+	discard = (nextev.type == KeyPress \|\| nextev.type == KeyRelease)
	465	+	&& ev.xkey.keycode == nextev.xkey.keycode;
	466	+	break;
	467	+	}
	468	+	}
	469	+	} while (discard);
460	470
461	471		switch (ev.type) {
462	472		/* handle events */
		@@ -482,9 +492,11 @@ void run(void) {
482	492		}
483	493		}
484	494		break;
	495	+	case Expose:
	496	+	win_expose(&win, &ev.xexpose);
	497	+	break;
485	498		case KeyPress:
486		−	if (qlen == 0 \|\| ev.xkey.keycode != nextev.xkey.keycode)
487		−	on_keypress(&ev.xkey);
	499	+	on_keypress(&ev.xkey);
488	500		break;
489	501		case MotionNotify:
490	502		if (mode == MODE_IMAGE) {

		@@ -188,8 +188,9 @@ void win_open(win_t *win) {
188	188		if (win->xwin == None)
189	189		die("could not create window");
190	190
191		−	XSelectInput(e->dpy, win->xwin, StructureNotifyMask \| KeyPressMask \|
192		−	ButtonPressMask \| ButtonReleaseMask \| PointerMotionMask);
	191	+	XSelectInput(e->dpy, win->xwin,
	192	+	ExposureMask \| ButtonReleaseMask \| ButtonPressMask \|
	193	+	KeyPressMask \| PointerMotionMask \| StructureNotifyMask);
193	194
194	195		carrow = XCreateFontCursor(e->dpy, XC_left_ptr);
195	196		chand = XCreateFontCursor(e->dpy, XC_fleur);
		@@ -246,10 +247,15 @@ void win_close(win_t *win) {
246	247		bool win_configure(win_t win, XConfigureEvent c) {
247	248		bool changed;
248	249
249		−	if (win == NULL)
	250	+	if (win == NULL \|\| c == NULL)
250	251		return false;
251	252
252		−	changed = win->w != c->width \|\| win->h + win->barh != c->height;
	253	+	if ((changed = win->w != c->width \|\| win->h + win->barh != c->height)) {
	254	+	if (win->pm != None) {
	255	+	XFreePixmap(win->env.dpy, win->pm);
	256	+	win->pm = None;
	257	+	}
	258	+	}
253	259
254	260		win->x = c->x;
255	261		win->y = c->y;
		@@ -260,6 +266,14 @@ bool win_configure(win_t win, XConfigureEvent c) {
260	266		return changed;
261	267		}
262	268
	269	+	void win_expose(win_t win, XExposeEvent e) {
	270	+	if (win == NULL \|\| win->xwin == None \|\| win->pm == None \|\| e == NULL)
	271	+	return;
	272	+
	273	+	XCopyArea(win->env.dpy, win->pm, win->xwin, gc,
	274	+	e->x, e->y, e->width, e->height, e->x, e->y);
	275	+	}
	276	+
263	277		bool win_moveresize(win_t *win, int x, int y, unsigned int w, unsigned int h) {
264	278		if (win == NULL \|\| win->xwin == None)
265	279		return false;
		@@ -323,19 +337,20 @@ void win_toggle_bar(win_t *win) {
323	337		}
324	338
325	339		void win_clear(win_t *win) {
	340	+	int h;
326	341		win_env_t *e;
327	342
328	343		if (win == NULL \|\| win->xwin == None)
329	344		return;
330	345
	346	+	h = win->h + win->barh;
331	347		e = &win->env;
332	348
333		−	if (win->pm != None)
334		−	XFreePixmap(e->dpy, win->pm);
335		−	win->pm = XCreatePixmap(e->dpy, win->xwin, e->scrw, e->scrh, e->depth);
	349	+	if (win->pm == None)
	350	+	win->pm = XCreatePixmap(e->dpy, win->xwin, win->w, h, e->depth);
336	351
337	352		XSetForeground(e->dpy, gc, win->fullscreen ? win->fscol : win->bgcol);
338		−	XFillRectangle(e->dpy, win->pm, gc, 0, 0, e->scrw, e->scrh);
	353	+	XFillRectangle(e->dpy, win->pm, gc, 0, 0, win->w, h);
339	354		}
340	355
341	356		void win_draw_bar(win_t *win) {
		@@ -343,7 +358,7 @@ void win_draw_bar(win_t *win) {
343	358		int len, x, y, w, tw = 0, seplen;
344	359		const char *rt;
345	360
346		−	if (win == NULL \|\| win->xwin == None)
	361	+	if (win == NULL \|\| win->xwin == None \|\| win->pm == None)
347	362		return;
348	363
349	364		e = &win->env;
		@@ -391,18 +406,19 @@ void win_draw_bar(win_t *win) {
391	406		}
392	407
393	408		void win_draw(win_t *win) {
394		−	if (win == NULL \|\| win->xwin == None)
	409	+	if (win == NULL \|\| win->xwin == None \|\| win->pm == None)
395	410		return;
396	411
397	412		if (win->barh > 0)
398	413		win_draw_bar(win);
399	414
400		−	XSetWindowBackgroundPixmap(win->env.dpy, win->xwin, win->pm);
401		−	XClearWindow(win->env.dpy, win->xwin);
	415	+	XCopyArea(win->env.dpy, win->pm, win->xwin, gc,
	416	+	0, 0, win->w, win->h + win->barh, 0, 0);
402	417		}
403	418
404	419		void win_draw_rect(win_t *win, Pixmap pm, int x, int y, int w, int h,
405		−	bool fill, int lw, unsigned long col) {
	420	+	bool fill, int lw, unsigned long col)
	421	+	{
406	422		XGCValues gcval;
407	423
408	424		if (win == NULL \|\| pm == None)

		@@ -66,6 +66,7 @@ void win_open(win_t*);
66	66		void win_close(win_t*);
67	67
68	68		bool win_configure(win_t, XConfigureEvent);
	69	+	void win_expose(win_t, XExposeEvent);
69	70		bool win_moveresize(win_t*, int, int, unsigned int, unsigned int);
70	71
71	72		void win_toggle_fullscreen(win_t*);

nsxiv/0155223

Merge branch 'newdraw'

nsxiv0155223