1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-20 04:50:55 -07:00
Commit graph

26680 commits

Author SHA1 Message Date
Eli Zaretskii
f9d2fdc464 Changes for separate unspecified foreground and background colors
on character terminals:

* dispextern.h (FACE_TTY_DEFAULT_FG_COLOR)
(FACE_TTY_DEFAULT_BG_COLOR):  New macros.

* xfaces.c (Qunspecified_fg, Qunspecified_bg): New variables.
(syms_of_xfaces): Initialize and staticpro them.
(tty_defined_color): If the color name is unspecified-fg or
unspecified-bg, return FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR, respectively, as the pixel value.
(tty_color_name): If the color pixel value is either
FACE_TTY_DEFAULT_FG_COLOR or FACE_TTY_DEFAULT_BG_COLOR, return
Qunspecified_fg or Qunspecified_bg, respectively.
(Finternal_set_lisp_face_attribute): Allow values Qunspecified_fg
and Qunspecified_bg for foreground and background colors.
(realize_default_face): If the foreground and background colors
are not specified, default to Qunspecified_fg and Qunspecified_bg.
(realize_tty_face): By default, set the face colors to
FACE_TTY_DEFAULT_FG_COLOR and FACE_TTY_DEFAULT_BG_COLOR.
[MSDOS]: Handle FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR when face colors are not defined.
Reverse the colors if the default colors were reversed.

* dispnew.c (init_display): Initialize the frame pixels of the
initial frame to FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR.

* term.c (turn_on_face): If the default fore- and background
colors are reversed, enter inverse video mode.  Don't send color
escape sequences for unspecified foreground and background colors.
(turn_off_face): Handle unspecified-fg and unspecified-bg colors.

* dosfns.c (unspecified_colors): New variable.
(msdos_stdcolor_idx): Handle unspecified-fg and unspecified-bg
color names, return FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR, respectively.
(msdos_stdcolor_name): Handle FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR, return Qunspecified_fg and
Qunspecified_bg, respectively.

* msdos.c (IT_set_face): Support FACE_TTY_DEFAULT_FG_COLOR and
FACE_TTY_DEFAULT_BG_COLOR as pixel values.

* faces.el (face-read-integer, read-face-attribute)
(color-defined-p, color-values): Allow color values unspecified-fg
and unspecified-bg, handle them as unspecified.
1999-12-15 13:14:38 +00:00
Kenichi Handa
e19539f184 (code_convert_region): Fix the secoding arg to
update_compositions.
1999-12-15 12:49:36 +00:00
Kenichi Handa
5ec14d3c00 *** empty log message *** 1999-12-15 00:53:45 +00:00
Kenichi Handa
34a500b327 (fill-find-break-point): Delete codes for
composite characters.
(fill-region-as-paragraph): Likewise.
1999-12-15 00:52:08 +00:00
Kenichi Handa
d169c89e68 Register tibetan-composition-function in
composition-function-table.
(tibetan-composable-pattern): New variable.
(tibetan-subjoined-transcription-alist): Change key "R" to "+R".
(tibetan-precomposition-rule-alist): Move punctuations to
tibetan-punctuation-transcription-alist and
tibetan-obsolete-glyphs.
(tibetan-punctuation-transcription-alist): New variable.
(tibetan-obsolete-glyphs): New variable.
(tibetan-regexp): Improve the initialization code.
1999-12-15 00:50:58 +00:00
Kenichi Handa
3bdf8898b0 Most functions rewritten.
(tibetan-char-p): Renamed from tibetan-char-examin.
(tibetan-composable-examin) (tibetan-complete-char-examin)
(tibetan-vertical-stacking) (tibetan-composition): Deleted.
(tibetan-add-components): New function.
(tibetan-composition-function): New function.
1999-12-15 00:50:18 +00:00
Kenichi Handa
c27737aa24 Register thai-composition-function in
composition-function-table.
(thai-tis620): Delete `pre-write-conversion' property.
1999-12-15 00:48:14 +00:00
Kenichi Handa
31ce771921 Mostly rewritten. 1999-12-15 00:47:53 +00:00
Kenichi Handa
86e2a80397 Register lao-composition-function in
composition-function-table.
1999-12-15 00:47:31 +00:00
Kenichi Handa
c595d8887d (thai-category-table): Use
make-category-table, not copy-category-table, to initialize it.
(thai-composition-pattern): New variable.
(thai-with-thai-category-table): New macro.
(thai-compose-region, thai-compose-string): Rewritten.
(thai-post-read-conversion): Rewritten.
(thai-pre-write-conversion): Deleted.
(thai-composition-function): New function.
1999-12-15 00:46:54 +00:00
Kenichi Handa
817e162fea (quail-install-map): New optional arg
NAME.
(quail-get-translation): If DEF is a symbol but not a function,
ignore it.
(quail-start-translation): Put a key sequence undefined in the
translation keymap in unread-command-events, not generated-events.
Return parameterized event (compose-last-chars N) if the input
characters should be composed.
(quail-map-definition): If DEF is t, treat it as nil.
(quail-delete-last-char): Delete the quail region.
(quail-show-translations): Don't show list of translations if the
quail package is deterministic.
(quail-completion-max-depth): New variable.
(quail-completion-1): Pay attention to the above variable.  Fix
for the case that a translation is a function.
(quail-map-from-table, quail-map-from-table-1,
quail-map-from-table-2): New functions.
(quail-lookup-map-and-concat): New function
1999-12-15 00:42:43 +00:00
Kenichi Handa
72594565db (set-nested-alist): Set BRANCHES (if
non-nil) at the tail of ALIST.
(compose-region, decompose-region, decompse-string,
reference-point-alist, compose-chars): Moved to composite.el.
(compose-chars-component, compose-chars-rule,
decompose-composite-char): Deleted.
1999-12-15 00:42:14 +00:00
Kenichi Handa
ccac3d772c (iso-2022-7bit, iso-2022-7bit-ss2
iso-2022-7bit-lock, iso-2022-7bit-lock-ss2, iso-2022-8bit-ss2,
x-ctext): Give `composition' property t.
1999-12-15 00:41:44 +00:00
Kenichi Handa
5b8d2ff502 (encode-coding-char): Don't check
composite character.
1999-12-15 00:41:22 +00:00
Kenichi Handa
35554641be (mule-version): Updated to 5.0 (AOI).
(mule-version-date): Updated to 1999.12.7.
(with-category-table): New macro.
1999-12-15 00:40:48 +00:00
Kenichi Handa
0c4f97d011 (vertical-centering-font-regexp): New
variable.
1999-12-15 00:40:24 +00:00
Kenichi Handa
d5f05a67da Fix cateogries of Lao symbols. 1999-12-15 00:39:59 +00:00
Kenichi Handa
f0d16a7fec (what-cursor-position): Show "(composed)" if the
character is composed.
1999-12-15 00:39:33 +00:00
Kenichi Handa
9d4d60c169 (ps-plot-region): Handle new composition. 1999-12-15 00:38:58 +00:00
Kenichi Handa
d0da93b3a1 Define encode-composition-rule and find-composition
for Emacs 20.4 and the earlier versions.
(ps-mule-init-external-library): Just require a feature for
external libraries.
(ps-mule-prologue): Postscript code modified for new composition.
(ps-mule-find-wrappoint): New arg COMPOSITION.
(ps-mule-plot-string): Delete code for composite characaters.
(ps-mule-plot-composition): New funcion.
(ps-mule-prepare-font-for-components): New function.
(ps-mule-plot-components): New function.
(ps-mule-composition-prologue-generated): Renamed from
ps-mule-cmpchar-prologue-generated.
(ps-mule-composition-prologue): New named from
ps-mule-cmpchar-prologue.  Modified for new composition.
(ps-mule-plot-rule-cmpchar, ps-mule-plot-cmpchar,
ps-mule-prepare-cmpchar-font): Deleted.
(ps-mule-string-encoding): New arg NO-SETFONT.
(ps-mule-bitmap-prologue): In Postscript code of BuildGlyphCommon,
check Composing, not Cmpchar
(ps-mule-initialize): Set ps-mule-composition-prologue-generated
to nil.
(ps-mule-begin-job): Check existence of new composition.
1999-12-15 00:34:01 +00:00
Kenichi Handa
653b6bad98 Rewritten for new composition. 1999-12-15 00:32:16 +00:00
Kenichi Handa
c674f3518f New file. 1999-12-15 00:28:11 +00:00
Kenichi Handa
b4192550b1 (x_append_glyph): Setup members of struct glyph properly
for composition.
(x_append_composite_glyph): New function.
(VCENTER_BASELINE_OFFSET): New macro.
(x_produce_glyphs): If it->what == IT_COMPOSITION, setup members
of struct it for the composition.  Cache pixel offsets in the
struct composition.  Delete codes for a composite character.
Handle Vignore_relative_composition in composition code.
(struct glyph_string): Delete member cmpcharp, add new member cmp.
(x_set_cursor_gc): Check s->cmp, not s->cmpcharp.
(x_compute_glyph_string_overhangs): Likewise.
(x_get_glyph_overhangs): Delete codes for a composite character.
(x_right_overwritten): Check s->cmp, not s->cmpcharp.
(x_draw_glyph_string_background): Likewise.  Delete codes for
checking s->gidx for a composition.
(x_draw_glyph_string_foreground): Delete code for a composite
character.
(x_draw_composite_glyph_string_foreground): New function.
(x_draw_glyph_string_box): Check s->cmp, not s->cmpcharp.
(x_draw_glyph_string): Handle the case of COMPOSITE_GLYPH.
(struct work): Deleted.
(x_fill_composite_glyph_string): Argument changed.  Mostly
rewritten for that.
(x_fill_glyph_string): Don't check CHARSET_COMPOSITION.
(BUILD_CHAR_GLYPH_STRINGS): Don't handle composition here.
(BUILD_COMPOSITE_GLYPH_STRING): New macro.
(BUILD_GLYPH_STRINGS): For composition, call
BUILD_COMPOSITE_GLYPH_STRING.
(x_new_font): Initialize f->output_data.x->baseline_offset, not
f->output_data.x->font_baseline.
1999-12-15 00:27:21 +00:00
Kenichi Handa
b6c3d03479 (struct x_output): Change member font_baseline to
baseline_offset.
1999-12-15 00:26:32 +00:00
Kenichi Handa
99e1184e5c (lisp_data_to_selection_data): Adjusted for the change
for find_charset_in_str.
1999-12-15 00:26:05 +00:00
Kenichi Handa
58cad5ed4f Include intervals.h.
(syms_of_xfns): Make `display' property nonsticky by default.
1999-12-15 00:25:34 +00:00
Kenichi Handa
78d2079c49 (choose_face_fontset_font): Delete codes for a
composite character.
(realize_x_face): Likewise.  Change a place to set local variable
`f' to avoid a bug of GCC 2.8.1 on Solaris.
1999-12-15 00:24:07 +00:00
Kenichi Handa
260a86a07c (it_props): Add an entry for composition.
(face_before_or_after_it_pos): For composition, check face of a
character after the composition.
(handle_composition_prop): New function.
(get_next_display_element): Adjusted for the change of
CHAR_STRING.
(set_iterator_to_next): Handle the case that it->method ==
next_element_from_composition.
(next_element_from_composition): New function.
(message_dolog): Adjusted for the change of CHAR_STRING.
(set_message_1): Likewise.
(check_point_in_composition): New function.
(reconsider_clip_changes): If point moved into or out of
composition, set b->clip_changed to 1 to force updating of the
screen.
(disp_char_vector): Delete codes for a composite character.
(decode_mode_spec_coding): Adjusted for the change of CHAR_STRING.
1999-12-15 00:23:27 +00:00
Kenichi Handa
f02d6d5cbb (Frecenter): Clear all caches of compositions. 1999-12-15 00:22:26 +00:00
Kenichi Handa
abc2f676d6 (Vtext_property_default_nonsticky): New variable
(syms_of_textprop): Declare it as a Lisp variable.
1999-12-15 00:21:42 +00:00
Kenichi Handa
c7cba11dec (encode_terminal_code): Delete codes for a composite
character.  Adjusted for the change of CHAR_STRING.
(produce_glyphs): When called, it->what can be IT_COMPOSITION.
Delete codes for a composite character.
1999-12-15 00:21:15 +00:00
Kenichi Handa
aa9b6dd66b (SYNTAX_ENTRY_INT): Delete codes for a composite
character.
1999-12-15 00:20:44 +00:00
Kenichi Handa
daaa6ed868 (search_buffer): Adjusted for the change of CHAR_STRING. 1999-12-15 00:20:26 +00:00
Kenichi Handa
e0016554c4 Include composite.h.
(read_process_output): Call update_compositions.
1999-12-15 00:17:54 +00:00
Kenichi Handa
19a86a032e (printchar): Adjusted for the change of CHAR_STRING. 1999-12-15 00:17:25 +00:00
Kenichi Handa
449fea3977 (readchar): Adjusted for the change of CHAR_STRING.
Delete a code that handles an invalid too-long multibyte sequence
because we are now sure that we never encounter with such a
sequence.
(read_multibyte): Use macro MAX_MULTIBYTE_LENGTH, not
MAX_LENGTH_OF_MULTI_BYTE_FORM.
(init_obarray): Likewise.
(read1): Likewise.  Adjusted for the change of CHAR_STRING.
1999-12-15 00:17:03 +00:00
Kenichi Handa
1948175262 (QCtest, QCweakness, Qequal): Extern them.
(hash_put): Adjusted for the change of the definition.
(signal_after_change): Likewise.
(check_point_in_composition): Extern it.
1999-12-15 00:16:30 +00:00
Kenichi Handa
0a16479ffe (push_key_description): Adjusted for the change of
CHAR_STRING.
(Ftext_char_description): Likewise.
1999-12-15 00:15:57 +00:00
Kenichi Handa
adf5cb9c38 (Vdisable_point_adjustment): New variable.
(Vglobal_disable_point_adjustment): New variable.
(syms_of_keyboard): Declare them as Lisp variables.
(command_loop_1): Check them and call adjust_point_for_property if
necessary.
(adjust_point_for_property): New function.
1999-12-15 00:15:16 +00:00
Kenichi Handa
f56b42ac9e (adjust_intervals_for_insertion): To check stickines
of properties, pay attention to text-property-default-nonsticky.
(merge_properties_sticky): Likewise.
(get_property_and_range): New function.
1999-12-15 00:14:44 +00:00
Kenichi Handa
a5ecc8a315 Include composite.h.
(get_property_and_range): Extern it.
(Vtext_property_default_nonsticky): Extern it.
1999-12-15 00:14:19 +00:00
Kenichi Handa
0ef71121ca (copy_text): Adjusted for the change of CHAR_STRING.
(insert_char): Likewise.
(insert): Call update_compositions.
(insert_and_inherit): Likewise.
(insert_before_markers): Likewise.
(insert_before_markers_and_inherit): Likewise.
(insert_from_string): Likewise.
(insert_from_string_before_markers): Likewise.
(insert_from_buffer): Likewise.
(replace_range): Likewise.
(count_combining_composition): Deleted.
(count_combining_before): Delete codes for a composite character.
(count_combining_after): Likewise.
(del_range_1): Call update_compositions.
(del_range_byte): Likewise.
(del_range_both): Likewise.
(Fcombine_after_change_execute): Likewise.
1999-12-15 00:13:49 +00:00
Kenichi Handa
012fd715d2 (check_composition): New function.
(MULTIBYTE_BYTES_WIDTH): Call STRING_CHAR_AND_LENGTH with
MAX_MULTIBYTE_LENGTH, not MAX_LENGTH_OF_MULTI_BYTE_FORM.
(current_column_1): Handle new way of composition.
(Fmove_to_column): Likewise.
(compute_motion): Likewise.
1999-12-15 00:13:13 +00:00
Kenichi Handa
810abb8758 (Vvertical_centering_font_regexp): New variable.
(syms_of_fontset): Declare it as a Lisp variable and initialize.
Set Vignore_relative_composition to nil.
(fs_load_font): Initialize `vertical_centering' of struct
font_info.
1999-12-15 00:12:47 +00:00
Kenichi Handa
21fa1afa72 (struct font_info): New member vertical_centering.
(Vvertical_centering_font_regexp): Extern it.
1999-12-15 00:12:19 +00:00
Kenichi Handa
64a5094a4a (Flength): The length of char-table is MAX_CHAR.
(concat): Adjusted for the change of CHAR_STRING.
(Ffillarray): Adjusted for the change of CHAR_STRING.
(Fset_char_table_default): Delete codes for a composite character.
(hash_put): Return hash index.
1999-12-15 00:11:56 +00:00
Kenichi Handa
ce51c54c3f (Fsubstitute_in_file_name): Adjusted for the change of
CHAR_STRING.
(Finsert_file_contents): Set Vlast_coding_system_used before
calling signal_after_change.  Call update_compositions if some
texts are inserted..
(Fwrite_region): Adjusted for the change of a_write and e_write.
(a_write): Argument changed.  Work based on character position,
not byte position.
(e_write): Argument changed.  Handle new way of composition.
1999-12-15 00:11:24 +00:00
Kenichi Handa
9d100795e3 (main): Call syms_of_composite. 1999-12-15 00:10:49 +00:00
Kenichi Handa
d5c2c40348 (Fchar_to_string): Adjusted for the change of
CHAR_STRING.
(general_insert_function): Likewise.
(Finsert_char): Likewise.
(Fsubst_char_in_region): Likewise.  Call update_compositions.
(Ftranslate_region): Call update_compositions.
(Ftranspose_regions): Call update_compositions.
1999-12-15 00:10:23 +00:00
Kenichi Handa
91f045dfa3 (doprnt1): Adjusted for the change of CHAR_STRING. 1999-12-15 00:09:57 +00:00