made Fnt an anonymous struct

This commit is contained in:
Anselm R. Garbe 2007-02-22 18:16:35 +01:00
parent 18592825d2
commit de34639883
2 changed files with 10 additions and 15 deletions

View File

@ -1,5 +1,5 @@
# dmenu version # dmenu version
VERSION = 2.3 VERSION = 2.4
# Customize below to fit your system # Customize below to fit your system

23
dmenu.h
View File

@ -14,25 +14,20 @@
/* color */ /* color */
enum { ColFG, ColBG, ColLast }; enum { ColFG, ColBG, ColLast };
typedef struct DC DC; typedef struct {
typedef struct Fnt Fnt;
struct Fnt {
XFontStruct *xfont;
XFontSet set;
int ascent;
int descent;
int height;
};
struct DC {
int x, y, w, h; int x, y, w, h;
unsigned long norm[ColLast]; unsigned long norm[ColLast];
unsigned long sel[ColLast]; unsigned long sel[ColLast];
Drawable drawable; Drawable drawable;
Fnt font;
GC gc; GC gc;
}; /* draw context */ struct {
XFontStruct *xfont;
XFontSet set;
int ascent;
int descent;
int height;
} font;
} DC; /* draw context */
extern int screen; extern int screen;
extern Display *dpy; extern Display *dpy;