19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 # DEALINGS IN THE SOFTWARE. |
21 # DEALINGS IN THE SOFTWARE. |
22 # |
22 # |
23 |
23 |
24 diff -urp -x '*~' -x '*.orig' modules/om/generic/omGeneric.c modules/om/generic/omGeneric.c |
24 diff --git a/modules/om/generic/omGeneric.c b/modules/om/generic/omGeneric.c |
25 --- modules/om/generic/omGeneric.c 2010-11-21 18:48:04.435666511 -0800 |
25 index c5d9416..d286165 100644 |
26 +++ modules/om/generic/omGeneric.c 2010-11-21 18:48:05.261723978 -0800 |
26 --- a/modules/om/generic/omGeneric.c |
|
27 +++ b/modules/om/generic/omGeneric.c |
27 @@ -175,6 +175,11 @@ init_fontset( |
28 @@ -175,6 +175,11 @@ init_fontset( |
28 if((font_set->substitute = init_fontdata(data->substitute, |
29 if((font_set->substitute = init_fontdata(data->substitute, |
29 data->substitute_num)) == NULL) |
30 data->substitute_num)) == NULL) |
30 goto err; |
31 goto err; |
31 + |
32 + |
141 - if (font_set->font_name == NULL) |
142 - if (font_set->font_name == NULL) |
142 + if (font_set->font_name == NULL || font_set->delay_loading) /*if delay_loading, continue*/ |
143 + if (font_set->font_name == NULL || font_set->delay_loading) /*if delay_loading, continue*/ |
143 continue; |
144 continue; |
144 |
145 |
145 font_set->id = count; |
146 font_set->id = count; |
146 @@ -1177,7 +1202,7 @@ parse_fontname( |
147 @@ -1163,7 +1188,7 @@ parse_fontname( |
147 * a "missing_charset" will be reported to the client |
148 * a "missing_charset" will be reported to the client |
148 * for this CharSet. |
149 * for this CharSet. |
149 */ |
150 */ |
150 - font_data_return. xlfd_name = NULL; |
151 - font_data_return. xlfd_name = NULL; |
151 + font_data_return.xlfd_name = NULL; |
152 + font_data_return.xlfd_name = NULL; |
152 font_data_return.side = XlcUnknown; |
153 font_data_return.side = XlcUnknown; |
153 |
154 |
154 ret = parse_fontdata(oc, font_set, font_set->font_data, |
155 ret = parse_fontdata(oc, font_set, font_set->font_data, |
155 @@ -1275,7 +1300,7 @@ set_missing_list( |
156 @@ -1258,7 +1283,7 @@ set_missing_list( |
156 count = length = 0; |
157 count = length = 0; |
157 |
158 |
158 for ( ; font_set_num-- > 0; font_set++) { |
159 for ( ; font_set_num-- > 0; font_set++) { |
159 - if (font_set->info || font_set->font) { |
160 - if (font_set->info || font_set->font) { |
160 + if (font_set->info || font_set->font || font_set->no_checking) { |
161 + if (font_set->info || font_set->font || font_set->no_checking) { |
161 continue; |
162 continue; |
162 } |
163 } |
163 |
164 |
164 @@ -1322,7 +1347,7 @@ set_missing_list( |
165 @@ -1305,7 +1330,7 @@ set_missing_list( |
165 font_set_num = gen->font_set_num; |
166 font_set_num = gen->font_set_num; |
166 |
167 |
167 for ( ; font_set_num-- > 0; font_set++) { |
168 for ( ; font_set_num-- > 0; font_set++) { |
168 - if (font_set->info || font_set->font) { |
169 - if (font_set->info || font_set->font) { |
169 + if (font_set->info || font_set->font || font_set->no_checking) { |
170 + if (font_set->info || font_set->font || font_set->no_checking) { |
170 continue; |
171 continue; |
171 } |
172 } |
172 |
173 |
173 @@ -2110,6 +2135,20 @@ init_om( |
174 @@ -2089,6 +2114,20 @@ init_om( |
174 } |
175 } |
175 read_vw(lcd,data,num); |
176 read_vw(lcd,data,num); |
176 length += strlen(data->font_data->name) + 1; |
177 length += strlen(data->font_data->name) + 1; |
177 + |
178 + |
178 + /* For load_option */ |
179 + /* For load_option */ |
189 + } |
190 + } |
190 + } |
191 + } |
191 } |
192 } |
192 |
193 |
193 /* required charset list */ |
194 /* required charset list */ |
194 diff -urp -x '*~' -x '*.orig' modules/om/generic/omXChar.c modules/om/generic/omXChar.c |
195 diff --git a/modules/om/generic/omXChar.c b/modules/om/generic/omXChar.c |
195 --- modules/om/generic/omXChar.c 2010-09-03 22:52:38.000000000 -0700 |
196 index ff517d5..0120c5b 100644 |
196 +++ modules/om/generic/omXChar.c 2010-11-21 18:48:05.262027476 -0800 |
197 --- a/modules/om/generic/omXChar.c |
|
198 +++ b/modules/om/generic/omXChar.c |
197 @@ -326,6 +326,12 @@ load_font( |
199 @@ -326,6 +326,12 @@ load_font( |
198 XOC oc, |
200 XOC oc, |
199 FontSet font_set) |
201 FontSet font_set) |
200 { |
202 { |
201 + /* Give up displaying any characters of this missing charset. */ |
203 + /* Give up displaying any characters of this missing charset. */ |
218 + return -1; |
220 + return -1; |
219 + } |
221 + } |
220 |
222 |
221 length = *to_left - cs_left; |
223 length = *to_left - cs_left; |
222 |
224 |
223 diff -urp -x '*~' -x '*.orig' src/XomGeneric.h src/XomGeneric.h |
225 diff --git a/src/XomGeneric.h b/src/XomGeneric.h |
224 --- src/XomGeneric.h 2010-09-03 22:52:39.000000000 -0700 |
226 index d6f182d..d8eaf89 100644 |
225 +++ src/XomGeneric.h 2010-11-21 18:48:05.262416597 -0800 |
227 --- a/src/XomGeneric.h |
|
228 +++ b/src/XomGeneric.h |
226 @@ -81,6 +81,9 @@ typedef struct _OMDataRec { |
229 @@ -81,6 +81,9 @@ typedef struct _OMDataRec { |
227 XlcCharSet *charset_list; |
230 XlcCharSet *charset_list; |
228 int font_data_count; |
231 int font_data_count; |
229 FontData font_data; |
232 FontData font_data; |
230 + /* For load_option */ |
233 + /* For load_option */ |