diff options
| author | Anselm R. Garbe <arg@suckless.org> | 2007-02-22 18:16:35 +0100 |
|---|---|---|
| committer | Anselm R. Garbe <arg@suckless.org> | 2007-02-22 18:16:35 +0100 |
| commit | de3463988319271f504b5e3deb13f598470acd0d (patch) | |
| tree | 3ce16dae2ac865f564ddf7ebcc558b6cdfc52a5b | |
| parent | 18592825d253dbab35238063806c6c67876841f5 (diff) | |
made Fnt an anonymous struct
| -rw-r--r-- | config.mk | 2 | ||||
| -rw-r--r-- | dmenu.h | 23 |
2 files changed, 10 insertions, 15 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | # dmenu version | 1 | # dmenu version |
| 2 | VERSION = 2.3 | 2 | VERSION = 2.4 |
| 3 | 3 | ||
| 4 | # Customize below to fit your system | 4 | # Customize below to fit your system |
| 5 | 5 | ||
| @@ -14,25 +14,20 @@ | |||
| 14 | /* color */ | 14 | /* color */ |
| 15 | enum { ColFG, ColBG, ColLast }; | 15 | enum { ColFG, ColBG, ColLast }; |
| 16 | 16 | ||
| 17 | typedef struct DC DC; | 17 | typedef struct { |
| 18 | typedef struct Fnt Fnt; | ||
| 19 | |||
| 20 | struct Fnt { | ||
| 21 | XFontStruct *xfont; | ||
| 22 | XFontSet set; | ||
| 23 | int ascent; | ||
| 24 | int descent; | ||
| 25 | int height; | ||
| 26 | }; | ||
| 27 | |||
| 28 | struct DC { | ||
| 29 | int x, y, w, h; | 18 | int x, y, w, h; |
| 30 | unsigned long norm[ColLast]; | 19 | unsigned long norm[ColLast]; |
| 31 | unsigned long sel[ColLast]; | 20 | unsigned long sel[ColLast]; |
| 32 | Drawable drawable; | 21 | Drawable drawable; |
| 33 | Fnt font; | ||
| 34 | GC gc; | 22 | GC gc; |
| 35 | }; /* draw context */ | 23 | struct { |
| 24 | XFontStruct *xfont; | ||
| 25 | XFontSet set; | ||
| 26 | int ascent; | ||
| 27 | int descent; | ||
| 28 | int height; | ||
| 29 | } font; | ||
| 30 | } DC; /* draw context */ | ||
| 36 | 31 | ||
| 37 | extern int screen; | 32 | extern int screen; |
| 38 | extern Display *dpy; | 33 | extern Display *dpy; |
