dmlib: dmtext_bm.c annotate

annotate dmtext_bm.c @ 161:0df62d4a1d1b

Fix DMFONT saving.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 06 Oct 2012 07:48:17 +0300
parents	67d2cba58a87
children	040e3bbce5ba

rev	line source
60 f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	1 /*
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	2 * DMLib
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	3 * -- Bitmap and TTF text & font support
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	4 * Programmed and designed by Matti 'ccr' Hamalainen
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	5 * (C) Copyright 2012 Tecnic Software productions (TNSP)
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	6 */
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	7 #include "dmtext.h"
73 295d08376744 Add function for saving a bitmap font. Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	8 #include "dmresw.h"
60 f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	9
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	10
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	11 void dmDrawBMTextConst(SDL_Surface screen, DMBitmapFont font, int mode, int xc, int yc, const char *fmt)
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	12 {
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	13 const char *ptr = fmt;
129 975725e3126d Cleanup some prototyping code. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	14 DMUnscaledBlitFunc blit = NULL;
70 a791146e3094 Make BM text work, a bit at least. Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	15
60 f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	16 while (*ptr)
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	17 {
129 975725e3126d Cleanup some prototyping code. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	18 int ch = *ptr++;
70 a791146e3094 Make BM text work, a bit at least. Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	19 SDL_Surface *glyph;
60 f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	20
129 975725e3126d Cleanup some prototyping code. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	21 if (ch >= 0 && ch < font->nglyphs && (glyph = font->glyphs[ch]) != NULL)
60 f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	22 {
129 975725e3126d Cleanup some prototyping code. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	23 if (blit == NULL)
975725e3126d Cleanup some prototyping code. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	24 blit = dmGetUnscaledBlitFunc(glyph->format, screen->format, mode);
975725e3126d Cleanup some prototyping code. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	25
975725e3126d Cleanup some prototyping code. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	26 blit(glyph, xc, yc, screen);
63 3d9da937db69 More work on the text support. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	27 xc += glyph->w;
60 f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	28 }
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	29 else
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	30 xc += font->width;
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	31 }
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	32 }
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	33
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	34
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	35 void dmDrawBMTextVA(SDL_Surface screen, DMBitmapFont font, int mode, int xc, int yc, const char *fmt, va_list ap)
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	36 {
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	37 char *tmp = dm_strdup_vprintf(fmt, ap);
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	38 if (tmp != NULL)
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	39 {
63 3d9da937db69 More work on the text support. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	40 dmDrawBMTextConst(screen, font, mode, xc, yc, tmp);
60 f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	41 dmFree(tmp);
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	42 }
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	43 }
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	44
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	45
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	46 void dmDrawBMText(SDL_Surface screen, DMBitmapFont font, int mode, int xc, int yc, const char *fmt, ...)
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	47 {
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	48 va_list ap;
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	49
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	50 va_start(ap, fmt);
63 3d9da937db69 More work on the text support. Matti Hamalainen <ccr@tnsp.org> parents: 60 diff changeset	51 dmDrawBMTextVA(screen, font, mode, xc, yc, fmt, ap);
60 f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	52 va_end(ap);
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	53 }
f28cd66356f6 Initial work for bitmapped fonts and text drawing. Also moved TTF header Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	54
65 03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	55
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	56 DMBitmapFont *dmNewBitmapFont(int nglyphs, int width, int height)
65 03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	57 {
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	58 DMBitmapFont *font = dmMalloc0(sizeof(DMBitmapFont));
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	59 if (font == NULL)
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	60 return NULL;
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	61
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	62 font->width = width;
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	63 font->height = height;
65 03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	64 font->nglyphs = nglyphs;
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	65 font->glyphs = dmCalloc(nglyphs, sizeof(SDL_Surface *));
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	66 if (font->glyphs == NULL)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	67 {
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	68 dmFree(font);
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	69 return NULL;
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	70 }
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	71
65 03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	72 return font;
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	73 }
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	74
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	75
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	76 int dmFreeBitmapFont(DMBitmapFont *font)
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	77 {
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	78 int i;
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	79
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	80 if (font == NULL)
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	81 return DMERR_NULLPTR;
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	82
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	83 for (i = 0; i < font->nglyphs; i++)
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	84 {
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	85 if (font->glyphs[i] != NULL)
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	86 {
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	87 SDL_FreeSurface(font->glyphs[i]);
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	88 font->glyphs[i] = NULL;
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	89 }
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	90 }
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	91
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	92 dmFree(font);
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	93 return DMERR_OK;
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	94 }
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	95
03375aa0ef2b Implement some new functions for bitmapped font handling. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	96
100 f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	97 /* Set the palette for each glyph. While the function allows you to
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	98 * specify 'start' and 'end' indices and palette array freely, you should
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	99 * typically use DMFONT_NPALETTE size palette starting at index 0.
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	100 */
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	101 int dmSetBitmapFontPalette(DMBitmapFont font, SDL_Color pal, int start, int size)
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	102 {
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	103 int i;
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	104
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	105 if (font == NULL)
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	106 return DMERR_NULLPTR;
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	107
102 751af3f0e3f2 Oops, 100L :( Matti Hamalainen <ccr@tnsp.org> parents: 101 diff changeset	108 if (start < 0 \|\| size < 1)
100 f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	109 return DMERR_INVALID_ARGS;
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	110
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	111 for (i = 0; i < font->nglyphs; i++)
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	112 {
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	113 SDL_Surface *glyph = font->glyphs[i];
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	114 if (glyph != NULL)
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	115 {
101 8bba97252d85 Oops, 10L. Matti Hamalainen <ccr@tnsp.org> parents: 100 diff changeset	116 SDL_SetColors(glyph, pal, start, size);
100 f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	117 }
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	118 }
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	119
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	120 return DMERR_OK;
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	121 }
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	122
f16d102dbbac Add a function for setting bitmapped font palette. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	123
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	124 int dmLoadBitmapFont(DMResource res, DMBitmapFont *pfont)
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	125 {
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	126 DMBitmapFont *font;
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	127 char magic[8];
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	128 Uint16 version, nglyphs, maxglyph;
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	129 int width, height;
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	130 BOOL tsfont = FALSE;
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	131
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	132 // Check magic and version
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	133 dmf_read_str(res, (Uint8 *) &magic, 6);
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	134 dmf_read_le16(res, &version);
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	135
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	136 // Check if it is a legacy TSFONT file
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	137 if (memcmp(magic, TSFONT_MAGIC, 6) == 0)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	138 {
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	139 // Yep, we handle these a bit differently
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	140 int encoding = dmfgetc(res);
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	141 tsfont = TRUE;
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	142
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	143 if (version > TSFONT_VERSION)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	144 return DMERR_VERSION;
132 b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	145
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	146 #ifdef FN_DEBUG
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	147 fprintf(stderr, "TSFONT v%d.%d (0x%04x), encoding=%d\n", version >> 8, version & 0xff, version, encoding);
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	148 #endif
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	149
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	150 // There were only two encodings, 0 = none and 1 = RLE
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	151 // of which RLE was never actually used ... derp.
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	152 if (encoding != 0)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	153 return DMERR_NOT_SUPPORTED;
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	154 }
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	155 else
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	156 {
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	157 if (memcmp(magic, DMFONT_MAGIC, 6) != 0)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	158 return DMERR_INVALID;
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	159
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	160 if (version > DMFONT_VERSION)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	161 return DMERR_VERSION;
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	162 }
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	163
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	164 // Read other header data
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	165 if (tsfont)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	166 {
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	167 // TSFONT only has number of glyphs stored in the file
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	168 nglyphs = dmfgetc(res);
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	169
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	170 // Maximum glyph number
104 7160c1d71ade Few nasty bugs fixed in TSFONT loading. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	171 maxglyph = 256;
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	172 }
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	173 else
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	174 {
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	175 dmf_read_le16(res, &nglyphs);
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	176 dmf_read_le16(res, &maxglyph);
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	177 }
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	178
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	179 width = dmfgetc(res);
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	180 height = dmfgetc(res);
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	181
132 b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	182 #ifdef FN_DEBUG
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	183 fprintf(stderr, "nglyphs=%d (0x%02x), width=%d, height=%d\n", nglyphs, nglyphs, width, height);
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	184 #endif
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	185
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	186 if (tsfont)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	187 {
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	188 // TSFONT color assignments (boolean) .. we discard this.
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	189 dmfgetc(res);
132 b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	190
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	191 // Very old TSFONTs have some extra data that is not used
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	192 // .. can't actually even remember what it was for.
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	193 if (version == 0x0200)
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	194 {
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	195 int i;
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	196 for (i = 0; i < 32; i++)
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	197 dmfgetc(res);
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	198 }
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	199 }
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	200
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	201 if (width < DMFONT_MIN_WIDTH \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	202 height < DMFONT_MIN_HEIGHT \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	203 width > DMFONT_MAX_WIDTH \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	204 height > DMFONT_MAX_HEIGHT \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	205 nglyphs > DMFONT_MAX_GLYPHS \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	206 maxglyph > DMFONT_MAX_GLYPHS \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	207 maxglyph < 1)
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	208 return DMERR_INVALID_DATA;
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	209
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	210 // Allocate font
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	211 if ((*pfont = font = dmNewBitmapFont(maxglyph, width, height)) == NULL)
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	212 return DMERR_MALLOC;
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	213
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	214 // Read glyph data, if any
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	215 if (nglyphs > 0)
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	216 {
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	217 int n, i;
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	218 Uint32 BitsPerPixel, Rmask, Gmask, Bmask, Amask;
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	219 SDL_Color pal[DMFONT_NPALETTE];
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	220
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	221 // Setup palette for 8bpp fonts
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	222 for (n = 0; n < DMFONT_NPALETTE; n++)
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	223 {
104 7160c1d71ade Few nasty bugs fixed in TSFONT loading. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	224 pal[n].r = pal[n].g = pal[n].b = 0;
7160c1d71ade Few nasty bugs fixed in TSFONT loading. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	225 pal[n].unused = n > 0 ? 255 : 0;
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	226 }
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	227
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	228 if (tsfont)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	229 {
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	230 BitsPerPixel = 8;
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	231 Rmask = Gmask = Bmask = Amask = 0;
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	232 }
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	233 else
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	234 {
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	235 BitsPerPixel = dmfgetc(res);
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	236 dmf_read_le32(res, &Rmask);
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	237 dmf_read_le32(res, &Gmask);
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	238 dmf_read_le32(res, &Bmask);
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	239 dmf_read_le32(res, &Amask);
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	240 }
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	241
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	242 for (i = 0; i < nglyphs; i++)
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	243 {
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	244 int y;
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	245 Uint16 index;
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	246 Uint8 *pixels;
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	247 SDL_Surface *glyph;
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	248
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	249 // TSFONT format has only byte sized index
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	250 if (tsfont)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	251 index = dmfgetc(res);
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	252 else
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	253 dmf_read_le16(res, &index);
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	254
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	255 // Read dimensions
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	256 width = dmfgetc(res);
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	257 height = dmfgetc(res);
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	258
132 b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	259 #ifdef FN_DEBUG
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	260 fprintf(stderr, "#%d @ %d - w=%d, h=%d\n", i, index, width, height);
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	261 #endif
b5569c84f00a Add support for loading ancient version of TSFONTs. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	262
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	263 if (width < DMFONT_MIN_WIDTH \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	264 height < DMFONT_MIN_HEIGHT \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	265 width > DMFONT_MAX_WIDTH \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	266 height > DMFONT_MAX_HEIGHT \|\|
104 7160c1d71ade Few nasty bugs fixed in TSFONT loading. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	267 index >= maxglyph)
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	268 return DMERR_INVALID_DATA;
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	269
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	270 // Allocate bitmap
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	271 font->glyphs[index] = glyph = SDL_CreateRGBSurface(
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	272 SDL_SWSURFACE, width, height,
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	273 BitsPerPixel, Rmask, Gmask,
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	274 Bmask,
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	275 Amask);
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	276
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	277 if (glyph == NULL)
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	278 return DMERR_MALLOC;
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	279
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	280 if (BitsPerPixel == 8)
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	281 SDL_SetColors(glyph, pal, 0, DMFONT_NPALETTE);
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	282
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	283 // Read pixel data
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	284 pixels = glyph->pixels;
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	285 for (y = 0; y < glyph->h; y++)
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	286 {
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	287 if (dmfread(pixels, glyph->format->BytesPerPixel, glyph->w, res) != (size_t) glyph->w)
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	288 return DMERR_FREAD;
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	289 pixels += glyph->pitch;
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	290 }
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	291 }
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	292 }
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	293
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	294 return DMERR_OK;
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	295 }
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	296
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	297
73 295d08376744 Add function for saving a bitmap font. Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	298 int dmSaveBitmapFont(DMResource res, DMBitmapFont font)
295d08376744 Add function for saving a bitmap font. Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	299 {
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	300 int maxglyph, nglyphs, n;
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	301 if (font == NULL)
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	302 return DMERR_NULLPTR;
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	303
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	304 if (font->nglyphs > DMFONT_MAX_GLYPHS \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	305 font->width > DMFONT_MAX_WIDTH \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	306 font->height > DMFONT_MAX_HEIGHT \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	307 font->width < DMFONT_MIN_WIDTH \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	308 font->height < DMFONT_MIN_HEIGHT)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	309 return DMERR_INVALID_DATA;
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	310
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	311 // Count number of actually existing glyphs
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	312 for (maxglyph = nglyphs = n = 0; n < font->nglyphs; n++)
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	313 {
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	314 if (font->glyphs[n] != NULL)
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	315 {
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	316 nglyphs++;
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	317 maxglyph = n;
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	318 }
e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	319 }
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	320
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	321 // Write the DMFONT header
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	322 if (!dmf_write_str(res, (Uint8 *) DMFONT_MAGIC, 6))
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	323 return DMERR_FWRITE;
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	324
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	325 dmf_write_le16(res, DMFONT_VERSION);
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	326 dmf_write_le16(res, nglyphs);
161 0df62d4a1d1b Fix DMFONT saving. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	327 dmf_write_le16(res, maxglyph + 1);
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	328 dmfputc(font->width, res);
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	329 dmfputc(font->height, res);
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	330
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	331 if (nglyphs > 0)
73 295d08376744 Add function for saving a bitmap font. Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	332 {
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	333 int i;
91 e1e308167991 Various improvements in the bitmapped font loading and saving functions. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	334 SDL_Surface *glyph = font->glyphs[maxglyph];
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	335
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	336 // If there are actual glyphs stored, save thi
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	337 dmfputc(glyph->format->BitsPerPixel, res);
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	338 dmf_write_le32(res, glyph->format->Rmask);
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	339 dmf_write_le32(res, glyph->format->Gmask);
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	340 dmf_write_le32(res, glyph->format->Bmask);
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	341 dmf_write_le32(res, glyph->format->Amask);
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	342
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	343 for (i = 0; i < font->nglyphs; i++)
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	344 {
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	345 glyph = font->glyphs[i];
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	346 if (glyph != NULL)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	347 {
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	348 int y;
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	349 Uint8 *pixels = glyph->pixels;
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	350
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	351 if (glyph->w < DMFONT_MIN_WIDTH \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	352 glyph->h < DMFONT_MIN_HEIGHT \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	353 glyph->w > DMFONT_MAX_WIDTH \|\|
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	354 glyph->h > DMFONT_MAX_HEIGHT)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	355 return DMERR_INVALID_DATA;
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	356
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	357 // Each glyph has its table index and w/h stored
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	358 dmf_write_le16(res, i);
161 0df62d4a1d1b Fix DMFONT saving. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	359 dmfputc(glyph->w, res);
0df62d4a1d1b Fix DMFONT saving. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	360 dmfputc(glyph->h, res);
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	361
89 b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	362 // Write the pixel data
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	363 for (y = 0; y < glyph->h; y++)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	364 {
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	365 if (dmfwrite(pixels, glyph->format->BytesPerPixel, glyph->w, res) != (size_t) glyph->w)
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	366 return DMERR_FWRITE;
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	367 pixels += glyph->pitch;
b10884934aca Various improvements in bitmapped font support, and addition of legacy Matti Hamalainen <ccr@tnsp.org> parents: 76 diff changeset	368 }
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	369 }
e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	370 }
73 295d08376744 Add function for saving a bitmap font. Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	371 }
75 e6535609c161 Initial implementation of loading and saving of bitmap fonts. Matti Hamalainen <ccr@tnsp.org> parents: 73 diff changeset	372
73 295d08376744 Add function for saving a bitmap font. Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	373 return DMERR_OK;
295d08376744 Add function for saving a bitmap font. Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	374 }

Mercurial > hg > dmlib

annotate dmtext_bm.c @ 161:0df62d4a1d1b