new directory structure

1 files changed, 0 insertions, 537 deletions

diff --git a/nsxiv/window.c b/nsxiv/window.c
deleted file mode 100644
index 69c7b66..0000000
--- a/nsxiv/window.c
+++ /dev/null
@@ -1,537 +0,0 @@
-/* Copyright 2011-2020 Bert Muennich
- * Copyright 2021-2022 nsxiv contributors
- *
- * This file is a part of nsxiv.
- *
- * nsxiv is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * nsxiv is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with nsxiv.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "nsxiv.h"
-#define _WINDOW_CONFIG
-#include "config.h"
-#include "icon/data.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <locale.h>
-#include <unistd.h>
-#include <X11/cursorfont.h>
-#include <X11/Xatom.h>
-#include <X11/Xresource.h>
-
-#if HAVE_LIBFONTS
-#include "utf8.h"
-static XftFont *font;
-static double fontsize;
-#define TEXTWIDTH(win, text, len) \
-	win_draw_text(win, NULL, NULL, 0, 0, text, len, 0)
-#endif
-
-#define RES_CLASS "Nsxiv"
-
-#define INIT_ATOM_(atom) \
-	atoms[ATOM_##atom] = XInternAtom(e->dpy, #atom, False);
-
-enum {
-	H_TEXT_PAD = 5,
-	V_TEXT_PAD = 1
-};
-
-static struct {
-	int name;
-	Cursor icon;
-} cursors[CURSOR_COUNT] = {
-	{ XC_left_ptr }, { XC_dotbox }, { XC_fleur }, { XC_watch },
-	{ XC_sb_left_arrow }, { XC_sb_right_arrow }
-};
-
-static GC gc;
-
-static int barheight;
-
-Atom atoms[ATOM_COUNT];
-
-#if HAVE_LIBFONTS
-static void win_init_font(const win_env_t *e, const char *fontstr)
-{
-	int fontheight = 0;
-	if ((font = XftFontOpenName(e->dpy, e->scr, fontstr)) == NULL)
-		error(EXIT_FAILURE, 0, "Error loading font '%s'", fontstr);
-	fontheight = font->ascent + font->descent;
-	FcPatternGetDouble(font->pattern, FC_SIZE, 0, &fontsize);
-	barheight = fontheight + 2 * V_TEXT_PAD;
-}
-
-static void xft_alloc_color(const win_env_t *e, const char *name, XftColor *col)
-{
-	if (!XftColorAllocName(e->dpy, e->vis, e->cmap, name, col))
-		error(EXIT_FAILURE, 0, "Error allocating color '%s'", name);
-}
-#endif /* HAVE_LIBFONTS */
-
-static void win_alloc_color(const win_env_t *e, const char *name, XColor *col)
-{
-	XColor screen;
-	if (!XAllocNamedColor(e->dpy, e->cmap, name, &screen, col))
-		error(EXIT_FAILURE, 0, "Error allocating color '%s'", name);
-}
-
-static const char* win_res(XrmDatabase db, const char *name, const char *def)
-{
-	char *type;
-	XrmValue ret;
-
-	if (db != NULL &&
-	    XrmGetResource(db, name, name, &type, &ret) &&
-	    STREQ(type, "String"))
-	{
-		return ret.addr;
-	} else {
-		return def;
-	}
-}
-
-void win_init(win_t *win)
-{
-	win_env_t *e;
-	const char *win_bg, *win_fg, *mrk_fg;
-#if HAVE_LIBFONTS
-	const char *bar_fg, *bar_bg, *f;
-#endif
-	char *res_man;
-	XrmDatabase db;
-
-	memset(win, 0, sizeof(win_t));
-
-	e = &win->env;
-	if ((e->dpy = XOpenDisplay(NULL)) == NULL)
-		error(EXIT_FAILURE, 0, "Error opening X display");
-
-	e->scr = DefaultScreen(e->dpy);
-	e->scrw = DisplayWidth(e->dpy, e->scr);
-	e->scrh = DisplayHeight(e->dpy, e->scr);
-	e->depth = DefaultDepth(e->dpy, e->scr);
-	e->vis = DefaultVisual(e->dpy, e->scr);
-	e->cmap = DefaultColormap(e->dpy, e->scr);
-
-	if (setlocale(LC_CTYPE, "") == NULL || XSupportsLocale() == 0)
-		error(0, 0, "No locale support");
-
-	XrmInitialize();
-	res_man = XResourceManagerString(e->dpy);
-	db = res_man == NULL ? NULL : XrmGetStringDatabase(res_man);
-
-	win_bg = win_res(db, RES_CLASS ".window.background", DEFAULT_WIN_BG);
-	win_fg = win_res(db, RES_CLASS ".window.foreground", DEFAULT_WIN_FG);
-	mrk_fg = win_res(db, RES_CLASS ".mark.foreground",   DEFAULT_MARK_COLOR ? DEFAULT_MARK_COLOR : win_fg);
-	win_alloc_color(e, win_bg, &win->win_bg);
-	win_alloc_color(e, win_fg, &win->win_fg);
-	win_alloc_color(e, mrk_fg, &win->mrk_fg);
-
-#if HAVE_LIBFONTS
-	bar_bg = win_res(db, RES_CLASS ".bar.background", DEFAULT_BAR_BG ? DEFAULT_BAR_BG : win_bg);
-	bar_fg = win_res(db, RES_CLASS ".bar.foreground", DEFAULT_BAR_FG ? DEFAULT_BAR_FG : win_fg);
-	xft_alloc_color(e, bar_bg, &win->bar_bg);
-	xft_alloc_color(e, bar_fg, &win->bar_fg);
-
-	f = win_res(db, RES_CLASS ".bar.font", DEFAULT_FONT);
-	win_init_font(e, f);
-
-	win->bar.l.size = BAR_L_LEN;
-	win->bar.r.size = BAR_R_LEN;
-	/* 3 padding bytes needed by utf8_decode */
-	win->bar.l.buf = emalloc(win->bar.l.size + 3);
-	win->bar.l.buf[0] = '\0';
-	win->bar.r.buf = emalloc(win->bar.r.size + 3);
-	win->bar.r.buf[0] = '\0';
-	win->bar.h = options->hide_bar ? 0 : barheight;
-	win->bar.top = TOP_STATUSBAR;
-#endif /* HAVE_LIBFONTS */
-
-	XrmDestroyDatabase(db);
-	INIT_ATOM_(WM_DELETE_WINDOW);
-	INIT_ATOM_(_NET_WM_NAME);
-	INIT_ATOM_(_NET_WM_ICON_NAME);
-	INIT_ATOM_(_NET_WM_ICON);
-	INIT_ATOM_(_NET_WM_STATE);
-	INIT_ATOM_(_NET_WM_PID);
-	INIT_ATOM_(_NET_WM_STATE_FULLSCREEN);
-	INIT_ATOM_(UTF8_STRING);
-	INIT_ATOM_(WM_NAME);
-	INIT_ATOM_(WM_ICON_NAME);
-}
-
-void win_open(win_t *win)
-{
-	int c, i, j, n;
-	Window parent;
-	win_env_t *e;
-	XClassHint classhint;
-	unsigned long *icon_data;
-	XColor col;
-	Cursor *cnone = &cursors[CURSOR_NONE].icon;
-	char none_data[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-	Pixmap none;
-	int gmask;
-	XSizeHints sizehints;
-	XWMHints hints;
-	long pid;
-	char hostname[256];
-	XSetWindowAttributes attrs;
-	char res_class[] = RES_CLASS;
-	char res_name[] = "nsxiv";
-
-	e = &win->env;
-	parent = options->embed ? options->embed : RootWindow(e->dpy, e->scr);
-
-	sizehints.flags = PWinGravity;
-	sizehints.win_gravity = NorthWestGravity;
-
-	/* determine window offsets, width & height */
-	if (options->geometry == NULL)
-		gmask = 0;
-	else
-		gmask = XParseGeometry(options->geometry, &win->x, &win->y,
-		                       &win->w, &win->h);
-	if (gmask & WidthValue)
-		sizehints.flags |= USSize;
-	else
-		win->w = WIN_WIDTH;
-	if (gmask & HeightValue)
-		sizehints.flags |= USSize;
-	else
-		win->h = WIN_HEIGHT;
-	if (gmask & XValue) {
-		if (gmask & XNegative) {
-			win->x += e->scrw - win->w;
-			sizehints.win_gravity = NorthEastGravity;
-		}
-		sizehints.flags |= USPosition;
-	} else {
-		win->x = 0;
-	}
-	if (gmask & YValue) {
-		if (gmask & YNegative) {
-			win->y += e->scrh - win->h;
-			sizehints.win_gravity = sizehints.win_gravity == NorthEastGravity
-			                        ? SouthEastGravity : SouthWestGravity;
-		}
-		sizehints.flags |= USPosition;
-	} else {
-		win->y = 0;
-	}
-
-	attrs.colormap = e->cmap;
-	attrs.border_pixel = 0;
-
-	win->xwin = XCreateWindow(e->dpy, parent, win->x, win->y, win->w, win->h, 0,
-	                          e->depth, InputOutput, e->vis,
-	                          CWColormap | CWBorderPixel, &attrs);
-	if (win->xwin == None)
-		error(EXIT_FAILURE, 0, "Error creating X window");
-
-	/* set the _NET_WM_PID */
-	pid = getpid();
-	XChangeProperty(e->dpy, win->xwin, atoms[ATOM__NET_WM_PID], XA_CARDINAL,
-	                32, PropModeReplace, (unsigned char *) &pid, 1);
-	if (gethostname(hostname, ARRLEN(hostname)) == 0) {
-		XTextProperty tp;
-		tp.value = (unsigned char *)hostname;
-		tp.nitems = strnlen(hostname, ARRLEN(hostname));
-		tp.encoding = XA_STRING;
-		tp.format = 8;
-		XSetWMClientMachine(e->dpy, win->xwin, &tp);
-	}
-
-	XSelectInput(e->dpy, win->xwin,
-	             ButtonReleaseMask | ButtonPressMask | KeyPressMask |
-	             PointerMotionMask | StructureNotifyMask);
-
-	for (i = 0; i < ARRLEN(cursors); i++) {
-		if (i != CURSOR_NONE)
-			cursors[i].icon = XCreateFontCursor(e->dpy, cursors[i].name);
-	}
-	if (XAllocNamedColor(e->dpy, e->cmap, "black", &col, &col) == 0)
-		error(EXIT_FAILURE, 0, "Error allocating color 'black'");
-
-	none = XCreateBitmapFromData(e->dpy, win->xwin, none_data, 8, 8);
-	*cnone = XCreatePixmapCursor(e->dpy, none, none, &col, &col, 0, 0);
-
-	gc = XCreateGC(e->dpy, win->xwin, 0, None);
-
-	n = icons[ARRLEN(icons)-1].size;
-	icon_data = emalloc((n * n + 2) * sizeof(*icon_data));
-
-	for (i = 0; i < ARRLEN(icons); i++) {
-		n = 0;
-		icon_data[n++] = icons[i].size;
-		icon_data[n++] = icons[i].size;
-
-		for (j = 0; j < icons[i].cnt; j++) {
-			for (c = icons[i].data[j] >> 4; c >= 0; c--)
-				icon_data[n++] = icon_colors[icons[i].data[j] & 0x0F];
-		}
-		XChangeProperty(e->dpy, win->xwin, atoms[ATOM__NET_WM_ICON], XA_CARDINAL, 32,
-		                i == 0 ? PropModeReplace : PropModeAppend,
-		                (unsigned char *) icon_data, n);
-	}
-	free(icon_data);
-
-	win_set_title(win, true);
-	classhint.res_class = res_class;
-	classhint.res_name = options->res_name != NULL ? options->res_name : res_name;
-	XSetClassHint(e->dpy, win->xwin, &classhint);
-
-	XSetWMProtocols(e->dpy, win->xwin, &atoms[ATOM_WM_DELETE_WINDOW], 1);
-
-	sizehints.width = win->w;
-	sizehints.height = win->h;
-	sizehints.x = win->x;
-	sizehints.y = win->y;
-	XSetWMNormalHints(win->env.dpy, win->xwin, &sizehints);
-
-	hints.flags = InputHint | StateHint;
-	hints.input = 1;
-	hints.initial_state = NormalState;
-	XSetWMHints(win->env.dpy, win->xwin, &hints);
-
-	if (options->fullscreen) {
-		XChangeProperty(e->dpy, win->xwin, atoms[ATOM__NET_WM_STATE],
-		                XA_ATOM, 32, PropModeReplace,
-		                (unsigned char *) &atoms[ATOM__NET_WM_STATE_FULLSCREEN], 1);
-	}
-
-	win->h -= win->bar.h;
-
-	win->buf.w = e->scrw;
-	win->buf.h = e->scrh;
-	win->buf.pm = XCreatePixmap(e->dpy, win->xwin, win->buf.w, win->buf.h, e->depth);
-
-	XSetForeground(e->dpy, gc, win->win_bg.pixel);
-	XFillRectangle(e->dpy, win->buf.pm, gc, 0, 0, win->buf.w, win->buf.h);
-	XSetWindowBackgroundPixmap(e->dpy, win->xwin, win->buf.pm);
-	XMapWindow(e->dpy, win->xwin);
-	XFlush(e->dpy);
-}
-
-CLEANUP void win_close(win_t *win)
-{
-	unsigned int i;
-
-	for (i = 0; i < ARRLEN(cursors); i++)
-		XFreeCursor(win->env.dpy, cursors[i].icon);
-
-	XFreeGC(win->env.dpy, gc);
-#if HAVE_LIBFONTS
-	XftFontClose(win->env.dpy, font);
-#endif
-	XDestroyWindow(win->env.dpy, win->xwin);
-	XCloseDisplay(win->env.dpy);
-}
-
-bool win_configure(win_t *win, XConfigureEvent *c)
-{
-	bool changed;
-
-	changed = win->w != c->width || win->h + win->bar.h != c->height;
-
-	win->x = c->x;
-	win->y = c->y;
-	win->w = c->width;
-	win->h = c->height - win->bar.h;
-	win->bw = c->border_width;
-
-	return changed;
-}
-
-void win_toggle_fullscreen(win_t *win)
-{
-	XEvent ev;
-	XClientMessageEvent *cm;
-
-	memset(&ev, 0, sizeof(ev));
-	ev.type = ClientMessage;
-
-	cm = &ev.xclient;
-	cm->window = win->xwin;
-	cm->message_type = atoms[ATOM__NET_WM_STATE];
-	cm->format = 32;
-	cm->data.l[0] = 2; /* toggle */
-	cm->data.l[1] = atoms[ATOM__NET_WM_STATE_FULLSCREEN];
-
-	XSendEvent(win->env.dpy, DefaultRootWindow(win->env.dpy), False,
-	           SubstructureNotifyMask | SubstructureRedirectMask, &ev);
-}
-
-void win_toggle_bar(win_t *win)
-{
-	if (win->bar.h != 0) {
-		win->h += win->bar.h;
-		win->bar.h = 0;
-	} else {
-		win->bar.h = barheight;
-		win->h -= win->bar.h;
-	}
-}
-
-void win_clear(win_t *win)
-{
-	win_env_t *e;
-
-	e = &win->env;
-
-	if (win->w > win->buf.w || win->h + win->bar.h > win->buf.h) {
-		XFreePixmap(e->dpy, win->buf.pm);
-		win->buf.w = MAX(win->buf.w, win->w);
-		win->buf.h = MAX(win->buf.h, win->h + win->bar.h);
-		win->buf.pm = XCreatePixmap(e->dpy, win->xwin,
-		                            win->buf.w, win->buf.h, e->depth);
-	}
-	XSetForeground(e->dpy, gc, win->win_bg.pixel);
-	XFillRectangle(e->dpy, win->buf.pm, gc, 0, 0, win->buf.w, win->buf.h);
-}
-
-#if HAVE_LIBFONTS
-static int win_draw_text(win_t *win, XftDraw *d, const XftColor *color,
-                         int x, int y, char *text, int len, int w)
-{
-	int err, tw = 0;
-	char *t, *next;
-	uint32_t rune;
-	XftFont *f;
-	FcCharSet *fccharset;
-	XGlyphInfo ext;
-
-	for (t = text; t - text < len; t = next) {
-		next = utf8_decode(t, &rune, &err);
-		if (XftCharExists(win->env.dpy, font, rune)) {
-			f = font;
-		} else { /* fallback font */
-			fccharset = FcCharSetCreate();
-			FcCharSetAddChar(fccharset, rune);
-			f = XftFontOpen(win->env.dpy, win->env.scr, FC_CHARSET, FcTypeCharSet,
-			                fccharset, FC_SCALABLE, FcTypeBool, FcTrue,
-			                FC_SIZE, FcTypeDouble, fontsize, NULL);
-			FcCharSetDestroy(fccharset);
-		}
-		XftTextExtentsUtf8(win->env.dpy, f, (XftChar8*)t, next - t, &ext);
-		tw += ext.xOff;
-		if (tw <= w) {
-			XftDrawStringUtf8(d, color, f, x, y, (XftChar8*)t, next - t);
-			x += ext.xOff;
-		}
-		if (f != font)
-			XftFontClose(win->env.dpy, f);
-	}
-	return tw;
-}
-
-static void win_draw_bar(win_t *win)
-{
-	int len, x, y, w, tw;
-	win_env_t *e;
-	win_bar_t *l, *r;
-	XftDraw *d;
-
-	if ((l = &win->bar.l)->buf == NULL || (r = &win->bar.r)->buf == NULL)
-		return;
-
-	e = &win->env;
-	y = (win->bar.top ? 0 : win->h) + font->ascent + V_TEXT_PAD;
-	w = win->w - 2*H_TEXT_PAD;
-	d = XftDrawCreate(e->dpy, win->buf.pm, e->vis, e->cmap);
-
-	XSetForeground(e->dpy, gc, win->bar_bg.pixel);
-	XFillRectangle(e->dpy, win->buf.pm, gc, 0, win->bar.top ? 0 : win->h, win->w, win->bar.h);
-
-	XSetForeground(e->dpy, gc, win->win_bg.pixel);
-	XSetBackground(e->dpy, gc, win->bar_bg.pixel);
-
-	if ((len = strlen(r->buf)) > 0) {
-		if ((tw = TEXTWIDTH(win, r->buf, len)) > w)
-			return;
-		x = win->w - tw - H_TEXT_PAD;
-		w -= tw;
-		win_draw_text(win, d, &win->bar_fg, x, y, r->buf, len, tw);
-	}
-	if ((len = strlen(l->buf)) > 0) {
-		x = H_TEXT_PAD;
-		w -= 2 * H_TEXT_PAD; /* gap between left and right parts */
-		win_draw_text(win, d, &win->bar_fg, x, y, l->buf, len, w);
-	}
-	XftDrawDestroy(d);
-}
-#else
-static void win_draw_bar(win_t *win)
-{
-	(void) win;
-}
-#endif /* HAVE_LIBFONTS */
-
-void win_draw(win_t *win)
-{
-	if (win->bar.h > 0)
-		win_draw_bar(win);
-
-	XSetWindowBackgroundPixmap(win->env.dpy, win->xwin, win->buf.pm);
-	XClearWindow(win->env.dpy, win->xwin);
-	XFlush(win->env.dpy);
-}
-
-void win_draw_rect(win_t *win, int x, int y, int w, int h, bool fill, int lw,
-                   unsigned long col)
-{
-	XGCValues gcval;
-
-	gcval.line_width = lw;
-	gcval.foreground = col;
-	XChangeGC(win->env.dpy, gc, GCForeground | GCLineWidth, &gcval);
-
-	if (fill)
-		XFillRectangle(win->env.dpy, win->buf.pm, gc, x, y, w, h);
-	else
-		XDrawRectangle(win->env.dpy, win->buf.pm, gc, x, y, w, h);
-}
-
-void win_set_title(win_t *win, bool init)
-{
-	size_t len, i;
-	unsigned char title[512];
-	int targets[] = { ATOM_WM_NAME, ATOM_WM_ICON_NAME, ATOM__NET_WM_NAME, ATOM__NET_WM_ICON_NAME };
-
-	if ((len = get_win_title(title, ARRLEN(title), init)) > 0) {
-		for (i = 0; i < ARRLEN(targets); ++i) {
-			XChangeProperty(win->env.dpy, win->xwin, atoms[targets[i]],
-			                atoms[ATOM_UTF8_STRING], 8, PropModeReplace, title, len);
-		}
-	}
-}
-
-void win_set_cursor(win_t *win, cursor_t cursor)
-{
-	if (cursor >= 0 && cursor < ARRLEN(cursors)) {
-		XDefineCursor(win->env.dpy, win->xwin, cursors[cursor].icon);
-		XFlush(win->env.dpy);
-	}
-}
-
-void win_cursor_pos(win_t *win, int *x, int *y)
-{
-	int i;
-	unsigned int ui;
-	Window w;
-
-	if (!XQueryPointer(win->env.dpy, win->xwin, &w, &w, &i, &i, x, y, &ui))
-		*x = *y = 0;
-}