annotate gui/skin/font.c @ 33082:8b561660a6f7

Cosmetic: Use more appropriate variable names. The new names make code more intelligible.
author ib
date Thu, 31 Mar 2011 11:38:30 +0000
parents 334e19411421
children 9566100d88a1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26458
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
1 /*
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
2 * This file is part of MPlayer.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
3 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
5 * it under the terms of the GNU General Public License as published by
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
7 * (at your option) any later version.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
8 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
12 * GNU General Public License for more details.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
13 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
14 * You should have received a copy of the GNU General Public License along
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
17 */
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
18
32851
4a0455472d13 Add missing include file.
ib
parents: 32842
diff changeset
19 #include <gtk/gtk.h>
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
20 #include <inttypes.h>
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
21 #include <stdlib.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
22 #include <string.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
23
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
24 #include "font.h"
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
25 #include "gui/interface.h"
33046
9684ad0e1291 Move files with auxiliary functions to own directory.
ib
parents: 32917
diff changeset
26 #include "gui/util/cut.h"
33048
c6d0adf896ea Move auxiliary string functions into separate file.
ib
parents: 33046
diff changeset
27 #include "gui/util/string.h"
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
28 #include "skin.h"
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
29
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
30 #include "libavutil/avstring.h"
26382
b2f4abcf20ed Make include paths consistent; do not use ../ in them.
diego
parents: 26365
diff changeset
31 #include "mp_msg.h"
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
32
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
33 static bmpFont *Fonts[MAX_FONTS];
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
34
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
35 static int fntAddNewFont(char *name)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
36 {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
37 int id, i;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
38
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
39 for (id = 0; id < MAX_FONTS; id++)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
40 if (!Fonts[id])
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
41 break;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
42
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
43 if (id == MAX_FONTS)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
44 return -2;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
45
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
46 Fonts[id] = calloc(1, sizeof(*Fonts[id]));
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
47
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
48 if (!Fonts[id])
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
49 return -1;
32839
2dd39155f320 Cosmetic: Make conditions more readable by having assignments outside.
ib
parents: 32838
diff changeset
50
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
51 av_strlcpy(Fonts[id]->name, name, MAX_FONT_NAME);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
52
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
53 for (i = 0; i < ASCII_CHRS + EXTRA_CHRS; i++) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
54 Fonts[id]->Fnt[i].x = -1;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
55 Fonts[id]->Fnt[i].y = -1;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
56 Fonts[id]->Fnt[i].sx = -1;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
57 Fonts[id]->Fnt[i].sy = -1;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
58 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
59
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
60 return id;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
61 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
62
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
63 void fntFreeFont(void)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
64 {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
65 int i;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
66
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
67 for (i = 0; i < MAX_FONTS; i++) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
68 if (Fonts[i]) {
32917
9949f3a123cf Add new function bpFree() to free txSamples (bitmaps).
ib
parents: 32869
diff changeset
69 bpFree(&Fonts[i]->Bitmap);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
70 gfree((void **)&Fonts[i]);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
71 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
72 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
73 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
74
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
75 int fntRead(char *path, char *fname)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
76 {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
77 FILE *f;
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
78 unsigned char buf[512];
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
79 unsigned char item[32];
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
80 unsigned char param[256];
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
81 int id, n, i;
32817
a104f879bfbc Clean up variable declarations.
ib
parents: 32810
diff changeset
82
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
83 id = fntAddNewFont(fname);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
84
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
85 if (id < 0)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
86 return id;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
87
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
88 av_strlcpy(buf, path, sizeof(buf));
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
89 av_strlcat(buf, fname, sizeof(buf));
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
90 av_strlcat(buf, ".fnt", sizeof(buf));
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
91 f = fopen(buf, "rt");
32839
2dd39155f320 Cosmetic: Make conditions more readable by having assignments outside.
ib
parents: 32838
diff changeset
92
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
93 if (!f) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
94 gfree((void **)&Fonts[id]);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
95 return -3;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
96 }
32839
2dd39155f320 Cosmetic: Make conditions more readable by having assignments outside.
ib
parents: 32838
diff changeset
97
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
98 while (fgets(buf, sizeof(buf), f)) {
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
99 buf[strcspn(buf, "\n\r")] = 0; // remove any kind of newline, if any
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
100 strswap(buf, '\t', ' ');
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
101 trim(buf);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
102 decomment(buf);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
103
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
104 if (!*buf)
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
105 continue;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
106
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
107 n = (strncmp(buf, "\"=", 2) == 0 ? 1 : 0);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
108 cutItem(buf, item, '=', n);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
109 cutItem(buf, param, '=', n + 1);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26458
diff changeset
110
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
111 if (item[0] == '"') {
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
112 if (!item[1])
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
113 item[0] = '=';
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
114 else if (item[1] == '"')
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
115 item[1] = 0;
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
116 else
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
117 cutItem(item, item, '"', 1);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
118
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
119 if (item[0] & 0x80) {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
120 for (i = 0; i < EXTRA_CHRS; i++) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
121 if (!Fonts[id]->nonASCIIidx[i][0]) {
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
122 strncpy(Fonts[id]->nonASCIIidx[i], item, UTF8LENGTH);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
123 break;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
124 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
125 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
126
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
127 if (i == EXTRA_CHRS)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
128 continue;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
129
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
130 i += ASCII_CHRS;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
131 } else
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
132 i = item[0];
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
133
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
134 cutItem(param, buf, ',', 0);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
135 Fonts[id]->Fnt[i].x = atoi(buf);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
136
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
137 cutItem(param, buf, ',', 1);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
138 Fonts[id]->Fnt[i].y = atoi(buf);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
139
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
140 cutItem(param, buf, ',', 2);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
141 Fonts[id]->Fnt[i].sx = atoi(buf);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
142
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
143 cutItem(param, buf, ',', 3);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
144 Fonts[id]->Fnt[i].sy = atoi(buf);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
145
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
146 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[font] char: '%s' params: %d,%d %dx%d\n", item, Fonts[id]->Fnt[i].x, Fonts[id]->Fnt[i].y, Fonts[id]->Fnt[i].sx, Fonts[id]->Fnt[i].sy);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
147 } else if (!strcmp(item, "image")) {
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
148 av_strlcpy(buf, path, sizeof(buf));
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
149 av_strlcat(buf, param, sizeof(buf));
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
150
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
151 mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[font] image file: %s\n", buf);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
152
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
153 if (skinBPRead(buf, &Fonts[id]->Bitmap) != 0) {
32917
9949f3a123cf Add new function bpFree() to free txSamples (bitmaps).
ib
parents: 32869
diff changeset
154 bpFree(&Fonts[id]->Bitmap);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
155 gfree((void **)&Fonts[id]);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
156 fclose(f);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
157 return -4;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
158 }
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
159 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
160 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
161
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
162 fclose(f);
33053
f64d41dac10b Cosmetic: Separate return statement with newline.
ib
parents: 33048
diff changeset
163
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
164 return 0;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
165 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
166
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
167 int fntFindID(char *name)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
168 {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
169 int i;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
170
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
171 for (i = 0; i < MAX_FONTS; i++)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
172 if (Fonts[i])
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
173 if (!strcmp(name, Fonts[i]->name))
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
174 return i;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
175
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
176 return -1;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
177 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
178
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
179 // get Fnt index of character (utf8 or normal one) *str points to,
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
180 // then move pointer to next/previous character
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
181 static int fntGetCharIndex(int id, unsigned char **str, gboolean utf8, int direction)
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
182 {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
183 unsigned char *p, uchar[6] = ""; // glib implements 31-bit UTF-8
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
184 int i, c = -1;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
185
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
186 if (**str & 0x80) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
187 if (utf8) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
188 p = *str;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
189 *str = g_utf8_next_char(*str);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
190 strncpy(uchar, p, *str - p);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
191
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
192 if (direction < 0)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
193 *str = g_utf8_prev_char(p);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
194 } else {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
195 uchar[0] = **str;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
196 *str += direction;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
197 }
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
198
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
199 for (i = 0; (i < EXTRA_CHRS) && Fonts[id]->nonASCIIidx[i][0]; i++) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
200 if (strncmp(Fonts[id]->nonASCIIidx[i], uchar, UTF8LENGTH) == 0)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
201 return i + ASCII_CHRS;
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
202
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
203 if (!utf8 &&
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
204 (Fonts[id]->nonASCIIidx[i][0] == (*uchar >> 6 | 0xc0) &&
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
205 Fonts[id]->nonASCIIidx[i][1] == ((*uchar & 0x3f) | 0x80) &&
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
206 Fonts[id]->nonASCIIidx[i][2] == 0))
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
207 c = i + ASCII_CHRS;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
208 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
209 } else {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
210 c = **str;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
211
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
212 if (utf8 && (direction < 0))
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
213 *str = g_utf8_prev_char(*str);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
214 else
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
215 *str += direction;
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
216 }
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
217
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
218 return c;
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
219 }
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
220
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
221 int fntTextWidth(int id, char *str)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
222 {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
223 int size = 0, c;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
224 gboolean utf8;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
225 unsigned char *p;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
226
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
227 utf8 = g_utf8_validate(str, -1, NULL);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
228 p = str;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
229
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
230 while (*p) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
231 c = fntGetCharIndex(id, &p, utf8, 1);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
232
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
233 if (c == -1 || Fonts[id]->Fnt[c].sx == -1)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
234 c = ' ';
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
235
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
236 if (Fonts[id]->Fnt[c].sx != -1)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
237 size += Fonts[id]->Fnt[c].sx;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
238 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
239
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
240 return size;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
241 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
242
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
243 static int fntTextHeight(int id, char *str)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
244 {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
245 int max = 0, c, h;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
246 gboolean utf8;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
247 unsigned char *p;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
248
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
249 utf8 = g_utf8_validate(str, -1, NULL);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
250 p = str;
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
251
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
252 while (*p) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
253 c = fntGetCharIndex(id, &p, utf8, 1);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
254
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
255 if (c == -1 || Fonts[id]->Fnt[c].sx == -1)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
256 c = ' ';
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
257
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
258 h = Fonts[id]->Fnt[c].sy;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
259
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
260 if (h > max)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
261 max = h;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
262 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
263
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
264 return max;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
265 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
266
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
267 txSample *fntRender(wItem *item, int px, char *txt)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
268 {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
269 unsigned char *u;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
270 unsigned int i;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
271 int c, dx, tw, th, fbw, iw, id, ofs;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
272 int x, y, fh, fw, fyc, yc;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
273 uint32_t *ibuf;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
274 uint32_t *obuf;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
275 gboolean utf8;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
276
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
277 id = item->fontid;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
278 tw = fntTextWidth(id, txt);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
279
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
280 if (!tw)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
281 return NULL;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
282
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
283 iw = item->width;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
284 fbw = Fonts[id]->Bitmap.Width;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
285 th = fntTextHeight(id, txt);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
286
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
287 if (item->height != th)
32917
9949f3a123cf Add new function bpFree() to free txSamples (bitmaps).
ib
parents: 32869
diff changeset
288 bpFree(&item->Bitmap);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
289
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
290 if (!item->Bitmap.Image) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
291 item->Bitmap.Height = item->height = th;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
292 item->Bitmap.Width = item->width = iw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
293 item->Bitmap.ImageSize = item->height * iw * 4;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26458
diff changeset
294
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
295 if (!item->Bitmap.ImageSize)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
296 return NULL;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
297
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
298 item->Bitmap.BPP = 32;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
299 item->Bitmap.Image = malloc(item->Bitmap.ImageSize);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
300
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
301 if (!item->Bitmap.Image)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
302 return NULL;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
303 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26458
diff changeset
304
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
305 obuf = (uint32_t *)item->Bitmap.Image;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
306 ibuf = (uint32_t *)Fonts[id]->Bitmap.Image;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
307
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
308 for (i = 0; i < item->Bitmap.ImageSize / 4; i++)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
309 obuf[i] = 0x00ff00ff;
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
310
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
311 if (tw <= iw) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
312 switch (item->align) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
313 default:
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
314 case fntAlignLeft:
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
315 dx = 0;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
316 break;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26458
diff changeset
317
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
318 case fntAlignCenter:
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
319 dx = (iw - tw) / 2;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
320 break;
32792
31ce0bd110d5 Only replace non-existing font character by space if space itself exists.
ib
parents: 32791
diff changeset
321
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
322 case fntAlignRight:
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
323 dx = iw - tw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
324 break;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
325 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
326 } else
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
327 dx = px;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
328
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
329 ofs = dx;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
330
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
331 utf8 = g_utf8_validate(txt, -1, NULL);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
332 u = txt;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
333
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
334 while (*u) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
335 c = fntGetCharIndex(id, &u, utf8, 1);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26458
diff changeset
336
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
337 if (c != -1)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
338 fw = Fonts[id]->Fnt[c].sx;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
339
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
340 if (c == -1 || fw == -1) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
341 c = ' ';
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
342 fw = Fonts[id]->Fnt[c].sx;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
343 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
344
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
345 if (fw == -1)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
346 continue;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
347
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
348 fh = Fonts[id]->Fnt[c].sy;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
349 fyc = Fonts[id]->Fnt[c].y * fbw + Fonts[id]->Fnt[c].x;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
350 yc = dx;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
351
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
352 if (dx >= 0) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
353 for (y = 0; y < fh; y++) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
354 for (x = 0; x < fw; x++)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
355 if (dx + x >= 0 && dx + x < iw)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
356 obuf[yc + x] = ibuf[fyc + x];
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
357
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
358 fyc += fbw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
359 yc += iw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
360 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
361 }
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
362
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
363 dx += fw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
364 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26458
diff changeset
365
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
366 if (ofs > 0 && tw > item->width) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
367 dx = ofs;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
368 u = txt + strlen(txt);
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
369
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
370 while (u > (unsigned char *)txt) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
371 c = fntGetCharIndex(id, &u, utf8, -1);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
372
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
373 if (c != -1)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
374 fw = Fonts[id]->Fnt[c].sx;
32792
31ce0bd110d5 Only replace non-existing font character by space if space itself exists.
ib
parents: 32791
diff changeset
375
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
376 if (c == -1 || fw == -1) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
377 c = ' ';
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
378 fw = Fonts[id]->Fnt[c].sx;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
379 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
380
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
381 if (fw == -1)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
382 continue;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
383
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
384 fh = Fonts[id]->Fnt[c].sy;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
385 fyc = Fonts[id]->Fnt[c].y * fbw + Fonts[id]->Fnt[c].x;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
386
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
387 dx -= fw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
388 yc = dx;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
389
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
390 if (dx >= 0) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
391 for (y = 0; y < fh; y++) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
392 for (x = fw - 1; x >= 0; x--)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
393 if (dx + x >= 0 && dx + x < iw)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
394 obuf[yc + x] = ibuf[fyc + x];
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
395
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
396 fyc += fbw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
397 yc += iw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
398 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
399 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
400 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
401 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
402
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
403 return &item->Bitmap;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
404 }