Commit graph

25195 commits

Author SHA1 Message Date
Kenichi Handa
173144084b *** empty log message *** 2007-12-01 04:12:53 +00:00
Kenichi Handa
d8d1da594a Re-generated. 2007-12-01 04:12:42 +00:00
Kenichi Handa
88501357fa *** empty log message *** 2007-12-01 02:42:37 +00:00
Kenichi Handa
11bfed587c (x_draw_composite_glyph_string_foreground): Adjusted for
the change of lispy gstring.
2007-12-01 02:42:24 +00:00
Kenichi Handa
4613015e6a Include "ftfont.h".
(struct xftfont_info) [HAVE_LIBOTF]: New members maybe_otf and
otf.
(xftfont_open) [HAVE_LIBOTF]: Initialize the above members.
(xftfont_close) [HAVE_LIBOTF]: Close otf.
(xftfont_shape) [HAVE_LIBOTF, HAVE_M17N_FLT]: New function.
(syms_of_xftfont) [HAVE_LIBOTF, HAVE_M17N_FLT]: Set
xftfont_driver.shape to xftfont_shape.
2007-12-01 02:42:03 +00:00
Kenichi Handa
a9822ae878 * xfont.c (x_font_charset_alist): Moved to font.c and renamed.
(xfont_registry_charsets): Likewise.  Caller changed.
(syms_of_xfont): Don't handle x_font_charset_alist.
2007-12-01 02:41:41 +00:00
Kenichi Handa
6e846fdc69 (set_font_frame_param): Adjusted for the change of
font_find_for_lface.
2007-12-01 02:41:23 +00:00
Kenichi Handa
f08696c668 (handle_composition_prop): Adjusted for the change of
lispy gstring.  Call a function for auto-composition with the
third arg it->window.
(fill_composite_glyph_string): Adjusted for the change of lispy
string.
(x_produce_glyphs): Adjusted for the change of
font_prepare_compositionl.
2007-12-01 02:41:05 +00:00
Kenichi Handa
0c16681f76 (x_draw_composite_glyph_string_foreground): Adjusted
for the change of lispy gstring.
2007-12-01 02:40:49 +00:00
Kenichi Handa
7a259f4b7d New file. 2007-12-01 02:39:57 +00:00
Kenichi Handa
de023c40ad Don't include Freetype headers. Include "ftfont.h".
(struct ftfont_info) [HAVE_LIBOTF]: New members maybe_otf and otf.
(ftfont_open) [HAVE_LIBOTF]: Initialize the above members.
(ftfont_driver) [HAVE_LIBOTF, HAVE_M17N_FLT]: Don't set
font_otf_capability and font_drive_otf, set ftfont_shape.
(ftfont_list): Adjusted for the change of :otf property value.
(struct MFLTFontFT) [HAVE_LIBOTF, HAVE_M17N_FLT]: New struct.
(ftfont_get_glyph_id, ftfont_get_metrics, ftfont_check_otf)
(adjust_anchor, ftfont_drive_otf, ftfont_shape_by_flt)
(ftfont_shape) [HAVE_LIBOTF, HAVE_M17N_FLT]: New function.s
(DEVICE_DELTA) [HAVE_LIBOTF, HAVE_M17N_FLT]: New macro.
(otf_gstring, gstring, m17n_flt_initialized): New variables.
2007-12-01 02:39:27 +00:00
Kenichi Handa
8b67c40a93 (fontset_find_font) [USE_FONT_BACKEND]: Try multiple
fonts of the same font-spec.  Change the format of RFONT-DEF.
(face_for_char): Adjusted for the change of RFONT-DEF.
(make_fontset_for_ascii_face): Likewise.
(Finternal_char_font): Likewise.
(Fset_fontset_font) [USE_FONT_BACKEND]: Handle new format of
font-spec.
2007-12-01 02:39:01 +00:00
Kenichi Handa
1701724c31 * font.c [HAVE_M17N_FLT]: Include <m17n-flt.h>.
(font_charset_alist): Moved from xfont.c and renamed.
(font_registry_charsets): Likewise.
(font_prop_validate_otf): New function.
(font_property_table): Register it for QCotf.
(DEVICE_DELTA, adjust_anchor, REPLACEMENT_CHARACTER)
(font_drive_otf): Deleted.
(font_prepare_composition): New arg F.  Adjusted for the change of
lispy gstring.
(font_find_for_lface): New arg C.
(font_load_for_face): Adjusted for the change of
font_find_for_lface.
(Ffont_make_gstring): Adjusted for the change of lispy gstring.
(Ffont_fill_gstring): Likewise.
(Ffont_shape_text): New function.
(Fopen_font): If the font size is not given, use 12-pixel.
(Ffont_at): New arg STRING.
(syms_of_font): Initalize font_charset_alist.  Declare
Ffont_shape_text as a Lisp function.  Call syms_of_XXfont
conditionally.
2007-12-01 02:38:23 +00:00
Kenichi Handa
4b4836deaf (FONT_ENTITY_NOT_LOADABLE)
(FONT_ENTITY_SET_NOT_LOADABLE): New macros.
(LGSTRING_XXXX, LGLYPH_XXX): Adjusted for the change of lispy
gstring.
(struct font_driver): New member shape.
(font_registry_charsets): Extern. it.
(font_find_for_lface): Prototype adjusted.
(font_prepare_composition): Likewise.
(font_otf_capability, font_drive_otf): Delete their externs.
2007-12-01 02:37:59 +00:00
Kenichi Handa
102780a67e (main): Call syms_of_font unconditionally. 2007-12-01 02:37:34 +00:00
Kenichi Handa
e8e6136b2a (compose_text): Don't treat the new style
composition specially.
2007-12-01 02:35:41 +00:00
Kenichi Handa
ac96711a3b (ALL_CFLAGS): Add @M17N_FLT_CFLAGS@.
(FONTSRC, FONTOBJ) [HAVE_WINDOW_SYSTEM]: Set them unconditionally.
(LIBES): Add @M17N_FLT_CFLAGS@.
2007-12-01 02:35:22 +00:00
Kenichi Handa
dac72a9dfa *** empty log message *** 2007-12-01 02:00:06 +00:00
Jason Rumney
a6708cd05a *** empty log message *** 2007-12-01 00:31:50 +00:00
Jason Rumney
fb3b8017ff (w32font_draw): Fill background manually. 2007-12-01 00:31:23 +00:00
Kenichi Handa
b9217c57e7 (ftxfont_end_for_frame): Fix array indexing error. 2007-11-29 13:00:37 +00:00
Jason Rumney
5f22d86229 *** empty log message *** 2007-11-23 02:10:11 +00:00
Jason Rumney
4c496d0dbb (Qfontp): Remove unused symbol.
(QCantialias): New symbol.
(syms_of_font): Define it.
(font_property_table): Set a validator for QCantialias.
2007-11-23 02:09:42 +00:00
Jason Rumney
9158328107 (CLEARTYPE_QUALITY, CLEARTYPE_NATURAL_QUALITY): Define
if not already.
(QCfamily): Share with xfaces.c.
(Qstandard, Qsubpixel, Qnatural): New symbols.
(syms_of_w32font): Define them. Don't define QCfamily here.
(w32_antialias_type, lispy_antialias_type): New functions.
(w32_enumfont_pattern_entity): New arg requested_font.
Set antialias parameter if non-default was requested.
(fill_in_logfont): Fill in lfQuality if :antialias specified.
2007-11-23 02:09:19 +00:00
Kenichi Handa
532729d52d *** empty log message *** 2007-11-21 12:12:19 +00:00
Kenichi Handa
940054308a (read1): Undo the previous change. 2007-11-21 12:12:06 +00:00
Kenichi Handa
495636f946 *** empty log message *** 2007-11-21 00:26:53 +00:00
Kenichi Handa
d0167372fd (Fdelete_frame): Call font_update_drivers only when
USE_FONT_BACKEND is defined..
2007-11-21 00:26:15 +00:00
Kenichi Handa
5ecee3f4fb *** empty log message *** 2007-11-19 05:17:26 +00:00
Kenichi Handa
5a74d0e507 (struct font_bitmap): New member bits_per_pixel.
(struct font_driver): New members start_for_frame and end_for_frame.
(struct font_data_list): New struct.
(font_put_frame_data, font_get_frame_data): Extern them.
2007-11-19 05:16:48 +00:00
Kenichi Handa
6aae9c92a0 (struct frame): New member font_data_list. 2007-11-19 05:15:30 +00:00
Kenichi Handa
f697fff0b7 (font_update_drivers): Call driver->start_for_frame and
driver->end_for_frame at proper timings.
(font_put_frame_data, font_get_frame_data): New functions.
(Ffont_spec): Add usage in the docstring.
2007-11-19 05:14:46 +00:00
Kenichi Handa
50e3873c24 (make_frame): Initialize f->font_data_list to NULL.
(Fdelete_frame): Call font_update_drivers.
2007-11-19 05:09:08 +00:00
Kenichi Handa
a92ee6bfdd (struct xftface_info): Delete the member xft_draw.
(xftfont_prepare_face): Adjusted for the above change.
(xftfont_done_face): Likewise.
(xftfont_get_xft_draw): New function.
(xftfont_draw): Get XftDraw by xftfont_get_xft_draw.
(xftfont_end_for_frame): New function.
(syms_of_xftfont): Set xftfont_driver.end_for_frame.
2007-11-19 05:08:04 +00:00
Kenichi Handa
00c37e1883 (ftxfont_get_gcs): Renamed from ftxfont_create_gcs.
Argument changed.  Cache GCs in the per-frame data.
(struct ftxfont_frame_data): New struct.
(ftxfont_draw_bitmap): New arg gc_fore and flush.
(ftxfont_prepare_face, ftxfont_done_face): Delete them.
(ftxfont_draw): Get GCs by ftxfont_get_gcs.  Reflect s->clip in
GCs.
(ftxfont_end_for_frame): New function.
(syms_of_ftxfont): Set ftxfont_driver.end_for_frame.
2007-11-19 05:06:09 +00:00
Kenichi Handa
b51e5112fa (ftfont_get_bitmap): Set bitmap->bits_per_pixel. 2007-11-19 05:02:49 +00:00
Kenichi Handa
b8f931edac *** empty log message *** 2007-11-18 09:13:58 +00:00
Kenichi Handa
82e0280c80 (Vselection_coding_system)
(Vnext_selection_coding_system): Delete them.
(syms_of_xselect): Don't declare selection-coding-system and
next-selection-coding-system.  They are declared in select.el.
2007-11-18 09:05:14 +00:00
Jason Rumney
b03b652b47 *** empty log message *** 2007-11-17 03:02:07 +00:00
Jason Rumney
820eff5a8f Include imm.h.
(get_composition_string_fn, get_ime_context_fn): New optional system functions.
(globals_of_w32fns): Load them from imm32.dll.
(ignore_ime_char): New flag.
(w32_wnd_proc): Handle WM_UNICHAR, WM_IME_CHAR and WM_IME_ENDCOMPOSITION.
2007-11-17 03:01:50 +00:00
Jason Rumney
a60b033380 (w32_read_socket) [WM_UNICHAR]: Handle as MULTIBYTE_CHAR_KEYSTROKE_EVENT. 2007-11-17 03:00:47 +00:00
Jason Rumney
499180d57c (WM_UNICHAR, UNICODE_NOCHAR): Define if not already. 2007-11-17 03:00:27 +00:00
Kenichi Handa
d4599abc04 *** empty log message *** 2007-11-14 04:52:20 +00:00
Kenichi Handa
1202434be8 (READCHAR): Call readchar with the 2nd arg NULL.
(READCHAR_REPORT_MULTIBYTE): New macro.
(readchar): New 2nd arg MULTIBYTE.
(read1): Use READCHAR_REPORT_MULTIBYTE for the first read.  Make
symbol's name multibyte according to the multibyteness of the
source.
2007-11-14 04:52:07 +00:00
Kenichi Handa
8f46ce9a7c *** empty log message *** 2007-11-12 04:07:16 +00:00
Kenichi Handa
67bb7826df *** empty log message *** 2007-11-12 02:40:22 +00:00
Kenichi Handa
ce9c2e7b3b (face_for_overlay_string): Call lookup_face with
correct arguments (fix of synching with the trunk).
2007-11-12 02:30:30 +00:00
Miles Bader
f23d76bdef Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
2007-11-11 00:56:44 +00:00
Miles Bader
a457417ee5 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-927
2007-11-11 00:03:33 +00:00
Juri Linkov
d83e029983 (BASE_PURESIZE): Increase to 1130000. 2007-11-10 22:42:06 +00:00