1 --- ~/tuxtxt.c 2008-09-03 20:07:53.000000000 +0200
2 +++ ~/tuxtxt.c 2008-09-04 10:54:47.000000000 +0200
7 +#if ((defined(FREETYPE_MAJOR)) && (((FREETYPE_MAJOR == 2) && (((FREETYPE_MINOR == 1) && (FREETYPE_PATCH >= 9)) || (FREETYPE_MINOR > 1))) || (FREETYPE_MAJOR > 2)))
8 + typettf.width = (FT_UShort) fontwidth * TTFWidthFactor16 / 16;
10 typettf.font.pix_width = (FT_UShort) fontwidth * TTFWidthFactor16 / 16;
19 +#if ((defined(FREETYPE_MAJOR)) && (((FREETYPE_MAJOR == 2) && (((FREETYPE_MINOR == 1) && (FREETYPE_PATCH >= 9)) || (FREETYPE_MINOR > 1))) || (FREETYPE_MAJOR > 2)))
20 + typettf.width = typettf.height = (FT_UShort) newwidth;
22 typettf.font.pix_width = typettf.font.pix_height = (FT_UShort) newwidth;
25 for (i = 0; i <= 12; i++)
26 axdrcs[i] = (fontwidth * i + 6) / 12;
31 +#if ((defined(FREETYPE_MAJOR)) && (((FREETYPE_MAJOR == 2) && (((FREETYPE_MINOR == 1) && (FREETYPE_PATCH >= 9)) || (FREETYPE_MINOR > 1))) || (FREETYPE_MAJOR > 2)))
32 + typettf.face_id = (FTC_FaceID) TUXTXTTTFVAR;
33 + typettf.height = (FT_UShort) fontheight * TTFHeightFactor16 / 16;
35 typettf.font.face_id = (FTC_FaceID) TUXTXTTTFVAR;
36 typettf.font.pix_height = (FT_UShort) fontheight * TTFHeightFactor16 / 16;
41 +#if ((defined(FREETYPE_MAJOR)) && (((FREETYPE_MAJOR == 2) && (((FREETYPE_MINOR == 1) && (FREETYPE_PATCH >= 9)) || (FREETYPE_MINOR > 1))) || (FREETYPE_MAJOR > 2)))
42 + typettf.face_id = (FTC_FaceID) TUXTXTOTBVAR;
43 + typettf.width = (FT_UShort) 23;
44 + typettf.height = (FT_UShort) 23;
46 typettf.font.face_id = (FTC_FaceID) TUXTXTOTBVAR;
47 typettf.font.pix_width = (FT_UShort) 23;
48 typettf.font.pix_height = (FT_UShort) 23;
52 +#if ((defined(FREETYPE_MAJOR)) && (((FREETYPE_MAJOR == 2) && (((FREETYPE_MINOR == 1) && (FREETYPE_PATCH >= 9)) || (FREETYPE_MINOR > 1))) || (FREETYPE_MAJOR > 2)))
53 + typettf.flags = FT_LOAD_MONOCHROME;
55 typettf.image_type = ftc_image_mono;
58 +#if ((defined(FREETYPE_MAJOR)) && (((FREETYPE_MAJOR == 2) && (((FREETYPE_MINOR == 1) && (FREETYPE_PATCH >= 9)) || (FREETYPE_MINOR > 1))) || (FREETYPE_MAJOR > 2)))
59 + if ((error = FTC_Manager_Lookup_Face(manager, typettf.face_id, &face)))
61 + typettf.face_id = (usettf ? (FTC_FaceID) TUXTXTTTF : TUXTXTOTB);
62 + if ((error = FTC_Manager_Lookup_Face(manager, typettf.face_id, &face)))
64 if ((error = FTC_Manager_Lookup_Face(manager, typettf.font.face_id, &face)))
66 typettf.font.face_id = (usettf ? (FTC_FaceID) TUXTXTTTF : TUXTXTOTB);
67 if ((error = FTC_Manager_Lookup_Face(manager, typettf.font.face_id, &face)))
70 printf("TuxTxt <FTC_Manager_Lookup_Face failed with Errorcode 0x%.2X>\n", error);
71 FTC_Manager_Done(manager);
72 --- ~/tuxtxt.h 2008-09-03 20:07:53.000000000 +0200
73 +++ ~/tuxtxt.h 2008-09-04 10:54:18.000000000 +0200
75 struct fb_fix_screeninfo fix_screeninfo;
78 +#if ((defined(FREETYPE_MAJOR)) && (((FREETYPE_MAJOR == 2) && (((FREETYPE_MINOR == 1) && (FREETYPE_PATCH >= 9)) || (FREETYPE_MINOR > 1))) || (FREETYPE_MAJOR > 2)))
79 +typedef FTC_ImageTypeRec FTC_Image_Desc;
80 +typedef FTC_SBitCache FTC_SBit_Cache;
81 +#define FTC_SBit_Cache_New(a,b) FTC_SBitCache_New(a,b)
82 +#define FTC_SBit_Cache_Lookup(a,b,c,d) FTC_SBitCache_Lookup(a,b,c,d,NULL)
83 +#define FTC_Manager_Lookup_Face(a,b,c) FTC_Manager_LookupFace(a,b,c)