summaryrefslogtreecommitdiff
path: root/src/fontset.c
Commit message (Collapse)AuthorAgeFilesLines
* (Fset_fontset_font): Treate `ascii' as charset, not script.Kenichi Handa2002-08-191-7/+7
|
* (fontset_add): Make the type `int'.Kenichi Handa2002-08-151-2/+18
| | | | (fontset_id_valid_p): Define it if FONTSET_DEBUG is defined.
* (fs_load_font): If fontp->charset is not negative,Kenichi Handa2002-08-011-12/+21
| | | | return fontp without setting its members.
* (fontset_add): Declare args. Call make_numberDave Love2002-07-301-15/+11
| | | | | | correctly. (face_for_char): Delete unused vars. (Fset_fontset_font): Doc fix. Delete unused vars.
* (Qprepend, Qappend): New variables.Kenichi Handa2002-07-261-410/+745
| | | | | | | | | | | | | | | | | | | | | | | | | | (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.
* (fontset_ref, fontset_set, fs_load_font)Dave Love2002-07-161-5/+5
| | | | (Ffontset_info): Convert Lisp types.
* (Ffontset_info): Doc fix. Return charset names, notDave Love2002-05-251-9/+7
| | | | | ids. (font-encoding-alist): Doc fix.
* (Fclear_face_cache): Declare.Dave Love2002-05-171-8/+5
| | | | | | (accumulate_font_info): Commented-out (unused). (face_for_char, Fset_fontset_font, Ffontset_info): Remove unused variables.
* (fs_load_font): Check fontp->full_name (not fontname)Kenichi Handa2002-05-141-1/+2
| | | | against Vfont_encoding_alist.
* (free_realized_fontsets): Call Fclear_face_cache insteadKenichi Handa2002-05-131-0/+8
| | | | of calling free_reazlied_face.
* Mostly re-written.Kenichi Handa2002-03-011-564/+421
|
* Fix typos, remove unnecessary space.Pavel Janík2001-12-121-23/+22
|
* Remove variables `Vhighlight_wrong_size_font' and `Vclip_large_size_font'.Pavel Janík2001-11-141-10/+0
|
* Change doc-string comments to `new style' [w/`doc:' keyword].Pavel Janík2001-11-131-86/+86
|
* (fontset_font_pattern): Remove unused variable `family_registry'.Pavel Janík2001-11-061-1/+0
|
* Update usage of CHECK_ macros (remove unused second argument).Pavel Janík2001-11-021-16/+16
|
* (fs_load_font) [WINDOWSNT && _MSC_VER]: DisableAndrew Innes2001-10-181-0/+8
| | | | | optimization. The fontp->encoding array was not being initialized correctly when compiled with optimizations by MSVC.
* Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimentingKen Raeburn2001-10-161-8/+8
| | | | with lisp system changes.
* (Ffontset_info): Check that face is non-nullGerd Moellmann2001-05-161-1/+1
| | | | before accessing its fields.
* (syms_of_fontset): Describe highlight-wrong-size-fontKenichi Handa2001-03-131-12/+2
| | | | and clip-large-size-font as obsolete.
* (Fnew_fontset): Fix handling of the case that anKenichi Handa2001-02-241-4/+11
| | | | element of FONTLIST is a cons of family and registry.
* * fontset.c (fontset_pattern_regexp): Allocate three more bytes toAndrew Choi2001-01-281-1/+1
| | | | regex for '^', '$', and '\0'.
* (font_family_registry): Even if FONTNAME conform toKenichi Handa2001-01-281-22/+30
| | | | | | | | | | | 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_ref): Remove unused variable `i'.Eli Zaretskii2001-01-021-14/+8
| | | | | | | | | | | | | | | (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'.
* (syms_of_fontset) [WINDOWSNT]: Make default fontsize on w32 10Jason Rumney2000-10-271-1/+1
| | | | point, as Windows has oversized fonts.
* (syms_of_fontset) [WINDOWSNT]: Special case for ASCII font of defaultJason Rumney2000-10-231-1/+5
| | | | fontset on Windows.
* Initial check-in: changes for building Emacs under Mac OS.Andrew Choi2000-10-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Include keyboard.h before frame.h.Andrew Innes2000-08-221-0/+1
|
* (Finternal_char_font): Search only the selected frame for a window ofKenichi Handa2000-08-181-1/+1
| | | | the current buffer.
* (fontset_ref): Remove INLINE declaration.Kenichi Handa2000-07-241-14/+18
| | | | | | (fontset_ref_via_base): Likewise. (Fset_fontset_font): Convert FAMILY and REGISTRY specifications to downcase.
* (AREF, ASIZE): Remove definitions.Gerd Moellmann2000-07-131-4/+0
|
* (Ffontset_info): Make the return value more compatibleKenichi Handa2000-07-101-4/+17
| | | | with that of Emacs 20.
* (FONTSET_ASCII): Use the first element of char tableKenichi Handa2000-06-201-19/+16
| | | | | | | | | | 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): The arg CHARACTER may be a charset.Kenichi Handa2000-06-081-0/+10
|
* (check_registry_encoding): This function deleted.Kenichi Handa2000-05-261-31/+16
| | | | | (Fset_fontset_font): Remove the adhoc condition for the default fontset. Allow cons in FONTNAME.
* (syms_of_fontset): Adjust the font name for ascii ofKenichi Handa2000-05-261-1/+2
| | | | the default fontset to what Emacs uses by default.
* (fontset_ref): Use SPLIT_CHAR instead ofKenichi Handa2000-05-201-3/+3
| | | | | SPLIT_NON_ASCII_CHAR. (fontset_ref_via_base, fontset_set): Likewise
* (Ffontset_info): ...and another.Dave Love2000-05-181-1/+1
|
* (Ffontset_info): Fix newline in doc.Dave Love2000-05-181-1/+1
|
* Include "buffer.h".Kenichi Handa2000-05-171-74/+182
| | | | | | | | | | | | (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.
* (fs_load_font): By default, use 0x00..0x7f for ASCII.Kenichi Handa2000-05-011-2/+4
| | | | | Check Vfont_encoding_alist against the full name of the opened font.
* (Fset_fontset_font): Fix docstring. Local variableKenichi Handa2000-04-201-12/+12
| | | | name change: ch -> character.
* (make_fontset_for_ascii_face): Use XINT on return value.Ken Raeburn2000-04-081-2/+2
| | | | (Fset_fontset_font): Use EQ to compare lisp objects.
* (Fset_fontset_font, Ffontset_font): Fix newlines in doc string.Dave Love2000-03-211-9/+9
|
* All codes rewritten or adjusted for the change ofKenichi Handa2000-03-211-452/+917
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* (Vvertical_centering_font_regexp): New variable.Kenichi Handa1999-12-151-4/+17
| | | | | | | (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.
* more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engineKen Raeburn1999-10-251-33/+33
|
* (Ffont_info): Change for Lisp_Object selected_frame.Gerd Moellmann1999-09-131-12/+6
| | | | (Ffontset_info): DItto.
* (Fset_fontset_font): Fix previous change.Kenichi Handa1999-04-121-1/+1
|
* (Fquery_fontset): Check for fontset aliases here.Kenichi Handa1999-04-101-6/+7
| | | | (Fnew_fontset, Fset_fontset_font): Don't check for them here.