made Fnt an anonymous inner struct
8d111632
1 file(s) · +15 −15
| 41 | 41 | enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ |
|
| 42 | 42 | enum { ColBorder, ColFG, ColBG, ColLast }; /* color */ |
|
| 43 | 43 | ||
| 44 | - | typedef struct { |
|
| 45 | - | int x, y, w, h; |
|
| 46 | - | unsigned long norm[ColLast]; |
|
| 47 | - | unsigned long sel[ColLast]; |
|
| 48 | - | Drawable drawable; |
|
| 49 | - | GC gc; |
|
| 50 | - | struct Fnt { |
|
| 51 | - | int ascent; |
|
| 52 | - | int descent; |
|
| 53 | - | int height; |
|
| 54 | - | XFontSet set; |
|
| 55 | - | XFontStruct *xfont; |
|
| 56 | - | } font; |
|
| 57 | - | } DC; /* draw context */ |
|
| 58 | - | ||
| 59 | 44 | typedef struct Client Client; |
|
| 60 | 45 | struct Client { |
|
| 61 | 46 | char name[256]; |
|
| 72 | 57 | Client *snext; |
|
| 73 | 58 | Window win; |
|
| 74 | 59 | }; |
|
| 60 | + | ||
| 61 | + | typedef struct { |
|
| 62 | + | int x, y, w, h; |
|
| 63 | + | unsigned long norm[ColLast]; |
|
| 64 | + | unsigned long sel[ColLast]; |
|
| 65 | + | Drawable drawable; |
|
| 66 | + | GC gc; |
|
| 67 | + | struct { |
|
| 68 | + | int ascent; |
|
| 69 | + | int descent; |
|
| 70 | + | int height; |
|
| 71 | + | XFontSet set; |
|
| 72 | + | XFontStruct *xfont; |
|
| 73 | + | } font; |
|
| 74 | + | } DC; /* draw context */ |
|
| 75 | 75 | ||
| 76 | 76 | typedef struct { |
|
| 77 | 77 | const char *symbol; |
|