Browse Source

made Fnt an anonymous struct

master
Anselm R. Garbe 18 years ago
parent
commit
de34639883
2 changed files with 10 additions and 15 deletions
  1. +1
    -1
      config.mk
  2. +9
    -14
      dmenu.h

+ 1
- 1
config.mk 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


+ 9
- 14
dmenu.h View File

@ -14,25 +14,20 @@
/* color */ /* color */
enum { ColFG, ColBG, ColLast }; enum { ColFG, ColBG, ColLast };
typedef struct DC DC;
typedef struct Fnt Fnt;
struct Fnt {
XFontStruct *xfont;
XFontSet set;
int ascent;
int descent;
int height;
};
struct DC {
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;
}; /* 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;


Loading…
Cancel
Save