made Fnt an anonymous struct de346398
Anselm R. Garbe · 2007-02-22 18:16 2 file(s) · +10 −15
config.mk +1 −1
1 1 
# dmenu version
2 - 
VERSION = 2.3
2 + 
VERSION = 2.4
3 3 

            

            
            

                4
                4
                 
                
# Customize below to fit your system

            

            
            

                5
                5
                 
                

            

            
        
        
    

    





    

        dmenu.h
        +9 −14
    

    
    

        
        
            
            
            

                14
                14
                 
                
/* color */

            

            
            

                15
                15
                 
                
enum { ColFG, ColBG, ColLast };

            

            
            

                16
                16
                 
                

            

            
            

                17
                
                -
                
typedef struct DC DC;

            

            
            

                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 {

            

            
            

                
                17
                +
                
typedef struct {

            

            
            

                29
                18
                 
                
	int x, y, w, h;

            

            
            

                30
                19
                 
                
	unsigned long norm[ColLast];

            

            
            

                31
                20
                 
                
	unsigned long sel[ColLast];

            

            
            

                32
                21
                 
                
	Drawable drawable;

            

            
            

                33
                
                -
                
	Fnt font;

            

            
            

                34
                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
                32
                 
                
extern int screen;

            

            
            

                38
                33
                 
                
extern Display *dpy;