Commit 2b1c088

nsxiv2b1c088

Implemented fullscreen mode

Author: Bert
Date: 2011-01-23 16:14 +0100
Parent: 8183b5a
Commit: 2b1c0885fe53b95455ae650762651c69ae1a227d

+46 −7

4 files changed

Browse files Patch

−Context 3+

M TODO +0 −1
M main.c +5 −0
M window.c +38 −5
M window.h +3 −1

M TODO View

M main.c View

M window.c View

M window.h View

		@@ -2,5 +2,4 @@
2	2		- add some useful command line options
3	3		- write man page
4	4		- toggle aliasing
5		−	- fullscreen mode
6	5		- view all images in directories (recursive mode)

		@@ -218,6 +218,11 @@ void on_keypress(XEvent *ev) {
218	218		case 'l':
219	219		changed = img_pan(&img, &win, PAN_RIGHT);
220	220		break;
	221	+
	222	+	/* change window state */
	223	+	case 'f':
	224	+	win_toggle_fullscreen(&win);
	225	+	break;
221	226		}
222	227
223	228		if (changed) {

		@@ -18,17 +18,19 @@
18	18
19	19		#include <stdlib.h>
20	20		#include <stdio.h>
	21	+	#include <string.h>
21	22
22	23		#include <X11/Xutil.h>
23	24
24	25		#include "sxiv.h"
25	26		#include "window.h"
26	27
	28	+	GC bgc;
	29	+
27	30		void win_open(win_t *win) {
28	31		win_env_t *e;
29	32		XClassHint *classhint;
30	33		XColor bgcol;
31		−	XGCValues gcval;
32	34
33	35		if (!win)
34	36		return;
		@@ -48,6 +50,9 @@ void win_open(win_t *win) {
48	50		&bgcol, &bgcol))
49	51		DIE("could not allocate color: %s", BG_COLOR);
50	52
	53	+	win->bgcol = bgcol.pixel;
	54	+	win->pm = 0;
	55	+
51	56		win->w = WIN_WIDTH;
52	57		win->h = WIN_HEIGHT;
53	58		if (win->w > e->scrw)
		@@ -66,9 +71,7 @@ void win_open(win_t *win) {
66	71		XSelectInput(e->dpy, win->xwin,
67	72		StructureNotifyMask \| KeyPressMask);
68	73
69		−	gcval.foreground = bgcol.pixel;
70		−	win->bgc = XCreateGC(e->dpy, win->xwin, GCForeground, &gcval);
71		−	win->pm = 0;
	74	+	bgc = XCreateGC(e->dpy, win->xwin, 0, None);
72	75
73	76		win_set_title(win, "sxiv");
74	77
		@@ -119,8 +122,34 @@ int win_configure(win_t win, XConfigureEvent c) {
119	122		return changed;
120	123		}
121	124
	125	+	void win_toggle_fullscreen(win_t *win) {
	126	+	XEvent ev;
	127	+	XClientMessageEvent *cm;
	128	+
	129	+	if (!win)
	130	+	return;
	131	+
	132	+	win->fullscreen ^= 1;
	133	+
	134	+	memset(&ev, 0, sizeof(ev));
	135	+	ev.type = ClientMessage;
	136	+
	137	+	cm = &ev.xclient;
	138	+	cm->window = win->xwin;
	139	+	cm->message_type = XInternAtom(win->env.dpy, "_NET_WM_STATE", False);
	140	+	cm->format = 32;
	141	+	cm->data.l[0] = win->fullscreen;
	142	+	cm->data.l[1] = XInternAtom(win->env.dpy, "_NET_WM_STATE_FULLSCREEN", False);
	143	+	cm->data.l[2] = XInternAtom(win->env.dpy, "_NET_WM_STATE_ABOVE", False);
	144	+	cm->data.l[3] = 0;
	145	+
	146	+	XSendEvent(win->env.dpy, DefaultRootWindow(win->env.dpy), False,
	147	+	SubstructureNotifyMask, &ev);
	148	+	}
	149	+
122	150		void win_clear(win_t *win) {
123	151		win_env_t *e;
	152	+	XGCValues gcval;
124	153
125	154		if (!win)
126	155		return;
		@@ -130,7 +159,11 @@ void win_clear(win_t *win) {
130	159		if (win->pm)
131	160		XFreePixmap(e->dpy, win->pm);
132	161		win->pm = XCreatePixmap(e->dpy, win->xwin, e->scrw, e->scrh, e->depth);
133		−	XFillRectangle(e->dpy, win->pm, win->bgc, 0, 0, e->scrw, e->scrh);
	162	+
	163	+	gcval.foreground = win->fullscreen ? BlackPixel(e->dpy, e->scr) : win->bgcol;
	164	+	XChangeGC(e->dpy, bgc, GCForeground, &gcval);
	165	+
	166	+	XFillRectangle(e->dpy, win->pm, bgc, 0, 0, e->scrw, e->scrh);
134	167		}
135	168
136	169		void win_draw(win_t *win) {

		@@ -33,7 +33,8 @@ typedef struct win_env_s {
33	33		typedef struct win_s {
34	34		Window xwin;
35	35		win_env_t env;
36		−	GC bgc;
	36	+
	37	+	unsigned long bgcol;
37	38		Pixmap pm;
38	39
39	40		int w;
		@@ -51,6 +52,7 @@ void win_close(win_t*);
51	52		void win_set_title(win_t, const char);
52	53
53	54		int win_configure(win_t, XConfigureEvent);
	55	+	void win_toggle_fullscreen(win_t*);
54	56
55	57		void win_clear(win_t*);
56	58		void win_draw(win_t*);

nsxiv/2b1c088

Implemented fullscreen mode

nsxiv2b1c088