diff lwlib/xlwmenuP.h @ 108045:ad01848d2984

Merge from mainline.

--- a/lwlib/xlwmenuP.h	Wed Apr 07 21:55:20 2010 +0000
+++ b/lwlib/xlwmenuP.h	Mon Apr 12 01:03:06 2010 +0000
@@ -25,6 +25,9 @@
 
 #include "xlwmenu.h"
 #include <X11/CoreP.h>
+#ifdef HAVE_XFT
+#include <X11/Xft/Xft.h>
+#endif
 
 /* Elements in the stack arrays. */
 typedef struct _window_state
@@ -35,9 +38,13 @@
   Dimension	width;
   Dimension	height;
   Dimension	label_width;
+  int           max_rest_width;
 
   /* Width of toggle buttons or radio buttons.  */
   Dimension     button_width;
+#ifdef HAVE_XFT
+  XftDraw*      xft_draw;
+#endif
 } window_state;
 
 
@@ -49,6 +56,12 @@
   XFontSet	fontSet;
   XFontSetExtents *font_extents;
 #endif
+#ifdef HAVE_XFT
+  String        faceName;
+  int           default_face;
+  XftFont*      xft_font;
+  XftColor      xft_fg, xft_bg, xft_disabled_fg;
+#endif
   XFontStruct*	font;
   Pixel		foreground;
   Pixel		disabled_foreground;