X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Ffonts.h;h=913b29e97a4a24ff514f659c36c0e47d27c07d8d;hb=dfdbbddc36c37252ca349eb150cf042ecc8a3688;hp=7de377cf70bdc1021962552fbc81d3b3142558cb;hpb=098e28598f92a2b91951ea1cce0c2d35f65b7462;p=monky

diff --git a/src/fonts.h b/src/fonts.h
index 7de377c..913b29e 100644
--- a/src/fonts.h
+++ b/src/fonts.h
@@ -9,7 +9,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *	(see AUTHORS)
  * All rights reserved.
  *
@@ -32,28 +32,45 @@
 
 #include "x11.h"
 
+/* for fonts */
+struct font_list {
+
+	char name[DEFAULT_TEXT_BUFFER_SIZE];
+	int num;
+	XFontStruct *font;
+
+#ifdef XFT
+	XftFont *xftfont;
+	int font_alpha;
+#endif
+};
+
 #ifdef XFT
 
-#define font_height() (use_xft ? (fonts[ctx->selected_font].xftfont->ascent + \
-	fonts[ctx->selected_font].xftfont->descent) \
-	: (fonts[ctx->selected_font].font->max_bounds.ascent + \
-	fonts[ctx->selected_font].font->max_bounds.descent))
-#define font_ascent() (use_xft ? fonts[ctx->selected_font].xftfont->ascent \
-	: fonts[ctx->selected_font].font->max_bounds.ascent)
-#define font_descent() (use_xft ? fonts[ctx->selected_font].xftfont->descent \
-	: fonts[ctx->selected_font].font->max_bounds.descent)
+#define font_height() (use_xft ? (fonts[selected_font].xftfont->ascent + \
+	fonts[selected_font].xftfont->descent) \
+	: (fonts[selected_font].font->max_bounds.ascent + \
+	fonts[selected_font].font->max_bounds.descent))
+#define font_ascent() (use_xft ? fonts[selected_font].xftfont->ascent \
+	: fonts[selected_font].font->max_bounds.ascent)
+#define font_descent() (use_xft ? fonts[selected_font].xftfont->descent \
+	: fonts[selected_font].font->max_bounds.descent)
 
 #else
 
-#define font_height() (fonts[ctx->selected_font].font->max_bounds.ascent + \
-	fonts[ctx->selected_font].font->max_bounds.descent)
-#define font_ascent() fonts[ctx->selected_font].font->max_bounds.ascent
-#define font_descent() fonts[ctx->selected_font].font->max_bounds.descent
+#define font_height() (fonts[selected_font].font->max_bounds.ascent + \
+	fonts[selected_font].font->max_bounds.descent)
+#define font_ascent() fonts[selected_font].font->max_bounds.ascent
+#define font_descent() fonts[selected_font].font->max_bounds.descent
 
 #endif
 
 #define MAX_FONTS 256
 
+/* direct access to registered fonts (FIXME: bad encapsulation) */
+extern struct font_list *fonts;
+extern int selected_font;
+extern int font_count;
 
 void setup_fonts(void);
 void set_font(void);