1 2005-02-28 Kenichi Handa <handa@m17n.org>
3 * font-flt.c (mfont__flt_run): Add resulting code sequence in
6 2005-02-17 Kenichi Handa <handa@m17n.org>
8 * input.c: Include <sys/types.h>, <dirent.h>, and "database.h".
9 (M_description, M_command, M_variable): New variables.
10 (load_im_info_keys): New variables.
11 (load_im_info, check_command_keyseq, get_description_advance)
12 (parse_command_list, get_command_list, parse_variable_list)
13 (get_variable_list, input_method_hook): New functions.
14 (command_list, variable_list): New variables.
15 (minput__init): Put input_method_hook to Minput_method.
16 Initialize M_description, M_command, M_variable, Mdetail_text,
17 load_im_info_keys, command_list, variable_list.
18 (minput__fini): Unref command_list, variable_list, load_im_info_keys.
19 (Mdetail_text): New variable.
20 (minput_get_description, minput_get_commands)
21 (minput_assign_command_keys, minput_get_variables)
22 (minput_set_variable): New functions.
24 * m17n.h (Mdetail_text, minput_get_description, minput_get_commands)
25 (minput_assign_command_keys, minput_get_variables)
26 (minput_set_variable): Extern them.
28 * plist.c (UNGETC): Just decrement st->p.
29 (read_mtext_element): New arg skip.
30 (read_integer_element): Likewise.
31 (read_symbol_element): Likewise.
32 (read_element): New arg KEYS.
33 (mplist__from_plist): Don't increment ref-count of NULL object.
34 (mplist__from_file): New arg KEYS.
35 (mplist_put): Don't increment ref-count of NULL object.
36 (mplist_add): Likewise.
37 (mplist_push): Likewise.
38 (mplist_set): Likewise. Call M17N_OBJECT_UNREF unconditionally.
40 * plist.h (mplist__from_file): Prototype adjusted.
42 * database.c (mdatabase__dir_list): Renamed from mdb_dir_list.
43 (get_database_stream): New function.
44 (load_database): Use get_database_stream.
45 (M_database_hook): New variable
46 (mdatabase__init): Initialize M_database_hook.
47 (mdatabase__load_for_keys): New function.
48 (mdatabase_find, mdatabase_list, mdatabase_define): Check hook
50 (mdatabase_define): Free mdb->extra_info if necessary.
52 * database.h (mdatabase__dir_list, M_database_hook)
53 (mdatabase__load_for_keys): Extern them.
54 (MDatabaseHookFunc): New type.
56 * internal.h (M17N_OBJECT_UNREF): When freed, set OBJECT to NULL.
58 2004-12-27 Kenichi Handa <handa@m17n.org>
60 * Version 1.2.0 released.
62 2004-12-27 Kenichi Handa <handa@m17n.org>
64 * input.c (minput_filter): Don't reset ic->xxx_changed.
66 * mtext.c (mtext_from_data): Fix documentation.
68 2004-12-25 Kenichi Handa <handa@m17n.org>
70 * m17n-core.h (M17NLIB_MINOR_VERSION): Update to 2.
71 (M17NLIB_VERSION_NAME): Update to "1.2.".
73 2004-12-24 Kenichi Handa <handa@m17n.org>
75 * input.c (reset_ic): Set key_unhandled to 0.
77 2004-12-21 Kenichi Handa <handa@m17n.org>
79 * m17n-gui.h (mfont_from_spec): Delete extern.
81 * input-gui.c (win_callback): Handle Minput_reset.
82 (minput__win_init): Register reset_ic as a callback for
85 * input.c (reset_ic): New arg IGNORE which is ignored. Caller
86 changed. At first, shift to the initial state.
87 (minput__init): Initialize Minput_reset. Register reset_ic as a
88 callback for Minput_reset.
89 (Minput_reset): New variable.
90 (minput_filter): Always set ic->xxx_changed to 0.
91 (minput_reset_ic): New function.
92 (integer_value): Fix typo ('>' -> '<') and calculation of length
95 * m17n-core.c (merror_code): Change type to `int'.
97 * m17n-misc.h (merror_code): Adjust type.
99 * m17n.h (Minput_reset, minput_reset_ic): Extern them.
101 * m17n-core.h (MTEXT_FORMAT_UTF_16, MTEXT_FORMAT_UTF_32): Adjust types.
102 (mtext_change_prop): Delete extern.
104 * mtext.c (MTEXT_FORMAT_UTF_16, MTEXT_FORMAT_UTF_32): Change types
105 to `int'. Move the documents to m17n-core.h.
107 2004-12-13 Kenichi Handa <handa@m17n.org>
109 * m17n-core.h (m17n_object): Rename extern from m17n_object_setup.
110 (MTextProperty): Document it.
112 2004-12-09 Kenichi Handa <handa@m17n.org>
114 * m17n-core.h: Fix typo (MTextStatus -> M17NStatus).
116 2004-12-03 Kenichi Handa <handa@m17n.org>
118 * internal.h (m17n__core_initialized, m17n__shell_initialized,
119 m17n__gui_initialized): New externs.
121 * m17n-core.h (enum M17NStatus): New enum.
122 (m17n_status): Extern it.
124 * m17n-core.c (core_initialized): Delete this variable.
125 (m17n__core_initialized, m17n__shell_initialized,
126 m17n__gui_initialized): New variables.
127 (m17n_init_core, m17n_fini_core): Check m17n__core_initialized
128 instead of core_initialized.
129 (m17n_status): New function.
131 * m17n.c (shell_initialized): Delete this variable.
132 (m17n_init, m17n_fini): Check m17n__shell_initialized instead of
135 * m17n-gui.h (m17n_init_win): Adjust the prototype.
137 * m17n-gui.c (win_initialized): Delete this variable.
138 (m17n_init_win, m17n_fini_win): Check m17n__gui_initialized
139 instead of gui_initialized.
141 2004-11-19 Kenichi Handa <handa@m17n.org>
143 * input.c (reset_ic): Check if ic_info->state is NULL.
144 (filter): If ic_info->state is NULL, return 0.
145 (load_input_method): Don't unref `maps' it it's not created.
147 2004-11-15 Kenichi Handa <handa@m17n.org>
149 * input.c (find_candidates_group): If INDEX is -1, find the last
151 (take_action_list): If the previous of the first candidate is
152 requested, select the last candidate.
154 2004-11-08 Kenichi Handa <handa@m17n.org>
156 * m17n-X.c (device_open): Try at most 32 fonts to find a
159 * font.c (xlfd_parse_name): Fix previous change.
161 2004-11-05 Kenichi Handa <handa@m17n.org>
163 * font.c: (commont_style): Include dummy elements "slanted" and
164 "rslanted" to prefer "o" to "r" if "i" is requested.
166 * font-ft.c (ft_to_prop): Fix "oblique" entry.
168 2004-10-29 Kenichi Handa <handa@m17n.org>
170 * font.c (xlfd_parse_name): If avgwidth is 0, set the size to 0.
172 * m17n-X.c (MXFont): Change type of the member `sizes' to int.
173 New members smallest and larger.
174 (SET_SIZE, HAVE_SIZE): Adjusted for the above change.
175 (xfont_registry_list): Likewise.
176 (xfont_select): Likewise.
179 2004-10-28 Kenichi Handa <handa@m17n.org>
181 * m17n-X.c (xfont_registry_list): Include '-' before PIXEL_SIZE in
182 font name comparison.
183 (xfont_select): Fix logic for selecting a larger size font.
185 2004-10-25 Kenichi Handa <handa@m17n.org>
187 * input.c (take_action_list): Initialize `ret' to 0 for "=", "<",
190 2004-10-22 Kenichi Handa <handa@m17n.org>
192 * input.c (update_candidate): Renamed from udpate_candidate.
193 (take_action_list): Show more debugging info on arithmetic commands.
195 * m17n-X.c (device_open): Fix previous change.
197 * draw.c (compose_glyph_string): Don't get face property at the
200 2004-10-21 Kenichi Handa <handa@m17n.org>
202 * draw.c (compose_glyph_string): Fix for the case of category
205 2004-10-19 Kenichi Handa <handa@m17n.org>
207 * input.c (mdebug_mask): New variable.
208 (shift_state): Print debug information.
209 (take_action_list): Likewise.
210 (handle_key): Likewise.
212 2004-10-14 Kenichi Handa <handa@m17n.org>
214 * m17n-X.c (device_open): Accept Mxft as the value of key Mfont.
216 2004-10-13 Kenichi Handa <handa@m17n.org>
218 * m17n-X.c (device_open): Be sure to register at least one font
221 * font-ft.c: Include <freetype/ftbdf.h> conditionally. Check
222 HAVE_FTBDF_H before calling FT_Get_BDF_Property.
224 2004-10-12 Kenichi Handa <handa@m17n.org>
226 * draw.c (alloc_gstring): Fix previous change.
228 * font-ft.c (ft_list_generic): Fix for the case of not
231 * m17n-X.c (mwin__parse_event): Fix for non-ASCII keys.
233 * font.c (mfont_list): If no font is found, return NULL.
234 (load_font_encoding_table): Put entries of nil registry first.
235 (find_encoding): Adjust for the above change.
237 2004-10-11 Kenichi Handa <handa@m17n.org>
239 * m17n-gui.h (mfont_list): Adjust prototype.
241 * m17n-X.c (xfont_list): New arg maxnum.
243 * font.h (struct MFontDriver): Change prototype of <list>.
245 * font-ft.c (fc_generic_family_list): Delete it.
246 (Mserif, Msans_serif, Mmonospace): Delete them.
247 (M_generic_family_info): New variable.
248 (enum GenericFamilyType): New enum.
249 (struct GenericFamilyInfo): New struct.
250 (generic_family_table): New variable.
251 (set_font_info): New arg style. Don't check 0xA0..0xBF to decide
253 (add_font_info): Get style here.
254 (ft_list_family): Don't initialize fc_config here. Don't list
256 (ft_list_generic): New function.
257 (ft_select): Pay attention to generic familes here.
258 (ft_open): Fix calculation of ascent and descent.
259 (ft_list): Pay attention to generic families.
260 (mfont__ft_init): Initialize M_generic_family_info,
261 generic_family_table, and fc_config..
262 (mfont__ft_fini): Finalize generic_family_table.
264 * draw.c (compose_glyph_string): Use more constant font for
265 glyphs. Adjust for the member change in MGlyph.
266 (layout_glyph_string): Adjust for the member change in MGlyph.
267 (alloc_gstring): Intilize scracth_glyph to avoid
268 compose_glyph_string on it.
269 (get_gstring): Don't call compose_glyph_string on scracth_glyph.
270 (mdraw_coordinates_position): Fix previous change.
272 * internal-gui.h (glyph_category): New enum.
273 (MGlyph): Change type of <category> to enum glyph_category.
275 * face.c (mface__realize): Delete args langauge and charset.
276 (mface__for_chars): Fix for the case that glyphs have different
278 (mface__update_frame_face): Adjust for mface__realize change.
280 * face.h (mface__realize): Adjust prototype.
282 2004-10-05 Kenichi Handa <handa@m17n.org>
284 * language.c (mlang__init): Add Akan.
286 2004-10-04 Kenichi Handa <handa@m17n.org>
288 * font-ft.c (add_font_info): Add instead of push the element.
289 (ft_list_family): For generic fonts, try all
290 substituted. families.
292 * font-flt.c (UPDATE_CLUSTER_RANGE): New macro.
293 (run_rule): Don't update cluster range here.
294 (run_command): Update cluster range on appending a glyph.
295 (run_otf): Update cluster range for glyphs generated by OTF.
297 2004-10-02 Kenichi Handa <handa@m17n.org>
299 * m17n-X.c (device_open): Handle Mfont key in PLIST.
301 2004-09-30 Kenichi Handa <handa@m17n.org>
303 * font-ft.c (ft_select): Ignore family on calling mfont__score.
305 2004-09-30 Kenichi Handa <handa@m17n.org>
307 * font.h: Include <fontconfig/fontconfig.h>.
308 (MFTInfo): New member langset.
309 (mfont__encoding_list): Extern it.
311 * font.c (mfont__encoding_list): New function.
312 (mdebug_dump_font_list): New function.
314 * font-ft.c: Don't include <fontconfig/fontconfig.h> here.
315 (Mserif, Msans_serif, Mmonospace, Mmedium, Mr, Mnull): New
317 (ft_family_list): New variable.
318 (set_font_info): New arg basep. Callers changed.
319 (fc_list): Check the return value of FcPatternGetString.
320 (add_font_info): New arg plist. Callers changed. Update
322 (ft_list_family): New function (merged fc_list and ft_list_all).
323 (ft_select): Use ft_list_family.
324 (ft_list): Likewise. If FONT is not NULL, check all fonts. Fix
326 (mfont__ft_init): Initialize above new variables.
327 (mfont__ft_fini): Free ft_family_list.
328 (STRDUP_LOWER): New macro.
329 (set_font_info): Use STRDUP_LOWER.
330 (ft_list_family): Avoid duplicate addition of font path. Use
332 (fc_decode_prop): Fix typo.
334 * m17n-X.c (MDisplayInfo): New member all_fonts_scaned.
335 (xfont_registry_list): Change argument disp_info to frame.
337 (xfont_list_all): New function.
338 (xfont_list): If FONT is not NULL, check all fonts.
340 2004-09-28 Kenichi Handa <handa@m17n.org>
342 * m17n-X.c (MXFont, MXFontList): New types.
343 (MDisplayInfo): Delete members font_registry_list,
344 iso8859_1_family_list, iso10646_1_family_list, new members
345 font_list, base_font_list.
346 (free_display_info): Adusted for the change of MDisplayInfo.
347 (xfont_driver): Initialize with xfont_list.
348 (font_compare): New function.
349 (build_font_list): Deleted.
350 (xfont_registry_list): New function.
351 (xfont_select): Use xfont_registry_list.
352 (xfont_list): New function.
353 (device_open): Adusted for the change of MDisplayInfo.
355 * font-ft.c (add_font_info): New arg languages. Callers changed.
356 (fc_list): Get languages from fonts..
357 (ft_list_all): Renamed from ft_list. Callers changed.
358 (ft_list): New function.
359 (mfont__ft_driver): Initalize with ft_list.
361 * font.c (mfont_list): New function.
363 * font.h (struct MFontDriver): New member `list'.
364 (MFTInfo): New member languages.
366 * m17n-gui.h (mfont_list): Extern it.
368 2004-09-27 Kenichi Handa <handa@m17n.org>
370 * internal-gui.h (struct MGlyphString): Delete members mt,
371 sub_width, sub_lbrearing, sub_rbearing, and region.
373 * draw.c (MSubTextExtents): New type.
374 (layout_glyphs): New arg extents. Set its members.
375 (layout_glyph_string): Adjusted for the above change.
376 (alloc_gstring): Don't set gstring->mt.
377 (truncate_gstring): Call line_break function with mt instead of
380 2004-09-22 Kenichi Handa <handa@m17n.org>
382 * mtext.c (count_utf_16_chars): Count each code of invalid
385 2004-09-19 Kenichi Handa <handa@m17n.org>
387 * mtext.c (default_utf_16, default_utf_32): Rename them to
388 MTEXT_FORMAT_UTF_16 and MTEXT_FORMAT_UTF_32 respectively. Caller
391 * m17n-core.h (MTEXT_FORMAT_UTF_16, MTEXT_FORMAT_UTF_32): Extern
394 2004-09-13 Kenichi Handa <handa@m17n.org>
396 * draw.c (Mlatin): Don't declare it here.
397 (visual_order): Fix reordering of combining characters.
398 (compose_glyph_string): Fix detection of script.
399 (layout_glyphs): Don't fix reordering of combining characters
401 (layout_glyph_string): Pay attention to
402 control->disable_overlapping_adjustment.
403 (truncate_gstring): Include at least on character in a line.
404 (get_gstring): Always scan one full line.
405 (mdraw__init): Don't initialize Mlatin here.
406 (mdraw_text_per_char_extents): Fix iteration. If a glyph doesn't
407 have a font, use ascent/descent of an ASCII font. Allow
408 ink_array_return and logical_array_return to be NULL.
409 (mdraw_coordinates_position): Fix iteration.
411 * font-ft.c (MFTtoProp): Member completely changed.
412 (ft_to_prop): Adjusted for the above change.
413 (ft_to_prop_size): Likewise.
414 (set_font_info): Adjusted for the change of MFTtoProp.
415 (fc_generic_family_list): New variable.
416 (fc_list): Add special handling of generic font names.
417 (mfont__ft_init): Adjusted for the change of MFTtoProp.
418 Initialize fc_generic_family_list.
419 (mfont__ft_fini): Don't free ft_to_prop. Free
420 fc_generic_family_list.
421 (FC_vs_M17N_font_prop): New type.
422 (fc_weight_table, fc_slant_table, fc_width_table): New variables.
423 (fc_decode_prop, fc_encode_prop): New functions.
424 (mfont__ft_parse_name): Use fc_decode_prop.
425 (mfont__ft_unparse_name): Use fc_encode_prop.
427 * m17n-X.c (MDisplayInfo): Delete member realized_font_list.
428 (MWDevice): Add member realized_font_list.
429 (free_display_info): Don't free disp_info->realized_font_list.
430 (free_device): Free device->realized_fontset_list.
431 (xft_find_metric): Use gstring->frame instead of rfont->frame.
432 (device_open): Don't initialize disp_info->realized_font_list.
433 (device_open): Initialize device->realized_font_list and set it to
434 frame->realized_font_list.
436 * fontset.c (try_font_group): New function.
437 (mfont__lookup_fontset): Use try_font_group.
439 * font.c (common_weight): Change the order of "regular".
441 * face.c (Mlatin): Don't make it static.
442 (mface__realize): Be sure to set work_gstring.frame.
443 (mface__for_chars): Likewise.
445 * mtext.c (mdebug_dump_mtext): Fix for the case of mt->format >
448 * internal-gui.h (Mlatin): Extern it.
450 * m17n-gui.h (MDrawControl): New member
451 disable_overlapping_adjustment.
453 2004-09-06 Kenichi Handa <handa@m17n.org>
455 * font-flt.c (run_otf): Fix typo ('}'->']').
457 * internal-gui.h (MAKE_PRECOMPUTED_COMBINDING_CODE)
458 (COMBINING_PRECOMPUTED_P): New macros.
460 * draw.c (layout_glyphs): Handle precomputed combining code.
462 * font-ft.c (mfont__ft_drive_otf): Set g->combining_code to a
463 precomupted combining code.
465 2004-09-03 Kenichi Handa <handa@m17n.org>
467 * font-ft.c (mfont__ft_drive_otf): Use malloc and free for
470 2004-08-27 Kenichi Handa <handa@m17n.org>
472 * face.c (mface_put_prop): If the new value is the same as the
473 current one, don't increment frame->tick.
475 2004-08-25 Kenichi Handa <handa@m17n.org>
477 * fontset.c (mfontset): Initialize font_spec_list member.
478 (mfontset_copy): Load fontset if necessary.
480 * m17n-gui.h (MDrawGlyphInfo): Change the member name 'this' to
481 'metrics' to for C++.
483 * draw.c (mdraw_glyph_info): Adjusted for the member name change
486 2004-08-16 Kenichi Handa <handa@m17n.org>
488 * Version 1.1.0 released.
490 2004-08-13 Kenichi Handa <handa@m17n.org>
492 * language.c (mlang__init): Add Dhivehi.
494 * m17n-gui.c (Mx, Mfreetype): Delete it.
495 (m17n_init_win): Don't initialize Mx and Mfreetype here.
497 * m17n-gui.h (Mfreetype, Mxft): Extern them.
498 (mfont_resize_ratio): Extern it.
499 (MDrawGlyphInfo): New member logical_width;
500 (MDrawGlyph): New type.
501 (mdraw_glyph_list): Prototype adjusted.
503 * m17n-X.c (xfont_open): Set type and fontp members.
504 (xft_open): Likewise.
506 * internal-gui.h (Mx, Mfreetype): Delete extern.
508 * font.h (struct MRealizedFont): New member type and fontp.
510 * font.c (mfont__init): Initialize Mx, Mfreetype, and Mxft.
511 (Mx, Mfreetype): Declare here.
512 (Mxft): New variable.
513 (mfont_resize_ratio): New function.
515 * font-ft.c (ft_open): Set type and fontp members.
517 * draw.c (mdraw_glyph_list): Argument type changed. Don't set
520 2004-08-11 Kenichi Handa <handa@m17n.org>
522 * font-ft.c (ft_find_metric): Call FT_Load_Glyph with
525 2004-08-06 Kenichi Handa <handa@m17n.org>
527 * font-ft.c (mfont__ft_drive_otf): Fix for the case that no GSUB
530 * font-flt.c (run_otf): Print debugging information if necessary.
532 2004-08-05 Kenichi Handa <handa@m17n.org>
534 * font-ft.c (mfont__ft_drive_otf): Fix sign of g->yoff. Support
535 positioning_type 5 and 6. Switch simplified.
537 2004-08-04 Kenichi Handa <handa@m17n.org>
539 * font-ft.c (mfont__ft_drive_otf): Call OTF_drive_gdef.
541 2004-08-02 Kenichi Handa <handa@m17n.org>
543 * font.c (mfont__score): If prop is MFONT_FOUNDRY or MFONT_FAMILY,
544 set val to 1 even if it is greater than 1.
546 * fontset.c (mfontset_modify_entry): Fix handling of the arg `how'.
548 2004-07-29 Kenichi Handa <handa@m17n.org>
550 * font-flt.c (run_rule, run_command, mfont__flt_run): Print more
551 debugging information.
553 * internal.h (MDEBUG_PRINT5): New macro.
555 * draw.c (layout_glyphs): Don't combine a zero width glyph with
556 the previous one if the zero width glyph has left or right
559 2004-07-26 Kenichi Handa <handa@m17n.org>
561 * m17n-X.c (xft_render): Pay attention to members left_padding and
562 right_padding of MGlyph.
564 * draw.c (visual_order): Allocate one more elements for arrays as
565 a workaround of fribidi bug.
566 (layout_glyphs): Fix previous change. Check MGlyph->combining_code
567 instead of MGlyph->bidi_sensitive.
568 (layout_glyph_string): Pay attentinon to
569 control->orientation_reversed when padding at the head or tail.
570 Fix adjustment of space glyph width.
571 (get_gstring): If cursor_width or cursor_bidi is changed, don't
574 * font-ft.c (mfont__ft_drive_otf): Set MGlyph->combining_code
575 instead of MGlyph->bidi_sensitive.
577 * internal-gui.h (MGlyph): Delete member bidi_sensitive.
579 2004-07-26 Kenichi Handa <handa@m17n.org>
581 * draw.c (visual_order): Don't treat combined glyphs specially.
582 (layout_glyphs): Don't get metrics glyphs that are already ready.
583 Pay attention to MGlyph->bidi_sensitive. Combine a glyph of zero
584 width with the previous one.
585 (draw_background): Fix bar cursor position on a r2l glyph.
587 * font-flt.c (FontLayoutCmdOTF): Move back from internal-gui.h.
588 (run_rule): Fix place of updating cluster_begin_pos and
589 cluster_end_pos here.
590 (run_otf): Don't set left_padding.
592 * font-ft.c (adjust_anchor): Type of argument `code' changed.
594 (mfont__ft_drive_otf): Renamed back from mfont__ft_drive_gsub.
595 Fix handling of GPOS.
596 (mfont__ft_drive_gpos): Delete this function.
598 * font.h (mfont__ft_drive_otf): Renamed back from
599 mfont__ft_drive_gsub.
600 (mfont__ft_drive_gpos): Delete extern.
602 * internal-gui.h (FontLayoutCmdOTF): Move back to font-flt.c.
603 (MGlyph): Delete member otf_cmd, add member bidi_sensitive.
605 2004-07-23 Kenichi Handa <handa@m17n.org>
607 * draw.c (layout_glyphs): Call mfont__ft_drive_gpos with glyphs of
610 * font-ft.c (mfont__ft_drive_gpos): Check bidi-level.
612 2004-07-22 Kenichi Handa <handa@m17n.org>
614 * font-flt.c (load_flt): Treat the symbol Mend as end-of-file.
616 2004-07-20 Kenichi Handa <handa@m17n.org>
618 * draw.c (render_glyphs): Fix checking of g->code validity.
620 * face.c (mface__realize): Set g.type.
622 2004-07-18 Kenichi Handa <handa@m17n.org>
624 * Makefile.am: Prepend ${top_srcdir} to all *.la in
627 * m17n-gui.c (mframe): Print error message give by dlopen to
630 2004-07-16 Kenichi Handa <handa@m17n.org>
632 * draw.c (compose_glyph_string): Improve the way of deciding a
633 script. For a character that doesn't have script property, use
634 the last non-latin script.
636 * font-ft.c (fc_list): Cancel previous change.
637 (mfont__ft_init): Add more entries in ft_to_prop_name.
639 2004-07-15 Kenichi Handa <handa@m17n.org>
641 * draw.c (mdraw_glyph_list): Add the width of padding glyphs to
642 previous or next character glyphs.
644 2004-07-14 Kenichi Handa <handa@m17n.org>
646 * draw.c (compose_glyph_string): Be sure to set codes for glyphs
649 * fontset.c (mfont__lookup_fontset): If glyph type is
650 GLYPH_SPACE, get codes for SPACE.
652 * internal-gui.h (Mfont): Delete extern.
654 * m17n-gui.h (Mfont): Delete duplicated extern.
656 2004-07-13 Kenichi Handa <handa@m17n.org>
658 * font-ft.c (DEVICE_DELTA): New macro.
659 (adjust_anchor): New function.
660 (mfont__ft_drive_gsub): Renamed from mfont__ft_drive_otf. Drive
662 (mfont__ft_drive_gpos): New function.
664 * font-flt.c (FontLayoutCmdOTF): Moved to internal-gui.h.
665 (FontLayoutContext): Delete member `rfont'.
666 (run_otf): Set g->otf_cmd. Call
667 (mfont__flt_run): Don't set ctx.rfont. Call mfont__ft_decode_otf
668 only whne HAVE_OTF is defined.
670 * fontset.c: Include "config.h".
672 * internal-gui.h (FontLayoutCmdOTF): Moved from font-flt.c.
673 (MGlyph): New member otf_cmd.
675 * font.h (mfont__ft_drive_gsub): Changed from mfont__ft_drive_otf.
676 (mfont__ft_drive_gpos): Extern it.
678 * face.c: Include "config.h".
680 * draw.c (layout_glyphs): Call mfont__ft_drive_gpos.
682 * input-gui.c: Include "config.h".
684 * plist.c: Include "config.h".
686 2004-07-06 Kenichi Handa <handa@m17n.org>
688 * m17n-gui.c, m17n-gui.h, m17n-gd.c, m17n-X.h, m17n-X.c,
689 internal-gui.h: Cancel previous changes.
691 * m17n-gd.h: Delete it.
693 * Makefile.am (libm17n_core_la_LIBADD): New variable.
694 (libm17n_core_la_LDFLAGS): Add -export-dynamic, move
695 @XML2_LD_FLAGS@ to above.
696 (libm17n_la_LIBADD): Add -ldl.
697 (libm17n_la_LDFLAGS): Add -export-dynamic.
698 (X_LD_FLAGS): Fix the order of linking.
699 (libm17n_gui_la_LIBADD): Add ${OPTIONAL_LD_FLAGS}.
700 (libm17n_gui_la_LDFLAGS): Add -export-dynamic, delete above.
701 (libm17n_X_la_LDFLAGS): Add -module.
702 (libm17n_gd_la_SOURCES): Delete m17n-gd.h.
703 (libm17n_gd_la_LIBADD): Add @GD_LD_FLAGS@.
704 (libm17n_gd_la_LDFLAGS): Add -module.
705 (include_HEADERS): Delete m17n-gd.h.
707 2004-06-30 Kenichi Handa <handa@m17n.org>
709 * m17n-gui.c: Adjusted for the change of struct MDeviceDriver.
710 (MDeviceLibraryInterface): Delete it.
711 (register_device_library): Delete it.
712 (m17n__device_library_list): Renamed from device_library_list.
714 * m17n-gui.h (M17N_INIT_X, M17N_INIT_GD): New macros.
715 (m17n_init_win): Adjust prototype.
717 * m17n-gd.c: Adjusted for the change of struct MDeviceDriver.
718 (m17n_init_gd): New function.
720 * m17n-gd.h: New file.
722 * m17n-X.h: Include <m17n-gui.h>.
723 (m17n_init_X): Extern it.
724 (M17N_INIT): Redefine it.
726 * m17n-X.c: Adjusted for the change of struct MDeviceDriver.
727 (m17n_init_X): New function.
729 * internal-gui.h (m17n__device_library_list): Extern it.
730 (struct MDeviceDriver): New members initialized, init, and fini.
732 * Makefile.am (libm17n_X_la_LIBADD): Add ${X_LD_FLAGS} and
734 (libm17n_X_la_LIBADD): Delete aboves.
735 (libm17n_gd_la_SOURCES): Add m17n-gd.h.
736 (libm17n_gd_la_LIBADD): Add @GD_LD_FLAGS@.
737 (libm17n_gd_la_LDFLAGS): Delete it.
738 (include_HEADERS): Add m17n-gd.h.
740 2004-06-25 Kenichi Handa <handa@m17n.org>
742 * Makefile.am (libm17n_X_la_LDFLAGS): Cancel previous change.
743 (libm17n_gd_la_LDFLAGS): Cancel previous change.
745 * m17n-gd.c (gd_render): Don't call FT_Get_Char_Index.
747 * font-ft.c (fc_list): If FcFontList finds no font, try
750 * draw.c (compose_glyph_string): Terminate the last loop after
751 doing default combining if necessary.
753 2004-06-24 Kenichi Handa <handa@m17n.org>
755 * draw.c (mdraw_glyph_list): Unref gstring->top at the tail.
757 * character.c (mchar_define_property): Add const to an arg.
759 * charset.c (mchar_define_charset): Add const to an arg.
761 * coding.c (MCodingSystem): Add const to an arg or decoder.
762 (finish_decoding): Add const to an arg.
763 (decode_coding_charset, decode_coding_utf_8)
764 (decode_coding_utf_16, decode_coding_utf_32)
765 (decode_coding_iso_2022, decode_coding_sjis)
766 (mconv_define_coding): Likewise.
768 * m17n-X.c (xft_find_metric): Delete unused variable.
770 * m17n-core.h (mchar_define_property, mtext_from_data): Adjust
773 * m17n.h (mchar_define_charset, mconv_define_coding): Adjust
776 * mtext.c (count_utf_8_chars, count_utf_16_chars)
777 (mtext__from_data, mtext_from_data): Add `const' to an arg.
779 * mtext.h (mtext__from_data): Ajust prototype.
781 2004-06-23 Kenichi Handa <handa@m17n.org>
783 * draw.c (compose_glyph_string): Always get glyph codes by
785 (mdraw_glyph_info): Set info->glyph_code and info->logical_width.
786 (mdraw_glyph_list): New function.
788 * font-flt.c (mfont__flt_run): Be sure to call
789 rfont->driver->encode_char.
791 * font-ft.c (ft_find_metric): Don't call FT_Get_Char_Index.
792 (ft_encode_char): Delete arg C.
793 (ft_render): Don't call FT_Get_Char_Index.
795 * font.c (mfont__encodable_p): Delete it.
796 (mfont__encode_char): Be sure to call rfont->driver->encode_char.
798 * font.h (struct MFontDriver): Delete arg C of encode_char.
799 (mfont__encodable_p): Delete extern.
801 * m17n-X.c (xfont_encode_char): Delete arg C.
802 (xft_find_metric): Don't cal FT_Get_Char_Index.
803 (xft_render): Likewise.
805 * m17n-gui.h (MDrawGlyphInfo): New members glyph_code and
807 (mdraw_glyph_list): Extern it.
809 * Makefile.am (libm17n_X_la_LDFLAGS): Don't include ${X_LD_FLAGS}.
811 2004-06-22 Kenichi Handa <handa@m17n.org>
813 * m17n-gui.h (mfontset_lookup): Extern it.
815 * m17n-gui.c (m17n_init_win): Delete unnecessary printing.
817 * fontset.c (realize_fontset_elements)
818 (free_realized_fontset_elements, update_fontset_elements): New
820 (mfont__realize_fontset): Call realize_fontset_elements.
821 (mfont__free_realized_fontset): Call free_realized_fontset_elements.
822 (mfont__lookup_fontset): If a fontset was modified, update
823 the realized fontset.
824 (mfontset_modify_entry): Increment fontset->tick.
825 (mfontset_lookup): New function.
827 2004-06-21 Kenichi Handa <handa@m17n.org>
829 * font-ft.c (mfont__ft_parse_name): Cast the arg to FcNameParse.
831 * mtext.c (mtext_dup, mtext_cat, mtext_ncat, mtext_cpy)
832 (mtext_ncpy, mtext_duplicate): Pay attention to the case that the
833 length of source text 0.
835 2004-06-21 Kenichi Handa <handa@m17n.org>
837 * mtext.c (INC_POSITION): Use CHAR_UNITS_BY_HEAD_UTF16.
838 (compare): Pay attention to format other than utf-8.
839 (copy): Delete this function.
840 (count_by_utf_8, count_by_utf_16, insert): New functions.
841 (count_utf_16_chars): Fix handling of a surrogate pair.
842 (find_char_forward, find_char_backward): Likewise.
843 (mtext__from_data): Delete unnecessary check. Fix number of
845 (mtext_from_data): Don't count items.
846 (mtext_ref_char): Optimize the code.
847 (mtext_set_char): Pay attention to format other than utf-8.
848 (mtext_cat_char): Likewise.
849 (mtext_dup): Don't call copy, instead do allocation here.
850 (mtext_cat): Call insert instead of copy.
851 (mtext_ncat): Likewise.
852 (mtext_cpy): Delete character at first and call insert instead of
854 (mtext_ncpy): Likewise.
855 (mtext_copy): Likewise.
856 (mtext_duplicate): Call insert instead of copy.
857 (mtext_del): Pay attention to format other than utf-8.
858 (mtext_ins): Simply call insert.
859 (mtext_ins_char): Pay attention to format other than utf-8.
860 (mtext_tok): Call insert instead of copy.
861 (mtext_text): Call UNIT_BYTES.
863 * textprop.c (mtext__adjust_plist_for_change): New function.
865 * character.h (USHORT_SIZE, UINT_SIZE, UNIT_BYTES): New macros.
866 (CHAR_UNITS_UTF16, CHAR_UNITS): Simplified.
867 (CHAR_UNITS_AT): Fix typo.
868 (CHAR_UNITS_BY_HEAD): Fix typo.
869 (STRING_CHAR_AND_UNITS): Fix typo.
871 * internal.h (MTEXT_READ_ONLY_P): New macro.
873 * mtext.h (mtext__replace): Delete the extern.
874 (mtext__adjust_foramt): Adjust prototype.
876 * plist.c (mplist_deserialize): Adjust the format of MT to utf-8
877 if possible. Otherwise make a copy of mmt.
879 * coding.c (mconv_decode, mconv_gets): Adjust the format of MT to
882 2004-06-18 Kenichi Handa <handa@m17n.org>
884 * character.h (CHAR_STRING_UTF16): Fix syntax.
886 2004-06-16 Kenichi Handa <handa@m17n.org>
888 * Makefile.am (libm17n_gd_la_LIBADD): Delete it.
889 (libm17n_X_la_LIBADD): Delete it.
890 (libm17n_gd_la_LDFLAGS): Don't include @GD_LD_FLAGS@.
892 * m17n-X.c (device_open): Add parens in `if' condition.
894 * mtext.c (INC_POSITION): Handle format other than utf8 and utf16.
895 (DEC_POSITION): Likewise.
896 (compare): Fix case that mt1->format is MTEXT_FORMAT_UTF_8.
898 2004-06-15 Kenichi Handa <handa@m17n.org>
900 * fontset.c (mfont__lookup_fontset): Fix selection of font groups
903 * draw.c (compose_glyph_string): If langauge is specified, call
904 mface__for_chars even if a text is all latin. Fix condition for
905 setting non_ascii_found.
907 * m17n-X.c (xft_find_metric): Fix setting of g->lbrearing.
909 * m17n.h (minput_char_to_key): Delete extern.
911 * m17n-gui.h (minput_event_to_key): Cancel previous change.
913 * m17n-gui.c (null_device_open): Set several members of frame.
915 2004-06-14 Kenichi Handa <handa@m17n.org>
917 * m17n-gui.h (minput_event_to_key): Delete extern.
919 * symbol.h (struct MSymbolStruct): Renamed from MSymbol.
921 * m17n-core.h (MSymbol): Defined as "struct MSymbolStruct *".
923 * Makefile.am (AM_CPPFLAGS): Refer to @M17NDIR@.
925 2004-06-08 Kenichi Handa <handa@m17n.org>
927 * character.c (mchar_put_prop): Don't increment the ref-count of
930 2004-06-04 Kenichi Handa <handa@m17n.org>
932 * m17n-core.c (mdebug__register_object): New function.
933 (mdebug__unregister_object): Likewise.
935 * internal.h (mdebug__register_object, mdebug__unregister_object):
937 (M17N_OBJECT_REGISTER, M17N_OBJECT_UNREGISTER): Call them
940 * charset.c (mcharset__load_from_database): Don't call
941 mconv__register_charset_coding here.
943 * coding.c (find_coding): Get a real name from an element of
944 coding_definition_list.
945 (mconv__register_charset_coding): Set the real name at the top of
947 (mcoding__load_from_database): Likewise.
948 (mconv_list_codings): Adjusted for the above change.
950 2004-06-03 Kenichi Handa <handa@m17n.org>
952 * coding.c (find_coding): Find by canonicalized name. Don't have
953 to modify the element of coding_definition_list by
955 (mconv__define_coding_from_charset): Delete it.
956 (mconv__register_charset_coding): Canonicalize sym.
957 (mcoding__load_from_database): Register plist modified by
960 * coding.h (mconv__define_coding_from_charset): Don't extern it.
962 * font-ft.c (ft_open): Fix setting of rfont->descent.
964 2004-06-02 Kenichi Handa <handa@m17n.org>
966 * font.c (enum xlfd_field_idx): Moved from m17n-X.c.
967 (xlfd_parse_name): Merge split_font_name and xfont_parse_name.
968 (xlfd_unparse_name): Renamed from xfont_build_name.
969 (mfont__init): Initialized Mfontconfig.
970 (mfont__free_realized): Unconditionally unref rfont->info.
971 (mfont__select): Free `this' if it's not best.
972 (mfont__open): Don't check frame->realized_font_list.
973 (mfont__parse_name_into_font): New function.
974 (Mfontconfig): New variable.
975 (mfont_from_name): Call mfont_parse_name.
976 (mfont_name): Call mfont_unparse_name.
977 (mdebug_dump_font): Likewise.
979 * font.h (struct MFontDriver): Delete members parse_name and
981 (mfont__ft_parse_name, mfont__ft_unparse_name): Extern them.
982 (mfont__parse_name_into_font): Extern it.
984 * font-ft.c: Include "symbol.h".
985 (close_ft): Unconditionally free filename and charmap_list of
987 (ft_open): Duplicate base->filename. Increment ref-count of
988 ft_info->charmap_list. Free ft_info->charmap_list and
989 ft_info->filename on error.
990 (mfont__ft_parse_name, mfont__ft_unparse_name): New functions.
992 * m17n-X.c (xfont_driver): Don't include xfont_parse_name and
994 (enum xlfd_field_idx): Moved to font.c.
995 (split_font_name, build_font_name): Likewise.
996 (build_font_list): Call mfont__parse_name_info_font.
997 (xfont_open): Call mfont__unparse_name. Free name.
998 (xfont_parse_name, xfont_build_name): Moved to font.c
999 (xft_select): Prototype deleted.
1000 (device_open): Check HAVE_FREETYPE on using mfont__ft_driver.
1001 Call mfont_pase_name.
1003 * m17n-gui.c (free_frame): Unref frame->font_driver_list.
1004 (m17n_fini_win): Add check HAVE_FREETYPE on using null_interface.
1007 * m17n-gui.h (mfont_parse_name, mfont_unparse_name, Mfontconfig):
1010 * Makefile.am (linkgui_LDADD): Add libm17n-X.la and libm17n-gd.la.
1012 2004-06-01 Kenichi Handa <handa@m17n.org>
1014 * fontset.c (mfontset_modify_entry): Pay attention to the case
1015 that fontset->font_spec_list is NULL.
1017 2004-05-31 Kenichi Handa <handa@m17n.org>
1019 * m17n-gui.c: Include <dlfcn.h> only when HAVE_DLFCN_H is defined.
1021 * input.c: Include <dlfcn.h> only when HAVE_DLFCN_H is defined.
1023 * font.c (mfont__select): Print score the a font for debugging.
1025 * Makefile.am (libm17n_la_LIBADD): Delete -ldl.
1027 * coding.c (reset_coding_sjis): Check kanji and kana instead of
1028 kanji_sym and kana_sym.
1030 2004-05-28 Kenichi Handa <handa@m17n.org>
1032 * Makefile.am (VINFO): New variable.
1033 (libm17n_core_la_LDFLAGS, libm17n_la_LDFLAGS)
1034 (libm17n_gd_la_LDFLAGS): Include ${VINFO}.
1036 2004-05-27 Kenichi Handa <handa@m17n.org>
1038 The following chanages are to make device dependent functions
1039 accessible only from MDeviceDriver structure, and to add GD and
1040 null device drivers. Font drivers get also device dependent.
1042 * m17n.c (m17n_init): Increament shell_initialized.
1043 (m17n_fini): Decremented shell_initialized.
1045 * m17n-misc.h (enum MErrorCode): New element MERROR_GD.
1047 * m17n-gui.h (Mdevice, Mdisplay, Mscreen, Mdrawable, Mdepth)
1048 (Mwidget, Mcolormap, Mx): Extern them.
1050 * m17n-gui.c: Include <dlfcn.h> and "config.h".
1051 (free_frame): Call frame->driver->close instead of
1053 (DLOPEN_SHLIB_EXT): New macro.
1054 (MDeviceLibraryInterface): New type.
1055 (device_library_list): New variable.
1056 (register_device_library): New function.
1057 (null_device): New variable.
1058 (null_device_close, null_device_get_prop)
1059 (null_device_realize_face, null_device_free_realized_face): New
1061 (null_driver): New variable.
1062 (null_device_init, null_device_fini, null_device_open): New
1064 (null_interface): New variable.
1065 (Mfreetype, Mdevice): Declare them.
1066 (m17n_init_win): Increment win_initialized. Initialize Mx, Mgd,
1067 Mfreetype, Mdevice, Mdisplay, Mscreen, Mdrawable, Mdevice, and
1068 Mwin__Close_Device. Register drivers for Mx and Mgd.
1069 (m17n_fini_win): Decremented win_initialized. Call "fini"
1070 function of all opened devices. Don't call mwin__fini.
1071 (Mdisplay, Mscreen, Mdrawable, Mdepth, Mwidget, Mcolormap):
1073 (mframe): Handle Mdevice key of PLIST.
1074 (mframe_get_prop): Call frame->device->get_prop instead of
1075 mwin__device_get_prop.
1077 * m17n-gd.c: New file.
1079 * m17n-core.h (M17NLIB_MAJOR_VERSION, M17NLIB_MINOR_VERSION)
1080 (M17NLIB_PATCH_LEVEL, M17NLIB_VERSION_NAME): Updated to 1.1.0.
1082 * m17n-core.c (m17n_init_core): Increate core_initialized.
1083 (m17n_fini_core): Decremented core_initialized.
1085 * m17n-X.h (Mdisplay, Mscreen, Mdrawable, Mdepth, Mwidget)
1086 (Mcolormap): Don't extern them here.
1088 * m17n-X.c (FRAME_DEVICE): New macro.
1089 (FRAME_DISPLAY, FRAME_SCREEN, FRAME_CMAP): Use FRAME_DEVICE.
1090 (free_display_info): Use MPLIST_DO.
1091 (free_device): Free rface->info.
1092 (xft_close): Delete it.
1093 (device_init): Renamed from mwin__init.
1094 (device_fini): Renamed from mwin__fini.
1095 (device_open): Renamed from mwin__open_device.
1096 (x_driver): New variable.
1097 (MXFontInfo): Delete member frame, add member display.
1098 (Mdisplay, Mscreen, Mdrawable, Mdepth, Mwidget, Mcolormap, Mxim):
1099 Don't declare them here.
1101 * internal-gui.h (MDeviceType): New enum.
1102 (MWDefice): Delete it.
1103 (struct MFrame): Change type of device to void *. New members
1104 device_type, driver, font_driver_list.
1105 (M_CHECK_WRITABLE, M_CHECK_READABLE): New macros.
1106 (MDeviceDriver): New type.
1107 (Mx, Mgd, Mfreetype): Extern them.
1108 (mwin__XXX): Delete all of them.
1110 * input-gui.c (win_create_ic): Call frame->driver->XXX instead of
1112 (win_destroy_ic): Likewise.
1113 (adjust_window_and_draw): Likewise.
1114 (win_callback): Likewise.
1115 (Mxim): Declare it here.
1116 (minput_event_to_key): Call M_CHECK_READABLE.
1118 * fontset.c (mfont__lookup_fontset): Delete local variable
1121 * font.h (struct MFontDriver): Delete member close, add members
1122 parse_name and build_name.
1123 (mfont__driver_list): Delete extern.
1124 (mfont__close): Delete extern.
1126 * font.c (mfont__init): Don't set mfont__driver_list.
1127 (mfont__fini): Don't unref mfont__driver_list.
1128 (mfont__select): Try font drivers in frame->font_driver_list. Set
1129 driver member of a realized font.
1130 (mfont__close): Delete it.
1131 (mfont_from_name, mfont_name, mdebug_dump_font): Call driver
1132 functions of the default frame.
1134 * font-ft.c (close_ft): Check ft_info->ft_face and work
1136 (add_font_info): Allocate ft_info by M17N_OBJECT.
1137 (ft_close): Delete it.
1138 (mfont__ft_driver): Don't set ft_close.
1139 (ft_select): Increment ref-count of best_font.
1140 (ft_open): Decremented ref-count of base. On error, call
1141 FT_Done_Face and free ft_info.
1142 (ft_find_metric): Always use XXX_MONO in load_flags.
1143 (ft_render): Fix setting of width. Call
1144 frame->driver->draw_points instead of mwin__draw_points.
1145 (ft_to_prop): Don't set mfont__driver_list.
1146 (mfont__ft_fini): Just unref ft_info.
1148 * face.c (mface__init): Exchange foreground and background of
1149 mface__default. Call mface_put_prop to set hline of
1151 (mface__realize): Call frame->driver->XXX instead of mwin__XXX.
1152 (mface__free_realized): Don't call mwin__free_realized_face.
1154 * draw.c (Mdepth): Don't declare it here.
1155 (draw_background): Call frame->driver->XXX instead of mwin__XXX.
1156 (render_glyphs, render_glyph_string): Likewise.
1157 (mdraw__init): Don't set Mdepth.
1158 (mdraw_text, mdraw_image_text, mdraw_text_with_control): Call
1160 (mdraw_text_per_char_extents): Return 0 on success and -1 on
1162 (mdraw_text_items): Check FRAME is writable.
1163 (mdraw_per_char_extents): Implement body.
1165 * Makefile.am (lib_LTLIBRARIES): Include libm17n-gui.la and
1167 (OPTIONAL_LD_FLAGS): Include @FONTCONFIG_LD_FLAGS@.
1168 (GUI_SOURCES): Delete it.
1169 (libm17n_X_la_SOURCES): Don't include ${GUI_SOURCES}.
1170 (libm17n_gui_la_SOURCES, libm17n_gui_la_LIBADD)
1171 (libm17n_gui_la_LDFLAGS, libm17n_gd_la_SOURCES)
1172 (libm17n_gd_la_LIBADD, libm17n_gd_la_LDFLAGS): New targets.
1173 (linkgui_LDADD): Set to libm17n-gui.la
1174 (linkgui_LDFLAGS): New target.
1175 (SRC): Include ${libm17n_gui_la_SOURCES} and
1176 ${libm17n_gd_la_SOURCES}.
1178 2004-05-24 Kenichi Handa <handa@m17n.org>
1180 * draw.c (draw_background): Don't draw background even if
1181 rface->face.property[MFACE_BACKGROUND] is not Mnil.
1183 2004-05-22 Kenichi Handa <handa@m17n.org>
1185 * m17n-X.c (xft_open_font): Fix anti_alias setting.
1187 2004-05-20 Kenichi Handa <handa@m17n.org>
1189 * m17n-gui.h (MFaceHookFunc): Change this function type to void.
1191 * m17n-gui.c: Include "plist.h".
1192 (mframe): If PLIST is NULL, initialize it to emply plist.
1194 * m17n-X.c (build_font_list): Don't set property[MFONT_TYPE].
1195 (xft_driver): New variable.
1196 (xft_select, close_xft, xft_open_font, xft_open, xft_close)
1197 (xft_find_metric, xft_render): New function.
1198 (mwin__init): Adjusted for the new mfont__driver_list.
1199 (mwin__open_device): Assume arg PARAM is not NULL. Push a newly
1200 generated face to PARAM.
1201 (mwin__realize_face): Fix setting of box colors. Don't call hook
1203 (mwin__draw_hline): New function.
1204 (mwin__xft_close, mwin__xft_open, mwin__xft_get_metric)
1205 (mwin__xft_render): Delete these function.
1207 * internal-gui.h (struct MFrame): New member tick.
1208 (struct MGlyphString): New member tick.
1209 (mwin__draw_rect, mwin__draw_empty_boxes): Extern them.
1210 (mwin__xft_open, mwin__xft_close, mwin__xft_get_metric)
1211 (mwin__xft_render): Delete extern.
1213 * fontset.c (mfont__lookup_fontset): Make the code simpler.
1214 (mfontset): Always increment the reference count of returned
1217 * font-ft.c (mfont__ft_fini): Don't include <otf.h> here.
1218 (MFTInfo): Moved to font.h.
1219 (ft_iso8859_1_font_list): Delete this variable.
1220 (set_font_info): Don't set font->property[MFONT_TYPE].
1221 (set_font_info): Don't udpate ft_iso8859_1_font_list.
1222 (add_font_info): Change type to void.
1223 (fc_list): Change anme from xft_list. Caller changed. Include
1224 FC_FOUNDRY and FC_PIXEL_SIZE in FcObjectSet.
1225 (mfont__ft_driver): Change name from ft_driver. Caller changed.
1226 (ft_select): Check HAVE_FONTCONFIG instead of HAVE_XFT2.
1227 (close_ft): Don't call mwin__xft_close. Unref
1228 ft_info->extra_info.
1229 (ft_open): Don't setup ft_info->fontname. Don't call
1231 (ft_find_metric): Don't call mwin__xft_get_metric.
1232 (ft_encode_char): Call rfont->driver->open instead of ft_open.
1233 (ft_render): Don't check HAVE_XFT2. Don't call mwin__xft_render.
1234 (mfont__ft_init): Adjusted for new mfont__driver_list.
1235 (mfont__ft_fini): Don't unref ft_iso8859_1_font_list.
1237 * font.c (mfont__driver_list): Make it MPlist.
1238 (mfont__init): Adjust initialization of mfont__driver_list.
1239 (mfont__fini): Free mfont__driver_list.
1240 (mfont__set_spec_from_face): Don't set spec->property[MFONT_TYPE].
1241 (mfont__select): Adjusted for the new mfont__driver_list.
1243 * font.h (enum MFontProperty): Delete MFONT_TYPE.
1244 (mfont__drirver_list): Adjust prototype.
1245 (MFTInfo): Move to here from fron.c. Deleve member fontname.
1247 * face.h (struct MFace): Delete member realized_face_list, add
1249 (struct MRealizedFace): Delete member need_update
1250 andnofont_rface, add member non_ascii_list.
1251 (mface__update_frame_face): Extern it.
1253 * face.c (hline_prop_list, box_prop_list, noop_hook): New
1255 (get_hline_create, get_box_create): New functions.
1256 (find_realized_face): Cancel previous change. Arg RFONT deleted.
1258 (free_face): Cancep previous change. Free face->frame_list.
1259 (serialize_hline): Do nothing if hline->width is zero.
1260 (serialize_box): Do nothing if box->width is zero.
1261 (mface__init): Setup all properties of mface__default.
1262 (mface__fini): Free hline_prop_list and box_prop_list.
1263 (mface__realize): Cancel previous change. Update
1264 face->frame_list. Setup rface->non_ascii_list.
1265 (mface__for_chars): Update rface->non_ascii_list.
1266 (mface__free_realized): Free rface->non_ascii_list.
1267 (mface__update_frame_face): New function.
1268 (mface): Initialize face->frame_list.
1269 (mface_copy): Likewise. Just copy MFACE_HLINE and MFACE_BOX
1271 (mface_merge): Likewise.
1272 (mface_put_prop): If key is Mhline or Mbox, get value by
1273 get_hline_create or get_box_create respectively.
1274 (mface_put_prop): Update frame->tick and call
1275 mface__update_frame_face if necessary.
1276 (mface_update): Do nothing if func is noop_hook.
1278 * draw.c (render_glyphs): If a font is not found, use
1279 mwin__draw_empty_boxes.
1280 (alloc_gstring): Initialize gstring->tick.
1281 (get_gstring): Check gstring->tick.
1283 2004-05-17 Kenichi Handa <handa@m17n.org>
1285 * face.c (find_realized_face): Return value changed. If RFONT is
1286 NULL, avoid unnecessary checking.
1287 (free_face): Free face->realized_face_list.
1288 (mface__realize): Adjusted for the change of find_realized_face.
1289 If it returns a realized face that needs update, free it and
1290 realize a new one. Push a new realized face to
1291 frame->realized_face_list instead of appending.
1292 (mface__for_chars): Adjusted for the change of find_realized_face.
1293 Short cut if the required font is in rface->ascii_rface.
1294 (mface_put_prop): Free old value if necessary. Set need_update
1295 member of realized faces to 1.
1297 * face.h (struct MFace): Delete member tick, add member
1299 (struct MRealizedFace): Delete member tick, add member
1302 2004-05-13 Kenichi Handa <handa@m17n.org>
1304 * m17n-X.c (mwin__xft_open): Destroy unnecessary patterns.
1306 2004-05-12 Kenichi Handa <handa@m17n.org>
1308 * internal-gui.h (mwin__xft_open): Arguemnt name changed.
1310 * m17n-X.c (mwin__xft_open): Argument changed to fontname and
1311 parse it XftNameParse.
1313 * font-ft.c (MFTInfo) [HAVE_XFT2]: New member fontname.
1314 (all_fonts_scaned): New variable.
1315 (set_font_info): FAMILY may be Mnil.
1316 (add_font_info): Argument changed.
1317 (xft_list): Call add_font_info in it.
1318 (ft_list): Likewise.
1319 (ft_select): Make it work in the case family is Mnil.
1320 (ft_open) [HAVE_XFT2]: Setup ft_info->fontname.
1321 (mfont__ft_fini): Set all_fonts_scaned to 0.
1323 * fontset.c (mfont__lookup_fontset): Don't repeatedly try a font
1324 that is failed to open.
1326 2004-05-10 Kenichi Handa <handa@m17n.org>
1328 * m17n-X.c (mwin__xft_render): Don't use anti-alias if the
1329 device's depth is 1 (i.e. monochrome).
1331 * Makefile.am (OPTIONAL_LD_FLAGS): Change the order of elements
1332 to work around the problem of libtool.
1334 * font-ft.c: Include <freetype/ftbdf.h>.
1335 (Municode_bmp, Municode_full, Miso10646_1, Miso8859_1): New
1337 (mfont__ft_init): Initialize them.
1338 (ft_iso8859_1_font_list): New variable.
1339 (set_font_info): Detect a font containing iso8859-1 glyphs and
1340 register it in ft_iso8859_1_font_list. If the font is not
1341 scalable, assume it as BDF or PCF font and setup SIZE and RESY
1342 properties of the font from its properties.
1343 (add_font_list): If the font is not scalable, check if it is BDF
1344 or PCF font. If not, ignore it.
1345 (ft_select): If FAMILY is Mnil, return NULL only if the requested
1346 registry is not iso8859-1.
1347 (ft_select) [not HAVE_XFT2]: If FAMILY is Mnil, select one from
1348 ft_iso8859_1_font_list.
1349 (ft_find_metric): If the font is not scalable, assume it as BDF
1350 or PCF, and get a metric from its properties.
1351 (mfont__ft_fini): Free ft_iso8859_1_font_list.
1353 2004-05-07 Kenichi Handa <handa@redhat.m17n.org>
1355 * Makefile.am (libm17n_la_LIBADD): Include -ldl.
1356 (libm17n_la_LDFLAGS): Delete it.
1357 (noinst_PROGRAMS): Renamed from bin_PROGRAMS.
1358 (install-binPROGRAMS, uninstall-binPROGRAMS): Delete them.
1360 2004-05-06 Kenichi Handa <handa@m17n.org>
1362 * draw.c (compose_glyph_string): Fix previous change.
1364 2004-04-30 Kenichi Handa <handa@m17n.org>
1366 * font-ft.c (ft_list): Delete unused variable `result'.
1367 (ft_render): Fix for the case that bitmap.pitch < bitmap.width.
1369 2004-04-27 Kenichi Handa <handa@m17n.org>
1371 * m17n-X.c: Include config.h
1372 [HAVE_XFT2]: Include <X11/Xft/Xft.h>.
1373 (GCInfo) [HAVE_XFT2]: New member xft_color_fore, xft_color_back.
1374 (MWDevice) [HAVE_XFT2]: New member xft_draw.
1375 (FRAME_CMAP, FRAME_VISUAL): New macros.
1376 (free_device) [HAVE_XFT2]: Destroy device->xft_draw.
1377 (xfont_driver): Make it static.
1378 (mwin__open_device) [HAVE_XFT2]: Setup device->xft_draw.
1379 (mwin__realize_face) [HAVE_XFT2]: Setup info->xft_color_fore and
1380 info->xft_color_back.
1381 (MXftFontInfo) [HAVE_XFT2]: New type.
1382 (mwin__xft_close) [HAVE_XFT2]: New function.
1383 (mwin__xft_open) [HAVE_XFT2]: New function.
1384 (mwin__xft_get_metric) [HAVE_XFT2]: New function.
1385 (mwin__xft_render) [HAVE_XFT2]: New function.
1387 * internal-gui.h [HAVE_FREETYPE]: Include FT_FREETYPE_H.
1388 (mwin__xft_open, mwin__xft_close) [HAVE_FREETYPE]: New externs.
1389 (mwin__xft_get_metric, mwin__xft_render) [HAVE_FREETYPE]: New
1392 * font.h [HAVE_FREETYPE]: Include FT_FREETYPE_H.
1394 * font-ft.c: Don't include FT_FREETYPE_H here.
1395 [HAVE_XFT2]: Include <fontconfig/fontconfig.h>.
1396 (fontconfig_initialized, fc_config) [HAVE_XFT2]: New variables.
1397 (MFTInfo): New member charmap_index.
1398 (MFTInfo) [HAVE_XFT2]: New member xft_info.
1399 (check_otf_filename): Renamed from check_filename. Return value
1401 (ft_set_property): This function deleted.
1402 (set_font_info): New function.
1403 (add_font_list): Argument changed. Add multiple fonts.
1404 (xft_list) [HAVE_XFT2]: New function.
1405 (ft_list) [not HAVE_XFT2]: New function.
1406 (ft_select): Add code for Xft.
1407 (close_ft): Likewise.
1408 (ft_open): Likewise.
1409 (ft_find_metric): Likewise.
1410 (ft_encode_char): Likewise.
1411 (ft_render): Likewise.
1413 * makefile.am (OPTIONAL_LD_FLAGS): Include @XFT2_LD_FLAGS@.
1415 2004-04-26 Kenichi Handa <handa@m17n.org>
1417 * textprop.c (mtext_attach_property): Declare the return type as
1420 2004-04-21 Kenichi Handa <handa@m17n.org>
1422 * Makefile.am (OPTIONAL_LD_FLAGS): Include @XFT2_LD_FLAGS@
1424 2004-04-09 Kenichi Handa <handa@m17n.org>
1426 * font-flt.c (struct): New members seq_beg, seq_end, seq_from,
1428 (load_command): Setup above members.
1430 2004-04-05 Kenichi Handa <handa@m17n.org>
1432 * m17n-X.c (xfont_encode_char): Fix checking of byte1 and byte2.
1434 2004-03-30 Kenichi Handa <handa@m17n.org>
1436 * m17n-X.c (xfont_encode_char): Return MCHAR_INVALID_CODE if code
1439 * m17n-core.h (M17NLIB_PATCH_LEVEL): Changed to 2.
1440 (M17NLIB_VERSION_NAME): Changed to 1.0.2.
1442 2004-03-29 Kenichi Handa <handa@m17n.org>
1444 * Version 1.0 Patch Level 2 released.
1446 2004-03-29 Kenichi Handa <handa@m17n.org>
1448 * charset.c (make_charset): Set charset->fully_loaded and
1449 charset->simple correctly. Don't try to get charset->min_char and
1450 charset->max_char for a charset of method subset and superset.
1451 Don't load a mapping file here.
1452 (mcharset__init): Set unified_max.
1453 (mcharset__load_from_database): Free a working plist.
1455 * coding.c (mcoding__fini): Free all malloced data.
1457 * input-gui.c (win_create_ic): Set control.as_image for preediting
1460 * internal.h (M17N_OBJECT_REGISTER): Check the member `used' (not
1461 `count') to initialize the array.
1463 * locale.c (mlocale_set): Fix the order of M17N_OBJECT_REF and
1466 * m17n-X.c (xfont_render): If rface->rfont is null, draw a
1468 (mwin__create_window): Fix bug of setting a background pixel of a
1470 (mwin__adjust_window): Clear the window before drawing.
1472 * m17n-core.c (mdebug__report_object): Free array->objectes if
1474 (m17n_init_core): Don't set report_header_printed to 0 here.
1475 Fix debugging information.
1476 (m17n_fini_core): Set report_header_printed to 0 here.
1478 * m17n-core.h (mplist_deserialize): Extern it.
1480 * m17n-gui.c (m17n_fini_win): Fix debugging information.
1482 * m17n.c (m17n_fini): Fix debugging information.
1484 * mtext.c (mtext__adjust_foramt): New function.
1486 * mtext.h (mtext__adjust_foramt): Extern it.
1488 * plist.c (mplist_deserialize): Renamed from mplist__deserialize.
1490 * plist.h (mplist__deserialize): Don't extern it.
1492 * symbol.c (msymbol__fini): Set freed_symbols to 0. Set all
1493 elements of symbol_table to NULL. Report about created and freed
1494 symbols if MDEBUG_FINI is set.
1496 2004-03-22 Kenichi Handa <handa@m17n.org>
1498 * m17n-core.c (m17n_init_core): Set merror_code to MERROR_NONE.
1500 * m17n.c (m17n_init): Fix the way of checking merror_code.
1502 * m17n-gui.c (m17n_init_win): Fix the way of checking merror_code.
1504 2004-03-22 Kenichi Handa <handa@m17n.org>
1506 * fontset.c (realize_font_group): Adjust the font size by
1507 mfont__resize before selecting a font.
1509 * font-ft.c (mfont__ft_init): Add oblique and boldoblique.
1511 2004-03-19 Kenichi Handa <handa@m17n.org>
1513 * Version 1.0 Patch Level 1 released.
1515 2004-03-19 Kenichi Handa <handa@m17n.org>
1517 * m17n-core.h (M17NLIB_PATCH_LEVEL): New macro.
1519 * m17n-core.c (M17NLIB_PATCH_LEVEL): Describe it.
1521 2004-03-19 Kenichi Handa <handa@m17n.org>
1523 Re-apply the changes forgotten in the released version.
1525 * charset.c (mcharset__load_from_database): Call
1526 mchar_define_charset.
1528 * coding.c (encode_unsupporeted_char): Put Mcoding text property.
1529 (mconv_encode_range): Put Mcoding text property.
1531 2004-03-18 Kenichi Handa <handa@m17n.org>
1533 * draw.c (Mdepth): New variable.
1534 (visual_order): Delete unused local var `pos'.
1535 (compose_glyph_string): Fix for the case that gstring->glyphs is
1536 realloced. Stop generating glyphs at TO. Fix handling of
1538 (layout_glyphs): Get metrics of all glyphs in advance. Set
1539 lbearing and rbearing of base of composition glyph correctly.
1540 Handle left-overhang glyphs correctly.
1541 (alloc_gstring): New arg frame. Set gstring->anti_alias. Caller
1543 (dump_combining_code): Change the defualt off_x character to ".".
1544 (mdraw__init): Initialize Mdepth.
1546 * face.c (work_gstring): New variable
1547 (mface__init): Initialize work_gstring.
1548 (mface__fini): Free work_gstring.glyphs.
1549 (mface__realize): Don't handle videomode property here. Adjusted
1550 for the change of mfont__get_metric.
1551 (mface__for_chars): Adjusted for the change of mfont__get_metric.
1553 * face.h (enum face_gc): Moved to m17n-X.c.
1555 * font.h (struct MFontDriver): Arguments of find_metric changed.
1556 (mfont__select): Prototype adjusted.
1557 (mfont__get_metric): Likewise.
1558 (mfont__ft_drive_otf): Likewise.
1559 (mfont__flt_run): Likewise.
1561 * font.c (mfont__select): New argument layouter. If layouter is
1562 different in the registered font, make a new copy of realized
1564 (mfont__get_metric): Argument changed. Get metrics of multiple
1566 (mfont_find): Call mfont__select with layouter as Mnil.
1568 * font-flt.c (FontLayoutContext): New member rfont.
1569 (run_otf): Adjusted for the change of mfont__ft_drive_otf.
1570 (mfont__flt_run): Argument changed. Initialize ctx.rfont.
1572 * font-ft.c (ft_find_metric): Arguments changed. Get metrics of
1574 (NUM_POINTS): New macro.
1575 (MPointTable): New type.
1576 (ft_render): Use mwin__draw_points instead of mwin__draw_bitmap.
1577 (mfont__ft_drive_otf): New argument rfont.
1579 * fontset.c (realize_font_group): Adjusted for the changed of
1581 (check_fontset_element): This function deleted.
1583 * input-gui.c (adjust_window_and_draw): Locate a preedit window
1584 off the parent window if the preedit text is zero length.
1586 * internal-gui.h (struct MFrame): New members foreground,
1587 background, videomode, font.
1588 (struct MGlyphString): New member anti_alias.
1589 (MDrawPoint): New type.
1590 (mwin__draw_bitmap): Prototype deleted.
1591 (mwin__draw_points): Prototype added.
1593 * m17n-gui.h (MDrawControl): New member anti_alias.
1595 * m17n-gui.c (free_frame): Free frame->font.
1596 (mframe): Set the fontset of frame->face to the default fontset.
1598 * m17n-X.c (RGB_GC): New type.
1599 (enum gc_index): Renamed from enum face_gc. Member names changed.
1601 (struct MWDevice): Members foreground and background deleted. New
1602 member scratch_gc, gc_list.
1603 (DEFAULT_FONT, FALLBACK_FONT): New macros.
1604 (free_device): Free GCs in device->gc_list.
1605 (get_rgb_gc): New function.
1606 (get_gc): Renamed and argument changed from get_color.
1607 (get_gc_for_anti_alias): New function.
1608 (xfont_find_metric): Arguments changed. Get metrics of multiple
1610 (set_region): Argument changed. Caller changed.
1611 (xfont_render): Allways set a font in gc.
1612 (x_error_handler, x_io_error_handler): Define only if
1613 X_SET_ERROR_HANDLER is defined.
1614 (mwin__open_device): Create device->scratch_gc. Set members
1615 foreground, background, and videomode of frame. Call
1616 XSetErrorHandler and XSetIOErrorHandler only if
1617 X_SET_ERROR_HANDLER is defined.
1618 (struct gc_list): Deleted.
1619 (REGISTER_GC, UNREGISTER_GC): These macros deleted.
1620 (mwin__realize_face): Adjusted for the change of the format of
1621 rface->info and the charge of set_region.
1622 (mwin__free_realized_face, mwin__fill_space, mwin__draw_hline)
1623 (mwin__draw_box): Likewise.
1624 (mwin__draw_bitmap): This function deleted.
1625 (mwin__draw_points): New function.
1626 (mwin__verify_region): Adjusted for the change of the format of
1627 rface->info and the charge of set_region.
1628 (mwin__create_window): Inherit backgound pixel from parent.
1629 (mwin__dump_gc): Adjusted for the change of the format of
1632 2004-03-16 Kenichi Handa <handa@m17n.org>
1634 * m17n-X.c (mwin__parse_event): Fix handling of modifier keys.
1636 * input.c (M_key_alias): New variable.
1637 (handle_key): Try M_key_alias property of a key too.
1638 (minput__init): Initialize M_key_alias. Give that property to
1639 symbols in one_char_symbol. Fix bug of initializing
1642 * draw.c (compose_glyph_string): Don't handle
1643 ignore_formatting_char here. Include formatting characters in the
1644 range processed by a FTL.
1645 (layout_glyph_string): Handle ignore_formatting_char here.
1647 2004-03-12 Kenichi Handa <handa@m17n.org>
1649 * input-gui.c (win_create_ic): Enable bidi in status control.
1651 * draw.c (visual_order): Avoid re-ordering of combining glyphs only.
1653 2004-03-09 Kenichi Handa <handa@m17n.org>
1655 * input.c (load_input_method): If title is not specified, use the
1656 input method name as title.
1658 * m17n-X.c (get_color): Make it static.
1659 (xim_create_ic, xim_destroy_ic, x_error_handler)
1660 (x_io_error_handler): Likewise.
1662 2004-03-01 Kenichi Handa <handa@m17n.org>
1664 * Version 1.0 released.
1667 Copyright (C) 2003, 2004
1668 National Institute of Advanced Industrial Science and Technology (AIST)
1669 Registration Number H15PRO112
1671 This file is part of the m17n library.
1673 The m17n library is free software; you can redistribute it and/or
1674 modify it under the terms of the GNU Lesser General Public License
1675 as published by the Free Software Foundation; either version 2.1 of
1676 the License, or (at your option) any later version.
1678 The m17n library is distributed in the hope that it will be useful,
1679 but WITHOUT ANY WARRANTY; without even the implied warranty of
1680 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1681 Lesser General Public License for more details.
1683 You should have received a copy of the GNU Lesser General Public
1684 License along with the m17n library; if not, write to the Free
1685 Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA