Create integration tests for WINGs WMPixmap API.

This is a simple value type with only a constructor method. We keep duplicate type definitions in C and Rust for now, with the intention of doing something smarter later on.

.gitignore

@@ -83,13 +83,20 @@ WINGs/Tests/wtest
 WPrefs.app/WPrefs
 
 # These files are generated from make rules
+wmlib/wmlib.pc
 wrlib/wrlib.pc
 WINGs/WINGs.pc
 WINGs/WUtil.pc
 
+doc/wmaker.1
+doc/wmsetbg.1
+
 wrlib/libwraster.map
 
 WindowMaker/appearance.menu
+WindowMaker/appearance.menu.fy
+WindowMaker/appearance.menu.nl
+WindowMaker/appearance.menu.sr
 WindowMaker/menu
 WindowMaker/menu.bg
 WindowMaker/menu.fi
@@ -99,6 +106,7 @@ WindowMaker/menu.ko
 WindowMaker/menu.nl
 WindowMaker/menu.ro
 WindowMaker/menu.sk
+WindowMaker/menu.sr
 WindowMaker/menu.zh_TW
 WindowMaker/plmenu
 WindowMaker/plmenu.bg
@@ -111,6 +119,7 @@ WindowMaker/plmenu.nl
 WindowMaker/plmenu.pl
 WindowMaker/plmenu.ro
 WindowMaker/plmenu.sk
+WindowMaker/plmenu.sr
 WindowMaker/plmenu.zh_CN
 WindowMaker/plmenu.zh_TW
 WindowMaker/wmmacros
@@ -142,4 +151,11 @@ WPrefs.app/WPrefs.desktop
 .pc
 
 # Rust stuff.
-/*/target/**
+/**/target/**
+WINGs/wings-rs-tests/Cargo.lock
+WINGs/wings-rs/Cargo.lock
+WINGs/wings-rs/src/WINGsP.rs
+wmaker-rs/Cargo.lock
+wrlib-rs/src/ffi.rs
+wrlib-rs/Cargo.lock
+wutil-rs/Cargo.lock

Makefile.am

@@ -39,7 +39,7 @@ ACLOCAL_AMFLAGS = -I m4
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-silent-rules LINGUAS='*'
 
 
-SUBDIRS = wrlib wutil-rs WINGs wmaker-rs src util po WindowMaker wmlib WPrefs.app doc
+SUBDIRS = wrlib wrlib-rs wutil-rs WINGs wmaker-rs src util po WindowMaker wmlib WPrefs.app doc
 DIST_SUBDIRS = $(SUBDIRS) test
 
 EXTRA_DIST = TODO BUGS BUGFORM FAQ INSTALL \

WINGs/Makefile.am

@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS =
 
-SUBDIRS = WINGs . po Documentation Resources
+SUBDIRS = WINGs wings-rs wings-rs-tests . po Documentation Resources
 DIST_SUBDIRS = $(SUBDIRS) Tests Examples Extras
 
 libWINGs_la_LDFLAGS = -version-info @WINGS_VERSION@
@@ -10,12 +10,10 @@ libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
 
 lib_LTLIBRARIES = libWUtil.la libWINGs.la
 
-wutilrs = $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a
 wraster = $(top_builddir)/wrlib/libwraster.la
 
-LDADD= libWUtil.la libWINGs.la $(wraster) $(wutilrs) @INTLIBS@
+LDADD= libWUtil.la libWINGs.la $(wraster) @INTLIBS@
-libWINGs_la_LIBADD = libWUtil.la $(wraster) $(wutilrs) @XLIBS@ @XFT_LIBS@ @FCLIBS@ @LIBM@ @PANGO_LIBS@
+libWINGs_la_LIBADD = libWUtil.la $(wraster) @XLIBS@ @XFT_LIBS@ @FCLIBS@ @LIBM@ @PANGO_LIBS@
-libWUtil_la_LIBADD = $(wutilrs)
 
 EXTRA_DIST = BUGS make-rgb Examples Extras Tests
 
@@ -34,15 +32,12 @@ libWINGs_la_SOURCES = 	\
 	wbox.c \
 	wbrowser.c \
 	wbutton.c \
-	wcolor.c \
 	wcolorpanel.c \
 	wcolorwell.c \
 	wconfig.h \
 	wevent.c \
 	wfilepanel.c \
 	wframe.c \
-	wfont.c \
-	wfontpanel.c \
 	widgets.c \
 	winputmethod.c \
 	wlabel.c \
@@ -68,7 +63,6 @@ libWUtil_la_SOURCES = 	\
 	error.c \
 	error.h \
 	findfile.c \
-	handlers.c \
 	menuparser.c \
 	menuparser.h \
 	menuparser_macros.c \
@@ -78,8 +72,7 @@ libWUtil_la_SOURCES = 	\
 	userdefaults.h \
 	usleep.c \
 	wapplication.c \
-	wconfig.h \
+	wconfig.h
-	wutil.c
 
 
 AM_CFLAGS = @PANGO_CFLAGS@

WINGs/Tests/Makefile.am

@@ -4,14 +4,17 @@ AUTOMAKE_OPTIONS =
 
 noinst_PROGRAMS = wtest wmquery wmfile testmywidget
 
-LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+LDADD= $(top_builddir)/WINGs/libWINGs.la \
+	$(top_builddir)/wrlib/libwraster.la \
 	$(top_builddir)/WINGs/libWUtil.la \
-	@XFT_LIBS@ @INTLIBS@ @XLIBS@
+	$(top_builddir)/WINGs/wings-rs/target/debug/libwings_rs.a \
+	@XFT_LIBS@ @INTLIBS@ @XLIBS@ @FCLIBS@ @PANGO_LIBS@
 
 
 testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
 
-wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
+	$(top_builddir)/WINGs/wings-rs/target/debug/libwings_rs.a
 
 
 EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png

WINGs/WINGs/WINGs.h

@@ -132,7 +132,7 @@ typedef enum {
 } WMButtonType;
 
 /* button behaviour masks */
-enum {
+typedef enum {
     WBBSpringLoadedMask = (1 << 0),
     WBBPushInMask       = (1 << 1),
     WBBPushChangeMask   = (1 << 2),
@@ -140,7 +140,7 @@ enum {
     WBBStateLightMask   = (1 << 5),
     WBBStateChangeMask  = (1 << 6),
     WBBStatePushMask    = (1 << 7)
-};
+} WMButtonBehaviorMask;
 
 
 /* frame title positions */
@@ -778,12 +778,8 @@ void WMSetViewDragDestinationProcs(WMView *view, WMDragDestinationProcs *procs);
 
 /* ---[ WINGs/wfont.c ]--------------------------------------------------- */
 
-Bool WMIsAntialiasingEnabled(WMScreen *scrPtr);
-
 WMFont* WMCreateFont(WMScreen *scrPtr, const char *fontName);
 
-WMFont* WMCopyFontWithStyle(WMScreen *scrPtr, WMFont *font, WMFontStyle style);
-
 WMFont* WMRetainFont(WMFont *font);
 
 void WMReleaseFont(WMFont *font);
@@ -792,12 +788,10 @@ char* WMGetFontName(WMFont *font);
 
 unsigned int WMFontHeight(WMFont *font);
 
+unsigned int WMFontAscent(WMFont *font);
+
 void WMGetScaleBaseFromSystemFont(WMScreen *scrPtr, int *alphabetWidth, int *fontHeight);
 
-void WMSetWidgetDefaultFont(WMScreen *scr, WMFont *font);
-
-void WMSetWidgetDefaultBoldFont(WMScreen *scr, WMFont *font);
-
 WMFont* WMDefaultSystemFont(WMScreen *scrPtr);
 
 WMFont* WMDefaultBoldSystemFont(WMScreen *scrPtr);
@@ -815,6 +809,8 @@ void WMDrawImageString(WMScreen *scr, Drawable d, WMColor *color,
 
 int WMWidthOfString(WMFont *font, const char *text, int length);
 
+struct _XftFont *WMFontXftFont(WMFont *font);
+
 /* ---[ WINGs/wpixmap.c ]------------------------------------------------- */
 
 WMPixmap* WMRetainPixmap(WMPixmap *pixmap);
@@ -856,7 +852,7 @@ Pixmap WMGetPixmapMaskXID(WMPixmap *pixmap);
 
 WMPixmap* WMGetSystemPixmap(WMScreen *scr, int image);
 
-/* ---[ WINGs/wcolor.c ]-------------------------------------------------- */
+/* ---[ WINGs/wings-rs/src/color.rs ]------------------------------------- */
 
 
 WMColor* WMDarkGrayColor(WMScreen *scr);
@@ -1043,11 +1039,7 @@ void WMCloseWindow(WMWindow *win);
 
 void WMSetButtonAction(WMButton *bPtr, WMAction *action, void *clientData);
 
-#define WMCreateCommandButton(parent) \
+WMButton* WMCreateCommandButton(WMWidget *parent);
-    WMCreateCustomButton((parent), WBBSpringLoadedMask\
-    |WBBPushInMask\
-    |WBBPushLightMask\
-    |WBBPushChangeMask)
 
 #define WMCreateRadioButton(parent) \
     WMCreateButton((parent), WBTRadio)

WINGs/WINGs/WINGsP.h.in

@@ -67,8 +67,10 @@ typedef struct W_DraggingInfo {
 
 /* ---[ Structures from WINGs.h ]----------------------------------------- */
 
-/* Pre-definition of internal structs */
+/* Opaque primitive types defined in Rust. */
 typedef struct W_Color W_Color;
+
+/* Pre-definition of internal structs */
 typedef struct W_Pixmap W_Pixmap;
 typedef struct W_View W_View;
 
@@ -122,8 +124,6 @@ typedef struct W_Screen {
     WMOpenPanel *sharedOpenPanel;
     WMSavePanel *sharedSavePanel;
 
-    struct W_FontPanel *sharedFontPanel;
-
     struct W_ColorPanel *sharedColorPanel;
 
     Pixmap stipple;
@@ -132,10 +132,10 @@ typedef struct W_Screen {
     W_DraggingInfo dragInfo;
 
     /* colors */
-    W_Color *white;
+    WMColor *white;
-    W_Color *black;
+    WMColor *black;
-    W_Color *gray;
+    WMColor *gray;
-    W_Color *darkGray;
+    WMColor *darkGray;
 
     GC stippleGC;
 
@@ -152,11 +152,11 @@ typedef struct W_Screen {
 
     GC drawImStringGC;                 /* for WMDrawImageString() */
 
-    struct W_Font *normalFont;
+    WMFont *normalFont;
 
-    struct W_Font *boldFont;
+    WMFont *boldFont;
 
-    WMHashTable *fontCache;
+    void *fontCache;                   /* owned/maintainted by wings-rs/src/screen.rs */
 
     Bool antialiasedText;
 
@@ -369,8 +369,12 @@ Bool W_CheckIdleHandlers(void);
 
 void W_CheckTimerHandlers(void);
 
-Bool W_HandleInputEvents(Bool waitForInput, int inputfd);
+/*
-
+ * Returns the duration in milliseconds until the next timer event should go off
+ * (saturating at INT_MAX). If there is no such timer event, returns a negative
+ * value.
+ */
+int W_DelayUntilNextTimerEvent_millis();
 
 /* ---[ notification.c ]-------------------------------------------------- */
 
@@ -378,6 +382,8 @@ void W_InitNotificationCenter(void);
 
 void W_ReleaseNotificationCenter(void);
 
+void W_ClearNotificationCenter(void);
+
 
 /* ---[ selection.c ]----------------------------------------------------- */
 
@@ -409,23 +415,6 @@ void W_BalloonHandleEnterView(WMView *view);
 void W_BalloonHandleLeaveView(WMView *view);
 
 
-/* ---[ wcolor.c ]-------------------------------------------------------- */
-
-struct W_Color {
-    struct W_Screen *screen;
-
-    XColor color;
-    unsigned short alpha;
-    short refCount;
-    GC gc;
-    struct {
-        unsigned int exact:1;
-    } flags;
-};
-
-#define W_PIXEL(c)		(c)->color.pixel
-
-
 /* ---[ wevent.c ]-------------------------------------------------------- */
 
 typedef struct W_EventHandler {
@@ -441,24 +430,6 @@ typedef struct W_EventHandler {
 void W_CallDestroyHandlers(W_View *view);
 
 
-/* ---[ wfont.c ]--------------------------------------------------------- */
-
-typedef struct W_Font {
-    struct W_Screen *screen;
-
-    struct _XftFont *font;
-
-    short height;
-    short y;
-    short refCount;
-    char *name;
-
-@USE_PANGO@    PangoLayout *layout;
-} W_Font;
-
-#define W_FONTID(f)		(f)->font->fid
-
-
 /* ---[ widgets.c ]------------------------------------------------------- */
 
 #define WC_UserWidget	128
@@ -504,7 +475,7 @@ void W_DrawReliefWithGC(W_Screen *scr, Drawable d, int x, int y,
                         GC black, GC dark, GC light, GC white);
 
 void W_PaintTextAndImage(W_View *view, int wrap, WMColor *textColor,
-                         W_Font *font, WMReliefType relief, const char *text,
+                         WMFont *font, WMReliefType relief, const char *text,
                          WMAlignment alignment, W_Pixmap *image,
                          WMImagePosition position, WMColor *backColor, int ofs);
 

WINGs/WINGs/WUtil.h

@@ -156,12 +156,7 @@ typedef struct {
 
 
 
-/* DO NOT ACCESS THE CONTENTS OF THIS STRUCT */
+typedef struct WMHashEnumerator WMHashEnumerator;
-typedef struct {
-    void *table;
-    void *nextItem;
-    int index;
-} WMHashEnumerator;
 
 
 typedef struct {
@@ -286,7 +281,7 @@ char* wtrimspace(const char *s);
  */
 char *wshellquote(const char *s);
 
-/* ---[ WINGs/misc.c ]--------------------------------------------------- */
+/* ---[ wutil-rs/src/range.rs ]------------------------------------------ */
 
 WMRange wmkrange(int start, int count);
 
@@ -302,34 +297,20 @@ void wusleep(unsigned int usec);
 
 /* Event handlers: timer, idle, input */
 
-WMHandlerID WMAddTimerHandler(int milliseconds, WMCallback *callback,
+WMHandlerID WMAddTimerHandler(unsigned milliseconds, WMCallback *callback,
                               void *cdata);
 
-WMHandlerID WMAddPersistentTimerHandler(int milliseconds, WMCallback *callback,
+WMHandlerID WMAddPersistentTimerHandler(unsigned milliseconds, WMCallback *callback,
                                         void *cdata);
 
-void WMDeleteTimerWithClientData(void *cdata);
-
 void WMDeleteTimerHandler(WMHandlerID handlerID);
 
 WMHandlerID WMAddIdleHandler(WMCallback *callback, void *cdata);
 
 void WMDeleteIdleHandler(WMHandlerID handlerID);
 
-WMHandlerID WMAddInputHandler(int fd, int condition, WMInputProc *proc,
-                              void *clientData);
 
-void WMDeleteInputHandler(WMHandlerID handlerID);
+/* ---[ wutil-rs/src/hash_table.rs ]----------------------------------------------- */
-
-
-/* This function is used _only_ if you create a non-GUI program.
- * For GUI based programs use WMNextEvent()/WMHandleEvent() instead.
- * This function will handle all input/timer/idle events, then return.
- */
-
-void WHandleEvents(void);
-
-/* ---[ WINGs/hashtable.c ]----------------------------------------------- */
 
 
 WMHashTable* WMCreateIdentityHashTable();
@@ -361,7 +342,7 @@ void* WMHashInsert(WMHashTable *table, const void *key, const void *data);
 void WMHashRemove(WMHashTable *table, const void *key);
 
 /* warning: do not manipulate the table while using the enumerator functions */
-WMHashEnumerator WMEnumerateHashTable(WMHashTable *table);
+WMHashEnumerator* WMEnumerateHashTable(WMHashTable *table);
 
 void* WMNextHashEnumeratorItem(WMHashEnumerator *enumerator);
 
@@ -376,7 +357,7 @@ Bool WMNextHashEnumeratorItemAndKey(WMHashEnumerator *enumerator,
                                     void **item, void **key);
 
 
-
+void WMFreeHashEnumerator(WMHashEnumerator *enumerator);
 
 /* some predefined callback sets */
 

WINGs/handlers.c

@@ -1,554 +0,0 @@
-
-/*
- * WINGs internal handlers: timer, idle and input handlers
- */
-
-#include "wconfig.h"
-#include "WINGsP.h"
-
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <X11/Xos.h>
-
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
-
-#include <time.h>
-
-#ifndef X_GETTIMEOFDAY
-#define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
-#endif
-
-typedef struct TimerHandler {
-	WMCallback *callback;	/* procedure to call */
-	struct timeval when;	/* when to call the callback */
-	void *clientData;
-	struct TimerHandler *next;
-	int nextDelay;		/* 0 if it's one-shot */
-} TimerHandler;
-
-typedef struct IdleHandler {
-	WMCallback *callback;
-	void *clientData;
-} IdleHandler;
-
-typedef struct InputHandler {
-	WMInputProc *callback;
-	void *clientData;
-	int fd;
-	int mask;
-} InputHandler;
-
-/* queue of timer event handlers */
-static TimerHandler *timerHandler = NULL;
-
-static WMArray *idleHandler = NULL;
-
-static WMArray *inputHandler = NULL;
-
-#define timerPending()	(timerHandler)
-
-static void rightNow(struct timeval *tv)
-{
-	X_GETTIMEOFDAY(tv);
-}
-
-/* is t1 after t2 ? */
-#define IS_AFTER(t1, t2)	(((t1).tv_sec > (t2).tv_sec) || \
-    (((t1).tv_sec == (t2).tv_sec) \
-    && ((t1).tv_usec > (t2).tv_usec)))
-
-#define IS_ZERO(tv) (tv.tv_sec == 0 && tv.tv_usec == 0)
-
-#define SET_ZERO(tv) tv.tv_sec = 0, tv.tv_usec = 0
-
-static void addmillisecs(struct timeval *tv, int milliseconds)
-{
-	tv->tv_usec += milliseconds * 1000;
-
-	tv->tv_sec += tv->tv_usec / 1000000;
-	tv->tv_usec = tv->tv_usec % 1000000;
-}
-
-static void enqueueTimerHandler(TimerHandler * handler)
-{
-	TimerHandler *tmp;
-
-	/* insert callback in queue, sorted by time left */
-	if (!timerHandler || !IS_AFTER(handler->when, timerHandler->when)) {
-		/* first in the queue */
-		handler->next = timerHandler;
-		timerHandler = handler;
-	} else {
-		tmp = timerHandler;
-		while (tmp->next && IS_AFTER(handler->when, tmp->next->when)) {
-			tmp = tmp->next;
-		}
-		handler->next = tmp->next;
-		tmp->next = handler;
-	}
-}
-
-static void delayUntilNextTimerEvent(struct timeval *delay)
-{
-	struct timeval now;
-	TimerHandler *handler;
-
-	handler = timerHandler;
-	while (handler && IS_ZERO(handler->when))
-		handler = handler->next;
-
-	if (!handler) {
-		/* The return value of this function is only valid if there _are_
-		   timers active. */
-		delay->tv_sec = 0;
-		delay->tv_usec = 0;
-		return;
-	}
-
-	rightNow(&now);
-	if (IS_AFTER(now, handler->when)) {
-		delay->tv_sec = 0;
-		delay->tv_usec = 0;
-	} else {
-		delay->tv_sec = handler->when.tv_sec - now.tv_sec;
-		delay->tv_usec = handler->when.tv_usec - now.tv_usec;
-		if (delay->tv_usec < 0) {
-			delay->tv_usec += 1000000;
-			delay->tv_sec--;
-		}
-	}
-}
-
-WMHandlerID WMAddTimerHandler(int milliseconds, WMCallback * callback, void *cdata)
-{
-	TimerHandler *handler;
-
-	handler = wmalloc(sizeof(TimerHandler));
-	if (!handler)
-		return NULL;
-
-	rightNow(&handler->when);
-	addmillisecs(&handler->when, milliseconds);
-	handler->callback = callback;
-	handler->clientData = cdata;
-	handler->nextDelay = 0;
-
-	enqueueTimerHandler(handler);
-
-	return handler;
-}
-
-WMHandlerID WMAddPersistentTimerHandler(int milliseconds, WMCallback * callback, void *cdata)
-{
-	TimerHandler *handler = WMAddTimerHandler(milliseconds, callback, cdata);
-
-	if (handler != NULL)
-		handler->nextDelay = milliseconds;
-
-	return handler;
-}
-
-void WMDeleteTimerWithClientData(void *cdata)
-{
-	TimerHandler *handler, *tmp;
-
-	if (!cdata || !timerHandler)
-		return;
-
-	tmp = timerHandler;
-	if (tmp->clientData == cdata) {
-		tmp->nextDelay = 0;
-		if (!IS_ZERO(tmp->when)) {
-			timerHandler = tmp->next;
-			wfree(tmp);
-		}
-	} else {
-		while (tmp->next) {
-			if (tmp->next->clientData == cdata) {
-				handler = tmp->next;
-				handler->nextDelay = 0;
-				if (IS_ZERO(handler->when))
-					break;
-				tmp->next = handler->next;
-				wfree(handler);
-				break;
-			}
-			tmp = tmp->next;
-		}
-	}
-}
-
-void WMDeleteTimerHandler(WMHandlerID handlerID)
-{
-	TimerHandler *tmp, *handler = (TimerHandler *) handlerID;
-
-	if (!handler || !timerHandler)
-		return;
-
-	tmp = timerHandler;
-
-	handler->nextDelay = 0;
-
-	if (IS_ZERO(handler->when))
-		return;
-
-	if (tmp == handler) {
-		timerHandler = handler->next;
-		wfree(handler);
-	} else {
-		while (tmp->next) {
-			if (tmp->next == handler) {
-				tmp->next = handler->next;
-				wfree(handler);
-				break;
-			}
-			tmp = tmp->next;
-		}
-	}
-}
-
-WMHandlerID WMAddIdleHandler(WMCallback * callback, void *cdata)
-{
-	IdleHandler *handler;
-
-	handler = wmalloc(sizeof(IdleHandler));
-	if (!handler)
-		return NULL;
-
-	handler->callback = callback;
-	handler->clientData = cdata;
-	/* add handler at end of queue */
-	if (!idleHandler) {
-		idleHandler = WMCreateArrayWithDestructor(16, wfree);
-	}
-	WMAddToArray(idleHandler, handler);
-
-	return handler;
-}
-
-void WMDeleteIdleHandler(WMHandlerID handlerID)
-{
-	IdleHandler *handler = (IdleHandler *) handlerID;
-
-	if (!handler || !idleHandler)
-		return;
-
-	WMRemoveFromArray(idleHandler, handler);
-}
-
-WMHandlerID WMAddInputHandler(int fd, int condition, WMInputProc * proc, void *clientData)
-{
-	InputHandler *handler;
-
-	handler = wmalloc(sizeof(InputHandler));
-
-	handler->fd = fd;
-	handler->mask = condition;
-	handler->callback = proc;
-	handler->clientData = clientData;
-
-	if (!inputHandler)
-		inputHandler = WMCreateArrayWithDestructor(16, wfree);
-	WMAddToArray(inputHandler, handler);
-
-	return handler;
-}
-
-void WMDeleteInputHandler(WMHandlerID handlerID)
-{
-	InputHandler *handler = (InputHandler *) handlerID;
-
-	if (!handler || !inputHandler)
-		return;
-
-	WMRemoveFromArray(inputHandler, handler);
-}
-
-Bool W_CheckIdleHandlers(void)
-{
-	IdleHandler *handler;
-	WMArray *handlerCopy;
-	WMArrayIterator iter;
-
-	if (!idleHandler || WMGetArrayItemCount(idleHandler) == 0) {
-		/* make sure an observer in queue didn't added an idle handler */
-		return (idleHandler != NULL && WMGetArrayItemCount(idleHandler) > 0);
-	}
-
-	handlerCopy = WMCreateArrayWithArray(idleHandler);
-
-	WM_ITERATE_ARRAY(handlerCopy, handler, iter) {
-		/* check if the handler still exist or was removed by a callback */
-		if (WMGetFirstInArray(idleHandler, handler) == WANotFound)
-			continue;
-
-		(*handler->callback) (handler->clientData);
-		WMDeleteIdleHandler(handler);
-	}
-
-	WMFreeArray(handlerCopy);
-
-	/* this is not necesarrily False, because one handler can re-add itself */
-	return (WMGetArrayItemCount(idleHandler) > 0);
-}
-
-void W_CheckTimerHandlers(void)
-{
-	TimerHandler *handler;
-	struct timeval now;
-
-	if (!timerHandler) {
-		return;
-	}
-
-	rightNow(&now);
-
-	handler = timerHandler;
-	while (handler && IS_AFTER(now, handler->when)) {
-		if (!IS_ZERO(handler->when)) {
-			SET_ZERO(handler->when);
-			(*handler->callback) (handler->clientData);
-		}
-		handler = handler->next;
-	}
-
-	while (timerHandler && IS_ZERO(timerHandler->when)) {
-		handler = timerHandler;
-		timerHandler = timerHandler->next;
-
-		if (handler->nextDelay > 0) {
-			handler->when = now;
-			addmillisecs(&handler->when, handler->nextDelay);
-			enqueueTimerHandler(handler);
-		} else {
-			wfree(handler);
-		}
-	}
-}
-
-/*
- * This functions will handle input events on all registered file descriptors.
- * Input:
- *    - waitForInput - True if we want the function to wait until an event
- *                     appears on a file descriptor we watch, False if we
- *                     want the function to immediately return if there is
- *                     no data available on the file descriptors we watch.
- *    - inputfd      - Extra input file descriptor to watch for input.
- *                     This is only used when called from wevent.c to watch
- *                     on ConnectionNumber(dpy) to avoid blocking of X events
- *                     if we wait for input from other file handlers.
- * Output:
- *    if waitForInput is False, the function will return False if there are no
- *                     input handlers registered, or if there is no data
- *                     available on the registered ones, and will return True
- *                     if there is at least one input handler that has data
- *                     available.
- *    if waitForInput is True, the function will return False if there are no
- *                     input handlers registered, else it will block until an
- *                     event appears on one of the file descriptors it watches
- *                     and then it will return True.
- *
- * If the retured value is True, the input handlers for the corresponding file
- * descriptors are also called.
- *
- * Parametersshould be passed like this:
- * - from wevent.c:
- *   waitForInput - apropriate value passed by the function who called us
- *   inputfd = ConnectionNumber(dpy)
- * - from wutil.c:
- *   waitForInput - apropriate value passed by the function who called us
- *   inputfd = -1
- *
- */
-Bool W_HandleInputEvents(Bool waitForInput, int inputfd)
-{
-#if defined(HAVE_POLL) && defined(HAVE_POLL_H) && !defined(HAVE_SELECT)
-	struct poll fd *fds;
-	InputHandler *handler;
-	int count, timeout, nfds, i, extrafd;
-
-	extrafd = (inputfd < 0) ? 0 : 1;
-
-	if (inputHandler)
-		nfds = WMGetArrayItemCount(inputHandler);
-	else
-		nfds = 0;
-
-	if (!extrafd && nfds == 0) {
-		return False;
-	}
-
-	fds = wmalloc((nfds + extrafd) * sizeof(struct pollfd));
-	if (extrafd) {
-		/* put this to the end of array to avoid using ranges from 1 to nfds+1 */
-		fds[nfds].fd = inputfd;
-		fds[nfds].events = POLLIN;
-	}
-
-	/* use WM_ITERATE_ARRAY() here */
-	for (i = 0; i < nfds; i++) {
-		handler = WMGetFromArray(inputHandler, i);
-		fds[i].fd = handler->fd;
-		fds[i].events = 0;
-		if (handler->mask & WIReadMask)
-			fds[i].events |= POLLIN;
-
-		if (handler->mask & WIWriteMask)
-			fds[i].events |= POLLOUT;
-
-#if 0				/* FIXME */
-		if (handler->mask & WIExceptMask)
-			FD_SET(handler->fd, &eset);
-#endif
-	}
-
-	/*
-	 * Setup the timeout to the estimated time until the
-	 * next timer expires.
-	 */
-	if (!waitForInput) {
-		timeout = 0;
-	} else if (timerPending()) {
-		struct timeval tv;
-		delayUntilNextTimerEvent(&tv);
-		timeout = tv.tv_sec * 1000 + tv.tv_usec / 1000;
-	} else {
-		timeout = -1;
-	}
-
-	count = poll(fds, nfds + extrafd, timeout);
-
-	if (count > 0 && nfds > 0) {
-		WMArray *handlerCopy = WMCreateArrayWithArray(inputHandler);
-		int mask;
-
-		/* use WM_ITERATE_ARRAY() here */
-		for (i = 0; i < nfds; i++) {
-			handler = WMGetFromArray(handlerCopy, i);
-			/* check if the handler still exist or was removed by a callback */
-			if (WMGetFirstInArray(inputHandler, handler) == WANotFound)
-				continue;
-
-			mask = 0;
-
-			if ((handler->mask & WIReadMask) &&
-			    (fds[i].revents & (POLLIN | POLLRDNORM | POLLRDBAND | POLLPRI)))
-				mask |= WIReadMask;
-
-			if ((handler->mask & WIWriteMask) && (fds[i].revents & (POLLOUT | POLLWRBAND)))
-				mask |= WIWriteMask;
-
-			if ((handler->mask & WIExceptMask) && (fds[i].revents & (POLLHUP | POLLNVAL | POLLERR)))
-				mask |= WIExceptMask;
-
-			if (mask != 0 && handler->callback) {
-				(*handler->callback) (handler->fd, mask, handler->clientData);
-			}
-		}
-
-		WMFreeArray(handlerCopy);
-	}
-
-	wfree(fds);
-
-	return (count > 0);
-#else
-#ifdef HAVE_SELECT
-	struct timeval timeout;
-	struct timeval *timeoutPtr;
-	fd_set rset, wset, eset;
-	int maxfd, nfds, i;
-	int count;
-	InputHandler *handler;
-
-	if (inputHandler)
-		nfds = WMGetArrayItemCount(inputHandler);
-	else
-		nfds = 0;
-
-	if (inputfd < 0 && nfds == 0) {
-		return False;
-	}
-
-	FD_ZERO(&rset);
-	FD_ZERO(&wset);
-	FD_ZERO(&eset);
-
-	if (inputfd < 0) {
-		maxfd = 0;
-	} else {
-		FD_SET(inputfd, &rset);
-		maxfd = inputfd;
-	}
-
-	/* use WM_ITERATE_ARRAY() here */
-	for (i = 0; i < nfds; i++) {
-		handler = WMGetFromArray(inputHandler, i);
-		if (handler->mask & WIReadMask)
-			FD_SET(handler->fd, &rset);
-
-		if (handler->mask & WIWriteMask)
-			FD_SET(handler->fd, &wset);
-
-		if (handler->mask & WIExceptMask)
-			FD_SET(handler->fd, &eset);
-
-		if (maxfd < handler->fd)
-			maxfd = handler->fd;
-	}
-
-	/*
-	 * Setup the timeout to the estimated time until the
-	 * next timer expires.
-	 */
-	if (!waitForInput) {
-		SET_ZERO(timeout);
-		timeoutPtr = &timeout;
-	} else if (timerPending()) {
-		delayUntilNextTimerEvent(&timeout);
-		timeoutPtr = &timeout;
-	} else {
-		timeoutPtr = (struct timeval *)0;
-	}
-
-	count = select(1 + maxfd, &rset, &wset, &eset, timeoutPtr);
-
-	if (count > 0 && nfds > 0) {
-		WMArray *handlerCopy = WMCreateArrayWithArray(inputHandler);
-		int mask;
-
-		/* use WM_ITERATE_ARRAY() here */
-		for (i = 0; i < nfds; i++) {
-			handler = WMGetFromArray(handlerCopy, i);
-			/* check if the handler still exist or was removed by a callback */
-			if (WMGetFirstInArray(inputHandler, handler) == WANotFound)
-				continue;
-
-			mask = 0;
-
-			if ((handler->mask & WIReadMask) && FD_ISSET(handler->fd, &rset))
-				mask |= WIReadMask;
-
-			if ((handler->mask & WIWriteMask) && FD_ISSET(handler->fd, &wset))
-				mask |= WIWriteMask;
-
-			if ((handler->mask & WIExceptMask) && FD_ISSET(handler->fd, &eset))
-				mask |= WIExceptMask;
-
-			if (mask != 0 && handler->callback) {
-				(*handler->callback) (handler->fd, mask, handler->clientData);
-			}
-		}
-
-		WMFreeArray(handlerCopy);
-	}
-
-	return (count > 0);
-#else				/* not HAVE_SELECT, not HAVE_POLL */
-# error   Neither select nor poll. You lose.
-#endif				/* HAVE_SELECT */
-#endif				/* HAVE_POLL */
-}

WINGs/misc.c

@@ -24,16 +24,6 @@
 
 #include "error.h"
 
-WMRange wmkrange(int start, int count)
-{
-	WMRange range;
-
-	range.position = start;
-	range.count = count;
-
-	return range;
-}
-
 /*
  * wutil_shutdown - cleanup in WUtil when user program wants to exit
  */

WINGs/wballoon.c

@@ -456,12 +456,12 @@ static void handleEvents(XEvent * event, void *data)
 
 static void destroyBalloon(Balloon * bPtr)
 {
-	WMHashEnumerator e;
+	WMHashEnumerator *e;
 	char *str;
 
 	e = WMEnumerateHashTable(bPtr->table);
 
-	while ((str = WMNextHashEnumeratorItem(&e))) {
+	while ((str = WMNextHashEnumeratorItem(e))) {
 		wfree(str);
 	}
 	WMFreeHashTable(bPtr->table);
@@ -472,5 +472,7 @@ static void destroyBalloon(Balloon * bPtr)
 	if (bPtr->font)
 		WMReleaseFont(bPtr->font);
 
+	WMFreeHashEnumerator(e);
+
 	wfree(bPtr);
 }

WINGs/wbutton.c

@@ -216,6 +216,14 @@ WMButton *WMCreateButton(WMWidget * parent, WMButtonType type)
 	return bPtr;
 }
 
+WMButton *WMCreateCommandButton(WMWidget *parent)
+{
+	return WMCreateCustomButton(
+		parent,
+		WBBSpringLoadedMask|WBBPushInMask|WBBPushLightMask|WBBPushChangeMask
+	);
+}
+
 static void updateDisabledMask(WMButton * bPtr)
 {
 	WMScreen *scr = WMWidgetScreen(bPtr);

WINGs/wcolorpanel.c

@@ -1292,7 +1292,7 @@ void WMSetColorPanelPickerMode(WMColorPanel * panel, WMColorPanelMode mode)
 	panel->mode = mode;
 }
 
-WMColor *WMGetColorPanelColor(WMColorPanel * panel)
+WMColor* WMGetColorPanelColor(WMColorPanel * panel)
 {
 	return WMGetColorWellColor(panel->colorWell);
 }
@@ -1301,9 +1301,9 @@ void WMSetColorPanelColor(WMColorPanel * panel, WMColor * color)
 {
 	WMSetColorWellColor(panel->colorWell, color);
 
-	panel->color.rgb.red = color->color.red >> 8;
+	panel->color.rgb.red = (WMRedComponentOfColor(color) >> 8);
-	panel->color.rgb.green = color->color.green >> 8;
+	panel->color.rgb.green = (WMGreenComponentOfColor(color) >> 8);
-	panel->color.rgb.blue = color->color.blue >> 8;
+	panel->color.rgb.blue = (WMBlueComponentOfColor(color) >> 8);
 	panel->color.set = cpRGB;
 
 	if (panel->mode == panel->lastChanged)

WINGs/wevent.c

@@ -3,8 +3,17 @@
  * This event handling stuff was inspired on Tk.
  */
 
+#include "wconfig.h"
 #include "WINGsP.h"
 
+#if !HAVE_POLL
+# error poll(2) is not present on this system
+#endif
+
+#if HAVE_POLL_H
+# include <poll.h>
+#endif
+
 /* table to map event types to event masks */
 static const unsigned long eventMasks[] = {
 	0,
@@ -349,6 +358,9 @@ int WMIsDoubleClick(XEvent * event)
  */
 static Bool waitForEvent(Display * dpy, unsigned long xeventmask, Bool waitForInput)
 {
+	struct pollfd pfd;
+ 	int timeout, inputfd;
+
 	XSync(dpy, False);
 	if (xeventmask == 0) {
 		if (XPending(dpy))
@@ -361,7 +373,18 @@ static Bool waitForEvent(Display * dpy, unsigned long xeventmask, Bool waitForIn
 		}
 	}
 
-	return W_HandleInputEvents(waitForInput, ConnectionNumber(dpy));
+	inputfd = ConnectionNumber(dpy);
+
+	if (inputfd < 0) {
+		return False;
+	}
+ 
+	pfd.fd = inputfd;
+	pfd.events = POLLIN;
+
+	timeout = waitForInput ? W_DelayUntilNextTimerEvent_millis() : 0;
+
+	return poll(&pfd, 1, timeout) > 0;
 }
 
 void WMNextEvent(Display * dpy, XEvent * event)

WINGs/wfont.c

@@ -1,433 +0,0 @@
-
-#include <stdlib.h>
-
-#include "wconfig.h"
-
-#include "WINGsP.h"
-
-#include <wraster.h>
-#include <assert.h>
-#include <X11/Xlocale.h>
-
-#include <X11/Xft/Xft.h>
-#include <fontconfig/fontconfig.h>
-
-#ifdef USE_PANGO
-#include <pango/pango.h>
-#include <pango/pangofc-fontmap.h>
-#include <pango/pangoxft.h>
-#endif
-
-#define DEFAULT_FONT "sans serif:pixelsize=12"
-
-#define DEFAULT_SIZE WINGsConfiguration.defaultFontSize
-
-static FcPattern *xlfdToFcPattern(const char *xlfd)
-{
-	FcPattern *pattern;
-	char *fname, *ptr;
-
-	/* Just skip old font names that contain %d in them.
-	 * We don't support that anymore. */
-	if (strchr(xlfd, '%') != NULL)
-		return FcNameParse((FcChar8 *) DEFAULT_FONT);
-
-	fname = wstrdup(xlfd);
-	if ((ptr = strchr(fname, ','))) {
-		*ptr = 0;
-	}
-	pattern = XftXlfdParse(fname, False, False);
-	wfree(fname);
-
-	if (!pattern) {
-		wwarning(_("invalid font: %s. Trying '%s'"), xlfd, DEFAULT_FONT);
-		pattern = FcNameParse((FcChar8 *) DEFAULT_FONT);
-	}
-
-	return pattern;
-}
-
-static char *xlfdToFcName(const char *xlfd)
-{
-	FcPattern *pattern;
-	char *fname;
-	char *result;
-
-	pattern = xlfdToFcPattern(xlfd);
-	fname = (char *)FcNameUnparse(pattern);
-	result = wstrdup(fname);
-	free(fname);
-	FcPatternDestroy(pattern);
-
-	return result;
-}
-
-static Bool hasProperty(FcPattern * pattern, const char *property)
-{
-	FcValue val;
-
-	if (FcPatternGet(pattern, property, 0, &val) == FcResultMatch) {
-		return True;
-	}
-
-	return False;
-}
-
-static Bool hasPropertyWithStringValue(FcPattern * pattern, const char *object, const char *value)
-{
-	FcChar8 *str;
-	int id;
-
-	if (!value || value[0] == 0)
-		return True;
-
-	id = 0;
-	while (FcPatternGetString(pattern, object, id, &str) == FcResultMatch) {
-		if (strcasecmp(value, (char *)str) == 0) {
-			return True;
-		}
-		id++;
-	}
-
-	return False;
-}
-
-static char *makeFontOfSize(const char *font, int size, const char *fallback)
-{
-	FcPattern *pattern;
-	char *name;
-	char *result;
-
-	if (font[0] == '-') {
-		pattern = xlfdToFcPattern(font);
-	} else {
-		pattern = FcNameParse((const FcChar8 *) font);
-	}
-
-	/*FcPatternPrint(pattern); */
-
-	if (size > 0) {
-		FcPatternDel(pattern, FC_PIXEL_SIZE);
-		FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)size);
-	} else if (size == 0 && !hasProperty(pattern, "size") && !hasProperty(pattern, FC_PIXEL_SIZE)) {
-		FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)DEFAULT_SIZE);
-	}
-
-	if (fallback && !hasPropertyWithStringValue(pattern, FC_FAMILY, fallback)) {
-		FcPatternAddString(pattern, FC_FAMILY, (const FcChar8 *) fallback);
-	}
-
-	/*FcPatternPrint(pattern); */
-
-	name = (char *)FcNameUnparse(pattern);
-	result = wstrdup(name);
-	free(name);
-	FcPatternDestroy(pattern);
-
-	return result;
-}
-
-WMFont *WMCreateFont(WMScreen * scrPtr, const char *fontName)
-{
-	Display *display = scrPtr->display;
-	WMFont *font;
-	char *fname;
-#ifdef USE_PANGO
-	PangoFontMap *fontmap;
-	PangoContext *context;
-	PangoLayout *layout;
-	FcPattern *pattern;
-	PangoFontDescription *description;
-	double size;
-#endif
-
-	if (fontName[0] == '-') {
-		fname = xlfdToFcName(fontName);
-	} else {
-		fname = wstrdup(fontName);
-	}
-
-	if (!WINGsConfiguration.antialiasedText && !strstr(fname, ":antialias=")) {
-		fname = wstrappend(fname, ":antialias=false");
-	}
-
-	font = WMHashGet(scrPtr->fontCache, fname);
-	if (font) {
-		WMRetainFont(font);
-		wfree(fname);
-		return font;
-	}
-
-	font = wmalloc(sizeof(WMFont));
-
-	font->screen = scrPtr;
-
-	font->font = XftFontOpenName(display, scrPtr->screen, fname);
-	if (!font->font) {
-		wfree(font);
-		wfree(fname);
-		return NULL;
-	}
-
-	font->height = font->font->ascent + font->font->descent;
-	font->y = font->font->ascent;
-
-	font->refCount = 1;
-
-	font->name = fname;
-
-#ifdef USE_PANGO
-	fontmap = pango_xft_get_font_map(scrPtr->display, scrPtr->screen);
-	context = pango_font_map_create_context(fontmap);
-	layout = pango_layout_new(context);
-
-	pattern = FcNameParse((FcChar8 *) font->name);
-	description = pango_fc_font_description_from_pattern(pattern, FALSE);
-
-	/* Pango examines FC_SIZE but not FC_PIXEL_SIZE of the patten, but
-	 * font-name has only "pixelsize", so set the size manually here.
-	 */
-	if (FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &size) == FcResultMatch)
-		pango_font_description_set_absolute_size(description, size * PANGO_SCALE);
-
-	pango_layout_set_font_description(layout, description);
-
-	font->layout = layout;
-#endif
-
-	assert(WMHashInsert(scrPtr->fontCache, font->name, font) == NULL);
-
-	return font;
-}
-
-WMFont *WMRetainFont(WMFont * font)
-{
-	wassertrv(font != NULL, NULL);
-
-	font->refCount++;
-
-	return font;
-}
-
-void WMReleaseFont(WMFont * font)
-{
-	wassertr(font != NULL);
-
-	font->refCount--;
-	if (font->refCount < 1) {
-		XftFontClose(font->screen->display, font->font);
-		if (font->name) {
-			WMHashRemove(font->screen->fontCache, font->name);
-			wfree(font->name);
-		}
-		wfree(font);
-	}
-}
-
-Bool WMIsAntialiasingEnabled(WMScreen * scrPtr)
-{
-	return scrPtr->antialiasedText;
-}
-
-unsigned int WMFontHeight(WMFont * font)
-{
-	wassertrv(font != NULL, 0);
-
-	return font->height;
-}
-
-char *WMGetFontName(WMFont * font)
-{
-	wassertrv(font != NULL, NULL);
-
-	return font->name;
-}
-
-void WMGetScaleBaseFromSystemFont(WMScreen *scrPtr, int *alphabetWidth, int *fontHeight)
-{
-	WMFont *font;
-
-	font = WMDefaultSystemFont(scrPtr);
-	*alphabetWidth = WMWidthOfString(font, "abcdefghijklmnopqrstuvwxyz", 26);
-	*fontHeight = WMFontHeight(font);
-	WMReleaseFont(font);
-}
-
-WMFont *WMDefaultSystemFont(WMScreen * scrPtr)
-{
-	return WMRetainFont(scrPtr->normalFont);
-}
-
-WMFont *WMDefaultBoldSystemFont(WMScreen * scrPtr)
-{
-	return WMRetainFont(scrPtr->boldFont);
-}
-
-WMFont *WMSystemFontOfSize(WMScreen * scrPtr, int size)
-{
-	WMFont *font;
-	char *fontSpec;
-
-	fontSpec = makeFontOfSize(WINGsConfiguration.systemFont, size, NULL);
-
-	font = WMCreateFont(scrPtr, fontSpec);
-
-	if (!font) {
-		wwarning(_("could not load font: %s."), fontSpec);
-	}
-
-	wfree(fontSpec);
-
-	return font;
-}
-
-WMFont *WMBoldSystemFontOfSize(WMScreen * scrPtr, int size)
-{
-	WMFont *font;
-	char *fontSpec;
-
-	fontSpec = makeFontOfSize(WINGsConfiguration.boldSystemFont, size, NULL);
-
-	font = WMCreateFont(scrPtr, fontSpec);
-
-	if (!font) {
-		wwarning(_("could not load font: %s."), fontSpec);
-	}
-
-	wfree(fontSpec);
-
-	return font;
-}
-
-int WMWidthOfString(WMFont * font, const char *text, int length)
-{
-#ifdef USE_PANGO
-	const char *previous_text;
-	int width;
-#else
-	XGlyphInfo extents;
-#endif
-
-	wassertrv(font != NULL && text != NULL, 0);
-#ifdef USE_PANGO
-	previous_text = pango_layout_get_text(font->layout);
-	if ((previous_text == NULL) || (strncmp(text, previous_text, length) != 0) || previous_text[length] != '\0')
-		pango_layout_set_text(font->layout, text, length);
-	pango_layout_get_pixel_size(font->layout, &width, NULL);
-
-	return width;
-#else
-	XftTextExtentsUtf8(font->screen->display, font->font, (XftChar8 *) text, length, &extents);
-
-	return extents.xOff;	/* don't ask :P */
-#endif
-}
-
-void WMDrawString(WMScreen * scr, Drawable d, WMColor * color, WMFont * font, int x, int y, const char *text, int length)
-{
-	XftColor xftcolor;
-#ifdef USE_PANGO
-	const char *previous_text;
-#endif
-
-	wassertr(font != NULL);
-
-	xftcolor.color.red = color->color.red;
-	xftcolor.color.green = color->color.green;
-	xftcolor.color.blue = color->color.blue;
-	xftcolor.color.alpha = color->alpha;;
-	xftcolor.pixel = W_PIXEL(color);
-
-	XftDrawChange(scr->xftdraw, d);
-
-#ifdef USE_PANGO
-	previous_text = pango_layout_get_text(font->layout);
-	if ((previous_text == NULL) || (strcmp(text, previous_text) != 0))
-		pango_layout_set_text(font->layout, text, length);
-	pango_xft_render_layout(scr->xftdraw, &xftcolor, font->layout, x * PANGO_SCALE, y * PANGO_SCALE);
-#else
-	XftDrawStringUtf8(scr->xftdraw, &xftcolor, font->font, x, y + font->y, (XftChar8 *) text, length);
-#endif
-}
-
-void
-WMDrawImageString(WMScreen * scr, Drawable d, WMColor * color, WMColor * background,
-		  WMFont * font, int x, int y, const char *text, int length)
-{
-	XftColor textColor;
-	XftColor bgColor;
-#ifdef USE_PANGO
-	const char *previous_text;
-#endif
-
-	wassertr(font != NULL);
-
-	textColor.color.red = color->color.red;
-	textColor.color.green = color->color.green;
-	textColor.color.blue = color->color.blue;
-	textColor.color.alpha = color->alpha;;
-	textColor.pixel = W_PIXEL(color);
-
-	bgColor.color.red = background->color.red;
-	bgColor.color.green = background->color.green;
-	bgColor.color.blue = background->color.blue;
-	bgColor.color.alpha = background->alpha;;
-	bgColor.pixel = W_PIXEL(background);
-
-	XftDrawChange(scr->xftdraw, d);
-
-	XftDrawRect(scr->xftdraw, &bgColor, x, y, WMWidthOfString(font, text, length), font->height);
-
-#ifdef USE_PANGO
-	previous_text = pango_layout_get_text(font->layout);
-	if ((previous_text == NULL) || (strcmp(text, previous_text) != 0))
-		pango_layout_set_text(font->layout, text, length);
-	pango_xft_render_layout(scr->xftdraw, &textColor, font->layout, x * PANGO_SCALE, y * PANGO_SCALE);
-#else
-	XftDrawStringUtf8(scr->xftdraw, &textColor, font->font, x, y + font->y, (XftChar8 *) text, length);
-#endif
-}
-
-WMFont *WMCopyFontWithStyle(WMScreen * scrPtr, WMFont * font, WMFontStyle style)
-{
-	FcPattern *pattern;
-	WMFont *copy;
-	char *name;
-
-	if (!font)
-		return NULL;
-
-	/* It's enough to add italic to slant, even if the font has no italic
-	 * variant, but only oblique. This is because fontconfig will actually
-	 * return the closest match font to what we requested which is the
-	 * oblique font. Same goes for using bold for weight.
-	 */
-	pattern = FcNameParse((FcChar8 *) WMGetFontName(font));
-	switch (style) {
-	case WFSNormal:
-		FcPatternDel(pattern, FC_WEIGHT);
-		FcPatternDel(pattern, FC_SLANT);
-		break;
-	case WFSBold:
-		FcPatternDel(pattern, FC_WEIGHT);
-		FcPatternAddString(pattern, FC_WEIGHT, (FcChar8 *) "bold");
-		break;
-	case WFSItalic:
-		FcPatternDel(pattern, FC_SLANT);
-		FcPatternAddString(pattern, FC_SLANT, (FcChar8 *) "italic");
-		break;
-	case WFSBoldItalic:
-		FcPatternDel(pattern, FC_WEIGHT);
-		FcPatternDel(pattern, FC_SLANT);
-		FcPatternAddString(pattern, FC_WEIGHT, (FcChar8 *) "bold");
-		FcPatternAddString(pattern, FC_SLANT, (FcChar8 *) "italic");
-		break;
-	}
-
-	name = (char *)FcNameUnparse(pattern);
-	copy = WMCreateFont(scrPtr, name);
-	FcPatternDestroy(pattern);
-	free(name);
-
-	return copy;
-}

WINGs/wfontpanel.c

@@ -1,825 +0,0 @@
-
-#include "WINGsP.h"
-#include "WUtil.h"
-#include "wconfig.h"
-
-#include <ctype.h>
-#include <string.h>
-#include <strings.h>
-#include <stdint.h>
-
-#include <X11/Xft/Xft.h>
-#include <fontconfig/fontconfig.h>
-
-/* XXX TODO */
-char *WMFontPanelFontChangedNotification = "WMFontPanelFontChangedNotification";
-
-typedef struct W_FontPanel {
-	WMWindow *win;
-
-	WMFrame *upperF;
-	WMTextField *sampleT;
-
-	WMSplitView *split;
-
-	WMFrame *lowerF;
-	WMLabel *famL;
-	WMList *famLs;
-	WMLabel *typL;
-	WMList *typLs;
-	WMLabel *sizL;
-	WMTextField *sizT;
-	WMList *sizLs;
-
-	WMAction2 *action;
-	void *data;
-
-	WMButton *revertB;
-	WMButton *setB;
-
-	WMPropList *fdb;
-} FontPanel;
-
-#define MIN_UPPER_HEIGHT	20
-#define MIN_LOWER_HEIGHT	140
-
-#define BUTTON_SPACE_HEIGHT 40
-
-#define MIN_WIDTH	250
-#define MIN_HEIGHT 	(MIN_UPPER_HEIGHT+MIN_LOWER_HEIGHT+BUTTON_SPACE_HEIGHT)
-
-#define DEF_UPPER_HEIGHT 60
-#define DEF_LOWER_HEIGHT 310
-
-#define DEF_WIDTH	320
-#define DEF_HEIGHT	(DEF_UPPER_HEIGHT+DEF_LOWER_HEIGHT)
-
-static const int scalableFontSizes[] = {
-	8,
-	10,
-	11,
-	12,
-	14,
-	16,
-	18,
-	20,
-	24,
-	36,
-	48,
-	64
-};
-
-static void setFontPanelFontName(FontPanel * panel, const char *family, const char *style, double size);
-
-static int isXLFD(const char *font, int *length_ret);
-
-static void arrangeLowerFrame(FontPanel * panel);
-
-static void familyClick(WMWidget *, void *);
-static void typefaceClick(WMWidget *, void *);
-static void sizeClick(WMWidget *, void *);
-
-static void listFamilies(WMScreen * scr, WMFontPanel * panel);
-
-static void splitViewConstrainCallback(WMSplitView * sPtr, int indView, int *min, int *max)
-{
-	/* Parameter not used, but tell the compiler that it is ok */
-	(void) sPtr;
-	(void) max;
-
-	if (indView == 0)
-		*min = MIN_UPPER_HEIGHT;
-	else
-		*min = MIN_LOWER_HEIGHT;
-}
-
-static void notificationObserver(void *self, WMNotification * notif)
-{
-	WMFontPanel *panel = (WMFontPanel *) self;
-	void *object = WMGetNotificationObject(notif);
-
-	if (WMGetNotificationName(notif) == WMViewSizeDidChangeNotification) {
-		if (object == WMWidgetView(panel->win)) {
-			int h = WMWidgetHeight(panel->win);
-			int w = WMWidgetWidth(panel->win);
-
-			WMResizeWidget(panel->split, w, h - BUTTON_SPACE_HEIGHT);
-
-			WMMoveWidget(panel->setB, w - 80, h - (BUTTON_SPACE_HEIGHT - 5));
-
-			WMMoveWidget(panel->revertB, w - 240, h - (BUTTON_SPACE_HEIGHT - 5));
-
-		} else if (object == WMWidgetView(panel->upperF)) {
-
-			if (WMWidgetHeight(panel->upperF) < MIN_UPPER_HEIGHT) {
-				WMResizeWidget(panel->upperF, WMWidgetWidth(panel->upperF), MIN_UPPER_HEIGHT);
-			} else {
-				WMResizeWidget(panel->sampleT, WMWidgetWidth(panel->upperF) - 20,
-					       WMWidgetHeight(panel->upperF) - 10);
-			}
-
-		} else if (object == WMWidgetView(panel->lowerF)) {
-
-			if (WMWidgetHeight(panel->lowerF) < MIN_LOWER_HEIGHT) {
-				WMResizeWidget(panel->upperF, WMWidgetWidth(panel->upperF), MIN_UPPER_HEIGHT);
-
-				WMMoveWidget(panel->lowerF, 0, WMWidgetHeight(panel->upperF)
-					     + WMGetSplitViewDividerThickness(panel->split));
-
-				WMResizeWidget(panel->lowerF, WMWidgetWidth(panel->lowerF),
-					       WMWidgetWidth(panel->split) - MIN_UPPER_HEIGHT
-					       - WMGetSplitViewDividerThickness(panel->split));
-			} else {
-				arrangeLowerFrame(panel);
-			}
-		}
-	}
-}
-
-static void closeWindow(WMWidget * w, void *data)
-{
-	FontPanel *panel = (FontPanel *) data;
-
-	/* Parameter not used, but tell the compiler that it is ok */
-	(void) w;
-
-	WMHideFontPanel(panel);
-}
-
-static void setClickedAction(WMWidget * w, void *data)
-{
-	FontPanel *panel = (FontPanel *) data;
-
-	/* Parameter not used, but tell the compiler that it is ok */
-	(void) w;
-
-	if (panel->action)
-		(*panel->action) (panel, panel->data);
-}
-
-static void revertClickedAction(WMWidget * w, void *data)
-{
-	/* Parameter not used, but tell the compiler that it is ok */
-	(void) w;
-	(void) data;
-
-	/*FontPanel *panel = (FontPanel*)data; */
-	/* XXX TODO */
-}
-
-WMFontPanel *WMGetFontPanel(WMScreen * scr)
-{
-	FontPanel *panel;
-	WMColor *dark, *white;
-	WMFont *font;
-	int divThickness;
-
-	if (scr->sharedFontPanel)
-		return scr->sharedFontPanel;
-
-	panel = wmalloc(sizeof(FontPanel));
-
-	panel->win = WMCreateWindow(scr, "fontPanel");
-	/*    WMSetWidgetBackgroundColor(panel->win, WMWhiteColor(scr)); */
-	WMSetWindowTitle(panel->win, _("Font Panel"));
-	WMResizeWidget(panel->win, DEF_WIDTH, DEF_HEIGHT);
-	WMSetWindowMinSize(panel->win, MIN_WIDTH, MIN_HEIGHT);
-	WMSetViewNotifySizeChanges(WMWidgetView(panel->win), True);
-
-	WMSetWindowCloseAction(panel->win, closeWindow, panel);
-
-	panel->split = WMCreateSplitView(panel->win);
-	WMResizeWidget(panel->split, DEF_WIDTH, DEF_HEIGHT - BUTTON_SPACE_HEIGHT);
-	WMSetSplitViewConstrainProc(panel->split, splitViewConstrainCallback);
-
-	divThickness = WMGetSplitViewDividerThickness(panel->split);
-
-	panel->upperF = WMCreateFrame(panel->win);
-	WMSetFrameRelief(panel->upperF, WRFlat);
-	WMSetViewNotifySizeChanges(WMWidgetView(panel->upperF), True);
-	panel->lowerF = WMCreateFrame(panel->win);
-	/*    WMSetWidgetBackgroundColor(panel->lowerF, WMBlackColor(scr)); */
-	WMSetFrameRelief(panel->lowerF, WRFlat);
-	WMSetViewNotifySizeChanges(WMWidgetView(panel->lowerF), True);
-
-	WMAddSplitViewSubview(panel->split, W_VIEW(panel->upperF));
-	WMAddSplitViewSubview(panel->split, W_VIEW(panel->lowerF));
-
-	WMResizeWidget(panel->upperF, DEF_WIDTH, DEF_UPPER_HEIGHT);
-
-	WMResizeWidget(panel->lowerF, DEF_WIDTH, DEF_LOWER_HEIGHT);
-
-	WMMoveWidget(panel->lowerF, 0, 60 + divThickness);
-
-	white = WMWhiteColor(scr);
-	dark = WMDarkGrayColor(scr);
-
-	panel->sampleT = WMCreateTextField(panel->upperF);
-	WMResizeWidget(panel->sampleT, DEF_WIDTH - 20, 50);
-	WMMoveWidget(panel->sampleT, 10, 10);
-	WMSetTextFieldText(panel->sampleT, _("The quick brown fox jumps over the lazy dog"));
-
-	font = WMBoldSystemFontOfSize(scr, 12);
-
-	panel->famL = WMCreateLabel(panel->lowerF);
-	WMSetWidgetBackgroundColor(panel->famL, dark);
-	WMSetLabelText(panel->famL, _("Family"));
-	WMSetLabelFont(panel->famL, font);
-	WMSetLabelTextColor(panel->famL, white);
-	WMSetLabelRelief(panel->famL, WRSunken);
-	WMSetLabelTextAlignment(panel->famL, WACenter);
-
-	panel->famLs = WMCreateList(panel->lowerF);
-	WMSetListAction(panel->famLs, familyClick, panel);
-
-	panel->typL = WMCreateLabel(panel->lowerF);
-	WMSetWidgetBackgroundColor(panel->typL, dark);
-	WMSetLabelText(panel->typL, _("Typeface"));
-	WMSetLabelFont(panel->typL, font);
-	WMSetLabelTextColor(panel->typL, white);
-	WMSetLabelRelief(panel->typL, WRSunken);
-	WMSetLabelTextAlignment(panel->typL, WACenter);
-
-	panel->typLs = WMCreateList(panel->lowerF);
-	WMSetListAction(panel->typLs, typefaceClick, panel);
-
-	panel->sizL = WMCreateLabel(panel->lowerF);
-	WMSetWidgetBackgroundColor(panel->sizL, dark);
-	WMSetLabelText(panel->sizL, _("Size"));
-	WMSetLabelFont(panel->sizL, font);
-	WMSetLabelTextColor(panel->sizL, white);
-	WMSetLabelRelief(panel->sizL, WRSunken);
-	WMSetLabelTextAlignment(panel->sizL, WACenter);
-
-	panel->sizT = WMCreateTextField(panel->lowerF);
-	/*    WMSetTextFieldAlignment(panel->sizT, WARight); */
-
-	panel->sizLs = WMCreateList(panel->lowerF);
-	WMSetListAction(panel->sizLs, sizeClick, panel);
-
-	WMReleaseFont(font);
-	WMReleaseColor(white);
-	WMReleaseColor(dark);
-
-	panel->setB = WMCreateCommandButton(panel->win);
-	WMResizeWidget(panel->setB, 70, 24);
-	WMMoveWidget(panel->setB, 240, DEF_HEIGHT - (BUTTON_SPACE_HEIGHT - 5));
-	WMSetButtonText(panel->setB, _("Set"));
-	WMSetButtonAction(panel->setB, setClickedAction, panel);
-
-	panel->revertB = WMCreateCommandButton(panel->win);
-	WMResizeWidget(panel->revertB, 70, 24);
-	WMMoveWidget(panel->revertB, 80, DEF_HEIGHT - (BUTTON_SPACE_HEIGHT - 5));
-	WMSetButtonText(panel->revertB, _("Revert"));
-	WMSetButtonAction(panel->revertB, revertClickedAction, panel);
-
-	WMRealizeWidget(panel->win);
-
-	WMMapSubwidgets(panel->upperF);
-	WMMapSubwidgets(panel->lowerF);
-	WMMapSubwidgets(panel->split);
-	WMMapSubwidgets(panel->win);
-
-	WMUnmapWidget(panel->revertB);
-
-	arrangeLowerFrame(panel);
-
-	scr->sharedFontPanel = panel;
-
-	/* register notification observers */
-	WMAddNotificationObserver(notificationObserver, panel,
-				  WMViewSizeDidChangeNotification, WMWidgetView(panel->win));
-	WMAddNotificationObserver(notificationObserver, panel,
-				  WMViewSizeDidChangeNotification, WMWidgetView(panel->upperF));
-	WMAddNotificationObserver(notificationObserver, panel,
-				  WMViewSizeDidChangeNotification, WMWidgetView(panel->lowerF));
-
-	listFamilies(scr, panel);
-
-	return panel;
-}
-
-void WMFreeFontPanel(WMFontPanel * panel)
-{
-	if (panel == WMWidgetScreen(panel->win)->sharedFontPanel) {
-		WMWidgetScreen(panel->win)->sharedFontPanel = NULL;
-	}
-	WMRemoveNotificationObserver(panel);
-	WMUnmapWidget(panel->win);
-	WMDestroyWidget(panel->win);
-	wfree(panel);
-}
-
-void WMShowFontPanel(WMFontPanel * panel)
-{
-	WMMapWidget(panel->win);
-}
-
-void WMHideFontPanel(WMFontPanel * panel)
-{
-	WMUnmapWidget(panel->win);
-}
-
-WMFont *WMGetFontPanelFont(WMFontPanel * panel)
-{
-	return WMGetTextFieldFont(panel->sampleT);
-}
-
-void WMSetFontPanelFont(WMFontPanel * panel, const char *fontName)
-{
-	int fname_len;
-	FcPattern *pattern;
-	FcChar8 *family, *style;
-	double size;
-
-	if (!isXLFD(fontName, &fname_len)) {
-		/* maybe its proper fontconfig and we can parse it */
-		pattern = FcNameParse((const FcChar8 *) fontName);
-	} else {
-		/* maybe its proper xlfd and we can convert it to an FcPattern */
-		pattern = XftXlfdParse(fontName, False, False);
-		/*//FcPatternPrint(pattern); */
-	}
-
-	if (!pattern)
-		return;
-
-	if (FcPatternGetString(pattern, FC_FAMILY, 0, &family) == FcResultMatch)
-		if (FcPatternGetString(pattern, FC_STYLE, 0, &style) == FcResultMatch)
-			if (FcPatternGetDouble(pattern, "pixelsize", 0, &size) == FcResultMatch)
-				setFontPanelFontName(panel, (char *)family, (char *)style, size);
-
-	FcPatternDestroy(pattern);
-}
-
-void WMSetFontPanelAction(WMFontPanel * panel, WMAction2 * action, void *data)
-{
-	panel->action = action;
-	panel->data = data;
-}
-
-static void arrangeLowerFrame(FontPanel * panel)
-{
-	int width = WMWidgetWidth(panel->lowerF) - 55 - 30;
-	int height = WMWidgetHeight(panel->split) - WMWidgetHeight(panel->upperF);
-	int fw, tw, sw;
-
-#define LABEL_HEIGHT 20
-
-	height -= WMGetSplitViewDividerThickness(panel->split);
-
-	height -= LABEL_HEIGHT + 8;
-
-	fw = (125 * width) / 235;
-	tw = (110 * width) / 235;
-	sw = 55;
-
-	WMMoveWidget(panel->famL, 10, 0);
-	WMResizeWidget(panel->famL, fw, LABEL_HEIGHT);
-
-	WMMoveWidget(panel->famLs, 10, 23);
-	WMResizeWidget(panel->famLs, fw, height);
-
-	WMMoveWidget(panel->typL, 10 + fw + 3, 0);
-	WMResizeWidget(panel->typL, tw, LABEL_HEIGHT);
-
-	WMMoveWidget(panel->typLs, 10 + fw + 3, 23);
-	WMResizeWidget(panel->typLs, tw, height);
-
-	WMMoveWidget(panel->sizL, 10 + fw + 3 + tw + 3, 0);
-	WMResizeWidget(panel->sizL, sw + 4, LABEL_HEIGHT);
-
-	WMMoveWidget(panel->sizT, 10 + fw + 3 + tw + 3, 23);
-	WMResizeWidget(panel->sizT, sw + 4, 20);
-
-	WMMoveWidget(panel->sizLs, 10 + fw + 3 + tw + 3, 46);
-	WMResizeWidget(panel->sizLs, sw + 4, height - 23);
-}
-
-#define NUM_FIELDS 14
-
-static int isXLFD(const char *font, int *length_ret)
-{
-	int c = 0;
-
-	*length_ret = 0;
-	while (*font) {
-		(*length_ret)++;
-		if (*font++ == '-')
-			c++;
-	}
-
-	return c == NUM_FIELDS;
-}
-
-typedef struct {
-	char *typeface;
-	WMArray *sizes;
-} Typeface;
-
-typedef struct {
-	char *name;		/* gotta love simplicity */
-	WMArray *typefaces;
-} Family;
-
-static int compare_int(const void *a, const void *b)
-{
-	int i1 = *(int *)a;
-	int i2 = *(int *)b;
-
-	if (i1 < i2)
-		return -1;
-	else if (i1 > i2)
-		return 1;
-	else
-		return 0;
-}
-
-static void addSizeToTypeface(Typeface * face, int size)
-{
-	if (size == 0) {
-		int j;
-
-		for (j = 0; j < wlengthof(scalableFontSizes); j++) {
-			size = scalableFontSizes[j];
-
-			if (!WMCountInArray(face->sizes, (void *)(uintptr_t) size)) {
-				WMAddToArray(face->sizes, (void *)(uintptr_t) size);
-			}
-		}
-		WMSortArray(face->sizes, compare_int);
-	} else {
-		if (!WMCountInArray(face->sizes, (void *)(uintptr_t) size)) {
-			WMAddToArray(face->sizes, (void *)(uintptr_t) size);
-			WMSortArray(face->sizes, compare_int);
-		}
-	}
-}
-
-static void addTypefaceToXftFamily(Family * fam, const char *style)
-{
-	Typeface *face;
-	WMArrayIterator i;
-
-	if (fam->typefaces) {
-		WM_ITERATE_ARRAY(fam->typefaces, face, i) {
-			if (strcmp(face->typeface, style) != 0)
-				continue;	/* go to next interation */
-			addSizeToTypeface(face, 0);
-			return;
-		}
-	} else {
-		fam->typefaces = WMCreateArray(4);
-	}
-
-	face = wmalloc(sizeof(Typeface));
-
-	face->typeface = wstrdup(style);
-	face->sizes = WMCreateArray(4);
-	addSizeToTypeface(face, 0);
-
-	WMAddToArray(fam->typefaces, face);
-}
-
-/*
- * families (same family name) (Hashtable of family -> array)
- * 	registries (same family but different registries)
- *
- */
-static void addFontToXftFamily(WMHashTable * families, const char *name, const char *style)
-{
-	WMArrayIterator i;
-	WMArray *array;
-	Family *fam;
-
-	array = WMHashGet(families, name);
-	if (array) {
-		WM_ITERATE_ARRAY(array, fam, i) {
-			if (strcmp(fam->name, name) == 0)
-				addTypefaceToXftFamily(fam, style);
-			return;
-		}
-	}
-
-	array = WMCreateArray(8);
-
-	fam = wmalloc(sizeof(Family));
-
-	fam->name = wstrdup(name);
-
-	addTypefaceToXftFamily(fam, style);
-
-	WMAddToArray(array, fam);
-
-	WMHashInsert(families, fam->name, array);
-}
-
-static void listFamilies(WMScreen * scr, WMFontPanel * panel)
-{
-	FcObjectSet *os = 0;
-	FcFontSet *fs;
-	FcPattern *pat;
-	WMHashTable *families;
-	WMHashEnumerator enumer;
-	WMArray *array;
-	int i;
-
-	pat = FcPatternCreate();
-	os = FcObjectSetBuild(FC_FAMILY, FC_STYLE, NULL);
-	fs = FcFontList(0, pat, os);
-	if (!fs) {
-		WMRunAlertPanel(scr, panel->win, _("Error"),
-				_("Could not init font config library\n"), _("OK"), NULL, NULL);
-		return;
-	}
-	if (pat)
-		FcPatternDestroy(pat);
-
-	families = WMCreateStringHashTable();
-
-	if (fs) {
-		for (i = 0; i < fs->nfont; i++) {
-			FcChar8 *family;
-			FcChar8 *style;
-
-			if (FcPatternGetString(fs->fonts[i], FC_FAMILY, 0, &family) == FcResultMatch)
-				if (FcPatternGetString(fs->fonts[i], FC_STYLE, 0, &style) == FcResultMatch)
-					addFontToXftFamily(families, (char *)family, (char *)style);
-		}
-		FcFontSetDestroy(fs);
-	}
-
-	enumer = WMEnumerateHashTable(families);
-
-	while ((array = WMNextHashEnumeratorItem(&enumer))) {
-		WMArrayIterator i;
-		Family *fam;
-		char buffer[256];
-		WMListItem *item;
-
-		WM_ITERATE_ARRAY(array, fam, i) {
-			strlcpy(buffer, fam->name, sizeof(buffer));
-			item = WMAddListItem(panel->famLs, buffer);
-
-			item->clientData = fam;
-		}
-
-		WMFreeArray(array);
-	}
-
-	WMSortListItems(panel->famLs);
-
-	WMFreeHashTable(families);
-}
-
-static void getSelectedFont(FontPanel * panel, char buffer[], int bufsize)
-{
-	WMListItem *item;
-	Family *family;
-	Typeface *face;
-	char *size;
-
-	item = WMGetListSelectedItem(panel->famLs);
-	if (!item)
-		return;
-	family = (Family *) item->clientData;
-
-	item = WMGetListSelectedItem(panel->typLs);
-	if (!item)
-		return;
-	face = (Typeface *) item->clientData;
-
-	size = WMGetTextFieldText(panel->sizT);
-
-	snprintf(buffer, bufsize, "%s:style=%s:pixelsize=%s", family->name, face->typeface, size);
-
-	wfree(size);
-}
-
-static void preview(FontPanel * panel)
-{
-	char buffer[512];
-	WMFont *font;
-
-	getSelectedFont(panel, buffer, sizeof(buffer));
-	font = WMCreateFont(WMWidgetScreen(panel->win), buffer);
-	if (font) {
-		WMSetTextFieldFont(panel->sampleT, font);
-		WMReleaseFont(font);
-	}
-}
-
-static void familyClick(WMWidget * w, void *data)
-{
-	WMList *lPtr = (WMList *) w;
-	WMListItem *item;
-	Family *family;
-	Typeface *face;
-	FontPanel *panel = (FontPanel *) data;
-	WMArrayIterator i;
-	/* current typeface and size */
-	char *oface = NULL;
-	char *osize = NULL;
-	int facei = -1;
-	int sizei = -1;
-
-	/* must try to keep the same typeface and size for the new family */
-	item = WMGetListSelectedItem(panel->typLs);
-	if (item)
-		oface = wstrdup(item->text);
-
-	osize = WMGetTextFieldText(panel->sizT);
-
-	item = WMGetListSelectedItem(lPtr);
-	family = (Family *) item->clientData;
-
-	WMClearList(panel->typLs);
-
-	WM_ITERATE_ARRAY(family->typefaces, face, i) {
-		char buffer[256];
-		int top = 0;
-		WMListItem *fitem;
-
-		strlcpy(buffer, face->typeface, sizeof(buffer));
-		if (strcasecmp(face->typeface, "Roman") == 0)
-			top = 1;
-		if (strcasecmp(face->typeface, "Regular") == 0)
-			top = 1;
-		if (top)
-			fitem = WMInsertListItem(panel->typLs, 0, buffer);
-		else
-			fitem = WMAddListItem(panel->typLs, buffer);
-		fitem->clientData = face;
-	}
-
-	if (oface) {
-		facei = WMFindRowOfListItemWithTitle(panel->typLs, oface);
-		wfree(oface);
-	}
-	if (facei < 0) {
-		facei = 0;
-	}
-	WMSelectListItem(panel->typLs, facei);
-	typefaceClick(panel->typLs, panel);
-
-	if (osize) {
-		sizei = WMFindRowOfListItemWithTitle(panel->sizLs, osize);
-	}
-	if (sizei >= 0) {
-		WMSelectListItem(panel->sizLs, sizei);
-		sizeClick(panel->sizLs, panel);
-	}
-
-	if (osize)
-		wfree(osize);
-
-	preview(panel);
-}
-
-static void typefaceClick(WMWidget * w, void *data)
-{
-	FontPanel *panel = (FontPanel *) data;
-	WMListItem *item;
-	Typeface *face;
-	WMArrayIterator i;
-	char buffer[32];
-
-	char *osize = NULL;
-	int sizei = -1;
-	void *size;
-
-	/* Parameter not used, but tell the compiler that it is ok */
-	(void) w;
-
-	osize = WMGetTextFieldText(panel->sizT);
-
-	item = WMGetListSelectedItem(panel->typLs);
-	face = (Typeface *) item->clientData;
-
-	WMClearList(panel->sizLs);
-
-	WM_ITERATE_ARRAY(face->sizes, size, i) {
-		if (size != NULL) {
-			int size_int = (intptr_t) size;
-
-			sprintf(buffer, "%i", size_int);
-
-			WMAddListItem(panel->sizLs, buffer);
-		}
-	}
-
-	if (osize) {
-		sizei = WMFindRowOfListItemWithTitle(panel->sizLs, osize);
-	}
-	if (sizei < 0) {
-		sizei = WMFindRowOfListItemWithTitle(panel->sizLs, "12");
-	}
-	if (sizei < 0) {
-		sizei = 0;
-	}
-	WMSelectListItem(panel->sizLs, sizei);
-	WMSetListPosition(panel->sizLs, sizei);
-	sizeClick(panel->sizLs, panel);
-
-	if (osize)
-		wfree(osize);
-
-	preview(panel);
-}
-
-static void sizeClick(WMWidget * w, void *data)
-{
-	FontPanel *panel = (FontPanel *) data;
-	WMListItem *item;
-
-	/* Parameter not used, but tell the compiler that it is ok */
-	(void) w;
-
-	item = WMGetListSelectedItem(panel->sizLs);
-	WMSetTextFieldText(panel->sizT, item->text);
-
-	WMSelectTextFieldRange(panel->sizT, wmkrange(0, strlen(item->text)));
-
-	preview(panel);
-}
-
-static void setFontPanelFontName(FontPanel * panel, const char *family, const char *style, double size)
-{
-	int famrow;
-	int stlrow;
-	int sz;
-	char asize[64];
-	void *vsize;
-	WMListItem *item;
-	Family *fam;
-	Typeface *face;
-	WMArrayIterator i;
-
-	famrow = WMFindRowOfListItemWithTitle(panel->famLs, family);
-	if (famrow < 0) {
-		famrow = 0;
-		return;
-	}
-	WMSelectListItem(panel->famLs, famrow);
-	WMSetListPosition(panel->famLs, famrow);
-
-	WMClearList(panel->typLs);
-
-	item = WMGetListSelectedItem(panel->famLs);
-
-	fam = (Family *) item->clientData;
-	WM_ITERATE_ARRAY(fam->typefaces, face, i) {
-		char buffer[256];
-		int top = 0;
-		WMListItem *fitem;
-
-		strlcpy(buffer, face->typeface, sizeof(buffer));
-		if (strcasecmp(face->typeface, "Roman") == 0)
-			top = 1;
-		if (top)
-			fitem = WMInsertListItem(panel->typLs, 0, buffer);
-		else
-			fitem = WMAddListItem(panel->typLs, buffer);
-		fitem->clientData = face;
-	}
-
-	stlrow = WMFindRowOfListItemWithTitle(panel->typLs, style);
-
-	if (stlrow < 0) {
-		stlrow = 0;
-		return;
-	}
-
-	WMSelectListItem(panel->typLs, stlrow);
-
-	item = WMGetListSelectedItem(panel->typLs);
-
-	face = (Typeface *) item->clientData;
-
-	WMClearList(panel->sizLs);
-
-	WM_ITERATE_ARRAY(face->sizes, vsize, i) {
-		char buffer[32];
-
-		if (vsize != NULL) {
-			int size_int = (intptr_t) vsize;
-
-			sprintf(buffer, "%i", size_int);
-
-			WMAddListItem(panel->sizLs, buffer);
-		}
-	}
-
-	snprintf(asize, sizeof(asize) - 1, "%d", (int)(size + 0.5));
-
-	sz = WMFindRowOfListItemWithTitle(panel->sizLs, asize);
-
-	if (sz < 0) {
-		return;
-	}
-
-	WMSelectListItem(panel->sizLs, sz);
-	sizeClick(panel->sizLs, panel);
-
-	return;
-}

WINGs/widgets.c

@@ -629,7 +629,8 @@ WMScreen *WMCreateScreenWithRContext(Display * display, int screen, RContext * c
 
 	scrPtr->rootWin = RootWindow(display, screen);
 
-	scrPtr->fontCache = WMCreateStringHashTable();
+        // Will be initialized lazily in wings-rs/src/screen.rs.
+	scrPtr->fontCache = NULL;
 
 	scrPtr->xftdraw = XftDrawCreate(scrPtr->display, W_DRAWABLE(scrPtr), scrPtr->visual, scrPtr->colormap);
 
@@ -724,14 +725,14 @@ WMScreen *WMCreateScreenWithRContext(Display * display, int screen, RContext * c
 	gcv.graphics_exposures = False;
 
 	gcv.function = GXxor;
-	gcv.foreground = W_PIXEL(scrPtr->white);
+	gcv.foreground = WMColorPixel(scrPtr->white);
 	if (gcv.foreground == 0)
 		gcv.foreground = 1;
 	scrPtr->xorGC = XCreateGC(display, W_DRAWABLE(scrPtr), GCFunction
 				  | GCGraphicsExposures | GCForeground, &gcv);
 
 	gcv.function = GXxor;
-	gcv.foreground = W_PIXEL(scrPtr->gray);
+	gcv.foreground = WMColorPixel(scrPtr->gray);
 	gcv.subwindow_mode = IncludeInferiors;
 	scrPtr->ixorGC = XCreateGC(display, W_DRAWABLE(scrPtr), GCFunction
 				   | GCGraphicsExposures | GCForeground | GCSubwindowMode, &gcv);
@@ -742,8 +743,8 @@ WMScreen *WMCreateScreenWithRContext(Display * display, int screen, RContext * c
 	scrPtr->clipGC = XCreateGC(display, W_DRAWABLE(scrPtr), GCFunction | GCGraphicsExposures, &gcv);
 
 	stipple = XCreateBitmapFromData(display, W_DRAWABLE(scrPtr), STIPPLE_BITS, STIPPLE_WIDTH, STIPPLE_HEIGHT);
-	gcv.foreground = W_PIXEL(scrPtr->darkGray);
+	gcv.foreground = WMColorPixel(scrPtr->darkGray);
-	gcv.background = W_PIXEL(scrPtr->gray);
+	gcv.background = WMColorPixel(scrPtr->gray);
 	gcv.fill_style = FillStippled;
 	gcv.stipple = stipple;
 	scrPtr->stippleGC = XCreateGC(display, W_DRAWABLE(scrPtr),
@@ -909,18 +910,6 @@ WMScreen *WMCreateScreenWithRContext(Display * display, int screen, RContext * c
 	return scrPtr;
 }
 
-void WMSetWidgetDefaultFont(WMScreen * scr, WMFont * font)
-{
-	WMReleaseFont(scr->normalFont);
-	scr->normalFont = WMRetainFont(font);
-}
-
-void WMSetWidgetDefaultBoldFont(WMScreen * scr, WMFont * font)
-{
-	WMReleaseFont(scr->boldFont);
-	scr->boldFont = WMRetainFont(font);
-}
-
 void WMHangData(WMWidget * widget, void *data)
 {
 	W_VIEW(widget)->hangedData = data;
@@ -1011,7 +1000,7 @@ void WMSetWidgetBackgroundColor(WMWidget * w, WMColor * color)
 		WMRedisplayWidget(w);
 }
 
-WMColor *WMGetWidgetBackgroundColor(WMWidget * w)
+WMColor * WMGetWidgetBackgroundColor(WMWidget * w)
 {
 	return W_VIEW(w)->backColor;
 }

WINGs/wings-rs-tests/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "wings-rs-tests"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+libc = "0.2"
+insta = "1.47"
+insta-image = { version = "1.0", features = ["png"] }
+png = "0.18"
+tempdir = "0.3.7"
+wings-rs = { path = "../wings-rs" }
+wrlib-rs = { path = "../../wrlib-rs" }
+wutil-rs = { path = "../../wutil-rs" }
+x11 = "2.21.0"
+
+[profile.dev.package]
+insta.opt-level = 3
+similar.opt-level = 3

WINGs/wings-rs-tests/Makefile.am

@@ -0,0 +1,43 @@
+AUTOMAKE_OPTIONS =
+
+RUST_SOURCES = \
+	examples/font_panel.rs \
+	src/headless/mod.rs \
+	src/headless/snapshots/wings_rs_tests__headless__xvfb__tests__blank_screen.snap \
+	src/headless/snapshots/wings_rs_tests__headless__xvfb__tests__blank_screen.snap.png \
+	src/headless/snapshots/wings_rs_tests__headless__xvfb__tests__snowlamp_in_window.snap \
+	src/headless/snapshots/wings_rs_tests__headless__xvfb__tests__snowlamp_in_window.snap.png \
+	src/headless/snapshots/wings_rs_tests__headless__xvfb__tests__xeyes.snap \
+	src/headless/snapshots/wings_rs_tests__headless__xvfb__tests__xeyes.snap.png \
+	src/headless/snapshots/wings_rs_tests__headless__xwd__tests__snowlamp_encoded.snap \
+	src/headless/snapshots/wings_rs_tests__headless__xwd__tests__snowlamp_encoded.snap.png \
+	src/headless/snowlamp.xwd \
+	src/headless/xvfb.rs \
+	src/headless/xwd.rs \
+	src/lib.rs \
+	tests/font_panel_tests.rs \
+	tests/snapshots/font_panel_tests__font_panel.snap \
+	tests/snapshots/font_panel_tests__font_panel.snap.png
+
+RUST_EXTRA = \
+	Cargo.lock \
+	Cargo.toml
+
+Cargo.lock:
+	cargo build
+
+rustlib: $(RUST_SOURCES) $(RUST_EXTRA)
+	cargo build
+
+check-local: rustlib
+
+clean-local:
+	$(CARGO) clean
+
+all: rustlib
+
+# Tests run with cargo-nextest because it puts each application test in its own
+# process, and WINGs currently assumes that it is running in a single-threaded
+# environment.
+test: rustlib
+	LD_LIBRARY_PATH=../.libs:../../wrlib/.libs $(CARGO) nextest run

WINGs/wings-rs-tests/build.rs

@@ -0,0 +1,13 @@
+fn main() {
+    println!("cargo::rustc-link-search=../.libs");
+    println!("cargo::rustc-link-search=../../wrlib/.libs");
+    println!("cargo::rustc-link-arg=-lX11");
+    println!("cargo::rustc-link-arg=-lWUtil");
+    println!("cargo::rustc-link-arg=-lWINGs");
+    println!("cargo::rustc-link-arg=-lwraster");
+    println!("cargo::rustc-link-arg=-lX11");
+    println!("cargo::rustc-link-arg=-lXft");
+    println!("cargo::rustc-link-arg=-lpango-1.0");
+    println!("cargo::rustc-link-arg=-lpangoxft-1.0");
+    println!("cargo::rustc-link-arg=-lpangoft2-1.0");
+}

WINGs/wings-rs-tests/examples/font_panel.rs

@@ -0,0 +1,11 @@
+use wings_rs::{font_panel::FontPanel, WINGsP::WMScreenMainLoop};
+use wings_rs_tests::LiveApplication;
+
+fn main() {
+    let app = LiveApplication::new("WMFontPanel");
+    let mut font_panel = FontPanel::new(app.screen.as_ptr()).expect("could not create font panel");
+    font_panel.show();
+    unsafe {
+        WMScreenMainLoop(app.screen.as_ptr());
+    }
+}

WINGs/wings-rs-tests/src/headless/mod.rs

@@ -0,0 +1,133 @@
+//! Provides utilites for integration tests that render to a headless X11 server.
+//!
+//! ## X11 `DISPLAY` value allocation
+//!
+//! When starting headless X servers, some care needs to be taken in selecting
+//! display numbers. An X server needs to have a unique display number and will
+//! not start if it is assigned a display number that is already in use.
+//!
+//! Local X servers usually leave a lockfile in `/tmp`, like `/tmp/.X0-lock` for
+//! display 0. Avoiding the use of display numbers that have a corresponding
+//! lockfile will get you part of the way towards avoiding collisions, but
+//! further coordination is provided by the [`Lock`] and
+//! [`DisplayNumberRegistry`] structs. These interfaces provide a mechanism for
+//! claiming a display number in a way that coordinates across processes and
+//! should be more efficient than simply scanning `/tmp` each time a new display
+//! number is needed.
+
+use std::{
+    fs,
+    io,
+    path::PathBuf,
+    sync::atomic::{self, AtomicU16},
+};
+
+pub mod xvfb;
+pub mod xwd;
+
+/// Represents a lock on a display number, which is released on drop.
+pub struct Lock {
+    display: u16,
+    path: PathBuf,
+}
+
+/// Errors that may occur when trying to lock a display number.
+pub enum LockError {
+    Io(io::Error),
+    Locked,
+}
+
+impl Lock {
+    pub(crate) fn new(display: u16, path: PathBuf) -> Self {
+        Lock {
+            display,
+            path
+        }
+    }
+
+    /// Returns the locked `DISPLAY` value.
+    pub fn display(&self) -> u16 {
+        self.display
+    }
+}
+
+impl Drop for Lock {
+    fn drop(&mut self) {
+        // `file` should be unlinked already, but we explicitly try to delete it
+        // and unwrap the result so that errors aren't dropped silently.
+        match fs::remove_file(&self.path) {
+            Ok(_) => (),
+            Err(e) if e.kind() == io::ErrorKind::NotFound => (),
+            Err(e) => panic!("could not unlink lock file: {:?}", e),
+        }
+    }
+}
+
+// Shared across threads in this process to help keep us from repeatedly asking
+// for the same DISPLAY value.
+static NEXT_DISPLAY: AtomicU16 = AtomicU16::new(32);
+
+/// Coordinates on the value of `DISPLAY` to use when creating new X11 servers.
+///
+/// Methods on `DisplayNumberRegistry` may be called across threads or in
+/// different processes to ensure that X servers are created with unique
+/// display numbers.
+pub struct DisplayNumberRegistry;
+
+impl DisplayNumberRegistry {
+    /// Returns a lock on the first local display number (the `N` in `:N` for
+    /// the X client `DISPLAY` environment variable) that is not currently in
+    /// use.
+    ///
+    /// If no display numbers are available, returns `None`.
+    ///
+    /// To avoid collisions with other processes, attempts are made to sniff out
+    /// which display numbers are already in use by looking for lock files
+    /// matching the pattern `/tmp/.X*-lock`. If such a file exists, its
+    /// display number will not be used.
+    ///
+    /// When an available display number is found, an empty lockfile is
+    /// atomically created (and marking the display number as claimed to other
+    /// well-behaved processes). When `Xvfb` is run using that display number,
+    /// it silently overwrites the empty lockfile.
+    ///
+    /// Any extant lockfile should be deleted by the `Drop` impl for [`Lock`],
+    /// although tests that panic may leave stale lockfiles behind.
+    pub fn next_unused_display() -> io::Result<Lock> {
+        loop {
+            let prev = NEXT_DISPLAY.fetch_add(1, atomic::Ordering::SeqCst);
+            if prev == u16::MAX {
+                return Err(io::Error::other("display numbers exhausted; check /tmp/.X{n}-lock"));
+            }
+            let next = prev + 1;
+            let path = PathBuf::from(format!("/tmp/.X{}-lock", next));
+            match fs::OpenOptions::new()
+                .write(true)
+                .create_new(true)
+                .open(&path) {
+                    Ok(_) => return Ok(Lock::new(next, path)),
+                    Err(e) if e.kind() == io::ErrorKind::AlreadyExists => continue,
+                    Err(e) => return Err(e),
+                }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn find_unused_display() {
+        assert!(DisplayNumberRegistry::next_unused_display().is_ok());
+
+        assert_ne!(
+            DisplayNumberRegistry::next_unused_display()
+                .unwrap()
+                .display,
+            DisplayNumberRegistry::next_unused_display()
+                .unwrap()
+                .display
+        );
+    }
+}

WINGs/wings-rs-tests/src/headless/snapshots/wings_rs_tests__headless__xvfb__tests__blank_screen.snap

@@ -0,0 +1,7 @@
+---
+source: src/headless/xvfb.rs
+assertion_line: 387
+expression: xwd.into_png().unwrap()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/src/headless/snapshots/wings_rs_tests__headless__xvfb__tests__snowlamp_in_window.snap

@@ -0,0 +1,7 @@
+---
+source: src/headless/xvfb.rs
+assertion_line: 416
+expression: compressed
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/src/headless/snapshots/wings_rs_tests__headless__xvfb__tests__xeyes.snap

@@ -0,0 +1,7 @@
+---
+source: src/headless/xvfb.rs
+assertion_line: 402
+expression: compressed
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/src/headless/snapshots/wings_rs_tests__headless__xwd__tests__snowlamp_encoded.snap

@@ -0,0 +1,7 @@
+---
+source: src/headless/xwd.rs
+assertion_line: 321
+expression: snowlamp_xwd.into_png().unwrap()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/src/headless/xvfb.rs

@@ -0,0 +1,471 @@
+//! Provides utilities for headlessly running and taking screenshots of X11
+//! programs in unit and integration tests.
+//!
+//! This uses [Xvfb](https://x.org/releases/X11R7.7/doc/man/man1/Xvfb.1.xhtml).
+//!
+//! Tests of this module invoke `xeyes` and `xwud` subprocesses. For all tests
+//! to pass, you may need to install these X11 utilities and make them available
+//! on your `PATH`.
+
+use std::{
+    ffi::CString,
+    fs, io,
+    process::{Child, Command, ExitStatus, Stdio},
+    thread,
+    time::{Duration, Instant},
+};
+use tempdir::TempDir;
+
+use super::xwd;
+use super::Lock;
+
+/// Arguments for `Xvfb`. Use `XvfbArgs::default()` for default values.
+#[derive(Clone, Copy, Debug)]
+pub struct XvfbArgs {
+    /// Width of the X11 screen.
+    pub width: u32,
+    /// Height of the X11 screen.
+    pub height: u32,
+    /// Bit depth of the X11 screen.
+    ///
+    /// This should probably be one of 8, 16, or 24. (And if you don't choose 24
+    /// bits, you should have a good reason why.)
+    pub depth: u8,
+}
+
+impl Default for XvfbArgs {
+    fn default() -> Self {
+        XvfbArgs {
+            width: 640,
+            height: 480,
+            depth: 24,
+        }
+    }
+}
+
+/// A captive `Xvfb` process, with affordances for running subprocesses that
+/// connect to it and taking screenshots.
+///
+/// When dropped, child processes will be killed automatically.
+pub struct XvfbProcess {
+    lock: Lock,
+    framebuffer_directory: TempDir,
+    process: Child,
+    subprocesses: Vec<(Child, SubprocessMonitor)>,
+    is_shutdown: bool,
+}
+
+impl XvfbProcess {
+    /// Attempts to start `Xvfb` with default options.
+    ///
+    /// Returns `None` if an error occurs while starting the `Xvfb` process.
+    pub fn start_default(lock: Lock) -> SubprocessResult<Self> {
+        XvfbProcess::start(lock, XvfbArgs::default())
+    }
+
+    /// Starts an `Xvfb` process with options specified by `args`.
+    ///
+    /// Returns `None` if an error occurs while starting the `Xvfb` process.
+    ///
+    /// This function connects to the `Xvfb` server briefly to try to ensure
+    /// that Xvfb is ready for clients to connect to it.
+    pub fn start(lock: Lock, args: XvfbArgs) -> SubprocessResult<Self> {
+        let framebuffer_directory = TempDir::new("wings_rs_xvfb").map_err(|e| {
+            SubprocessError::new("Xvfb temp dir".into(), SubprocessErrorType::Spawn(e))
+        })?;
+
+        #[cfg(target_os = "linux")]
+        unsafe {
+            // Kill children if this parent process dies catastrophically (e.g.,
+            // a test raises SIGABRT).
+            libc::prctl(libc::PR_SET_PDEATHSIG, libc::SIGKILL);
+        }
+        let process = Command::new("Xvfb")
+            .arg(format!(":{}", lock.display))
+            .arg("-screen")
+            .arg("0")
+            .arg(format!("{}x{}x{}", args.width, args.height, args.depth))
+            .arg("-fbdir")
+            .arg(format!("{}", framebuffer_directory.path().display()))
+            .stderr(Stdio::piped())
+            .spawn()
+            .map_err(|e| SubprocessError::new("Xvfb".into(), SubprocessErrorType::Spawn(e)))?;
+
+        let process = XvfbProcess {
+            lock,
+            framebuffer_directory,
+            process,
+            subprocesses: Vec::new(),
+            is_shutdown: false,
+        };
+
+        let now = Instant::now();
+        let display_name = CString::new(
+            format!(":{}", process.lock.display)
+        ).expect("could not construct display name");
+        while now.elapsed() < Duration::from_secs(1) {
+            unsafe {
+                let display = x11::xlib::XOpenDisplay(display_name.as_ptr());
+                if !display.is_null() {
+                    x11::xlib::XCloseDisplay(display);
+                    break;
+                }
+            }
+            thread::sleep(Duration::from_millis(10));
+        }
+        return Ok(process);
+    }
+
+    /// Returns the number in the `DISPLAY` environment variable to connect to
+    /// this X11 server.
+    pub fn display(&self) -> u16 {
+        self.lock.display
+    }
+
+    /// Provides access to the `Xvfb` child process wrapped by `self`.
+    pub fn process(&mut self) -> &mut Child {
+        &mut self.process
+    }
+
+    /// Attempts to clean up all child processes. Returns any errors encountered, or `Ok` if none.
+    ///
+    /// Child processes are cleaned up with the following escalating steps:
+    ///
+    /// * Call [`SubprocessMonitor::on_xvfb_shutdown`] on each child's monitor.
+    /// * Kill each of them directly (with [`Child::kill`]).
+    /// * Kill the `Xvfb` process (which may cause any children still connected to that display server to exit).
+    pub fn shutdown(&mut self) -> Result<(), Vec<SubprocessError>> {
+        if self.is_shutdown {
+            return Ok(());
+        }
+        self.is_shutdown = true;
+        let mut errors = Vec::new();
+        for (child, monitor) in self.subprocesses.iter_mut() {
+            if let Err(e) = monitor.on_xvfb_shutdown(child) {
+                errors.push(e);
+            }
+            match child.try_wait() {
+                Ok(Some(status)) => {
+                    if let Err(e) = monitor.check_subprocess_exit(status) {
+                        errors.push(e);
+                    }
+                }
+                Ok(None) => {
+                    if let Err(e) = child.kill() {
+                        errors.push(SubprocessError::new(
+                            monitor.name.clone(),
+                            SubprocessErrorType::Kill(e),
+                        ));
+                    }
+                }
+                Err(e) => errors.push(SubprocessError::new(
+                    monitor.name.clone(),
+                    SubprocessErrorType::Status(e),
+                )),
+            }
+        }
+        if let Err(e) = self.process.kill() {
+            errors.push(SubprocessError::new(
+                "Xvfb".into(),
+                SubprocessErrorType::Kill(e),
+            ));
+        }
+        if errors.is_empty() {
+            Ok(())
+        } else {
+            Err(errors)
+        }
+    }
+
+    /// Runs a simple command in this display server. No command line parsing is
+    /// done, so `run("ls -la")` will probably not do what you expect (because
+    /// there is no binary on your `PATH` called `ls -la`). Use [`XvfbProcess::run_args`]
+    /// to provide arguments to `command`.
+    pub fn run(&mut self, command: impl Into<String>) -> Result<(), SubprocessError> {
+        let name = command.into();
+        self.run_args(name.clone(), &name, |_c| {})
+    }
+
+    /// Runs a command that you can provide arguments to in this display
+    /// server.
+    ///
+    /// The `f` parameter can be used to modify the `Command` before it is
+    /// run (e.g., by adding arguments). For example:
+    ///
+    /// ```
+    /// # use wings_rs_tests::headless::DisplayNumberRegistry;
+    /// # use wings_rs_tests::headless::xvfb::XvfbProcess;
+    /// # fn main() {
+    /// # let mut xvfb = XvfbProcess::start_default(DisplayNumberRegistry::next_unused_display().unwrap()).unwrap();
+    /// xvfb.run_args(
+    ///     "demo of xeyes, angel-style",
+    ///     "/usr/bin/xeyes",
+    ///     |cmd| { cmd.arg("-biblicallyAccurate"); },
+    /// ).unwrap();
+    /// # }
+    /// ```
+    pub fn run_args(
+        &mut self,
+        name: impl Into<String>,
+        command: impl AsRef<std::ffi::OsStr>,
+        f: impl FnOnce(&mut Command),
+    ) -> Result<(), SubprocessError> {
+        let mut command = Command::new(command);
+        command.env("DISPLAY", format!(":{}", self.lock.display));
+        f(&mut command);
+        let mut monitor = SubprocessMonitor::new(name.into(), command);
+        monitor.with_subprocess_exit(SubprocessMonitor::require_clean_exit());
+        let child = monitor.start()?;
+        self.subprocesses.push((child, monitor));
+        Ok(())
+    }
+
+    /// Checks all subprocesses started with the [`XvfbProcess::run`] family of
+    /// methods and returns errors for any that have an error status, or `Ok` if
+    /// none do.
+    pub fn check(&mut self) -> Result<(), Vec<SubprocessError>> {
+        let errors: Vec<_> = self
+            .subprocesses
+            .iter_mut()
+            .filter_map(|(child, monitor)| match child.try_wait() {
+                Ok(Some(status)) => monitor.check_subprocess_exit(status).err(),
+                _ => None,
+            })
+            .collect();
+        if errors.is_empty() {
+            Ok(())
+        } else {
+            Err(errors)
+        }
+    }
+
+    /// Returns a screenshot of the current framebuffer contents in `xwd(1)`
+    /// format.
+    ///
+    /// For the same in a more generally useful format, try [`XvfbProcess::png_screenshot`].
+    pub fn xwd_screenshot(&self) -> io::Result<xwd::XwdImage> {
+        let path = self.framebuffer_directory.path().join("Xvfb_screen0");
+        Ok(xwd::XwdImage::read(&mut fs::read(path)?.into_iter()))
+    }
+
+    /// Returns a screenshot of the current framebuffer contents in PNG format.
+    ///
+    /// Panics on errors.
+    pub fn png_screenshot(&self) -> Vec<u8> {
+        self.xwd_screenshot().unwrap().into_png().unwrap()
+    }
+}
+
+impl Drop for XvfbProcess {
+    fn drop(&mut self) {
+        self.shutdown().unwrap();
+    }
+}
+
+pub type SubprocessResult<T> = Result<T, SubprocessError>;
+
+/// Errors that may occur when a subprocess fails to run or exit cleanly.
+#[derive(Debug)]
+pub struct SubprocessError {
+    /// Meaningful name that can be used to determine what subprocess failed.
+    pub name: String,
+    pub err: SubprocessErrorType,
+}
+
+impl SubprocessError {
+    pub fn new(name: String, err: SubprocessErrorType) -> Self {
+        SubprocessError { name, err }
+    }
+}
+
+/// Error details for `SubprocessError`.
+#[derive(Debug)]
+pub enum SubprocessErrorType {
+    /// Subprocess exited with bad exit code.
+    BadExit(ExitStatus),
+    /// Could not spawn child process (with `io::Error` as the reason).
+    Spawn(io::Error),
+    /// Could not kill child process (with `io::Error` as the reason).
+    Kill(io::Error),
+    /// Could not query child process for exit status (with `io::Error` as the reason).
+    Status(io::Error),
+}
+
+/// Manages spawning a subprocess, monitoring it during execution, and killing it when `Xvfb` shuts down.
+pub struct SubprocessMonitor {
+    name: String,
+    command: Command,
+    check_subprocess_exit: Option<Box<dyn FnMut(&str, ExitStatus) -> SubprocessResult<()>>>,
+    on_xvfb_shutdown: Option<Box<dyn FnMut(&mut Child) -> SubprocessResult<()>>>,
+}
+
+impl SubprocessMonitor {
+    /// Creates a new monitor but does not start any subprocess yet.
+    ///
+    /// This monitor may be configured further by calling mutators like
+    /// [`SubprocessMonitor::with_subprocess_exit`]. Once configuration is
+    /// completely, start the subprocess with [`SubprocessMonitor::start`].
+    pub fn new(name: impl Into<String>, command: Command) -> Self {
+        SubprocessMonitor {
+            name: name.into(),
+            command,
+            check_subprocess_exit: None,
+            on_xvfb_shutdown: None,
+        }
+    }
+
+    /// Sets the callback to execute when [`SubprocessMonitor::check_subprocess_exit`] is called.
+    pub fn with_subprocess_exit(
+        &mut self,
+        f: Box<dyn FnMut(&str, ExitStatus) -> SubprocessResult<()>>,
+    ) -> &mut Self {
+        self.check_subprocess_exit = Some(f);
+        self
+    }
+
+    /// Sets the callback to execute when
+    /// [`SubprocessMonitor::on_xvfb_shutdown`] is called. It may check process
+    /// status, clean up, etc.
+    pub fn with_xvfb_shutdown(
+        &mut self,
+        f: Box<dyn FnMut(&mut Child) -> SubprocessResult<()>>,
+    ) -> &mut Self {
+        self.on_xvfb_shutdown = Some(f);
+        self
+    }
+
+    /// Attempts to spawn a child process from the `Command` provided to
+    /// [`SubprocessMonitor::new`].
+    pub fn start(&mut self) -> SubprocessResult<Child> {
+        self.command
+            .spawn()
+            .map_err(|e| SubprocessError::new(self.name.clone(), SubprocessErrorType::Spawn(e)))
+    }
+
+    /// Called when subprocess exit status is polled. This may be used to signal
+    /// an error because the exit status is bad.
+    pub fn check_subprocess_exit(&mut self, status: ExitStatus) -> SubprocessResult<()> {
+        if let Some(f) = &mut self.check_subprocess_exit {
+            (f)(&self.name, status)
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Called immediately before the parent display server is being shut
+    /// down. This may be used to send `SIGINT` or otherwise clean up the child
+    /// before it is killed more forcibly.
+    pub fn on_xvfb_shutdown(&mut self, child: &mut Child) -> SubprocessResult<()> {
+        if let Some(f) = &mut self.on_xvfb_shutdown {
+            (f)(child)
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Returns a callback suitable for passing to [`SubprocessMonitor::check_subprocess_exit`]
+    /// which requires that the process has exited cleanly.
+    pub fn require_clean_exit() -> Box<dyn FnMut(&str, ExitStatus) -> SubprocessResult<()>> {
+        Box::new(|name: &str, status: ExitStatus| {
+            if status.success() {
+                Ok(())
+            } else {
+                Err(SubprocessError::new(
+                    String::from(name),
+                    SubprocessErrorType::BadExit(status),
+                ))
+            }
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::headless::DisplayNumberRegistry;
+    use super::XvfbProcess;
+    use insta_image::assert_png_snapshot;
+    use std::{
+        thread,
+        time::Duration,
+    };
+
+    /// Starts Xvfb and returns a managing object, or panics.
+    fn start_xvfb() -> XvfbProcess {
+        XvfbProcess::start_default(
+            DisplayNumberRegistry::next_unused_display().expect("cannot find a value for DISPLAY"),
+        )
+        .expect("cannot start Xvfb")
+    }
+
+    /// Reads a single frame of PNG data from the PNG image in `data`. Panics on
+    /// errors.
+    fn read_png_metadata(data: &[u8]) -> png::OutputInfo {
+        let mut reader = png::Decoder::new(std::io::Cursor::new(data))
+            .read_info()
+            .unwrap();
+        let mut buf = vec![0; reader.output_buffer_size().unwrap()];
+        reader.next_frame(&mut buf).unwrap()
+    }
+
+    /// Launches `xeyes(1)` with colors to make sure we're doing the right thing
+    /// with our color channels when encoding a screenshot tas PNG.
+    fn xeyes_color(xvfb: &mut XvfbProcess) {
+        xvfb.run_args("xeyes", "xeyes", |c| {
+            c.arg("-outline")
+                .arg("blue")
+                .arg("-center")
+                .arg("red")
+                .arg("-fg")
+                .arg("green");
+        })
+        .unwrap();
+        thread::sleep(Duration::from_millis(100));
+    }
+
+    #[test]
+    fn png_blank_screenshot() {
+        let xvfb = start_xvfb();
+        let xwd = xvfb.xwd_screenshot().unwrap();
+
+        assert_eq!(
+            xwd.visual_class(),
+            crate::headless::xwd::VisualClass::TrueColor
+        );
+
+        let args = crate::headless::xvfb::XvfbArgs::default();
+        assert_eq!(xwd.header.depth, args.depth as u32);
+        assert_eq!(xwd.header.width, args.width);
+        assert_eq!(xwd.header.height, args.height);
+
+        assert_png_snapshot!("blank_screen", xwd.into_png().unwrap());
+    }
+
+    #[test]
+    fn png_xeyes_screenshot() {
+        let mut xvfb = start_xvfb();
+        xeyes_color(&mut xvfb);
+
+        let compressed = xvfb.png_screenshot();
+        let image_data = read_png_metadata(&compressed);
+
+        let args = crate::headless::xvfb::XvfbArgs::default();
+        assert_eq!(image_data.width, args.width);
+        assert_eq!(image_data.height, args.height);
+
+        assert_png_snapshot!("xeyes", compressed);
+    }
+
+    #[test]
+    fn png_lamp_image() {
+        let mut xvfb = start_xvfb();
+        xvfb.run_args("xwud", "xwud", |c| {
+            c.arg("-in").arg("src/headless/snowlamp.xwd");
+        })
+        .unwrap();
+        thread::sleep(Duration::from_millis(100));
+
+        let compressed = xvfb.png_screenshot();
+
+        assert_png_snapshot!("snowlamp_in_window", compressed);
+    }
+}

WINGs/wings-rs-tests/src/headless/xwd.rs

@@ -0,0 +1,325 @@
+//! Provides basic support for rendering dumps of X11 windows made with [the `xwud` utility](https://gitlab.freedesktop.org/xorg/app/xwud/-/blob/master/xwud.c?ref_type=heads).
+
+use std::{
+    ffi::CString,
+    io::Cursor,
+    mem,
+};
+
+const SUPPORTED_XWD_VERSION: u32 = 7;
+
+/// Header for `xwd`-style dumps of X11 windows.
+///
+/// This is taken from `/usr/include/X11/XWDFile.h` on a Debian system.
+#[derive(Clone)]
+#[repr(C)]
+pub struct XwdHeader {
+    /// Total header size (including null-terminated window name).
+    pub size: u32,
+    /// Version of `xwd` that this dump came from.
+    pub version: u32,
+    pub _format: u32,
+    /// Bit depth of the X11 server.
+    pub depth: u32,
+    /// Image width.
+    pub width: u32,
+    /// Image height.
+    pub height: u32,
+    pub _x_offset: u32,
+    pub _byte_order: u32,
+    pub _bitmap_unit: u32,
+    pub _bitmap_bit_order: u32,
+    pub _bitmap_pad: u32,
+    pub bits_per_pixel: u32,
+    pub _bytes_per_line: u32,
+    /// X11 visual class for this window. See [`XwdImage::visual_class`] for a
+    /// more human-interpretable value.
+    pub visual_class: u32,
+    /// Bitmask for the red channel in pixel data.
+    pub red_mask: u32,
+    /// Bitmask for the green channel in pixel data.
+    pub green_mask: u32,
+    /// Bitmask for the blue channel in pixel data.
+    pub blue_mask: u32,
+    /// Number of bits per RGB tuple in color data. (E.g., 24-bit color may
+    /// actually be padded to 4 bytes.)
+    pub bits_per_rgb: u32,
+    pub _colormap_entries: u32,
+    /// Number of colors in the colormap for the window that this dump came from.
+    ///
+    /// Note that a colormap may exist but be unused (if the visual class is not
+    /// one that uses a colormap).
+    pub ncolors: u32,
+    pub _window_width: u32,
+    pub _window_height: u32,
+    pub _window_x: u32,
+    pub _window_y: u32,
+    pub _window_border_width: u32,
+}
+
+const HEADER_SIZE: u32 = mem::size_of::<XwdHeader>() as u32;
+
+/// Color data for an entry in a colormap.
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[repr(C)]
+pub struct XwdColor {
+    pixel: u32,
+    red: u16,
+    green: u16,
+    blue: u16,
+    flags: u8,
+    pad: u8,
+}
+
+fn next_u32(bytes: &mut impl Iterator<Item = u8>) -> u32 {
+    let bytes = [
+        bytes.next().unwrap(),
+        bytes.next().unwrap(),
+        bytes.next().unwrap(),
+        bytes.next().unwrap(),
+    ];
+    u32::from_be_bytes(bytes)
+}
+
+fn next_u16(bytes: &mut impl Iterator<Item = u8>) -> u16 {
+    let bytes = [bytes.next().unwrap(), bytes.next().unwrap()];
+    u16::from_be_bytes(bytes)
+}
+
+/// Describes how pixel data is represented in an `xwd` dump.
+///
+/// See descriptions of visual classes at
+/// <https://tronche.com/gui/x/xlib/window/visual-types.html> and [the official
+/// documentation](https://www.x.org/releases/X11R7.7/doc/xproto/x11protocol.html#visual_information)
+/// for more information.
+#[derive(Clone, Copy, Eq, Debug, PartialEq)]
+pub enum VisualClass {
+    StaticGray,
+    GrayScale,
+    StaticColor,
+    PseudoColor,
+    TrueColor,
+    DirectColor,
+}
+
+impl XwdHeader {
+    /// Decodes an `XwdHeader` from `bytes`, panicking on failure.
+    ///
+    /// Leaves `bytes` pointing to the start of the window name.
+    pub fn read(bytes: &mut impl Iterator<Item = u8>) -> XwdHeader {
+        // This layout might change in the future, but let's just go with it for now.
+        XwdHeader {
+            size: next_u32(bytes),
+            version: next_u32(bytes),
+            _format: next_u32(bytes),
+            depth: next_u32(bytes),
+            width: next_u32(bytes),
+            height: next_u32(bytes),
+            _x_offset: next_u32(bytes),
+            _byte_order: next_u32(bytes),
+            _bitmap_unit: next_u32(bytes),
+            _bitmap_bit_order: next_u32(bytes),
+            _bitmap_pad: next_u32(bytes),
+            bits_per_pixel: next_u32(bytes),
+            _bytes_per_line: next_u32(bytes),
+            visual_class: next_u32(bytes),
+            red_mask: next_u32(bytes),
+            green_mask: next_u32(bytes),
+            blue_mask: next_u32(bytes),
+            bits_per_rgb: next_u32(bytes),
+            _colormap_entries: next_u32(bytes),
+            ncolors: next_u32(bytes),
+            _window_width: next_u32(bytes),
+            _window_height: next_u32(bytes),
+            _window_x: next_u32(bytes),
+            _window_y: next_u32(bytes),
+            _window_border_width: next_u32(bytes),
+        }
+    }
+}
+
+impl XwdColor {
+    /// Reads an `XwdColor` from `bytes`, panicking on failure.
+    ///
+    /// Leaves `bytes` pointing to the next byte after the end of the color
+    /// definition.
+    pub fn read(bytes: &mut impl Iterator<Item = u8>) -> XwdColor {
+        XwdColor {
+            pixel: next_u32(bytes),
+            red: next_u16(bytes),
+            green: next_u16(bytes),
+            blue: next_u16(bytes),
+            flags: bytes.next().unwrap(),
+            pad: bytes.next().unwrap(),
+        }
+    }
+}
+
+/// A decoded `xwd` dump.
+pub struct XwdImage {
+    /// Header with image metadata.
+    pub header: XwdHeader,
+    /// Name of the X11 window that the image came from.
+    pub name: CString,
+    /// Colormap data for the X11 window that the image came from.
+    ///
+    /// Note that this may be populated even if it is unused (because the
+    /// window's visual class is one that does not use a colormap).
+    pub colors: Vec<XwdColor>,
+    /// Pixel data for the image.
+    ///
+    /// This may be indices pointing into `colors`, or it may be actual pixel
+    /// values.
+    pub pixels: Vec<u8>,
+}
+
+impl XwdImage {
+    /// Reads an `XwdImage` from `bytes`, panicking on failure.
+    pub fn read(bytes: &mut impl Iterator<Item = u8>) -> XwdImage {
+        let header = XwdHeader::read(bytes);
+        if header.version != SUPPORTED_XWD_VERSION {
+            panic!(
+                "header version {} is not supported. only version {} files are supported.",
+                header.version, SUPPORTED_XWD_VERSION
+            );
+        }
+        let name = Self::read_name(&header, bytes);
+        let colors = Self::read_colors(&header, bytes);
+        let pixels = bytes.collect();
+
+        XwdImage {
+            header,
+            name,
+            colors,
+            pixels,
+        }
+    }
+
+    /// Reads a colormap for the image described by `header` from `bytes`.
+    ///
+    /// `bytes` must point at the start of the colormap data. Leaves `bytes`
+    /// pointing at the first byte of the next item in the data stream.
+    pub fn read_colors(header: &XwdHeader, bytes: &mut impl Iterator<Item = u8>) -> Vec<XwdColor> {
+        let mut colors = Vec::with_capacity(header.ncolors as usize);
+        for _ in 0..header.ncolors {
+            colors.push(XwdColor::read(bytes));
+        }
+        colors
+    }
+
+    /// Reads the X11 window name from `bytes`.
+    ///
+    /// `bytes` must point at the start of the window name. Leaves `bytes`
+    /// pointing at the first byte of the next item in the data stream.
+    ///
+    /// Note that the window name is a null-terminated string, but `header.size`
+    /// (which is supposed to be equal to the size of the header structure plus
+    /// the window name) may actually be longer than `strlen(name) +
+    /// sizeof(HeaderType)`. When that is the case, the extra padding after the
+    /// first null byte in the window name will be passed over silently.
+    pub fn read_name(header: &XwdHeader, bytes: &mut impl Iterator<Item = u8>) -> CString {
+        if header.size <= HEADER_SIZE {
+            panic!(
+                "Invalid header size {} (smaller than header struct size {})",
+                header.size, HEADER_SIZE
+            );
+        }
+        let mut buf = Vec::new();
+        let mut found_nul = false;
+        for _ in 0..header.size - HEADER_SIZE {
+            let b = bytes.next().unwrap();
+            if b == 0 {
+                if found_nul {
+                    continue;
+                } else {
+                    buf.push(b);
+                    found_nul = true;
+                }
+            } else {
+                buf.push(b);
+            }
+        }
+        CString::from_vec_with_nul(buf).unwrap()
+    }
+
+    /// Returns the visual class for this window dump.
+    pub fn visual_class(&self) -> VisualClass {
+        match self.header.visual_class {
+            0 => VisualClass::StaticGray,
+            1 => VisualClass::GrayScale,
+            2 => VisualClass::StaticColor,
+            3 => VisualClass::PseudoColor,
+            4 => VisualClass::TrueColor,
+            5 => VisualClass::DirectColor,
+            _ => panic!(
+                "unrecognized X11 visual class: {}",
+                self.header.visual_class
+            ),
+        }
+    }
+
+    /// Encodes this image as a PNG, consumes `self` in the process (because the
+    /// image data is reused during the encoding process).
+    ///
+    /// Note that only [`VisualClass::TrueColor`] images with a specific pixel
+    /// format (24-bit color packed into 32-bit segments with BGR ordering) are
+    /// supported.
+    pub fn into_png(self) -> Result<Vec<u8>, png::EncodingError> {
+        match self.visual_class() {
+            VisualClass::TrueColor => into_png_true_color(self.header, self.pixels),
+            _ => todo!("X11 visual classes other than TrueColor are not yet supported"),
+        }
+    }
+}
+
+fn into_png_true_color(
+    header: XwdHeader,
+    mut pixels: Vec<u8>,
+) -> Result<Vec<u8>, png::EncodingError> {
+    if header.depth != 24 {
+        todo!("pixmap color depths other than 24-bit are not yet supported");
+    }
+    if !(header.red_mask == 0xff0000
+        && header.green_mask == 0x00ff00
+        && header.blue_mask == 0x0000ff)
+    {
+        todo!("color orderings other than RGB are not yet supported");
+    }
+    if header.bits_per_rgb == 32 {
+        todo!("bits per rgb triplet other than 32 are not yet supported");
+    }
+
+    let mut out = Cursor::new(Vec::<u8>::new());
+    let mut encoder = png::Encoder::new(&mut out, header.width, header.height);
+    encoder.set_color(png::ColorType::Rgba);
+    encoder.set_depth(png::BitDepth::Eight);
+    encoder.set_compression(png::Compression::High);
+
+    for pixel in pixels.chunks_mut(4) {
+        let blue = pixel[0];
+        let green = pixel[1];
+        let red = pixel[2];
+        pixel[0] = red;
+        pixel[1] = green;
+        pixel[2] = blue;
+        pixel[3] = 0xFF;
+    }
+
+    let mut writer = encoder.write_header()?;
+    writer.write_image_data(&pixels)?;
+    writer.finish()?;
+
+    Ok(out.into_inner())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::XwdImage;
+    use insta_image::assert_png_snapshot;
+
+    #[test]
+    fn png_encode() {
+        let snowlamp_xwd = XwdImage::read(&mut include_bytes!("snowlamp.xwd").into_iter().copied());
+        assert_png_snapshot!("snowlamp_encoded", snowlamp_xwd.into_png().unwrap());
+    }
+}

WINGs/wings-rs-tests/src/lib.rs

@@ -0,0 +1,185 @@
+pub mod headless;
+
+use headless::{xvfb::XvfbProcess, DisplayNumberRegistry};
+use std::{
+    env,
+    ffi::{c_char, c_int, CStr, CString},
+    ptr::{self, NonNull},
+    sync::Mutex,
+};
+use wings_rs::WINGsP::{WMHandleEvent, WMInitializeApplication, WMReleaseApplication, WMScreen};
+
+static APPLICATION_COUNT: Mutex<u32> = Mutex::new(0);
+
+/// Stubbed wrapper for WMApplication.
+pub struct HeadlessApplication {
+    /// The headless X server process.
+    pub xvfb: XvfbProcess,
+    /// An open client handle to the headless X server.
+    pub display: NonNull<x11::xlib::Display>,
+    /// A fully initialized `WMScreen` for an application running on the
+    /// headless X server.
+    pub screen: NonNull<WMScreen>,
+}
+
+impl HeadlessApplication {
+    /// Starts a headless X server and calls `WMInitializeApplication` if no
+    /// WINGs application is active.
+    pub fn new() -> Self {
+        static PROGNAME: &'static CStr = c"Test@eqweq_ewq$eqw";
+
+        let xvfb = XvfbProcess::start_default(
+            DisplayNumberRegistry::next_unused_display()
+                .expect("cannot allocate a value for DISPLAY"),
+        )
+        .expect("cannot start Xvfb");
+
+        {
+            let mut application_count = APPLICATION_COUNT.lock().unwrap();
+            if *application_count == 0 {
+                unsafe {
+                    let mut argv: Vec<*mut c_char> =
+                        vec![PROGNAME.as_ptr().cast::<c_char>() as *mut c_char];
+                    let mut argc: c_int = 1;
+                    WMInitializeApplication(
+                        PROGNAME.as_ptr().cast::<c_char>(),
+                        &mut argc as *mut _,
+                        argv.as_mut_ptr(),
+                    );
+                }
+            }
+            *application_count += 1;
+        }
+
+        let display_str = CString::new(format!(":{}", xvfb.display())).unwrap();
+        let display =
+            NonNull::new(unsafe { x11::xlib::XOpenDisplay(display_str.as_ptr()) }).unwrap();
+        let screen = WMScreen::new(&display).unwrap();
+
+        HeadlessApplication {
+            xvfb,
+            display,
+            screen,
+        }
+    }
+
+    /// Pumps the WUtil and X11 event queues, hackily.
+    ///
+    /// Runs WUtil event handlers that should be run by `now`, pumps the X11
+    /// event queue, dispatches the next pending event (if any), and runs
+    /// WUtil idle handlers (if no X11 events are available).
+    ///
+    /// Returns `true` if more events are pending. (This does not account for
+    /// WUtils timer events that might need to fire, since the future time when
+    /// `pump_event_queue` will next be called cannot be known.)
+    ///
+    /// This is somewhat hacky (because it does not match the WINGs main loop
+    /// logic exactly), so it should only be used by tests.
+    pub fn pump_event_queue(&mut self, now: std::time::Instant) -> bool {
+        let display = self.display.as_ptr();
+        wutil_rs::handlers::with_global_handlers(|handlers| handlers.check_timer_handlers(now));
+
+        unsafe {
+            x11::xlib::XSync(display, 0);
+            if x11::xlib::XPending(display) > 0 {
+                let mut event = x11::xlib::XEvent { type_: 0 };
+                x11::xlib::XNextEvent(display, &mut event as *mut _);
+                WMHandleEvent(&mut event as *mut _);
+            } else {
+                wutil_rs::handlers::run_global_idle_handlers();
+            }
+
+            x11::xlib::XSync(display, 0);
+            if x11::xlib::XPending(display) > 0 {
+                return true;
+            }
+            wutil_rs::handlers::with_global_handlers(|handlers| handlers.has_idle_handlers())
+        }
+    }
+}
+
+impl Drop for HeadlessApplication {
+    fn drop(&mut self) {
+        unsafe {
+            x11::xlib::XCloseDisplay(self.display.as_ptr());
+            // Leak self.screen, since WINGs doesn't provide a cleanup function.
+        }
+        let mut application_count = APPLICATION_COUNT.lock().unwrap();
+        if *application_count <= 1 {
+            *application_count = 0;
+            unsafe {
+                WMReleaseApplication();
+            }
+        } else {
+            *application_count -= 1;
+        }
+        self.xvfb.shutdown().unwrap();
+    }
+}
+
+/// Simple wrapper for demo WINGs applications.
+///
+/// This handles calling `WMInitializeApplication`, which operates on a
+/// singleton behind the scenes and wants to be passed command line arguments.
+///
+/// When the last instantiated `LiveApplication` is dropped,
+/// `WMReleaseApplication` is called automatically.
+pub struct LiveApplication {
+    /// Live X11 `Display` that the application is running on.
+    pub display: NonNull<x11::xlib::Display>,
+    /// Fully intialized `WMScreen` for the application.
+    ///
+    /// This is leaked when the `LiveApplication` is dropped because WINGs does
+    /// not provide a deletion function.
+    pub screen: NonNull<WMScreen>,
+}
+
+impl LiveApplication {
+    /// Creates a new application wrapper and initializes the global
+    /// `WMApplication` if necessary.
+    pub fn new(name: &str) -> Self {
+        let mut application_count = APPLICATION_COUNT.lock().unwrap();
+        if *application_count > 0 {
+            panic!("application already started!");
+        }
+        let name = CString::new(name).expect("invalid program name");
+        unsafe {
+            let mut argv: Vec<CString> = vec![name];
+            let name_ptr = argv[0].as_ptr().cast::<c_char>();
+            for arg in env::args() {
+                argv.push(CString::new(arg).expect("invalid argument string"));
+            }
+            let mut argv_ptrs: Vec<*mut c_char> = argv
+                .iter_mut()
+                .map(|a| a.as_ptr().cast::<c_char>() as *mut c_char)
+                .collect();
+            let mut argc: c_int = argv_ptrs.len().try_into().expect("invalid argument count");
+            WMInitializeApplication(name_ptr, &mut argc as *mut _, argv_ptrs.as_mut_ptr());
+        }
+        *application_count = 1;
+
+        let display = NonNull::new(unsafe { x11::xlib::XOpenDisplay(ptr::null_mut()) })
+            .expect("could not connect to X11 display");
+        let screen = WMScreen::new(&display).unwrap();
+
+        LiveApplication { display, screen }
+    }
+}
+
+impl Drop for LiveApplication {
+    fn drop(&mut self) {
+        unsafe {
+            x11::xlib::XCloseDisplay(self.display.as_ptr());
+            // Leak self.screen, since WINGs doesn't provide a cleanup function.
+        }
+        let mut application_count = APPLICATION_COUNT.lock().unwrap();
+        if *application_count <= 1 {
+            *application_count = 0;
+            unsafe {
+                WMReleaseApplication();
+            }
+        } else {
+            *application_count -= 1;
+        }
+    }
+}

WINGs/wings-rs-tests/tests/font_panel_tests.rs

@@ -0,0 +1,14 @@
+use insta_image::assert_png_snapshot;
+use std::time::Instant;
+use wings_rs::font_panel::FontPanel;
+use wings_rs_tests::HeadlessApplication;
+
+#[test]
+fn show_font_panel() {
+    let mut app = HeadlessApplication::new();
+    let mut font_panel =
+        FontPanel::new(app.screen.as_ptr()).expect("could not construct font panel");
+    font_panel.show();
+    while app.pump_event_queue(Instant::now()) {}
+    assert_png_snapshot!("font_panel", app.xvfb.png_screenshot());
+}

WINGs/wings-rs-tests/tests/snapshots/font_panel_tests__font_panel.snap

@@ -0,0 +1,7 @@
+---
+source: tests/font_panel_tests.rs
+assertion_line: 16
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/snapshots/wmpixmap_tests__empty_pixmap_on_window.snap

@@ -0,0 +1,7 @@
+---
+source: tests/wmpixmap_tests.rs
+assertion_line: 63
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/snapshots/wmpixmap_tests__empty_window.snap

@@ -0,0 +1,7 @@
+---
+source: tests/wmpixmap_tests.rs
+assertion_line: 41
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/snapshots/wmpixmap_tests__from_file_blended_base_pixmap.snap

@@ -0,0 +1,7 @@
+---
+source: tests/wmpixmap_tests.rs
+assertion_line: 142
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/snapshots/wmpixmap_tests__from_file_blended_cleared_window.snap

@@ -0,0 +1,7 @@
+---
+source: tests/wmpixmap_tests.rs
+assertion_line: 160
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/snapshots/wmpixmap_tests__from_file_blended_with_red.snap

@@ -0,0 +1,7 @@
+---
+source: tests/wmpixmap_tests.rs
+assertion_line: 175
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/snapshots/wmpixmap_tests__from_file_pixmap.snap

@@ -0,0 +1,7 @@
+---
+source: tests/wmpixmap_tests.rs
+assertion_line: 58
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/snapshots/wmpixmap_tests__from_file_scaled_blended_base_pixmap.snap

@@ -0,0 +1,7 @@
+---
+source: tests/wmpixmap_tests.rs
+assertion_line: 204
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/snapshots/wmpixmap_tests__from_file_scaled_blended_cleared_window.snap

@@ -0,0 +1,7 @@
+---
+source: tests/wmpixmap_tests.rs
+assertion_line: 222
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/snapshots/wmpixmap_tests__from_file_scaled_blended_non_integral_base_pixmap.snap

@@ -0,0 +1,7 @@
+---
+source: tests/wmpixmap_tests.rs
+assertion_line: 268
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/snapshots/wmpixmap_tests__from_file_scaled_blended_non_integral_cleared_window.snap

@@ -0,0 +1,7 @@
+---
+source: tests/wmpixmap_tests.rs
+assertion_line: 286
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/snapshots/wmpixmap_tests__from_file_scaled_blended_non_integral_scaled.snap

@@ -0,0 +1,7 @@
+---
+source: tests/wmpixmap_tests.rs
+assertion_line: 304
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/snapshots/wmpixmap_tests__from_file_scaled_blended_with_red.snap

@@ -0,0 +1,7 @@
+---
+source: tests/wmpixmap_tests.rs
+assertion_line: 239
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/snapshots/wmpixmap_tests__from_r_image_no_mask.snap

@@ -0,0 +1,7 @@
+---
+source: tests/wmpixmap_tests.rs
+assertion_line: 130
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/snapshots/wmpixmap_tests__from_r_image_with_mask.snap

@@ -0,0 +1,7 @@
+---
+source: tests/wmpixmap_tests.rs
+assertion_line: 229
+expression: app.xvfb.png_screenshot()
+extension: png
+snapshot_kind: binary
+---

WINGs/wings-rs-tests/tests/wmpixmap_tests.rs

@@ -0,0 +1,450 @@
+use insta_image::assert_png_snapshot;
+use std::{
+    ptr::{self, NonNull},
+    time::Instant,
+};
+use wings_rs::WINGsP::{
+    WMCreateBlendedPixmapFromFile, WMCreateBlendedPixmapFromRImage, WMCreatePixmap,
+    WMCreatePixmapFromFile, WMCreatePixmapFromRImage, WMCreateScaledBlendedPixmapFromFile,
+    WMDrawPixmap, WMReleasePixmap,
+};
+use wings_rs_tests::HeadlessApplication;
+use wrlib_rs::ffi::{RColor, RLoadImage, RReleaseImage};
+
+#[test]
+fn draw_blank_pixmap() {
+    let mut app = HeadlessApplication::new();
+    unsafe {
+        let display = (*app.screen.as_ptr()).display;
+        let win = x11::xlib::XCreateSimpleWindow(
+            display,
+            (*app.screen.as_ptr()).rootWin,
+            0,
+            0,
+            512,
+            512,
+            1,
+            1,
+            x11::xlib::XWhitePixel(display, 0),
+        );
+        x11::xlib::XMapWindow(display, win);
+
+        let pixmap = NonNull::new(WMCreatePixmap(app.screen.as_ptr(), 128, 196, 24, 1)).unwrap();
+        WMDrawPixmap(pixmap.as_ptr(), win, 64, 96);
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!("empty_window", app.xvfb.png_screenshot());
+
+        let gc = x11::xlib::XCreateGC(display, (*pixmap.as_ptr()).pixmap, 0, ptr::null_mut());
+        x11::xlib::XSetForeground(display, gc, 0);
+        x11::xlib::XFillRectangle(display, (*pixmap.as_ptr()).pixmap, gc, 0, 0, 128, 196);
+        WMDrawPixmap(pixmap.as_ptr(), win, 64, 96);
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!("empty_pixmap_on_window", app.xvfb.png_screenshot());
+
+        x11::xlib::XFreeGC(display, gc);
+        WMReleasePixmap(pixmap.as_ptr());
+    }
+}
+
+// WMCreatePixmapFromXPixmaps is not tested because it simply fills in struct
+// fields. Coverage from other tests in this file should be adequate.
+
+#[test]
+fn draw_pixmap_from_file() {
+    let mut app = HeadlessApplication::new();
+    unsafe {
+        let display = (*app.screen.as_ptr()).display;
+        let win = x11::xlib::XCreateSimpleWindow(
+            display,
+            (*app.screen.as_ptr()).rootWin,
+            0,
+            0,
+            512,
+            512,
+            1,
+            1,
+            x11::xlib::XWhitePixel(display, 0),
+        );
+        x11::xlib::XMapWindow(display, win);
+
+        let pixmap = NonNull::new(WMCreatePixmapFromFile(
+            app.screen.as_ptr(),
+            c"tests/image_128x120.png".as_ptr(),
+        ))
+        .unwrap();
+        WMDrawPixmap(pixmap.as_ptr(), win, 64, 96);
+
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!("from_file_pixmap", app.xvfb.png_screenshot());
+        WMReleasePixmap(pixmap.as_ptr());
+    }
+}
+
+#[test]
+fn draw_pixmap_from_r_image_no_mask() {
+    let mut app = HeadlessApplication::new();
+    unsafe {
+        let display = (*app.screen.as_ptr()).display;
+        let win = x11::xlib::XCreateSimpleWindow(
+            display,
+            (*app.screen.as_ptr()).rootWin,
+            0,
+            0,
+            512,
+            512,
+            1,
+            1,
+            x11::xlib::XWhitePixel(display, 0),
+        );
+        x11::xlib::XMapWindow(display, win);
+
+        let rimage = RLoadImage(
+            (*app.screen.as_ptr()).rcontext,
+            c"tests/image_128x120.png".as_ptr(),
+            0,
+        );
+        let pixmap =
+            NonNull::new(WMCreatePixmapFromRImage(app.screen.as_ptr(), rimage, 255)).unwrap();
+        WMDrawPixmap(pixmap.as_ptr(), win, 70, 74);
+
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!("from_r_image_no_mask", app.xvfb.png_screenshot());
+        WMReleasePixmap(pixmap.as_ptr());
+    }
+}
+
+#[test]
+fn draw_pixmap_from_r_image_with_mask() {
+    let mut app = HeadlessApplication::new();
+    unsafe {
+        let display = (*app.screen.as_ptr()).display;
+        let win = x11::xlib::XCreateSimpleWindow(
+            display,
+            (*app.screen.as_ptr()).rootWin,
+            0,
+            0,
+            512,
+            512,
+            1,
+            1,
+            x11::xlib::XBlackPixel(display, 0),
+        );
+        x11::xlib::XMapWindow(display, win);
+
+        let rimage = NonNull::new(RLoadImage(
+            (*app.screen.as_ptr()).rcontext,
+            c"tests/image_128x120_varying_alpha.png".as_ptr(),
+            255,
+        ))
+        .unwrap();
+
+        // The threshold given to WMCreatePixmapFromRImage is compared against
+        // the image's alpha channel. Pixels whose transparency are below the
+        // threshold are masked out. This should draw a quartet of images with
+        // varying masks.
+
+        // Totally masked.
+        let pixmap_255 = NonNull::new(WMCreatePixmapFromRImage(
+            app.screen.as_ptr(),
+            rimage.as_ptr(),
+            255,
+        ))
+        .unwrap();
+        WMDrawPixmap(pixmap_255.as_ptr(), win, 70, 74);
+        // Three bubbles masked.
+        let pixmap_200 = NonNull::new(WMCreatePixmapFromRImage(
+            app.screen.as_ptr(),
+            rimage.as_ptr(),
+            200,
+        ))
+        .unwrap();
+        WMDrawPixmap(pixmap_200.as_ptr(), win, 200, 74);
+        // Two bubbles masked.
+        let pixmap_128 = NonNull::new(WMCreatePixmapFromRImage(
+            app.screen.as_ptr(),
+            rimage.as_ptr(),
+            128,
+        ))
+        .unwrap();
+        WMDrawPixmap(pixmap_128.as_ptr(), win, 70, 200);
+        // Nothing masked.
+        let pixmap_0 = NonNull::new(WMCreatePixmapFromRImage(
+            app.screen.as_ptr(),
+            rimage.as_ptr(),
+            0,
+        ))
+        .unwrap();
+        WMDrawPixmap(pixmap_0.as_ptr(), win, 200, 200);
+
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!("from_r_image_with_mask", app.xvfb.png_screenshot());
+        WMReleasePixmap(pixmap_255.as_ptr());
+        WMReleasePixmap(pixmap_200.as_ptr());
+        WMReleasePixmap(pixmap_128.as_ptr());
+        WMReleasePixmap(pixmap_0.as_ptr());
+        RReleaseImage(rimage.as_ptr());
+    }
+}
+
+#[test]
+fn draw_blended_pixmap_from_r_image() {
+    let mut app = HeadlessApplication::new();
+    unsafe {
+        let display = (*app.screen.as_ptr()).display;
+        let win = x11::xlib::XCreateSimpleWindow(
+            display,
+            (*app.screen.as_ptr()).rootWin,
+            0,
+            0,
+            512,
+            512,
+            1,
+            1,
+            x11::xlib::XWhitePixel(display, 0),
+        );
+        x11::xlib::XMapWindow(display, win);
+
+        let rimage = RLoadImage(
+            (*app.screen.as_ptr()).rcontext,
+            c"tests/image_128x120.png".as_ptr(),
+            0,
+        );
+        let pixmap = NonNull::new(WMCreateBlendedPixmapFromRImage(
+            app.screen.as_ptr(),
+            rimage,
+            &RColor {
+                red: 255,
+                green: 0,
+                blue: 0,
+                alpha: 255,
+            } as *const _,
+        ))
+        .unwrap();
+        WMDrawPixmap(pixmap.as_ptr(), win, 70, 74);
+
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!("from_r_image_no_mask", app.xvfb.png_screenshot());
+        WMReleasePixmap(pixmap.as_ptr());
+    }
+}
+
+#[test]
+fn draw_blended_pixmap_from_file() {
+    let mut app = HeadlessApplication::new();
+    unsafe {
+        let display = (*app.screen.as_ptr()).display;
+        let win = x11::xlib::XCreateSimpleWindow(
+            display,
+            (*app.screen.as_ptr()).rootWin,
+            0,
+            0,
+            512,
+            512,
+            1,
+            1,
+            x11::xlib::XWhitePixel(display, 0),
+        );
+        x11::xlib::XMapWindow(display, win);
+
+        let pixmap = NonNull::new(WMCreatePixmapFromFile(
+            app.screen.as_ptr(),
+            c"tests/image_with_transparent_dot_128x120.png".as_ptr(),
+        ))
+        .unwrap();
+        WMDrawPixmap(pixmap.as_ptr(), win, 64, 96);
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!("from_file_blended_base_pixmap", app.xvfb.png_screenshot());
+
+        x11::xlib::XUnmapWindow(display, win);
+        WMReleasePixmap(pixmap.as_ptr());
+
+        let win = x11::xlib::XCreateSimpleWindow(
+            display,
+            (*app.screen.as_ptr()).rootWin,
+            0,
+            0,
+            512,
+            512,
+            1,
+            1,
+            x11::xlib::XWhitePixel(display, 0),
+        );
+        x11::xlib::XMapWindow(display, win);
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!(
+            "from_file_blended_cleared_window",
+            app.xvfb.png_screenshot()
+        );
+
+        let pixmap = NonNull::new(WMCreateBlendedPixmapFromFile(
+            app.screen.as_ptr(),
+            c"tests/image_with_transparent_dot_128x120.png".as_ptr(),
+            &RColor {
+                red: 255,
+                green: 0,
+                blue: 0,
+                alpha: 255,
+            } as *const _,
+        ))
+        .unwrap();
+        WMDrawPixmap(pixmap.as_ptr(), win, 64, 96);
+
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!("from_file_blended_with_red", app.xvfb.png_screenshot());
+        WMReleasePixmap(pixmap.as_ptr());
+    }
+}
+
+#[test]
+fn draw_scaled_blended_pixmap_from_file() {
+    let mut app = HeadlessApplication::new();
+    unsafe {
+        let display = (*app.screen.as_ptr()).display;
+        let win = x11::xlib::XCreateSimpleWindow(
+            display,
+            (*app.screen.as_ptr()).rootWin,
+            0,
+            0,
+            512,
+            512,
+            1,
+            1,
+            x11::xlib::XWhitePixel(display, 0),
+        );
+        x11::xlib::XMapWindow(display, win);
+
+        let pixmap = NonNull::new(WMCreatePixmapFromFile(
+            app.screen.as_ptr(),
+            c"tests/image_with_transparent_dot_128x120.png".as_ptr(),
+        ))
+        .unwrap();
+        WMDrawPixmap(pixmap.as_ptr(), win, 64, 96);
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!(
+            "from_file_scaled_blended_base_pixmap",
+            app.xvfb.png_screenshot()
+        );
+
+        x11::xlib::XUnmapWindow(display, win);
+        WMReleasePixmap(pixmap.as_ptr());
+
+        let win = x11::xlib::XCreateSimpleWindow(
+            display,
+            (*app.screen.as_ptr()).rootWin,
+            0,
+            0,
+            512,
+            512,
+            1,
+            1,
+            x11::xlib::XWhitePixel(display, 0),
+        );
+        x11::xlib::XMapWindow(display, win);
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!(
+            "from_file_scaled_blended_cleared_window",
+            app.xvfb.png_screenshot()
+        );
+
+        let pixmap = NonNull::new(WMCreateScaledBlendedPixmapFromFile(
+            app.screen.as_ptr(),
+            c"tests/image_with_transparent_dot_128x120.png".as_ptr(),
+            &RColor {
+                red: 255,
+                green: 0,
+                blue: 0,
+                alpha: 255,
+            } as *const _,
+            60,
+            64,
+        ))
+        .unwrap();
+        WMDrawPixmap(pixmap.as_ptr(), win, 64, 96);
+
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!(
+            "from_file_scaled_blended_with_red",
+            app.xvfb.png_screenshot()
+        );
+        WMReleasePixmap(pixmap.as_ptr());
+    }
+}
+
+#[test]
+fn draw_scaled_blended_pixmap_from_file_non_integral_scaling() {
+    let mut app = HeadlessApplication::new();
+    unsafe {
+        let display = (*app.screen.as_ptr()).display;
+        let win = x11::xlib::XCreateSimpleWindow(
+            display,
+            (*app.screen.as_ptr()).rootWin,
+            0,
+            0,
+            512,
+            512,
+            1,
+            1,
+            x11::xlib::XWhitePixel(display, 0),
+        );
+        x11::xlib::XMapWindow(display, win);
+
+        let pixmap = NonNull::new(WMCreatePixmapFromFile(
+            app.screen.as_ptr(),
+            c"tests/image_128x120.png".as_ptr(),
+        ))
+        .unwrap();
+        WMDrawPixmap(pixmap.as_ptr(), win, 64, 96);
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!(
+            "from_file_scaled_blended_non_integral_base_pixmap",
+            app.xvfb.png_screenshot()
+        );
+
+        x11::xlib::XUnmapWindow(display, win);
+        WMReleasePixmap(pixmap.as_ptr());
+
+        let win = x11::xlib::XCreateSimpleWindow(
+            display,
+            (*app.screen.as_ptr()).rootWin,
+            0,
+            0,
+            512,
+            512,
+            1,
+            1,
+            x11::xlib::XWhitePixel(display, 0),
+        );
+        x11::xlib::XMapWindow(display, win);
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!(
+            "from_file_scaled_blended_non_integral_cleared_window",
+            app.xvfb.png_screenshot()
+        );
+
+        let pixmap = NonNull::new(WMCreateScaledBlendedPixmapFromFile(
+            app.screen.as_ptr(),
+            // No alpha channel on this image, so no color blending happens.
+            c"tests/image_128x120.png".as_ptr(),
+            &RColor {
+                red: 255,
+                green: 0,
+                blue: 0,
+                alpha: 255,
+            } as *const _,
+            // Shrink by only a little bit, such that simple integer division
+            // might be thrown off. This test ensures that rescaling will
+            // actually happen.
+            110,
+            114,
+        ))
+        .unwrap();
+        WMDrawPixmap(pixmap.as_ptr(), win, 64, 96);
+
+        while app.pump_event_queue(Instant::now()) {}
+        assert_png_snapshot!(
+            "from_file_scaled_blended_non_integral_scaled",
+            app.xvfb.png_screenshot()
+        );
+        WMReleasePixmap(pixmap.as_ptr());
+    }
+}

WINGs/wings-rs/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "wings-rs"
+version = "0.1.0"
+edition = "2024"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+libc = "0.2.177"
+pango-sys = "0.21.2"
+wrlib-rs = { path = "../../wrlib-rs" }
+wutil-rs = { path = "../../wutil-rs" }
+x11 = "2.21.0"
+yeslogic-fontconfig-sys = "6.0"

WINGs/wings-rs/Makefile.am

@@ -0,0 +1,73 @@
+AUTOMAKE_OPTIONS =
+
+RUST_SRC = \
+	src/WINGsP.rs \
+	src/button.rs \
+	src/color.rs \
+	src/configuration.rs \
+	src/ffi.rs \
+	src/font.rs \
+	src/font_panel.rs \
+	src/lib.rs \
+	src/list.rs \
+	src/pango_extras.rs \
+	src/screen.rs \
+	src/widget.rs
+
+RUST_EXTRA = \
+	Cargo.lock \
+	Cargo.toml
+
+src/WINGsP.rs: ../WINGs/WINGsP.h ../../wrlib/wraster.h ../WINGs/WINGs.h ../WINGs/WUtil.h Makefile patch_WINGsP.sh
+	$(BINDGEN) ../WINGs/WINGsP.h \
+	--no-recursive-allowlist \
+	--allowlist-type "^W_.+|^WM(View|Array|DragOperationType|Point|Data|OpenPanel|SavePanel|HashTable|DraggingInfo|SelectionProcs|Rect|EventProc|Widget|Size|Pixmap|FilePanel|List|ListItem)" \
+	--allowlist-type "^WM(FontPanel|Screen|Button)" \
+	--allowlist-function "^WMCreateScreen|^WM(Get|Show)FontPanel|^WMCreateCommandButton|^WM(Initialize|Release)Application|^WMScreenMainLoop|^WMHandleEvent" \
+	--allowlist-function "^WMWidgetScreen|^WM(Initialize|Release)Application|^WM(ScreenMainLoop|HandleEvent)|^WM(((Get|Set)TextFieldFont)|GetTextFieldText|SetTextFieldText|SelectTextFieldRange)" \
+	--allowlist-type "WMList" \
+	--allowlist-function "^WM(CreateList|SetListAction|GetListSelectedItem|InsertListItem|ClearList|FindRowOfListItemWithTitle|SelectListItem|SetListPosition|SortListItems)" \
+	--allowlist-type "^WM(Window|Action)" \
+	--allowlist-function "^WM(CreateWindow|SetWindowTitle|SetWindowMinSize|SetWindowCloseAction)" \
+	--allowlist-type "^WMWidget" \
+	--allowlist-function "^WM(Map|Destroy|Unmap|Resize|Realize|Move)Widget" \
+	--allowlist-function "^WMWidget(Width|Height)" \
+	--allowlist-function "^WM(SetWidgetBackgroundColor|SetWidgetBackgroundColor|MapSubwidgets)" \
+	--allowlist-type "^WM(SplitView|SplitViewConstrainProc)" \
+	--allowlist-function "^WM(SetViewNotifySizeChanges|CreateSplitView|SetSplitViewConstrainProc|GetSplitViewDividerThickness|AddSplitViewSubview)" \
+	--allowlist-type "^WMNotification" \
+	--allowlist-function "^WM(Add|Remove)NotificationObserver|^WMGetNotification(Object|Name)" \
+	--allowlist-item "^WMNotificationObserverAction" \
+	--allowlist-item "^WMViewSizeDidChangeNotification" \
+	--allowlist-type "^WMFrame" \
+	--allowlist-function "^WM(CreateFrame|SetFrameRelief)" \
+	--allowlist-function "^WM(White|DarkGray|Release)Color" \
+	--allowlist-type "^WMTextField" \
+	--allowlist-function "^WM(CreateTextField)" \
+	--allowlist-type "^WMLabel" \
+	--allowlist-function "^WM(CreateLabel|SetLabelText|SetLabelFont|SetLabelTextColor|SetLabelRelief|SetLabelTextAlignment)" \
+	--allowlist-type "^WM(Button|ButtonBehaviorMask)" \
+	--allowlist-function "^WM(CreateCustomButton|SetButtonText|SetButtonAction|SetButtonText)" \
+	--allowlist-type "_WINGsConfiguration" \
+	--allowlist-item "^WMAlignment" \
+	--allowlist-item "^WMReliefType" \
+	--allowlist-function "^WM(Create|Release|Draw)Pixmap|^WMCreate(|Blended|ScaledBlended)PixmapFromFile|^WMCreate(|Blended)PixmapFromRImage" \
+	-o src/WINGsP.rs -- \
+	@PANGO_CFLAGS@ \
+	-I../../wrlib \
+	-I.. && ./patch_WINGsP.sh src/WINGsP.rs
+
+Cargo.lock:
+	$(CARGO) build
+
+target/debug/libwings_rs.so: $(RUST_SRC) $(RUST_EXTRA)
+	$(CARGO) build
+
+check-local:
+	$(CARGO) test
+
+clean-local:
+	$(CARGO) clean
+	rm -f src/WINGsP.rs
+
+all: target/debug/libwings_rs.so

WINGs/wings-rs/patch_WINGsP.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# This file provides ad-hoc fixups to the WINGsP provided by bindgen:
+#  - Import Xlib symbols so that everything compiles.
+#  - The opaque type names _XftDraw and _XftFont are replaced with void*.
+#  - Pango bindings aren't yet pulled into our Rust code, so PangoLayout is also demoted to void*.
+
+set -e
+
+if [ "x$1" = "x" ]; then
+    echo "Usage: $(basename $0) <file to patch>"
+    exit 1
+fi
+
+FILE="$1"
+
+exec sed -i -r \
+     -e "1s/^/use wrlib_rs::ffi::*;\nuse wutil_rs::range::ffi::*;\nuse x11::xlib::*;\nuse crate::ffi::*;\n\n/" \
+     -e "s/_XftDraw/::std::ffi::c_void/g" \
+     -e "s/_XftFont/::std::ffi::c_void/g" \
+     -e "s/PangoLayout/::std::ffi::c_void/g" \
+     "$1"

WINGs/wings-rs/src/button.rs

@@ -0,0 +1,22 @@
+#[allow(non_snake_case)]
+pub mod ffi {
+    use crate::WINGsP::*;
+
+    /// Creates a button like an "Ok" button to dismiss a dialog.
+    ///
+    /// ## Rust rewrite notes
+    ///
+    /// This was originally a macro.
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMCreateCommandButton(parent: *mut WMWidget) -> *mut WMButton {
+        unsafe {
+            WMCreateCustomButton(
+                parent,
+                (WMButtonBehaviorMask_WBBSpringLoadedMask
+                    | WMButtonBehaviorMask_WBBPushInMask
+                    | WMButtonBehaviorMask_WBBPushLightMask
+                    | WMButtonBehaviorMask_WBBPushChangeMask) as i32,
+            )
+        }
+    }
+}

WINGs/wings-rs/src/color.rs

@@ -0,0 +1,566 @@
+use crate::WINGsP::WMScreen;
+use std::cell::RefCell;
+use std::ffi::c_ulong;
+use std::ptr::{self, NonNull};
+use wrlib_rs::ffi::{RColor, RGetClosestXColor};
+
+pub struct Color {
+    screen: NonNull<WMScreen>,
+    color: x11::xlib::XColor,
+    alpha: RefCell<u16>,
+    gc: RefCell<x11::xlib::GC>,
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct Rgb {
+    pub r: u16,
+    pub g: u16,
+    pub b: u16,
+}
+
+impl Rgb {
+    pub fn with_alpha(self, alpha: u16) -> Rgba {
+        Rgba {
+            r: self.r,
+            g: self.g,
+            b: self.b,
+            a: alpha,
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum ColorMatch {
+    Approximate,
+    Exact,
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct Rgba {
+    pub r: u16,
+    pub g: u16,
+    pub b: u16,
+    pub a: u16,
+}
+
+impl Color {
+    const LIGHT_STIPPLE_WIDTH: u32 = 4;
+    const LIGHT_STIPPLE_HEIGHT: u32 = 4;
+    const LIGHT_STIPPLE_BITS: [u8; 4] = [0x05, 0x0a, 0x05, 0x0a];
+    const DARK_STIPPLE_WIDTH: u32 = 4;
+    const DARK_STIPPLE_HEIGHT: u32 = 4;
+    const DARK_STIPPLE_BITS: [u8; 4] = [0x0a, 0x04, 0x0a, 0x01];
+
+    pub fn new_rgb(screen: NonNull<WMScreen>, rgb: Rgb, mtch: ColorMatch) -> Option<Self> {
+        Self::new_rgba(screen, rgb.with_alpha(0xffff), mtch)
+    }
+
+    pub fn new_rgba(screen: NonNull<WMScreen>, rgba: Rgba, mtch: ColorMatch) -> Option<Self> {
+        match mtch {
+            ColorMatch::Approximate => find_close_rgba(screen, rgba),
+            ColorMatch::Exact => create_rgba(screen, rgba),
+        }
+    }
+
+    pub fn red(&self) -> u16 {
+        self.color.red
+    }
+
+    pub fn green(&self) -> u16 {
+        self.color.green
+    }
+
+    pub fn blue(&self) -> u16 {
+        self.color.blue
+    }
+
+    pub fn alpha(&self) -> u16 {
+        *self.alpha.borrow()
+    }
+
+    pub fn pixel(&self) -> c_ulong {
+        self.color.pixel
+    }
+
+    pub fn to_xft_color(&self) -> x11::xft::XftColor {
+        x11::xft::XftColor {
+            color: x11::xrender::XRenderColor {
+                red: self.red(),
+                green: self.green(),
+                blue: self.blue(),
+                alpha: self.alpha(),
+            },
+            pixel: self.pixel(),
+        }
+    }
+
+    pub fn to_rcolor(&self) -> RColor {
+        RColor {
+            red: (self.red() >> 8) as u8,
+            green: (self.green() >> 8) as u8,
+            blue: (self.blue() >> 8) as u8,
+            alpha: (self.alpha() >> 8) as u8,
+        }
+    }
+
+    pub fn gc(&self) -> x11::xlib::GC {
+        let mut gc = self.gc.borrow_mut();
+        if gc.is_null() {
+            let mut gcv =
+                unsafe { std::mem::MaybeUninit::<x11::xlib::XGCValues>::zeroed().assume_init() };
+            gcv.foreground = self.pixel();
+            gcv.graphics_exposures = 0;
+
+            *gc = unsafe {
+                let screen = &mut *self.screen.as_ptr();
+                x11::xlib::XCreateGC(
+                    screen.display,
+                    (*screen.rcontext).drawable,
+                    (x11::xlib::GCForeground | x11::xlib::GCGraphicsExposures) as u64,
+                    &mut gcv,
+                )
+            };
+        }
+        *gc
+    }
+
+    pub fn hex_triplet(&self) -> String {
+        format!(
+            "#{:02x}{:02x}{:02x}",
+            self.red() >> 8,
+            self.green() >> 8,
+            self.blue() >> 8
+        )
+    }
+}
+
+/*
+ * TODO: make the color creation code return the same WMColor for the
+ * same colors.
+ * make findCloseColor() find the closest color in the RContext pallette
+ * or in the other colors allocated by WINGs.
+ */
+
+fn find_close_rgba(screen: NonNull<WMScreen>, rgba: Rgba) -> Option<Color> {
+    let rcontext = unsafe { (*screen.as_ptr()).rcontext };
+    let display = unsafe { (*screen.as_ptr()).display };
+    let colormap = unsafe { (*screen.as_ptr()).colormap };
+
+    let mut xcolor = x11::xlib::XColor {
+        pixel: 0,
+        red: 0,
+        green: 0,
+        blue: 0,
+        flags: 0,
+        pad: 0,
+    };
+    let mut rcolor = RColor {
+        red: (rgba.r >> 8) as u8,
+        green: (rgba.g >> 8) as u8,
+        blue: (rgba.b >> 8) as u8,
+        alpha: (rgba.a >> 8) as u8,
+    };
+    if unsafe { RGetClosestXColor(rcontext, &mut rcolor, &mut xcolor) } == 0 {
+        return None;
+    }
+    if unsafe { x11::xlib::XAllocColor(display, colormap, &mut xcolor) } == 0 {
+        return None;
+    }
+
+    Some(Color {
+        screen: screen,
+        color: xcolor,
+        alpha: RefCell::new(rgba.a),
+        gc: RefCell::new(ptr::null_mut()),
+    })
+}
+
+fn create_rgba(screen: NonNull<WMScreen>, rgba: Rgba) -> Option<Color> {
+    let display = unsafe { (*screen.as_ptr()).display };
+    let colormap = unsafe { (*screen.as_ptr()).colormap };
+    let mut xcolor = x11::xlib::XColor {
+        red: rgba.r,
+        green: rgba.g,
+        blue: rgba.b,
+        flags: x11::xlib::DoRed | x11::xlib::DoGreen | x11::xlib::DoBlue,
+        pad: 0,
+        pixel: 0,
+    };
+    if unsafe { x11::xlib::XAllocColor(display, colormap, &mut xcolor) } == 0 {
+        return None;
+    }
+
+    Some(Color {
+        screen: screen,
+        color: xcolor,
+        alpha: RefCell::new(rgba.a),
+        gc: RefCell::new(ptr::null_mut()),
+    })
+}
+
+impl Drop for Color {
+    fn drop(&mut self) {
+        unsafe {
+            let display = (*self.screen.as_ptr()).display;
+            let colormap = (*self.screen.as_ptr()).colormap;
+            x11::xlib::XFreeColors(display, colormap, &mut self.color.pixel, 1, 0);
+            let gc = self.gc.borrow();
+            if !gc.is_null() {
+                x11::xlib::XFreeGC(display, *gc);
+            }
+        }
+    }
+}
+
+pub mod ffi {
+    use super::*;
+    use std::ffi::{c_char, c_int, c_uint, c_ulong, c_ushort, CString};
+    use std::ptr::NonNull;
+    use std::rc::Rc;
+    use wrlib_rs::ffi::RColor;
+
+    pub type WMColor = Rc<Color>;
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMCreateRGBColor(
+        screen: NonNull<WMScreen>,
+        red: c_ushort,
+        green: c_ushort,
+        blue: c_ushort,
+        exact: c_int,
+    ) -> *mut WMColor {
+        Color::new_rgb(
+            screen,
+            Rgb {
+                r: red,
+                g: green,
+                b: blue,
+            },
+            if exact == 0 {
+                ColorMatch::Approximate
+            } else {
+                ColorMatch::Exact
+            },
+        )
+        .map(|c| Box::leak(Box::new(Rc::new(c))) as *mut _)
+        .unwrap_or(unsafe { (*screen.as_ptr()).black })
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMGetRColorFroMColor(color: NonNull<WMColor>) -> RColor {
+        unsafe { (*color.as_ptr()).to_rcolor() }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn pixel(c: &WMColor) -> c_ulong {
+        c.color.pixel
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMCreateRGBAColor(
+        screen: NonNull<WMScreen>,
+        red: c_ushort,
+        green: c_ushort,
+        blue: c_ushort,
+        alpha: c_ushort,
+        exact: c_int,
+    ) -> *mut WMColor {
+        Color::new_rgba(
+            screen,
+            Rgba {
+                r: red,
+                g: green,
+                b: blue,
+                a: alpha,
+            },
+            if exact == 0 {
+                ColorMatch::Approximate
+            } else {
+                ColorMatch::Exact
+            },
+        )
+        .map(|c| Box::leak(Box::new(Rc::new(c))) as *mut _)
+        .unwrap_or(unsafe { (*screen.as_ptr()).black })
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMCreateNamedColor(
+        screen: NonNull<WMScreen>,
+        name: *const c_char,
+        exact: c_int,
+    ) -> *mut WMColor {
+        let display = unsafe { (*screen.as_ptr()).display };
+        let colormap = unsafe { (*screen.as_ptr()).colormap };
+        let mut xcolor = x11::xlib::XColor {
+            red: 0,
+            green: 0,
+            blue: 0,
+            flags: 0,
+            pad: 0,
+            pixel: 0,
+        };
+        if unsafe { x11::xlib::XParseColor(display, colormap, name, &mut xcolor) } == 0 {
+            return ptr::null_mut();
+        }
+        let visual_class = unsafe { (*(*screen.as_ptr()).visual).class };
+        let exact = visual_class == x11::xlib::TrueColor || exact != 0;
+        if exact {
+            if let Some(c) = Color::new_rgb(
+                screen,
+                Rgb {
+                    r: xcolor.red,
+                    g: xcolor.green,
+                    b: xcolor.blue,
+                },
+                ColorMatch::Exact,
+            ) {
+                return Box::leak(Box::new(Rc::new(c))) as *mut _;
+            }
+        }
+        match Color::new_rgb(
+            screen,
+            Rgb {
+                r: xcolor.red,
+                g: xcolor.green,
+                b: xcolor.blue,
+            },
+            ColorMatch::Approximate,
+        ) {
+            Some(c) => Box::leak(Box::new(Rc::new(c))) as *mut _,
+            None => ptr::null_mut(),
+        }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMRetainColor(color: NonNull<WMColor>) -> *mut WMColor {
+        Box::leak(Box::new(unsafe { (*color.as_ptr()).clone() })) as *mut _
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMReleaseColor(color: NonNull<WMColor>) {
+        unsafe {
+            let _ = Box::from_raw(color.as_ptr());
+        }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMSetColorAlpha(color: NonNull<WMColor>, alpha: c_ushort) {
+        unsafe {
+            (&mut *color.as_ptr()).alpha.replace(alpha);
+        }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMPaintColorSwatch(
+        color: NonNull<WMColor>,
+        d: x11::xlib::Drawable,
+        x: c_int,
+        y: c_int,
+        width: c_uint,
+        height: c_uint,
+    ) {
+        unsafe {
+            let color = &mut *color.as_ptr();
+            let display = (*color.screen.as_ptr()).display;
+            x11::xlib::XFillRectangle(display, d, color.gc(), x, y, width, height);
+        }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMColorPixel(color: NonNull<WMColor>) -> c_ulong {
+        unsafe { (*color.as_ptr()).pixel() }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMColorGC(color: NonNull<WMColor>) -> x11::xlib::GC {
+        unsafe { (&mut *color.as_ptr()).gc() }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMSetColorInGC(color: NonNull<WMColor>, gc: x11::xlib::GC) {
+        unsafe {
+            let color = &mut *color.as_ptr();
+            let display = (*color.screen.as_ptr()).display;
+            x11::xlib::XSetForeground(display, gc, color.pixel());
+        }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMWhiteColor(screen: NonNull<WMScreen>) -> *mut WMColor {
+        unsafe {
+            let scr = &mut *screen.as_ptr();
+            if scr.white.is_null() {
+                // TODO: warn if we couldn't allocate.
+                scr.white = WMCreateRGBColor(screen, 0xffff, 0xffff, 0xffff, 1);
+            }
+
+            NonNull::new(scr.white)
+                .map(|c| WMRetainColor(c))
+                .unwrap_or(ptr::null_mut())
+        }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMBlackColor(screen: NonNull<WMScreen>) -> *mut WMColor {
+        unsafe {
+            let scr = &mut *screen.as_ptr();
+            if scr.black.is_null() {
+                // TODO: warn or bail out if we couldn't allocate.
+                scr.black = WMCreateRGBColor(screen, 0, 0, 0, 1);
+            }
+
+            NonNull::new(scr.black)
+                .map(|c| WMRetainColor(c))
+                .unwrap_or(ptr::null_mut())
+        }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMGrayColor(screen: NonNull<WMScreen>) -> *mut WMColor {
+        unsafe {
+            let scr = &mut *screen.as_ptr();
+            if scr.gray.is_null() {
+                if scr.depth == 1 {
+                    let white = WMWhiteColor(screen);
+                    let black = WMBlackColor(screen);
+                    let stipple = x11::xlib::XCreateBitmapFromData(
+                        scr.display,
+                        (*scr.rcontext).drawable,
+                        Color::LIGHT_STIPPLE_BITS.as_ptr(),
+                        Color::LIGHT_STIPPLE_WIDTH,
+                        Color::LIGHT_STIPPLE_HEIGHT,
+                    );
+                    let color = create_rgba(
+                        screen,
+                        Rgba {
+                            r: 0,
+                            g: 0,
+                            b: 0,
+                            a: 0xffff,
+                        },
+                    )
+                    .expect("cannot create stipple color");
+                    let mut gcv =
+                        std::mem::MaybeUninit::<x11::xlib::XGCValues>::zeroed().assume_init();
+                    gcv.foreground = (&mut *white).color.pixel;
+                    gcv.background = (&mut *black).color.pixel;
+                    gcv.fill_style = x11::xlib::FillStippled;
+                    gcv.stipple = stipple;
+                    *color.gc.borrow_mut() = x11::xlib::XCreateGC(
+                        scr.display,
+                        (*scr.rcontext).drawable,
+                        (x11::xlib::GCForeground
+                            | x11::xlib::GCBackground
+                            | x11::xlib::GCStipple
+                            | x11::xlib::GCFillStyle
+                            | x11::xlib::GCGraphicsExposures) as u64,
+                        &mut gcv,
+                    );
+                    x11::xlib::XFreePixmap(scr.display, stipple);
+                    if let Some(white) = NonNull::new(white) {
+                        WMReleaseColor(white);
+                    }
+                    if let Some(black) = NonNull::new(black) {
+                        WMReleaseColor(black);
+                    }
+                } else {
+                    scr.gray = WMCreateRGBColor(screen, 0xaeba, 0xaaaa, 0xaeba, 1);
+                    // TODO: warn or bail if we couldn't allocate.
+                }
+            }
+            NonNull::new(scr.gray)
+                .map(|c| WMRetainColor(c))
+                .unwrap_or(ptr::null_mut())
+        }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMDarkGrayColor(screen: NonNull<WMScreen>) -> *mut WMColor {
+        unsafe {
+            let scr = &mut *screen.as_ptr();
+            if scr.darkGray.is_null() {
+                if scr.depth == 1 {
+                    let white = WMWhiteColor(screen);
+                    let black = WMBlackColor(screen);
+                    let stipple = x11::xlib::XCreateBitmapFromData(
+                        scr.display,
+                        (*scr.rcontext).drawable,
+                        Color::DARK_STIPPLE_BITS.as_ptr(),
+                        Color::DARK_STIPPLE_WIDTH,
+                        Color::DARK_STIPPLE_HEIGHT,
+                    );
+                    let color = create_rgba(
+                        screen,
+                        Rgba {
+                            r: 0,
+                            g: 0,
+                            b: 0,
+                            a: 0xffff,
+                        },
+                    )
+                    .expect("cannot create dark stipple color");
+                    let mut gcv =
+                        std::mem::MaybeUninit::<x11::xlib::XGCValues>::zeroed().assume_init();
+                    gcv.foreground = (&mut *white).color.pixel;
+                    gcv.background = (&mut *black).color.pixel;
+                    gcv.fill_style = x11::xlib::FillStippled;
+                    gcv.stipple = stipple;
+                    *color.gc.borrow_mut() = x11::xlib::XCreateGC(
+                        scr.display,
+                        (*scr.rcontext).drawable,
+                        (x11::xlib::GCForeground
+                            | x11::xlib::GCBackground
+                            | x11::xlib::GCStipple
+                            | x11::xlib::GCFillStyle
+                            | x11::xlib::GCGraphicsExposures) as u64,
+                        &mut gcv,
+                    );
+                    x11::xlib::XFreePixmap(scr.display, stipple);
+                    if let Some(white) = NonNull::new(white) {
+                        WMReleaseColor(white);
+                    }
+                    if let Some(black) = NonNull::new(black) {
+                        WMReleaseColor(black);
+                    }
+                } else {
+                    scr.darkGray = WMCreateRGBColor(screen, 0x5144, 0x5555, 0x5144, 1);
+                    // TODO: warn or bail if we couldn't allocate.
+                }
+            }
+            NonNull::new(scr.darkGray)
+                .map(|c| WMRetainColor(c))
+                .unwrap_or(ptr::null_mut())
+        }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMRedComponentOfColor(color: NonNull<WMColor>) -> c_ushort {
+        unsafe { (*color.as_ptr()).red() }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMGreenComponentOfColor(color: NonNull<WMColor>) -> c_ushort {
+        unsafe { (*color.as_ptr()).green() }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMBlueComponentOfColor(color: NonNull<WMColor>) -> c_ushort {
+        unsafe { (*color.as_ptr()).blue() }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMGetColorAlpha(color: NonNull<WMColor>) -> c_ushort {
+        unsafe { (*color.as_ptr()).alpha() }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMGetColorRGBDescription(color: NonNull<WMColor>) -> *const c_char {
+        unsafe {
+            wutil_rs::string::wstrdup(
+                CString::new((*color.as_ptr()).hex_triplet())
+                    .unwrap()
+                    .as_ptr(),
+            )
+        }
+    }
+}

WINGs/wings-rs/src/configuration.rs

@@ -0,0 +1,66 @@
+//! Global WINGs configuration.
+//!
+//! Use [`Configuration::global`] to get a snapshot of current configuration
+//! settings.
+//!
+//! ## Rust rewrite notes
+//!
+//! This accesses a global that is defined in C code. Once more of WINGs is
+//! migrated to Rust, we should use a different approach that is more
+//! Rust-friendly. Threading a configuration object down the stack is a likely
+//! way to go.
+
+use crate::WINGsP::_WINGsConfiguration;
+
+use std::{ffi::CStr, ptr::NonNull};
+
+unsafe extern "C" {
+    static WINGsConfiguration: _WINGsConfiguration;
+}
+
+#[derive(Clone, Copy, Debug)]
+pub struct Configuration {
+    pub system_font: &'static CStr,
+    pub bold_system_font: &'static CStr,
+    pub default_font_size: u16,
+    pub antialiased_text: bool,
+    pub floppy_path: &'static CStr,
+    pub double_click_delay: u32,
+    pub mouse_wheel_up: u32,
+    pub mouse_wheel_down: u32,
+}
+
+impl Configuration {
+    /// Returns the current WINGs configuration. Returns `None` if the
+    /// configuration appears not to have been loaded.
+    ///
+    /// This should only be called after `W_ReadConfigurations` is called
+    /// (presumably when initializing WINGs in C code), but it should be safe to
+    /// call it at any time. (It may just contain nonsense values.)
+    ///
+    /// ## Rust rewrite notes
+    ///
+    /// We should migrate away from a static global and thread a configuration
+    /// object in some other way.
+    pub fn global() -> Option<Self> {
+        let c = unsafe { &WINGsConfiguration };
+        let system_font = unsafe { CStr::from_ptr(NonNull::new(c.systemFont)?.as_ptr()) };
+        let bold_system_font = unsafe { CStr::from_ptr(NonNull::new(c.boldSystemFont)?.as_ptr()) };
+        let default_font_size = u16::try_from(c.defaultFontSize).ok()?;
+        let antialiased_text = c.antialiasedText != 0;
+        let floppy_path = unsafe { CStr::from_ptr(NonNull::new(c.floppyPath)?.as_ptr()) };
+        let double_click_delay = u32::try_from(c.doubleClickDelay).ok()?;
+        let mouse_wheel_up = u32::try_from(c.mouseWheelUp).ok()?;
+        let mouse_wheel_down = u32::try_from(c.mouseWheelDown).ok()?;
+        Some(Configuration {
+            system_font,
+            bold_system_font,
+            default_font_size,
+            antialiased_text,
+            floppy_path,
+            double_click_delay,
+            mouse_wheel_up,
+            mouse_wheel_down,
+        })
+    }
+}

WINGs/wings-rs/src/ffi.rs

@@ -0,0 +1,2 @@
+pub use crate::color::ffi::*;
+pub use crate::font::ffi::*;

WINGs/wings-rs/src/font.rs

@@ -0,0 +1,567 @@
+use crate::pango_extras;
+
+use std::{
+    ffi::{CStr, CString, c_double, c_int, c_uint, c_void},
+    ptr::NonNull,
+    rc::Rc,
+};
+
+use crate::configuration::Configuration;
+
+pub const DEFAULT_FONT: &'static str = "sans serif:pixelsize=12";
+pub const DEFAULT_FONT_CSTR: &'static CStr = c"sans serif:pixelsize=12";
+
+/// A loaded font, with support for basic drawing operations.
+///
+/// This owns Pango rendering state, and draw operations may mutate it. As a
+/// result, this is not at all thread-safe.
+///
+/// ## Rust rewrite notes
+///
+/// Unlike the original C API, font caching is handled by methods on
+/// [`W_Screen`].
+pub struct Font {
+    name: FontName,
+    font: NonNull<x11::xft::XftFont>,
+    height: c_uint,
+    ascent: c_uint,
+    layout: NonNull<pango_sys::PangoLayout>,
+}
+
+/// Attempts to convert `xlfd` to a Fontconfig pattern. Returns `None` if this
+/// cannot be accomplished (e.g., `xlfd` could not be parsed).
+fn xlfd_to_fc_pattern(xlfd: &str) -> Option<NonNull<x11::xft::FcPattern>> {
+    if xlfd.contains('%') {
+        return NonNull::new(unsafe {
+            fontconfig_sys::FcNameParse(DEFAULT_FONT_CSTR.as_ptr()).cast::<x11::xft::FcPattern>()
+        });
+    }
+
+    let name = xlfd.split(',').next().unwrap();
+    let ignore_scalable = 0;
+    let complete = 0;
+    NonNull::new(unsafe {
+        x11::xft::XftXlfdParse(
+            name.as_ptr(),
+            ignore_scalable,
+            complete,
+        )
+    })
+    .or_else(|| {
+        // TODO: warn.
+        NonNull::new(unsafe {
+            x11::xft::XftXlfdParse(
+                DEFAULT_FONT_CSTR.as_ptr(),
+                ignore_scalable,
+                complete,
+            )
+        })
+    })
+}
+
+/// A font name, with support for X logical font descriptions (like
+/// `-bitstream-charter-medium-r-normal--12-120-75-75-p-68-iso8859-1`, including
+/// `*`-style wildcards but not old-style `%d` tokens) and Fontconfig
+/// descriptions (like `sans serif:pixelsize=12`).
+///
+/// Data is held in a [`std::rc::Rc`], so copies are lightweight, and ownership
+/// may be shared between multiple objects (e.g., keying a hashtable and
+/// referenced by hashtable values).
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+pub struct FontName(Rc<CStr>);
+
+impl FontName {
+    /// Tries to interpret `name` as an XLFD or Fontconfig name. Returns an
+    /// instantiated `FontName` if this succeeds, or `None`.
+    pub fn new(name: &str) -> Option<Self> {
+        let name = if name.starts_with('-') {
+            let pattern = xlfd_to_fc_pattern(name)?;
+            let name = unsafe { fontconfig_sys::FcNameUnparse(pattern.as_ptr().cast::<c_void>()) };
+            let name = NonNull::new(name)?;
+            let result = unsafe { CStr::from_ptr(name.as_ptr()) }.to_str().ok()?;
+            unsafe {
+                libc::free(name.as_ptr().cast::<c_void>());
+                fontconfig_sys::FcPatternDestroy(pattern.as_ptr().cast::<c_void>());
+            }
+            result
+        } else {
+            name
+        };
+        if !Configuration::global()
+            .map(|c| c.antialiased_text)
+            .unwrap_or(false)
+            && !name.contains(":antialias=")
+        {
+            let mut name = String::from(name);
+            name += ":antialias=false";
+            Some(FontName(Rc::from(CString::new(name).ok()?)))
+        } else {
+            Some(FontName(Rc::from(CString::new(name).ok()?)))
+        }
+    }
+
+    /// Returns a C-style string owned by this object that names the font in a
+    /// way that is suitable for `x11::xft::XftFontOpenName` and other Xft
+    /// functions.
+    pub fn as_xft_name(&self) -> *const u8 {
+        self.0.as_ptr()
+    }
+
+    /// Converts `self` into a shareable name.
+    pub fn into_name(self) -> Rc<CStr> {
+        self.0.into()
+    }
+}
+
+impl Font {
+    /// Tries to load the named font for `screen` on `display`. Returns `None`
+    /// if `name` can't be handled or font cannot be loaded.
+    pub fn load(display: &mut x11::xlib::Display, screen: c_int, name: &FontName) -> Option<Self> {
+        let font = NonNull::new(unsafe {
+            x11::xft::XftFontOpenName(display, screen, name.as_xft_name())
+        })?;
+        let f = unsafe { font.as_ref() };
+        let height = u32::try_from(f.ascent + f.descent).ok()?;
+        let fontmap = unsafe { pango_extras::pango_xft_get_font_map(display, screen) };
+        let context = unsafe { pango_sys::pango_font_map_create_context(fontmap) };
+        let layout = NonNull::new(unsafe { pango_sys::pango_layout_new(context) })?;
+        let pattern = unsafe { fontconfig_sys::FcNameParse(name.as_xft_name()) };
+        let description =
+            unsafe { pango_extras::pango_fc_font_description_from_pattern(pattern.cast(), 0) };
+
+        // Pango examines FC_SIZE but not FC_PIXEL_SIZE of the pattern, but
+        // font-name has only "pixelsize", so set the size manually here.
+        let mut size: c_double = 0.0;
+        unsafe {
+            if fontconfig_sys::FcPatternGetDouble(
+                pattern,
+                fontconfig_sys::constants::FC_PIXEL_SIZE.as_ptr(),
+                0,
+                &mut size,
+            ) == fontconfig_sys::FcResultMatch
+            {
+                pango_sys::pango_font_description_set_absolute_size(
+                    description,
+                    size * (pango_sys::PANGO_SCALE as c_double),
+                );
+            }
+
+            pango_sys::pango_layout_set_font_description(layout.as_ptr(), description);
+            pango_sys::pango_font_description_free(description);
+        }
+
+        Some(Font {
+            font,
+            height,
+            ascent: u32::try_from(f.ascent).ok()?,
+            name: name.clone(),
+            layout,
+        })
+    }
+
+    /// Loads the font `name` at the size `size` (in pixels).
+    pub fn load_at_size(
+        display: &mut x11::xlib::Display,
+        screen: c_int,
+        name: &FontName,
+        size: u32,
+    ) -> Option<Self> {
+        let pattern = unsafe { fontconfig_sys::FcNameParse(name.as_xft_name()) };
+        unsafe {
+            fontconfig_sys::FcPatternDel(
+                pattern,
+                fontconfig_sys::constants::FC_PIXEL_SIZE.as_ptr(),
+            );
+            fontconfig_sys::FcPatternAddDouble(
+                pattern,
+                fontconfig_sys::constants::FC_PIXEL_SIZE.as_ptr(),
+                size as f64,
+            );
+        }
+
+        let name = unsafe { fontconfig_sys::FcNameUnparse(pattern) };
+        unsafe {
+            fontconfig_sys::FcPatternDestroy(pattern);
+        }
+        let name = NonNull::new(name)?;
+        let font_name = FontName(Rc::from(unsafe { CStr::from_ptr(name.as_ptr()) }));
+        unsafe {
+            libc::free(name.as_ptr().cast::<c_void>());
+        }
+
+        Font::load(display, screen, &font_name)
+    }
+
+    pub fn name(&self) -> &FontName {
+        &self.name
+    }
+}
+
+impl Drop for Font {
+    fn drop(&mut self) {
+        unsafe {
+            libc::free(self.font.as_ptr().cast::<c_void>());
+        }
+    }
+}
+
+pub mod ffi {
+    use super::{Font, FontName};
+
+    use std::ffi::CStr;
+
+    use crate::{
+        WINGsP,
+        configuration::Configuration,
+        color::ffi::WMColor,
+        pango_extras,
+    };
+
+    use std::{
+        ffi::{c_char, c_int, c_uint},
+        ptr,
+        rc::Rc,
+    };
+
+    pub type WMFont = Rc<Font>;
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMCreateFont(
+        screen: *mut WINGsP::W_Screen,
+        font_name: *const c_char,
+    ) -> *mut WMFont {
+        if screen.is_null() || font_name.is_null() {
+            return ptr::null_mut();
+        }
+
+        let screen = unsafe { &mut *screen };
+
+        if screen.display.is_null() {
+            return ptr::null_mut();
+        }
+
+        let font_name = unsafe { CStr::from_ptr(font_name) };
+        let Ok(font_name) = font_name.to_str() else {
+            return ptr::null_mut();
+        };
+        let Some(font_name) = FontName::new(font_name) else {
+            return ptr::null_mut();
+        };
+
+        let display = unsafe { &mut *screen.display };
+        let screen_n = screen.screen;
+        screen
+            .font_cache_get_or_else(font_name, |font_name| {
+                Font::load(display, screen_n, font_name)
+            })
+            .map(|font| Box::leak(Box::new(font)) as *mut WMFont)
+            .unwrap_or(ptr::null_mut())
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMRetainFont(font: *mut WMFont) -> *mut WMFont {
+        if font.is_null() {
+            return ptr::null_mut();
+        }
+        let font = unsafe { (*font).clone() };
+        Box::leak(Box::new(font))
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMReleaseFont(font: *mut WMFont) {
+        if font.is_null() {
+            return;
+        }
+        let _ = unsafe { Box::from_raw(font) };
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMGetFontName(font: *const WMFont) -> *const c_char {
+        if font.is_null() {
+            return ptr::null_mut();
+        }
+        unsafe { (**font).name.as_xft_name() }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMFontAscent(font: *mut WMFont) -> c_uint {
+        if font.is_null() {
+            return 0;
+        }
+        return unsafe { (**font).ascent };
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMFontXftFont(font: *mut WMFont) -> *mut x11::xft::XftFont {
+        if font.is_null() {
+            return ptr::null_mut();
+        }
+        return unsafe { (**font).font.as_ptr() };
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMFontHeight(font: *const WMFont) -> c_uint {
+        if font.is_null() {
+            return 0;
+        }
+        unsafe { (**font).height }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMGetScaleBaseFromSystemFont(
+        screen: *mut WINGsP::W_Screen,
+        alphabet_width: *mut c_int,
+        font_height: *mut c_int,
+    ) {
+        let font = unsafe { WMDefaultSystemFont(screen) };
+        unsafe {
+            *alphabet_width = WMWidthOfString(font, c"abcdefghijklmnopqrstuvwxyz".as_ptr(), 26);
+        }
+        if let Ok(x) = unsafe { (**font).height.try_into() } {
+            unsafe {
+                *font_height = x;
+            }
+        }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMDefaultSystemFont(screen: *mut WINGsP::W_Screen) -> *mut WMFont {
+        if screen.is_null() {
+            return ptr::null_mut();
+        }
+
+        unsafe { WMRetainFont((*screen).normalFont) }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMDefaultBoldSystemFont(screen: *mut WINGsP::W_Screen) -> *mut WMFont {
+        if screen.is_null() {
+            return ptr::null_mut();
+        }
+
+        unsafe { WMRetainFont((*screen).boldFont) }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMSystemFontOfSize(
+        screen: *mut WINGsP::W_Screen,
+        size: c_int,
+    ) -> *mut WMFont {
+        if screen.is_null() {
+            return ptr::null_mut();
+        }
+        let screen = unsafe { &*screen };
+        if screen.display.is_null() {
+            return ptr::null_mut();
+        }
+        if screen.display.is_null() {
+            return ptr::null_mut();
+        }
+        let display = unsafe { &mut *screen.display };
+        let size = if size > 0 {
+            size as u32
+        } else {
+            match Configuration::global().map(|c| c.default_font_size as u32) {
+                Some(x) => x,
+                None => return ptr::null_mut(),
+            }
+        };
+        let Some(font_name) = Configuration::global()
+            .and_then(|c| c.system_font.to_str().ok())
+            .and_then(|name| FontName::new(name))
+        else {
+            return ptr::null_mut();
+        };
+        if let Some(font) = Font::load_at_size(display, screen.screen, &font_name, size) {
+            Box::leak(Box::new(Rc::new(font)))
+        } else {
+            // TODO: warn.
+            ptr::null_mut()
+        }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMBoldSystemFontOfSize(
+        screen: *mut WINGsP::W_Screen,
+        size: c_int,
+    ) -> *mut WMFont {
+        if screen.is_null() {
+            return ptr::null_mut();
+        }
+        let screen = unsafe { &*screen };
+        if screen.display.is_null() {
+            return ptr::null_mut();
+        }
+        if screen.display.is_null() {
+            return ptr::null_mut();
+        }
+        let display = unsafe { &mut *screen.display };
+        let size = if size > 0 {
+            size as u32
+        } else {
+            match Configuration::global().map(|c| c.default_font_size as u32) {
+                Some(x) => x,
+                None => return ptr::null_mut(),
+            }
+        };
+        let Some(font_name) = Configuration::global()
+            .and_then(|c| c.bold_system_font.to_str().ok())
+            .and_then(|name| FontName::new(name))
+        else {
+            return ptr::null_mut();
+        };
+        if let Some(font) = Font::load_at_size(display, screen.screen, &font_name, size) {
+            Box::leak(Box::new(Rc::new(font)))
+        } else {
+            // TODO: warn.
+            ptr::null_mut()
+        }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMWidthOfString(
+        font: *mut WMFont,
+        text: *const c_char,
+        length: c_int,
+    ) -> c_int {
+        if font.is_null() || text.is_null() || length <= 0 {
+            return 0;
+        }
+        let font = unsafe { &*font };
+        let layout = font.layout.as_ptr();
+        let previous_text = unsafe { pango_sys::pango_layout_get_text(layout) };
+
+        if previous_text.is_null() {
+            unsafe {
+                pango_sys::pango_layout_set_text(layout, text, length);
+            }
+        } else {
+            let length = length as usize;
+            let previous_text = unsafe { CStr::from_ptr(previous_text).to_bytes() };
+            let text = unsafe { std::slice::from_raw_parts(text, length) };
+            if previous_text.len() < length || previous_text[0..length] != text[0..length] {
+                unsafe {
+                    pango_sys::pango_layout_set_text(layout, text.as_ptr(), length as i32);
+                }
+            }
+        }
+
+        let mut width = 0;
+        unsafe {
+            pango_sys::pango_layout_get_pixel_size(layout, &mut width, ptr::null_mut());
+        }
+        width
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMDrawString(
+        screen: *mut WINGsP::W_Screen,
+        d: x11::xlib::Drawable,
+        color: *mut WMColor,
+        font: *mut WMFont,
+        x: c_int,
+        y: c_int,
+        text: *const c_char,
+        length: c_int,
+    ) {
+        if screen.is_null() || color.is_null() || font.is_null() || text.is_null() {
+            return;
+        }
+
+        let screen = unsafe { &*screen };
+        let color = unsafe { &*color };
+        let layout = unsafe { &mut *(**font).layout.as_ptr() };
+        let mut xftcolor = color.to_xft_color();
+
+        let previous_text = unsafe { pango_sys::pango_layout_get_text(layout) };
+        if previous_text.is_null() {
+            unsafe {
+                pango_sys::pango_layout_set_text(layout, text, length);
+            }
+        } else {
+            let text = unsafe { CStr::from_ptr(text) };
+            let previous_text = unsafe { CStr::from_ptr(previous_text) };
+            if previous_text != text {
+                unsafe {
+                    pango_sys::pango_layout_set_text(layout, text.as_ptr(), length);
+                }
+            }
+        }
+
+        unsafe {
+            x11::xft::XftDrawChange(screen.xftdraw.cast(), d);
+            pango_extras::pango_xft_render_layout(
+                screen.xftdraw.cast(),
+                &mut xftcolor,
+                layout,
+                x * pango_sys::PANGO_SCALE,
+                y * pango_sys::PANGO_SCALE,
+            );
+        }
+    }
+
+    #[unsafe(no_mangle)]
+    pub unsafe extern "C" fn WMDrawImageString(
+        screen: *mut WINGsP::W_Screen,
+        d: x11::xlib::Drawable,
+        color: *mut WMColor,
+        background: *mut WMColor,
+        font: *mut WMFont,
+        x: c_int,
+        y: c_int,
+        text: *const c_char,
+        length: c_int,
+    ) {
+        if screen.is_null() || color.is_null() || font.is_null() || text.is_null() {
+            return;
+        }
+
+        let screen = unsafe { &*screen };
+        let color = unsafe { &*color };
+        let background = unsafe { &*background };
+        let layout = unsafe { &mut *(**font).layout.as_ptr() };
+        let mut text_color = color.to_xft_color();
+        let background = background.to_xft_color();
+
+        unsafe {
+            let Ok(width) = u32::try_from(WMWidthOfString(font, text, length)) else {
+                // TODO: complain.
+                return;
+            };
+            x11::xft::XftDrawChange(screen.xftdraw.cast(), d);
+            x11::xft::XftDrawRect(
+                screen.xftdraw.cast(),
+                &background,
+                x,
+                y,
+                width,
+                (**font).height,
+            );
+        }
+
+        let previous_text = unsafe { pango_sys::pango_layout_get_text(layout) };
+        if previous_text.is_null() {
+            unsafe {
+                pango_sys::pango_layout_set_text(layout, text, length);
+            }
+        } else {
+            let text = unsafe { CStr::from_ptr(text) };
+            let previous_text = unsafe { CStr::from_ptr(previous_text) };
+            if text != previous_text {
+                unsafe {
+                    pango_sys::pango_layout_set_text(layout, text.as_ptr(), length);
+                }
+            }
+        }
+
+        unsafe {
+            pango_extras::pango_xft_render_layout(
+                screen.xftdraw.cast(),
+                &mut text_color,
+                layout,
+                x * pango_sys::PANGO_SCALE,
+                y * pango_sys::PANGO_SCALE,
+            );
+        }
+    }
+}

WINGs/wings-rs/src/lib.rs

@@ -0,0 +1,15 @@
+#[allow(improper_ctypes)]
+#[allow(non_camel_case_types)]
+#[allow(non_snake_case)]
+#[allow(non_upper_case_globals)]
+pub mod WINGsP;
+pub mod button;
+pub mod color;
+pub mod configuration;
+pub mod ffi;
+pub mod font;
+pub mod font_panel;
+pub mod list;
+pub(crate) mod pango_extras;
+pub mod screen;
+pub mod widget;

WINGs/wings-rs/src/list.rs

@@ -0,0 +1,15 @@
+#[allow(non_snake_case)]
+pub mod ffi {
+    use crate::WINGsP::*;
+
+    use std::ffi::c_char;
+
+    /// Appends an item with the label `text` to `list`.
+    ///
+    /// ## Rust rewrite notes
+    ///
+    /// This was originally a macro.
+    pub unsafe fn WMAddListItem(list: *mut WMList, text: *const c_char) -> *mut WMListItem {
+        unsafe { WMInsertListItem(list, -1, text) }
+    }
+}

WINGs/wings-rs/src/pango_extras.rs

@@ -0,0 +1,21 @@
+use std::ffi::c_int;
+
+unsafe extern "C" {
+    pub fn pango_xft_get_font_map(
+        display: *mut x11::xlib::Display,
+        screen: c_int,
+    ) -> *mut pango_sys::PangoFontMap;
+
+    pub fn pango_fc_font_description_from_pattern(
+        pattern: *mut x11::xft::FcPattern,
+        include_size: c_int,
+    ) -> *mut pango_sys::PangoFontDescription;
+
+    pub fn pango_xft_render_layout(
+        draw: *mut x11::xft::XftDraw,
+        color: *mut x11::xft::XftColor,
+        layout: *mut pango_sys::PangoLayout,
+        x: c_int,
+        y: c_int,
+    );
+}

WINGs/wings-rs/src/screen.rs

@@ -0,0 +1,68 @@
+use crate::{
+    WINGsP::{WMScreen, WMCreateScreen},
+    font::{Font, FontName},
+};
+
+use std::{
+    collections::{HashMap, hash_map::Entry},
+    ffi::c_void,
+    ptr::NonNull,
+    rc::Rc,
+};
+
+impl WMScreen {
+    pub fn new(display: &NonNull<x11::xlib::Display>) -> Option<NonNull<Self>> {
+        NonNull::new(unsafe { WMCreateScreen(display.as_ptr(), x11::xlib::XDefaultScreen(display.as_ptr())) })
+    }
+
+    fn font_cache_mut(&mut self) -> &mut HashMap<FontName, Rc<Font>> {
+        if self.fontCache.is_null() {
+            self.fontCache = (Box::leak(Box::new(HashMap::<FontName, Rc<Font>>::new()))
+                as *mut HashMap<_, _>)
+                .cast::<c_void>();
+        }
+        unsafe { &mut *self.fontCache.cast::<HashMap<FontName, Rc<Font>>>() }
+    }
+
+    pub fn font_cache_get_or_else(
+        &mut self,
+        name: FontName,
+        f: impl FnOnce(&FontName) -> Option<Font>,
+    ) -> Option<Rc<Font>> {
+        match self.font_cache_mut().entry(name) {
+            Entry::Occupied(o) => Some(o.get().clone()),
+            Entry::Vacant(v) => {
+                if let Some(font) = f(v.key()) {
+                    let font = Rc::new(font);
+                    v.insert(font.clone());
+                    Some(font)
+                } else {
+                    None
+                }
+            }
+        }
+    }
+
+    /// Removes `font` from the font cache if it is not in use anywhere else
+    /// (i.e., the only live references are `font` and an entry in the cache).
+    pub fn font_cache_flush(&mut self, font: &Rc<Font>) {
+        if Rc::strong_count(font) > 2 {
+            return;
+        }
+        self.font_cache_mut().remove(&font.name());
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::WINGsP::WMScreen;
+
+    use std::mem::MaybeUninit;
+
+    #[test]
+    fn font_cache_init() {
+        let mut screen: WMScreen = unsafe { MaybeUninit::zeroed().assume_init() };
+        let cache = screen.font_cache_mut();
+        assert!(cache.is_empty());
+    }
+}

WINGs/wings-rs/src/widget.rs

@@ -0,0 +1,57 @@
+//! Common WINGs widget fields.
+//!
+//! WINGs widgets all have a [`WINGsP::WMView`] object that tracks common attributes
+//! like size and location and a [`WINGsP::W_Class`] field that identifies the widget
+//! type (button, list, etc.). This module provides access to these fields.
+//!
+//! ## Rust rewrite notes
+//!
+//! The original WINGs implementation uses casting and a common layout for
+//! "primitive" widget structs, such that the first two fields are always a
+//! `W_Class` and a `*mut WMView`. We rely on this convention when implementing
+//! [`Widget`] for widgets that are defined in C.
+use crate::WINGsP;
+use std::{
+    ptr::NonNull,
+};
+
+/// Base WINGs widget type.
+///
+/// All primitive widgets (like buttons and lists) should implement this.
+pub trait Widget {
+    fn class(&self) -> WINGsP::W_Class;
+    fn view(&self) -> NonNull<WINGsP::WMView>;
+}
+
+/// Common widget header fields. It should be safe to cast opaque WINGs widget
+/// structs defined in C to this type to access these fields. Before writing
+/// code that casts anything to this, double-check the widget definition!
+#[repr(C)]
+struct WidgetLike {
+    class: WINGsP::W_Class,
+    view: *mut WINGsP::WMView,
+}
+
+/// Casts `$widget` to [`WidgetLike`]. Provided for convenience.
+///
+/// ## Safety
+///
+/// The caller of this macro is responsible for ensuring that the layout of `$widget` is compatible
+/// with `WidgetLike`.
+macro_rules! impl_widget {
+    ($widget:ty) => {
+        impl Widget for $widget {
+            fn class(&self) -> crate::WINGsP::W_Class {
+                unsafe { ::std::mem::transmute::<&$widget, &WidgetLike>(self).class }
+            }
+
+            fn view(&self) -> ::std::ptr::NonNull<WINGsP::WMView> {
+                let widget = unsafe { ::std::mem::transmute::<&$widget, &WidgetLike>(self) };
+                NonNull::new(widget.view).expect("WMView field of widget struct cannot be null")
+            }
+        }
+    };
+}
+
+impl_widget!(WINGsP::WMWindow);
+impl_widget!(WINGsP::WMFrame);

WINGs/winputmethod.c

@@ -109,7 +109,7 @@ void W_CreateIC(WMView * view)
 		// this really needs to be changed, but I don't know how yet -Dan
 		// it used to be like this with fontsets, but no longer applies to xft
 		preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot,
-						   XNArea, &rect, XNFontInfo, scr->normalFont->font, NULL);
+						   XNArea, &rect, XNFontInfo, WMFontXftFont(scr->normalFont), NULL);
 	}
 
 	view->xic = XCreateIC(scr->imctx->xim, XNInputStyle, scr->imctx->ximstyle,

WINGs/wmisc.c

@@ -165,7 +165,7 @@ int W_GetTextHeight(WMFont * font, const char *text, int width, int wrap)
 
 void
 W_PaintText(W_View * view, Drawable d, WMFont * font, int x, int y,
-	    int width, WMAlignment alignment, WMColor * color, int wrap,
+	    int width, WMAlignment alignment, WMColor *color, int wrap,
 	    const char *text, int length)
 {
 	const char *ptr = text;
@@ -201,7 +201,7 @@ W_PaintText(W_View * view, Drawable d, WMFont * font, int x, int y,
 }
 
 void
-W_PaintTextAndImage(W_View * view, int wrap, WMColor * textColor, W_Font * font,
+W_PaintTextAndImage(W_View * view, int wrap, WMColor * textColor, WMFont * font,
 		    WMReliefType relief, const char *text,
 		    WMAlignment alignment, W_Pixmap * image,
 		    WMImagePosition position, WMColor * backColor, int ofs)

WINGs/wtext.c

@@ -718,8 +718,8 @@ static void paintText(Text * tPtr)
 			if (!tPtr->flags.monoFont && tb->underlined) {
 				XDrawLine(dpy, tPtr->db, WMColorGC(color),
 					  tb->sections[s].x - tPtr->hpos,
-					  y + font->y + 1,
+					  y + WMFontAscent(font) + 1,
-					  tb->sections[s].x + tb->sections[s].w - tPtr->hpos, y + font->y + 1);
+					  tb->sections[s].x + tb->sections[s].w - tPtr->hpos, y + WMFontAscent(font) + 1);
 			}
 		}
 		tb = (!done ? tb->next : NULL);
@@ -897,7 +897,7 @@ static void updateCursorPosition(Text * tPtr)
 		if (!(tb = tPtr->firstTextBlock)) {
 			WMFont *font = tPtr->dFont;
 			tPtr->tpos = 0;
-			tPtr->cursor.h = font->height + abs(font->height - font->y);
+			tPtr->cursor.h = WMFontHeight(font) + abs(WMFontHeight(font) - WMFontAscent(font));
 
 			tPtr->cursor.y = 2;
 			tPtr->cursor.x = 2;
@@ -979,7 +979,7 @@ static void cursorToTextPosition(Text * tPtr, int x, int y)
 		if (!(tb = tPtr->firstTextBlock)) {
 			WMFont *font = tPtr->dFont;
 			tPtr->tpos = 0;
-			tPtr->cursor.h = font->height + abs(font->height - font->y);
+			tPtr->cursor.h = WMFontHeight(font) + abs(WMFontHeight(font) - WMFontAscent(font));
 			tPtr->cursor.y = 2;
 			tPtr->cursor.x = 2;
 			return;
@@ -1378,9 +1378,9 @@ static int layOutLine(Text * tPtr, myLineItems * items, int nitems, int x, int y
 
 		} else {
 			font = (tPtr->flags.monoFont) ? tPtr->dFont : tb->d.font;
-			/*max_d = WMAX(max_d, abs(font->height-font->y)); */
+			/*max_d = WMAX(max_d, abs(WMFontHeight(font)-WMFontAscent(font))); */
 			max_d = 2;
-			line_height = WMAX(line_height, font->height + max_d);
+			line_height = WMAX(line_height, WMFontHeight(font) + max_d);
 			text = &(tb->text[items[i].begin]);
 			len = items[i].end - items[i].begin;
 			if (tPtr->flags.alignment != WALeft)
@@ -1430,7 +1430,7 @@ static int layOutLine(Text * tPtr, myLineItems * items, int nitems, int x, int y
 			len = items[i].end - items[i].begin;
 			text = &(tb->text[items[i].begin]);
 
-			tb->sections[n].y = y + line_height - font->y;
+			tb->sections[n].y = y + line_height - WMFontAscent(font);
 			tb->sections[n].w =
 			    WMWidthOfString(font,
 					    &(tb->text[tb->sections[n].begin]),
@@ -2989,8 +2989,8 @@ WMText *WMCreateTextForDocumentType(WMWidget * parent, WMAction * parser, WMActi
 	W_SetViewBackgroundColor(tPtr->view, tPtr->bgColor);
 
 	gcv.graphics_exposures = False;
-	gcv.foreground = W_PIXEL(scr->gray);
+	gcv.foreground = WMColorPixel(scr->gray);
-	gcv.background = W_PIXEL(scr->darkGray);
+	gcv.background = WMColorPixel(scr->darkGray);
 	gcv.fill_style = FillStippled;
 	/* why not use scr->stipple here? */
 	gcv.stipple = XCreateBitmapFromData(dpy, W_DRAWABLE(scr), STIPPLE_BITS, STIPPLE_WIDTH, STIPPLE_HEIGHT);

WINGs/wutil.c

@@ -1,24 +0,0 @@
-
-/*
- * Handle events for non-GUI based applications
- */
-
-#include "WINGsP.h"
-
-void WHandleEvents(void)
-{
-	/* Check any expired timers */
-	W_CheckTimerHandlers();
-
-	/* Do idle and timer stuff while there are no input events */
-	/* Do not wait for input here. just peek to see if input is available */
-	while (!W_HandleInputEvents(False, -1) && W_CheckIdleHandlers()) {
-		/* dispatch timer events */
-		W_CheckTimerHandlers();
-	}
-
-	W_HandleInputEvents(True, -1);
-
-	/* Check any expired timers */
-	W_CheckTimerHandlers();
-}

WINGs/wview.c

@@ -102,8 +102,8 @@ static W_View *createView(W_Screen * screen, W_View * parent)
 
                 view->attribFlags |= CWBackPixel | CWColormap | CWBorderPixel | CWBackPixmap;
                 view->attribs.background_pixmap = None;
-		view->attribs.background_pixel = W_PIXEL(screen->gray);
+		view->attribs.background_pixel = WMColorPixel(screen->gray);
-		view->attribs.border_pixel = W_PIXEL(screen->black);
+		view->attribs.border_pixel = WMColorPixel(screen->black);
 		view->attribs.colormap = screen->colormap;
 
 		view->backColor = WMRetainColor(screen->gray);
@@ -483,7 +483,7 @@ void W_RedisplayView(W_View * view)
 	WMHandleEvent(&ev);
 }
 
-void W_SetViewBackgroundColor(W_View * view, WMColor * color)
+void W_SetViewBackgroundColor(W_View * view, WMColor *color)
 {
 	if (view->backColor)
 		WMReleaseColor(view->backColor);
@@ -491,9 +491,9 @@ void W_SetViewBackgroundColor(W_View * view, WMColor * color)
 
 	view->attribFlags |= CWBackPixel;
 	view->attribFlags &= ~CWBackPixmap;
-	view->attribs.background_pixel = W_PIXEL(color);
+	view->attribs.background_pixel = WMColorPixel(color);
 	if (view->flags.realized) {
-		XSetWindowBackground(view->screen->display, view->window, W_PIXEL(color));
+		XSetWindowBackground(view->screen->display, view->window, WMColorPixel(color));
 		XClearWindow(view->screen->display, view->window);
 	}
 }

WPrefs.app/Makefile.am

@@ -66,10 +66,12 @@ AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdat
 WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
 
 WPrefs_LDADD = \
-	$(top_builddir)/wutil-rs/target/debug/libwutil_rs.a\
+	$(top_builddir)/wutil-rs/target/debug/libwutil_rs.so\
 	$(top_builddir)/WINGs/libWINGs.la\
+	$(top_builddir)/WINGs/wings-rs/target/debug/libwings_rs.so\
 	$(top_builddir)/WINGs/libWUtil.la\
 	$(top_builddir)/wrlib/libwraster.la \
+	@PANGO_LIBS@ \
 	@XLFLAGS@ @XLIBS@ \
 	@LIBM@ \
 	@FCLIBS@ \

WPrefs.app/double.c

@@ -94,7 +94,7 @@ static void paintDoubleTest(_DoubleTest * dPtr)
 
 	if (dPtr->text) {
 		int y;
-		y = (dPtr->view->size.height - scr->normalFont->height) / 2;
+		y = (dPtr->view->size.height - WMFontHeight(scr->normalFont)) / 2;
 		W_PaintText(dPtr->view, dPtr->view->window, scr->normalFont,
 			    dPtr->on, dPtr->on + y, dPtr->view->size.width, WACenter,
 			    scr->black, False, dPtr->text, strlen(dPtr->text));

configure.ac

@@ -60,6 +60,11 @@ AS_IF(test x$RUSTC = xno,
     AC_MSG_ERROR([rustc is required.  Please set the RUSTC environment variable or install the Rust toolchain from https://www.rust-lang.org/])
 )
 AC_SUBST(RUSTC, [rustc])
+AC_CHECK_PROG(BINDGEN, [bindgen], [yes], [no])
+AS_IF(test x$BINDGEN = xno,
+    AC_MSG_ERROR([bindgen is required. Please set the BINDGEN environment variable or install bindgen (maybe with `cargo install bindgen-cli`)])
+)
+AC_SUBST(BINDGEN, [bindgen])
 
 dnl libtool library versioning
 dnl ==========================
@@ -923,14 +928,15 @@ AC_CONFIG_FILES(
     dnl WRaster Library
     wrlib/Makefile wrlib/po/Makefile
     wrlib/tests/Makefile
+    wrlib-rs/Makefile
 
-    dnl Rust implementation of WINGs libraries
+    dnl Rust implementation of WINGs utilities
     wutil-rs/Makefile
 
     dnl WINGs toolkit
-    WINGs/Makefile WINGs/WINGs/Makefile WINGs/po/Makefile
+    WINGs/Makefile WINGs/wings-rs/Makefile WINGs/WINGs/Makefile WINGs/wings-rs-tests/Makefile
-    WINGs/Documentation/Makefile WINGs/Resources/Makefile WINGs/Extras/Makefile
+    WINGs/po/Makefile WINGs/Documentation/Makefile WINGs/Resources/Makefile
-    WINGs/Examples/Makefile WINGs/Tests/Makefile
+    WINGs/Extras/Makefile WINGs/Examples/Makefile WINGs/Tests/Makefile
 
     dnl Rust implementation of Window Maker core
     wmaker-rs/Makefile

src/Makefile.am

@@ -155,13 +155,20 @@ AM_CPPFLAGS = $(DFLAGS) \
 	-I$(top_srcdir)/WINGs -I$(top_builddir)/WINGs \
 	@HEADER_SEARCH_PATH@
 
+wmaker_LDFLAGS = \
+	-L$(top_builddir)/wutil-rs/target/debug \
+	-L$(top_builddir)/WINGs/wings-rs/target/debug \
+	-L$(top_builddir)/wmaker-rs/target/debug
 
 wmaker_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.la\
 	$(top_builddir)/WINGs/libWUtil.la\
 	$(top_builddir)/wrlib/libwraster.la\
-	$(top_builddir)/wutil-rs/target/debug/libwutil_rs.a\
+	-lwutil_rs\
-	$(top_builddir)/wmaker-rs/target/debug/libwmaker_rs.a\
+	-lwings_rs\
+	-lwmaker_rs\
+	@PANGO_LIBS@ \
+	@FCLIBS@ \
 	@XLFLAGS@ \
 	@LIBXRANDR@ \
 	@LIBXINERAMA@ \

src/menu.c

@@ -1608,7 +1608,7 @@ void wMenuScroll(WMenu *menu)
 	XEvent ev;
 
 	if (omenu->jump_back)
-		WMDeleteTimerWithClientData(omenu->jump_back);
+		WMDeleteTimerHandler(omenu->jump_back_timer);
 
 	if (( /*omenu->flags.buttoned && */ !wPreferences.wrap_menus)
 	    || omenu->flags.app_menu) {
@@ -1709,7 +1709,7 @@ void wMenuScroll(WMenu *menu)
 			scr->flags.jump_back_pending = 1;
 		} else
 			delayer = omenu->jump_back;
-		WMAddTimerHandler(MENU_JUMP_BACK_DELAY, callback_leaving, delayer);
+		omenu->jump_back_timer = WMAddTimerHandler(MENU_JUMP_BACK_DELAY, callback_leaving, delayer);
 	}
 }
 

src/menu.h

@@ -91,6 +91,7 @@ typedef struct WMenu {
 	WMHandlerID timer;		       /* timer for the autoscroll */
 
 	void *jump_back;                   /* jump back data */
+	WMHandlerID jump_back_timer;	/* set when jump_back is being used */
 
 	/* to be called when some entry is edited */
 	void (*on_edit)(struct WMenu *menu, struct WMenuEntry *entry);

src/window.c

@@ -1648,9 +1648,9 @@ void wUnmanageWindow(WWindow *wwin, Bool restore, Bool destroyed)
 	wSelectWindow(wwin, False);
 
 	/* remove all pending events on window */
-	/* I think this only matters for autoraise */
+	/* I think this only matters for autoraise. see event.c:1197. */
 	if (wPreferences.raise_delay)
-		WMDeleteTimerWithClientData(wwin->frame->core);
+		WMDeleteTimerHandler(wwin->frame->core->screen_ptr->autoRaiseTimer);
 
 	XFlush(dpy);
 

start-captive-wmaker.sh

@@ -54,7 +54,7 @@ rename_dir_if_possible "$wm_style"        "$wm_styles"
 make_dir_if_needed     "$wm_styles"
 make_dir_if_needed     "$wm_themes"
 
-export LD_LIBRARY_PATH="$project_base/wrlib/.libs:$project_base/WINGs/.libs:$LD_LIBRARY_PATH" 
+export LD_LIBRARY_PATH="$project_base/WINGs/wings-rs/target/debug:$project_base/wutil-rs/target/debug:$project_base/wmaker-rs/target/debug:$project_base/wrlib/.libs:$project_base/WINGs/.libs:$LD_LIBRARY_PATH" 
 
 copy_defaults_if_needed WindowMaker
 copy_defaults_if_needed WMRootMenu
@@ -89,6 +89,8 @@ Xephyr -screen 640x480 "$xephyr_display" &
 xephyr_pid=$!
 DISPLAY="$xephyr_display" gdb \
            --directory "$project_base" \
+           --directory "$HOME/src/libX11-1.5.0/build/src" \
            --quiet \
+           --fullname \
            --args "$WindowMaker" -display "$xephyr_display" --for-real "$@"
 kill $xephyr_pid

util/Makefile.am

@@ -18,75 +18,116 @@ AM_CPPFLAGS = \
 
 liblist= @LIBRARY_SEARCH_PATH@ @INTLIBS@
 
+wdwrite_LDFLAGS = \
+	-L$(top_builddir)/wutil-rs/target/debug
+
 wdwrite_LDADD = \
 	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \
+	-lwutil_rs \
 	$(liblist)
 
+wdread_LDFLAGS = \
+	-L$(top_builddir)/wutil-rs/target/debug
+
 wdread_LDADD = \
 	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \
+	-lwutil_rs \
 	$(liblist)
 
-wxcopy_LDADD = @XLFLAGS@ @XLIBS@ \
+wxcopy_LDFLAGS = \
-	$(top_builddir)/wutil-rs/target/debug/libwutil_rs.a
+	-L$(top_builddir)/wutil-rs/target/debug
+
+wxcopy_LDADD = @XLFLAGS@ @XLIBS@ -lwutil_rs
 
 wxpaste_LDADD = @XLFLAGS@ @XLIBS@
 
+getstyle_LDFLAGS = \
+	-L$(top_builddir)/wutil-rs/target/debug
+
 getstyle_LDADD = \
 	$(top_builddir)/WINGs/libWUtil.la \
-	 $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \
+	-lwutil_rs \
 	$(liblist)
 
 getstyle_SOURCES = getstyle.c fontconv.c common.h
 
+setstyle_LDFLAGS = \
+	-L$(top_builddir)/wutil-rs/target/debug
+
 setstyle_LDADD = \
 	$(top_builddir)/WINGs/libWUtil.la \
-	 $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \
+	-lwutil_rs \
 	@XLFLAGS@ @XLIBS@ $(liblist)
 
 setstyle_SOURCES = setstyle.c fontconv.c common.h
 
+convertfonts_LDFLAGS = \
+	-L$(top_builddir)/wutil-rs/target/debug
+
 convertfonts_LDADD = \
 	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \
+	-lwutil_rs \
 	$(liblist)
 
 convertfonts_SOURCES = convertfonts.c fontconv.c common.h
 
+seticons_LDFLAGS = \
+	-L$(top_builddir)/wutil-rs/target/debug
+
 seticons_LDADD= \
 	$(top_builddir)/WINGs/libWUtil.la \
-	 $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \
+	-lwutil_rs \
 	$(liblist)
 
+geticonset_LDFLAGS = \
+	-L$(top_builddir)/wutil-rs/target/debug
+
 geticonset_LDADD= \
 	$(top_builddir)/WINGs/libWUtil.la \
-	 $(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \
+	-lwutil_rs \
 	$(liblist)
 
+wmagnify_LDFLAGS = \
+	-L$(top_builddir)/WINGs/wings-rs/target/debug \
+	-L$(top_builddir)/wutil-rs/target/debug
+
 wmagnify_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.la \
 	$(top_builddir)/WINGs/libWUtil.la \
 	$(top_builddir)/wrlib/libwraster.la \
-	@XLFLAGS@ @XLIBS@ @INTLIBS@
+	-lwutil_rs \
+	-lwings_rs \
+	@XLFLAGS@ @XLIBS@ @INTLIBS@ @FCLIBS@ @PANGO_LIBS@
+
+wmsetbg_LDFLAGS = \
+	-L$(top_builddir)/wutil-rs/target/debug \
+	-L$(top_builddir)/WINGs/wings-rs/target/debug
 
 wmsetbg_LDADD = \
 	$(top_builddir)/WINGs/libWINGs.la \
-	$(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \
 	$(top_builddir)/WINGs/libWUtil.la \
 	$(top_builddir)/wrlib/libwraster.la \
-	@XLFLAGS@ @LIBXINERAMA@ @XLIBS@ @INTLIBS@
+	-lwings_rs \
+	-lwutil_rs \
+	$(top_builddir)/WINGs/libWINGs.la \
+	@XLFLAGS@ @LIBXINERAMA@ @XLIBS@ @INTLIBS@ @FCLIBS@ @PANGO_LIBS@
+
+wmgenmenu_LDFLAGS = \
+	-L$(top_builddir)/wutil-rs/target/debug
 
 wmgenmenu_LDADD = \
 	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \
+	-lwutil_rs \
 	@INTLIBS@
 
 wmgenmenu_SOURCES = wmgenmenu.c wmgenmenu.h
 
+wmmenugen_LDFLAGS = \
+	-L$(top_builddir)/wutil-rs/target/debug
+
 wmmenugen_LDADD = \
-	$(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \
 	$(top_builddir)/WINGs/libWUtil.la \
+	-lwutil_rs \
 	@INTLIBS@
 
 wmmenugen_SOURCES = wmmenugen.c wmmenugen.h wmmenugen_misc.c \
@@ -95,11 +136,16 @@ wmmenugen_SOURCES = wmmenugen.c wmmenugen.h wmmenugen_misc.c \
 
 wmiv_CFLAGS = @PANGO_CFLAGS@ @PTHREAD_CFLAGS@
 
+wmiv_LDFLAGS = \
+	-L$(top_builddir)/WINGs/wings-rs/target/debug \
+	-L$(top_builddir)/wutil-rs/target/debug
+
 wmiv_LDADD = \
 	$(top_builddir)/wrlib/libwraster.la \
-	$(top_builddir)/WINGs/libWINGs.la \
 	$(top_builddir)/WINGs/libWUtil.la \
-	$(top_builddir)/wutil-rs/target/debug/libwutil_rs.a \
+	$(top_builddir)/WINGs/libWINGs.la \
+	-lwings_rs \
+	-lwutil_rs \
 	@XLFLAGS@ @XLIBS@ @GFXLIBS@ \
 	@PANGO_LIBS@ @PTHREAD_LIBS@ @LIBEXIF@
 

wmaker-rs/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [lib]
-crate-type = ["staticlib"]
+crate-type = ["cdylib"]
 
 [dependencies]
 x11 = "2.21.0"

wmaker-rs/Makefile.am

@@ -21,7 +21,7 @@ RUST_SOURCES = \
 RUST_EXTRA = \
 	Cargo.lock
 
-target/debug/libwmaker_rs.a: $(RUST_SOURCES) $(RUST_EXTRA)
+target/debug/libwmaker_rs.so: $(RUST_SOURCES) $(RUST_EXTRA)
 	$(CARGO) build
 
 check-local:
@@ -30,4 +30,4 @@ check-local:
 clean-local:
 	$(CARGO) clean
 
-all: target/debug/libwmaker_rs.a
+all: target/debug/libwmaker_rs.so

wrlib-rs/Cargo.lock

@@ -0,0 +1,32 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "libc"
+version = "0.2.184"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
+
+[[package]]
+name = "wrlib-rs"
+version = "0.1.0"
+dependencies = [
+ "x11",
+]
+
+[[package]]
+name = "x11"
+version = "2.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e"
+dependencies = [
+ "libc",
+ "pkg-config",
+]

wrlib-rs/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "wrlib-rs"
+version = "0.1.0"
+edition = "2024"
+
+[lib]
+crate-type = ["staticlib", "rlib"]
+
+[dependencies]
+x11 = "2.21.0"