annotate gui/skin/font.c @ 33693:006a2db8bd55

Use unsigned index variable for comparison with array size.
author ib
date Wed, 29 Jun 2011 13:37:04 +0000
parents d9a4365d1006
children 34e85af9e80f
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>
33123
9566100d88a1 Replace inttypes.h by stdint.h and remove inttypes.h where unneeded.
ib
parents: 33082
diff changeset
20 #include <stdint.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
33269
49ca38147d1f Remove private symbolic constants from header files.
ib
parents: 33129
diff changeset
33 #define MAX_FONTS 25
49ca38147d1f Remove private symbolic constants from header files.
ib
parents: 33129
diff changeset
34
49ca38147d1f Remove private symbolic constants from header files.
ib
parents: 33129
diff changeset
35 #define fntAlignLeft 0
49ca38147d1f Remove private symbolic constants from header files.
ib
parents: 33129
diff changeset
36 #define fntAlignCenter 1
49ca38147d1f Remove private symbolic constants from header files.
ib
parents: 33129
diff changeset
37 #define fntAlignRight 2
49ca38147d1f Remove private symbolic constants from header files.
ib
parents: 33129
diff changeset
38
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
39 static bmpFont *Fonts[MAX_FONTS];
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
40
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
41 static int fntAddNewFont(char *name)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
42 {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
43 int id, i;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
44
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
45 for (id = 0; id < MAX_FONTS; id++)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
46 if (!Fonts[id])
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
47 break;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
48
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
49 if (id == MAX_FONTS)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
50 return -2;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
51
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
52 Fonts[id] = calloc(1, sizeof(*Fonts[id]));
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
53
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
54 if (!Fonts[id])
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
55 return -1;
32839
2dd39155f320 Cosmetic: Make conditions more readable by having assignments outside.
ib
parents: 32838
diff changeset
56
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
57 av_strlcpy(Fonts[id]->name, name, MAX_FONT_NAME);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
58
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
59 for (i = 0; i < ASCII_CHRS + EXTRA_CHRS; i++) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
60 Fonts[id]->Fnt[i].x = -1;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
61 Fonts[id]->Fnt[i].y = -1;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
62 Fonts[id]->Fnt[i].sx = -1;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
63 Fonts[id]->Fnt[i].sy = -1;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
64 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
65
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
66 return id;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
67 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
68
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
69 void fntFreeFont(void)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
70 {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
71 int i;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
72
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
73 for (i = 0; i < MAX_FONTS; i++) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
74 if (Fonts[i]) {
32917
9949f3a123cf Add new function bpFree() to free txSamples (bitmaps).
ib
parents: 32869
diff changeset
75 bpFree(&Fonts[i]->Bitmap);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
76 gfree((void **)&Fonts[i]);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
77 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
78 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
79 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
80
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
81 int fntRead(char *path, char *fname)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
82 {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
83 FILE *f;
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
84 unsigned char buf[512];
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
85 unsigned char item[32];
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
86 unsigned char param[256];
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
87 int id, n, i;
32817
a104f879bfbc Clean up variable declarations.
ib
parents: 32810
diff changeset
88
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
89 id = fntAddNewFont(fname);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
90
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
91 if (id < 0)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
92 return id;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
93
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
94 av_strlcpy(buf, path, sizeof(buf));
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
95 av_strlcat(buf, fname, sizeof(buf));
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
96 av_strlcat(buf, ".fnt", sizeof(buf));
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
97 f = fopen(buf, "rt");
32839
2dd39155f320 Cosmetic: Make conditions more readable by having assignments outside.
ib
parents: 32838
diff changeset
98
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
99 if (!f) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
100 gfree((void **)&Fonts[id]);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
101 return -3;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
102 }
32839
2dd39155f320 Cosmetic: Make conditions more readable by having assignments outside.
ib
parents: 32838
diff changeset
103
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
104 while (fgets(buf, sizeof(buf), f)) {
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
105 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
106 strswap(buf, '\t', ' ');
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
107 trim(buf);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
108 decomment(buf);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
109
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
110 if (!*buf)
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
111 continue;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
112
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
113 n = (strncmp(buf, "\"=", 2) == 0 ? 1 : 0);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
114 cutItem(buf, item, '=', n);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
115 cutItem(buf, param, '=', n + 1);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26458
diff changeset
116
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
117 if (item[0] == '"') {
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
118 if (!item[1])
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
119 item[0] = '=';
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
120 else if (item[1] == '"')
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
121 item[1] = 0;
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
122 else
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
123 cutItem(item, item, '"', 1);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
124
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
125 if (item[0] & 0x80) {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
126 for (i = 0; i < EXTRA_CHRS; i++) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
127 if (!Fonts[id]->nonASCIIidx[i][0]) {
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
128 strncpy(Fonts[id]->nonASCIIidx[i], item, UTF8LENGTH);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
129 break;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
130 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
131 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
132
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
133 if (i == EXTRA_CHRS)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
134 continue;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
135
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
136 i += ASCII_CHRS;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
137 } else
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
138 i = item[0];
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, ',', 0);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
141 Fonts[id]->Fnt[i].x = 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, ',', 1);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
144 Fonts[id]->Fnt[i].y = 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 cutItem(param, buf, ',', 2);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
147 Fonts[id]->Fnt[i].sx = atoi(buf);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
148
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
149 cutItem(param, buf, ',', 3);
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
150 Fonts[id]->Fnt[i].sy = atoi(buf);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
151
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
152 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
153 } else if (!strcmp(item, "image")) {
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
154 av_strlcpy(buf, path, sizeof(buf));
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
155 av_strlcat(buf, param, sizeof(buf));
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
156
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
157 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
158
33082
8b561660a6f7 Cosmetic: Use more appropriate variable names.
ib
parents: 33073
diff changeset
159 if (skinBPRead(buf, &Fonts[id]->Bitmap) != 0) {
32917
9949f3a123cf Add new function bpFree() to free txSamples (bitmaps).
ib
parents: 32869
diff changeset
160 bpFree(&Fonts[id]->Bitmap);
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
161 gfree((void **)&Fonts[id]);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
162 fclose(f);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
163 return -4;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
164 }
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
165 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
166 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
167
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
168 fclose(f);
33053
f64d41dac10b Cosmetic: Separate return statement with newline.
ib
parents: 33048
diff changeset
169
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
170 return 0;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
171 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
172
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
173 int fntFindID(char *name)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
174 {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
175 int i;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
176
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
177 for (i = 0; i < MAX_FONTS; i++)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
178 if (Fonts[i])
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
179 if (!strcmp(name, Fonts[i]->name))
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
180 return i;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
181
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
182 return -1;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
183 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
184
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
185 // 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
186 // then move pointer to next/previous character
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
187 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
188 {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
189 unsigned char *p, uchar[6] = ""; // glib implements 31-bit UTF-8
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
190 int i, c = -1;
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 (**str & 0x80) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
193 if (utf8) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
194 p = *str;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
195 *str = g_utf8_next_char(*str);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
196 strncpy(uchar, p, *str - p);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
197
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
198 if (direction < 0)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
199 *str = g_utf8_prev_char(p);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
200 } else {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
201 uchar[0] = **str;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
202 *str += direction;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
203 }
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
204
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
205 for (i = 0; (i < EXTRA_CHRS) && Fonts[id]->nonASCIIidx[i][0]; i++) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
206 if (strncmp(Fonts[id]->nonASCIIidx[i], uchar, UTF8LENGTH) == 0)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
207 return i + ASCII_CHRS;
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
208
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
209 if (!utf8 &&
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
210 (Fonts[id]->nonASCIIidx[i][0] == (*uchar >> 6 | 0xc0) &&
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
211 Fonts[id]->nonASCIIidx[i][1] == ((*uchar & 0x3f) | 0x80) &&
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
212 Fonts[id]->nonASCIIidx[i][2] == 0))
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
213 c = i + ASCII_CHRS;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
214 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
215 } else {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
216 c = **str;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
217
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
218 if (utf8 && (direction < 0))
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
219 *str = g_utf8_prev_char(*str);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
220 else
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
221 *str += direction;
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
222 }
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
223
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
224 return c;
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
225 }
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
226
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
227 int fntTextWidth(int id, char *str)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
228 {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
229 int size = 0, c;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
230 gboolean utf8;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
231 unsigned char *p;
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 utf8 = g_utf8_validate(str, -1, NULL);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
234 p = str;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
235
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
236 while (*p) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
237 c = fntGetCharIndex(id, &p, utf8, 1);
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 if (c == -1 || Fonts[id]->Fnt[c].sx == -1)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
240 c = ' ';
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
241
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
242 if (Fonts[id]->Fnt[c].sx != -1)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
243 size += Fonts[id]->Fnt[c].sx;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
244 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
245
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
246 return size;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
247 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
248
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
249 static int fntTextHeight(int id, char *str)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
250 {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
251 int max = 0, c, h;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
252 gboolean utf8;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
253 unsigned char *p;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
254
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
255 utf8 = g_utf8_validate(str, -1, NULL);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
256 p = str;
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
257
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
258 while (*p) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
259 c = fntGetCharIndex(id, &p, utf8, 1);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
260
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
261 if (c == -1 || Fonts[id]->Fnt[c].sx == -1)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
262 c = ' ';
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 h = Fonts[id]->Fnt[c].sy;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
265
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
266 if (h > max)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
267 max = h;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
268 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
269
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
270 return max;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
271 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
272
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33269
diff changeset
273 guiImage *fntRender(wItem *item, int px, char *txt)
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
274 {
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
275 unsigned char *u;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
276 unsigned int i;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
277 int c, dx, tw, th, fbw, iw, id, ofs;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
278 int x, y, fh, fw, fyc, yc;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
279 uint32_t *ibuf;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
280 uint32_t *obuf;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
281 gboolean utf8;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
282
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
283 id = item->fontid;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
284 tw = fntTextWidth(id, txt);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
285
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
286 if (!tw)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
287 return NULL;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
288
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
289 iw = item->width;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
290 fbw = Fonts[id]->Bitmap.Width;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
291 th = fntTextHeight(id, txt);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
292
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
293 if (item->height != th)
32917
9949f3a123cf Add new function bpFree() to free txSamples (bitmaps).
ib
parents: 32869
diff changeset
294 bpFree(&item->Bitmap);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
295
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
296 if (!item->Bitmap.Image) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
297 item->Bitmap.Height = item->height = th;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
298 item->Bitmap.Width = item->width = iw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
299 item->Bitmap.ImageSize = item->height * iw * 4;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26458
diff changeset
300
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
301 if (!item->Bitmap.ImageSize)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
302 return NULL;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
303
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33269
diff changeset
304 item->Bitmap.Bpp = 32;
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
305 item->Bitmap.Image = malloc(item->Bitmap.ImageSize);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
306
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
307 if (!item->Bitmap.Image)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
308 return NULL;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
309 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26458
diff changeset
310
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
311 obuf = (uint32_t *)item->Bitmap.Image;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
312 ibuf = (uint32_t *)Fonts[id]->Bitmap.Image;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
313
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
314 for (i = 0; i < item->Bitmap.ImageSize / 4; i++)
33582
d9a4365d1006 gui: Rename TRANSPARENT #define to MP_TRANSPARENT.
diego
parents: 33555
diff changeset
315 obuf[i] = MP_TRANSPARENT;
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
316
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
317 if (tw <= iw) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
318 switch (item->align) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
319 default:
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
320 case fntAlignLeft:
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
321 dx = 0;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
322 break;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26458
diff changeset
323
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
324 case fntAlignCenter:
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
325 dx = (iw - tw) / 2;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
326 break;
32792
31ce0bd110d5 Only replace non-existing font character by space if space itself exists.
ib
parents: 32791
diff changeset
327
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
328 case fntAlignRight:
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
329 dx = iw - tw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
330 break;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
331 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
332 } else
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
333 dx = px;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
334
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
335 ofs = dx;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
336
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
337 utf8 = g_utf8_validate(txt, -1, NULL);
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
338 u = txt;
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 while (*u) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
341 c = fntGetCharIndex(id, &u, utf8, 1);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26458
diff changeset
342
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
343 if (c != -1)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
344 fw = Fonts[id]->Fnt[c].sx;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
345
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
346 if (c == -1 || fw == -1) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
347 c = ' ';
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
348 fw = Fonts[id]->Fnt[c].sx;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
349 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
350
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
351 if (fw == -1)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
352 continue;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
353
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
354 fh = Fonts[id]->Fnt[c].sy;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
355 fyc = Fonts[id]->Fnt[c].y * fbw + Fonts[id]->Fnt[c].x;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
356 yc = dx;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
357
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
358 if (dx >= 0) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
359 for (y = 0; y < fh; y++) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
360 for (x = 0; x < fw; x++)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
361 if (dx + x >= 0 && dx + x < iw)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
362 obuf[yc + x] = ibuf[fyc + x];
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
363
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
364 fyc += fbw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
365 yc += iw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
366 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
367 }
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
368
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
369 dx += fw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
370 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 26458
diff changeset
371
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
372 if (ofs > 0 && tw > item->width) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
373 dx = ofs;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
374 u = txt + strlen(txt);
32734
cc58a1e919d9 Allow character in the font description file to be in UTF-8.
ib
parents: 32712
diff changeset
375
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
376 while (u > (unsigned char *)txt) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
377 c = fntGetCharIndex(id, &u, utf8, -1);
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
378
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
379 if (c != -1)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
380 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
381
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
382 if (c == -1 || fw == -1) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
383 c = ' ';
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
384 fw = Fonts[id]->Fnt[c].sx;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
385 }
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 if (fw == -1)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
388 continue;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
389
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
390 fh = Fonts[id]->Fnt[c].sy;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
391 fyc = Fonts[id]->Fnt[c].y * fbw + Fonts[id]->Fnt[c].x;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
392
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
393 dx -= fw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
394 yc = dx;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
395
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
396 if (dx >= 0) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
397 for (y = 0; y < fh; y++) {
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
398 for (x = fw - 1; x >= 0; x--)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
399 if (dx + x >= 0 && dx + x < iw)
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
400 obuf[yc + x] = ibuf[fyc + x];
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
401
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
402 fyc += fbw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
403 yc += iw;
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
404 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
405 }
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
406 }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
407 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
408
32869
67ec52396b81 Cosmetic: Format to MPlayer coding style.
ib
parents: 32858
diff changeset
409 return &item->Bitmap;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
410 }