diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2016-09-04 19:55:37 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2016-09-04 19:55:37 +0100 |
| commit | df25a1c5a2f433198915a4350eb3223665d53b21 (patch) | |
| tree | 9cc111912b00c4f65d9f6294016fcb3b433eda46 /greeter/LoginP.h | |
| parent | 93199a5240a48f6eb79cb91bd89a7bbc289f2b56 (diff) | |
Unifdef XFT
Diffstat (limited to 'greeter/LoginP.h')
| -rw-r--r-- | greeter/LoginP.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/greeter/LoginP.h b/greeter/LoginP.h index ccd0edf..abe0d8c 100644 --- a/greeter/LoginP.h +++ b/greeter/LoginP.h @@ -60,9 +60,7 @@ from The Open Group. # include <X11/IntrinsicP.h> # include <X11/CoreP.h> # include <X11/Xlib.h> -# ifdef USE_XFT -# include <X11/Xft/Xft.h> -# endif +# include <X11/Xft/Xft.h> # define INITIALIZING 0 # define PROMPTING 1 @@ -87,23 +85,12 @@ typedef struct { /* New fields for the login widget instance record */ typedef struct { -# ifndef USE_XFT - Pixel textpixel; /* foreground pixel */ - Pixel promptpixel; /* prompt pixel */ - Pixel greetpixel; /* greeting pixel */ - Pixel failpixel; /* failure pixel */ -# endif Pixel hipixel; /* frame hilite pixel */ Pixel shdpixel; /* shadow frame pixel */ Pixel inppixel; /* input field bg pixel */ GC textGC; /* pointer to GraphicsContext */ GC bgGC; /* pointer to GraphicsContext */ GC xorGC; /* pointer to GraphicsContext */ -# ifndef USE_XFT - GC promptGC; - GC greetGC; - GC failGC; -# endif GC hiGC; /* for hilight part of frame */ GC shdGC; /* for shaded part of frame */ GC inpGC; /* for input field of frame */ @@ -114,12 +101,6 @@ typedef struct { char *failMsg; /* failure message */ char *fail; /* current error message */ char *passwdChangeMsg; /* message when passwd expires */ -# ifndef USE_XFT - XFontStruct *textFont; /* font for text */ - XFontStruct *promptFont; /* font for prompts */ - XFontStruct *greetFont; /* font for greeting */ - XFontStruct *failFont; /* font for failure message */ -# endif /* USE_XFT */ int state; /* state */ int activePrompt; /* which prompt is active */ int failUp; /* failure message displayed */ @@ -156,7 +137,6 @@ typedef struct { Window logoWindow; Boolean useShape, logoValid; Pixmap logoPixmap, logoMask; -# ifdef USE_XFT XftDraw *draw; XftFont *textFace; /* font for text */ XftFont *promptFace; /* font for prompts */ @@ -166,7 +146,6 @@ typedef struct { XftColor promptcolor; /* prompt color */ XftColor greetcolor; /* greeting color */ XftColor failcolor; /* failure color */ -# endif } LoginPart; /* Full instance record declaration */ |