made Fnt an anonymous inner struct

diff --git a/dwm.h b/dwm.h
index ce9707a..f94ec8a 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -41,21 +41,6 @@ enum { WMProtocols, WMDelete, WMState, WMLast };     /* default atoms */
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };             /* color */
 
-typedef struct {
-       int x, y, w, h;
-       unsigned long norm[ColLast];
-       unsigned long sel[ColLast];
-       Drawable drawable;
-       GC gc;
-       struct Fnt {
-               int ascent;
-               int descent;
-               int height;
-               XFontSet set;
-               XFontStruct *xfont;
-       } font;
-} DC; /* draw context */
-
 typedef struct Client Client;
 struct Client {
        char name[256];
@@ -74,6 +59,21 @@ struct Client {
 };
 
 typedef struct {
+       int x, y, w, h;
+       unsigned long norm[ColLast];
+       unsigned long sel[ColLast];
+       Drawable drawable;
+       GC gc;
+       struct {
+               int ascent;
+               int descent;
+               int height;
+               XFontSet set;
+               XFontStruct *xfont;
+       } font;
+} DC; /* draw context */
+
+typedef struct {
        const char *symbol;
        void (*arrange)(void);
 } Layout;