| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
(fontset_id_valid_p): Define it if FONTSET_DEBUG is defined.
|
|
|
|
| |
return fontp without setting its members.
|
|
|
|
|
|
| |
correctly.
(face_for_char): Delete unused vars.
(Fset_fontset_font): Doc fix. Delete unused vars.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(FONTSET_CHARSET_ALIST, FONTSET_FACE_ALIST): These macros deleted.
(FONTSET_NOFONT_FACE, FONTSET_REPERTORY): New macros.
(FONTSET_REF): Optimize if FONTSET is Vdefault_fontset.
(FONTSET_REF_AND_RANGE, FONTSET_ADD): New macros.
(fontset_ref_and_range, fontset_add, reorder_font_vector)
(load_font_get_repertory): New functions.
(fontset_set): This function deleted.
(fontset_face): New arg FACE. Return face ID, not face.
Completely re-written to handle new fontset structure. Caller
changed.
(free_face_fontset): Use ASET istead of AREF (X) = Y.
(face_for_char): Don't call lookup_face.
(make_fontset_for_ascii_face): New arg FACE.
(fs_load_font): New arg CHARSET_ID. Don't check
Vfont_encoding_alist here.
(find_font_encoding): New function.
(list_fontsets): Use STRINGP, not ! NILP.
(accumulate_script_ranges): New function.
(Fset_fontset_font, Fnew_fontset, Ffontset_info): Completely
re-written to handle new fontset structure.
(Ffontset_font): Return a copy of element.
(syms_of_fontset): Define symbols Qprepend and Qappend. Fix
docstring of font-encoding-alist.
|
|
|
|
| |
(Ffontset_info): Convert Lisp types.
|
|
|
|
|
| |
ids.
(font-encoding-alist): Doc fix.
|
|
|
|
|
|
| |
(accumulate_font_info): Commented-out (unused).
(face_for_char, Fset_fontset_font, Ffontset_info): Remove unused
variables.
|
|
|
|
| |
against Vfont_encoding_alist.
|
|
|
|
| |
of calling free_reazlied_face.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
optimization. The fontp->encoding array was not being initialized
correctly when compiled with optimizations by MSVC.
|
|
|
|
| |
with lisp system changes.
|
|
|
|
| |
before accessing its fields.
|
|
|
|
| |
and clip-large-size-font as obsolete.
|
|
|
|
| |
element of FONTLIST is a cons of family and registry.
|
|
|
|
| |
regex for '^', '$', and '\0'.
|
|
|
|
|
|
|
|
|
|
|
| |
XLFD, if it specifies other fields than family and registry,
return FONTANME. New argument FORCE if nonzero cancel that
feature.
(fontset_font_pattern): Call font_family_registry with FORCE 1 for
a signle byte character. Don't set FAMILY part to nil here. It
is handled by the caller choose_face_font.
(Fnew_fontset): Call font_family_registry with FORCE 0.
(Fset_fontset_font): Likewise.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(fontset_set): Remove unused variables `j' and `tmp'.
(make_fontset): Remove unused variables `i', `j', `elt' and
`base_elt'.
(make_fontset_for_ascii_face): Remove unused variable `name'.
(fs_load_font): Remove unused variable `font_idx'.
(fs_query_fontset): Remove unused function-local variable
`fontset'.
(list_fontsets): Remove unused variable `tail'.
(Fnew_fontset): Remove unused variables `family' and `registry'.
(accumulate_font_info): Remove unused variable `tmp'.
(Ffontset_font): Remove unused variable `id'.
(syms_of_fontset): Remove unused variable `i'.
|
|
|
|
| |
point, as Windows has oversized fonts.
|
|
|
|
| |
fontset on Windows.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2000-10-23 Andrew Choi <akochoi@i-cable.com>
* dispextern.h [macintosh]: Include macgui.h instead of macterm.h.
* dispnew.c [macintosh]: Include macterm.h.
(init_display) [macintosh]: initialization for window system.
* emacs.c (main) [macintosh]: Call syms_of_textprop,
syms_of_macfns, syms_of_ccl, syms_of_fontset, syms_of_xterm,
syms_of_search, x_term_init, and init_keyboard before calling
init_window_once. Also, call syms_of_xmenu.
* fontset.c (syms_of_fontset) [macintosh]: Set ASCII font of
default fontset to Monaco.
* frame.c [macintosh]: Include macterm.h. Remove declarations of
NewMacWindow and DisposeMacWindow.
(make_terminal_frame) [macintosh]: Call make_mac_terminal_frame
instead of calling NewMacWindow and setting fields of
f->output_data.mac directly. Call init_frame_faces.
(Fdelete_frame) [macintosh]: Remove unused code.
(Fmodify_frame_parameters) [macintosh]: Call
x_set_frame_parameters instead of mac_set_frame_parameters.
* frame.h [macintosh]: Define menu_bar_lines field in struct
frame. Define FRAME_EXTERNAL_MENU_BAR macro.
* keyboard.c [macintosh]: Include macterm.h.
(kbd_buffer_get_event) [macintosh]: Generate delete_window_event
and menu_bar_activate_event type events as for X and NT.
(make_lispy_event) [macintosh]: Construct lisp events of type
MENU_BAR_EVENT as for X and NT.
* sysdep.c [macintosh]: Remove declaration for sys_signal.
Include stdlib.h. Remove definition of Vx_bitmap_file_path.
(sys_subshell) [macintosh]: Remove definition entirely.
(init_sys_modes) [macintosh]: Do not initialize Vwindow_system and
Vwindow_system_version here. Remove initialization of
Vx_bitmap_file_path.
(read_input_waiting): Correct the number of parameters passed to
read_socket_hook.
Move all Macintosh functions to mac/mac.c.
* term.c [macintosh]: Include macterm.h.
* window.c [macintosh]: Include macterm.h.
* xdisp.c [macintosh]: Include macterm.h. Declare
set_frame_menubar and pending_menu_activation.
(echo_area_display) [macintosh]: Do not return if terminal frame
is the selected frame.
(update_menu_bar) [macintosh]: Check FRAME_EXTERNAL_MENU_BAR (f).
Allow only the selected frame to set menu bar.
(redisplay_window) [macintosh]: Obtain menu bar to redisplay by
calling FRAME_EXTERNAL_MENU_BAR (f).
(display_menu_bar) [macintosh]: Check FRAME_MAC_P (f).
* xfaces.c [macintosh]: Include macterm.h. Define x_display_info
and check_x. Declare XCreateGC. Define x_create_gc and
x_free_gc. Initialize font_sort_order.
(x_face_list_fonts) [macintosh]: Use the same code as WINDOWSNT,
but call x_list_fonts instead of w32_list_fonts.
(Finternal_face_x_get_resource) [macintosh]: Do not call
display_x_get_resource.
(prepare_face_for_display) [macintosh]: Set xgcv.font.
(realize_x_face) [macintosh]: Load the font if it is specified in
ATTRS.
(syms_of_xfaces) [macintosh]: Initialize Vscalable_fonts_allowed
to Qt.
* cus-edit.el (custom-button-face): Use 3D look for mac.
(custom-button-pressed-face): Likewise.
* faces.el (set-face-attributes-from-resources): Handle mac frames
in the same way as x and w32 frames.
(face-valid-attribute-values): Likewise.
(read-face-attribute): Likewise.
(defined-colors): Likewise.
(color-defined-p): Likewise.
(color-values): Likewise.
(display-grayscale-p): Likewise.
(face-set-after-frame-default): Likewise.
(mode-line): Same default face as for x and w32.
(tool-bar): Likewise.
* frame.el: Remove call to frame-notice-user-settings at end of
the file.
* info.el (Info-fontify-node): make underlines invisible for mac
as for x, pc, and w32 frame types.
* term/mac-win.el: New file.
|
| |
|
|
|
|
| |
the current buffer.
|
|
|
|
|
|
| |
(fontset_ref_via_base): Likewise.
(Fset_fontset_font): Convert FAMILY and REGISTRY specifications
to downcase.
|
| |
|
|
|
|
| |
with that of Emacs 20.
|
|
|
|
|
|
|
|
|
|
| |
for an ASCII font, not defalt slot.
(fontset_ref_via_base): If FONTSET doesn't contain information for
C, try the default fontset.
(make_fontset): Don't copy the default fontset.
(fontset_font_pattern): Likewise.
(accumulate_font_info): If ELT is nil, use the corresponding
element in the default fontset.
|
| |
|
|
|
|
|
| |
(Fset_fontset_font): Remove the adhoc condition for the default
fontset. Allow cons in FONTNAME.
|
|
|
|
| |
the default fontset to what Emacs uses by default.
|
|
|
|
|
| |
SPLIT_NON_ASCII_CHAR.
(fontset_ref_via_base, fontset_set): Likewise
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
(fs_load_font): If the face has fontset, record the face ID in
that fontset.
(Finternal_char_font): New function.
(accumulate_font_info): New function.
(Ffontset_info): Rewritten for the new fontset implementation.
(syms_of_fontset): Register Vdefault_fontset in the first element
of Vfontset_table. Include Vdefault_fontset in
Vfontset_alias_alist. Declare `internal-char-font' as a Lisp
function.
|
|
|
|
|
| |
Check Vfont_encoding_alist against the full name of the opened
font.
|
|
|
|
| |
name change: ch -> character.
|
|
|
|
| |
(Fset_fontset_font): Use EQ to compare lisp objects.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
fontset implementation. Now fontset is represented by char table.
(Vglobal_fontset_alist, font_idx_temp, my_strcasetbl): Variables
removed.
(my_strcasecmp): Function removed.
(Vfontset_table, next_fontset_id, Vdefault_fontset): New
variables.
(AREF, ASIZE): New macros.
(FONTSET_FROM_ID, FONTSET_ID, FONTSET_NAME, FONTSET_FRAME,
FONTSET_ASCII, FONTSET_BASE, BASE_FONTSET_P, FONTSET_REF,
FONTSET_REF_VIA_BASE, FONTSET_SET): New macros.
(fontset_ref, fontset_ref_via_base, fontset_set, make_fontset,
fontset_id_valid_p, font_family_registry, fontset_name,
fontset_ascii, free_face_fontset, face_suitable_for_char_p,
face_for_char, make_fontset_for_ascii_face, fontset_font_pattern):
New functions.
(fs_load_font): New arg FACE. Caller changed.
(fs_query_fontset): Argument changed. Caller changed.
(Fquery_fontset): call fs_query_fontset.
(fs_register_fontset, alloc_fontset_data, free_fontset_data):
Functions removed.
(clear_fontset_elements, check_registry_encoding,
check_fontset_name): New functions.
(syms_of_fontset): Set char-table-extra-slots property of fontset
to 3. Staticpro and initialize Vfontset_table and
Vdefault_fontset. Defsubr fontset_font and fontset_list.
|
|
|
|
|
|
|
| |
(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.
|
| |
|
|
|
|
| |
(Ffontset_info): DItto.
|
| |
|
|
|
|
| |
(Fnew_fontset, Fset_fontset_font): Don't check for them here.
|