From de3463988319271f504b5e3deb13f598470acd0d Mon Sep 17 00:00:00 2001 From: "Anselm R. Garbe" Date: Thu, 22 Feb 2007 18:16:35 +0100 Subject: made Fnt an anonymous struct --- config.mk | 2 +- dmenu.h | 23 +++++++++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/config.mk b/config.mk index 195fd4c..525ef17 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ # dmenu version -VERSION = 2.3 +VERSION = 2.4 # Customize below to fit your system diff --git a/dmenu.h b/dmenu.h index bb3b144..2174688 100644 --- a/dmenu.h +++ b/dmenu.h @@ -14,25 +14,20 @@ /* color */ enum { ColFG, ColBG, ColLast }; -typedef struct DC DC; -typedef struct Fnt Fnt; - -struct Fnt { - XFontStruct *xfont; - XFontSet set; - int ascent; - int descent; - int height; -}; - -struct DC { +typedef struct { int x, y, w, h; unsigned long norm[ColLast]; unsigned long sel[ColLast]; Drawable drawable; - Fnt font; GC gc; -}; /* draw context */ + struct { + XFontStruct *xfont; + XFontSet set; + int ascent; + int descent; + int height; + } font; +} DC; /* draw context */ extern int screen; extern Display *dpy; -- cgit v1.2.3-54-g00ecf