Commit graph

97 commits

Author SHA1 Message Date
Thien-Thi Nguyen
0b5538bd85 Update years in copyright notice; nfc. 2005-08-07 12:33:19 +00:00
Lute Kamstra
4fc5845fe8 Update FSF's address. 2005-07-04 16:49:24 +00:00
Kenichi Handa
87ede5a106 (fontset_set): Fix previous change. 2005-04-25 06:50:51 +00:00
Kenichi Handa
b9c1591618 *** empty log message *** 2005-04-22 07:11:21 +00:00
Kenichi Handa
8f2e667359 (set_default_ascii_font): New function.
(syms_of_fontset): Don't set FONTSET_ASCII (Vdefault_fontset)
here.
2005-03-08 08:45:48 +00:00
Kenichi Handa
a653f81218 (fontset_pattern_regexp): Cancel my previous change;
don't pay attention to '\' before '*'.
(fontset_pattern_regexp): Change the meaning of the second arg.
(Fnew_fontset): Call fs_query_fontset, not Fquery_fontset.
(check_fontset_name): Try NAME as literal at first, and if it
failes, try NAME as pattern.
2004-11-08 00:38:48 +00:00
Kim F. Storm
6cc06608ad (fontset_pattern_regexp): Use unsigned char. 2004-11-04 23:12:33 +00:00
Kenichi Handa
b912921c67 (fontset_pattern_regexp): If '*' is preceded by '\',
treat it as a literal character.
2004-11-04 02:28:51 +00:00
Kenichi Handa
fc1062f541 (fontset_pattern_regexp): Optimize for the case that
PATTERN is full XLFD.
2004-10-25 02:03:47 +00:00
Kenichi Handa
6e1b0d8c4f (fs_load_font): Use fast_string_match_ignore_case for
comparing font names.
(fs_query_fontset): Use fast_string_match for comparing fontset
names.
(list_fontsets): Likewise.
2004-10-18 12:28:18 +00:00
Stefan Monnier
85b0dba0fb (Fset_fontset_font): Remove unused vars family' and registry'. 2004-06-30 19:34:15 +00:00
Kenichi Handa
cf14fd6ec4 (Finternal_char_font): If POSITION is nil, return
font for displaying CH with the default face.
2004-04-23 02:04:13 +00:00
John Paul Wallington
4ce2719dbb (regularize_fontname): Renamed from regulalize_fontname. 2004-04-20 00:26:36 +00:00
Kenichi Handa
07836f47b2 (fontset_font_pattern): Fix previous change. 2004-01-19 00:22:03 +00:00
Kenichi Handa
9da88f3786 (fontset_ref_via_base): Fix previous change. 2004-01-07 00:24:44 +00:00
Kenichi Handa
2f65c7b5ef (Voverriding_fontspec_alist): New variable.
(lookup_overriding_fontspec): New function.
(fontset_ref_via_base): Call lookup_overriding_fontspec if
necessary.
(fontset_font_pattern): Likewise.
(regulalize_fontname): New function.
(Fset_fontset_font): Call regulalize_fontname.
(Fset_overriding_fontspec_internal): New function.
(syms_of_fontset): Initialize and staticprop
Voverriding_fontspec_alist.
(syms_of_fontset): Defsubr Sset_overriding_fontspec_internal.
2003-12-29 06:53:50 +00:00
Jan Djärv
7c40296995 Remove period at end of error message. 2003-11-16 16:17:09 +00:00
Kenichi Handa
de5c0f3959 (fs_load_font): Don't set fontp->font_encoder to NULL
before calling find_ccl_program_func.  Call find_ccl_program_func
only when fontp->font_encoder is not NULL.
2003-10-02 02:06:08 +00:00
Kenichi Handa
e5bc082b29 (Finternal_char_font): Change return value to
cons (FONT-NAME . GLYPH-CODE).
2003-09-28 23:17:47 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Richard M. Stallman
6117a9cde1 (Ffontset_info): Pass new arg to map_char_table. 2003-05-17 12:46:53 +00:00
Juanma Barranquero
bad421f7a9 *** empty log message *** 2003-02-20 14:13:03 +00:00
Kenichi Handa
0134e6da12 (Fset_fontset_font): Document that NAME nil means the default
fontset.
(Ffontset_info): Likewise.
(Ffontset_font): Likewise.
2003-02-20 12:42:39 +00:00
Kenichi Handa
e2b45cf9a0 (check_fontset_name): If NAME is nil, return the
default fontset.
(override_font_info): New function.
(Ffontset_info): If FONTSET is not the default fontset, merge
FONTSET onto the copy of the default fontset, and work on that
copy.
2003-02-20 08:40:35 +00:00
Kenichi Handa
77c49b4ce6 (syms_of_fontset): Setup Vfont_encoding_alist here. 2003-01-17 08:10:00 +00:00
Juanma Barranquero
f83d92b2f8 (Fset_fontset_font): Fix spacing. 2002-09-06 09:03:22 +00:00
Ken Raeburn
637ddd3204 (font_family_registry, fs_query_fontset):
(list_fontsets): Use const for pointer to lisp string data.
2002-07-16 19:48:21 +00:00
Ken Raeburn
20cddf4e9f (Fset_fontset_font): Use SDATA instead of XSTRING()->data. 2002-07-16 16:35:27 +00:00
Ken Raeburn
d5db40779d Most uses of XSTRING combined with STRING_BYTES or indirection changed to
SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references
left unchanged for now.
2002-07-15 00:01:34 +00:00
Andrew Choi
f00691a3e4 In src/:
2002-06-16  Andrew Choi  <akochoi@shaw.ca>

        * fontset.c (syms_of_fontset) [MAC_OS]: Set ASCII font of
        Vdefault_fontset to Monaco with mac-roman coding.

        * mac.c, macfns.c, macmenu.c, macterm.c: Undefine and redefine
        init_process before and after inclusion of Carbon/Carbon.h, resp.

        * macterm.c (x_new_font): Set font for normal_gc, reverse_gc, and
        cursor_gc.
        (add_font_name_table_entry): New function.
        (init_font_name_table): Use add_font_name_table_entry; add italic,
        bold, and bold-italic entries for truetype fonts.

        * xfaces.c (init_frame_faces) [MAC_OS]: Call realize_basic_faces
        for Mac too.
        (try_font_list) [MAC_OS]: If no font matches given registry, try
        fonts with any registry matching face_family.
        (realize_x_face) [MAC_OS]: Remove old ad-hoc fix to load font
        here.

        * s/darwin.h: If autoconf detects the Ncurses library, define
        LIBS_TERMCAP to -lncurses to use it.

In lisp/:

2002-06-16  Andrew Choi  <akochoi@shaw.ca>

        * term/mac-win.el (scalable-fonts-allowed): Set to t.
2002-06-16 23:08:57 +00:00
Ken Raeburn
7c2379772d * fontset.c (Fset_fontset_font): Use SYMBOL_NAME and XSTRING
instead of XSYMBOL and name field.
2002-05-20 08:05:48 +00:00
Andrew Choi
e0f712ba55 Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
lisp/ChangeLog, and src/ChangeLog for list of changes.
2002-04-26 23:39:06 +00:00
Pavel Janík
fc8865fc5a Fix typos, remove unnecessary space. 2001-12-12 20:06:10 +00:00
Pavel Janík
2dc42b12c1 Remove variables Vhighlight_wrong_size_font' and Vclip_large_size_font'. 2001-11-14 13:38:51 +00:00
Pavel Janík
335c5470b5 Change doc-string comments to new style' [w/doc:' keyword]. 2001-11-13 07:48:37 +00:00
Pavel Janík
17893c65bd (fontset_font_pattern): Remove unused variable `family_registry'. 2001-11-06 13:19:01 +00:00
Pavel Janík
b782650360 Update usage of CHECK_ macros (remove unused second argument). 2001-11-02 20:46:55 +00:00
Andrew Innes
97f4db8c94 (fs_load_font) [WINDOWSNT && _MSC_VER]: Disable
optimization.  The fontp->encoding array was not being initialized
correctly when compiled with optimizations by MSVC.
2001-10-18 16:23:14 +00:00
Ken Raeburn
f3fbd15535 Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
with lisp system changes.
2001-10-16 09:09:51 +00:00
Gerd Moellmann
dbcf3c03ca (Ffontset_info): Check that face is non-null
before accessing its fields.
2001-05-16 10:18:36 +00:00
Kenichi Handa
e521c67d55 (syms_of_fontset): Describe highlight-wrong-size-font
and clip-large-size-font as obsolete.
2001-03-13 08:14:35 +00:00
Kenichi Handa
41d79f4d2b (Fnew_fontset): Fix handling of the case that an
element of FONTLIST is a cons of family and registry.
2001-02-24 02:45:00 +00:00
Andrew Choi
5604ec34e4 * fontset.c (fontset_pattern_regexp): Allocate three more bytes to
regex for '^', '$', and '\0'.
2001-01-28 15:41:57 +00:00
Kenichi Handa
8d04974a78 (font_family_registry): Even if FONTNAME conform to
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.
2001-01-28 01:12:01 +00:00
Eli Zaretskii
1337ac7772 (fontset_ref): Remove unused variable `i'.
(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'.
2001-01-02 14:11:36 +00:00
Jason Rumney
842c80a36f (syms_of_fontset) [WINDOWSNT]: Make default fontsize on w32 10
point, as Windows has oversized fonts.
2000-10-27 18:57:17 +00:00
Jason Rumney
82d9a3b9c5 (syms_of_fontset) [WINDOWSNT]: Special case for ASCII font of default
fontset on Windows.
2000-10-23 22:10:00 +00:00
Andrew Choi
1a578e9be2 Initial check-in: changes for building Emacs under Mac OS.
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.
2000-10-22 16:50:16 +00:00
Andrew Innes
2538fae4f8 Include keyboard.h before frame.h. 2000-08-22 22:41:00 +00:00
Kenichi Handa
851ab85e39 (Finternal_char_font): Search only the selected frame for a window of
the current buffer.
2000-08-18 05:05:39 +00:00