made Fnt an anonymous inner struct

master
Anselm R. Garbe 2007-02-22 18:08:31 +01:00
parent cac492b0e9
commit fe5acb939a
1 changed files with 7 additions and 9 deletions

16
dwm.h
View File

@ -41,21 +41,19 @@ enum { WMProtocols, WMDelete, WMState, WMLast }; /* default atoms */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
enum { ColBorder, ColFG, ColBG, ColLast }; /* color */ enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
typedef struct {
int ascent;
int descent;
int height;
XFontSet set;
XFontStruct *xfont;
} Fnt;
typedef struct { typedef struct {
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;
struct Fnt {
int ascent;
int descent;
int height;
XFontSet set;
XFontStruct *xfont;
} font;
} DC; /* draw context */ } DC; /* draw context */
typedef struct Client Client; typedef struct Client Client;