1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-18 10:16:51 +00:00
Commit Graph

229 Commits

Author SHA1 Message Date
Gerd Moellmann
c242484757 (face-spec-set): Interpret a nil in specs for
foreground and background colors as `unspecified', for
compatibility with 20.x.
2000-12-18 15:05:02 +00:00
Miles Bader
4385f1b08d WS 2000-12-15 03:18:26 +00:00
Miles Bader
f9056dd941 (read-face-attribute): If there's no entry for the user's input in
VALID, just use it as-is (this will often result in an error, but it may
be OK for e.g. colors using hexadecimal notation, and at least will
yield a better error message).
2000-12-15 03:12:09 +00:00
Miles Bader
6e4240195f (frame-set-background-mode): Avoid stomping on locally modified faces. 2000-12-06 05:11:20 +00:00
Kenichi Handa
8ac2d32f18 (face-font-registry-alternatives): Add entries for CJK
fonts.  Doc-string adjusted for the actual usage of this data.
2000-12-04 06:27:16 +00:00
Gerd Moellmann
e3fa42c299 (face-foreground, face-background, face-stipple):
Return nil if attribute is unspecified, for backward
compatibility.
2000-11-29 19:21:17 +00:00
Gerd Moellmann
bdc03dd96f (face-set-after-frame-default): Let face attributes
specified for new frames override frame parameters.
2000-11-24 13:16:13 +00:00
Miles Bader
ebd040584d (menu): Make inverse-video on ttys too. 2000-11-22 15:32:13 +00:00
Gerd Moellmann
2392ccb758 (face-set-after-frame-default): If
`inhibit-default-face-x-resources' is bound, don't intiialize the
default face from X resources.
2000-11-15 19:22:06 +00:00
Miles Bader
bdab1d433f (header-line): Use `:box nil' for color/gs displays too. 2000-11-14 09:02:02 +00:00
Eli Zaretskii
1695ca2b15 (face-spec-set-match-display): Revert the change from
2000-10-24.  Add a FIXME for after v21.1.
2000-11-13 15:03:35 +00:00
Dave Love
f676894c4e (face-font-registry-alternatives): Add :version. 2000-11-12 00:38:44 +00:00
Gerd Moellmann
18f1dcb449 (face-font-registry-alternatives): New user-option. 2000-11-10 14:34:23 +00:00
Eli Zaretskii
53990c845c (tty-handle-reverse-video): New function.
(tty-create-frame-with-faces): Call it.
2000-10-28 17:17:42 +00:00
Miles Bader
073f69e6f7 (face-spec-choose): Change syntax so that the list of attribute-value
pairs is now the cdr of each clause, not the cadr.  Detect old-style
entries, and handle them.  Use pop.
2000-10-27 01:46:13 +00:00
Miles Bader
c698842f20 (face-spec-set-match-display):
Add `graphic' display type (the inverse of `tty').
  Use `display-graphic-p' instead of the window-system variable.
2000-10-24 06:16:20 +00:00
Miles Bader
94fe8a31c7 (face-default-spec, face-user-default-spec): Make defsubsts. 2000-10-24 01:17:23 +00:00
Miles Bader
96c2938fc9 (face-user-default-spec, face-default-spec): New functions.
(face-spec-choose, face-spec-set): Document nil-SPEC behavior.
(frame-set-background-mode, face-set-after-frame-default):
  Use `face-user-default-spec'.  Simplify code slightly.
2000-10-23 05:32:59 +00:00
Miles Bader
984905989e (header-line): Make more reasonable on mono/grayscale displays. 2000-10-23 04:50:20 +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
Miles Bader
1e221c163c (color-values, color-defined-p): Use `member', not
`memq', because it works correctly for strings.
(frame-set-background-mode): Actually, "unspecified-fg" and
"unspecified-bg" *are* strings.  Use `member', not `memq', and
`equal', not `eq', when a string value is possible.
2000-10-21 22:29:38 +00:00
Miles Bader
d8abcd91a3 (frame-set-background-mode): `unspecified' &c are symbols, not strings. 2000-10-19 08:37:11 +00:00
Eli Zaretskii
772139c0a6 (frame-set-background-mode): If a tty frame defines a
background color, use that to compute the background mode, instead
of always defaulting to "dark".
2000-10-19 06:56:50 +00:00
Miles Bader
1cb4393ea7 (header-line): Change tty-variant to use underlining. 2000-10-12 07:52:42 +00:00
Miles Bader
2af966f9ad (region): Make dark-background `region' face less in-your-face. 2000-10-11 10:39:08 +00:00
Miles Bader
f161d53913 (frame-set-background-mode):
Only do anything if the bg-mode or display-type has actually changed.
  Use `dolist'.
2000-10-11 10:02:10 +00:00
Miles Bader
4b33f2900f (frame-set-background-mode):
Pay attention to saved face specs as well as default ones.
2000-10-11 07:43:17 +00:00
Miles Bader
445a653e23 (secondary-selection): Make foreground visible on tty. 2000-10-08 04:28:35 +00:00
Miles Bader
55a3d2a170 (mode-line, tool-bar): Merge entries for x' and w32'. 2000-09-20 08:46:32 +00:00
Miles Bader
37a9982199 (face-valid-attribute-values): Make sure directories we search for
stipples both exist and are readable before trying to search them.
2000-09-20 07:42:51 +00:00
Miles Bader
690d30e676 (secondary-selection): Make dark-background variant sane. 2000-09-18 05:48:14 +00:00
Miles Bader
53c9ab4f44 (header-line): Tweak face. 2000-09-17 17:05:15 +00:00
Miles Bader
a114b1ca6e (header-line): Change defaults to be less confusing when mixed with mode-lines. 2000-09-17 16:42:09 +00:00
Dave Love
b5325e7880 (face-x-resources): Make custom type more specific.
(frame-background-mode): Use mapc.
(region) <defcustom>: Add :version.
2000-09-10 21:55:22 +00:00
Gerd Moellmann
10ab7a5122 (face-spec-set): Only face-spec-reset-face when
ATTRS is non-nil.
2000-09-08 13:51:08 +00:00
Gerd Moellmann
b0285112e8 (color-values): Doc fix. 2000-09-07 14:10:09 +00:00
Gerd Moellmann
7542976865 (frame-set-background-mode): Use frame-parameter
instead of frame-parameters.
2000-09-07 11:39:31 +00:00
Gerd Moellmann
70a267c9b5 (set-face-attribute): Simplify by calling
internal-set-lisp-face-attribute with FRAME being 0.
2000-09-07 09:50:30 +00:00
Gerd Moellmann
bfe27647ad (set-face-attribute, face-spec-reset-face)
(face-spec-set): Avoid consing by removing calls to `apply'.
2000-09-05 15:54:58 +00:00
Miles Bader
48ec993922 (read-face-font, read-face-and-attribute): Tweak prompts. 2000-08-27 02:04:26 +00:00
Miles Bader
a0e5a5a49c (face-x-resources): Add entry for :inherit. 2000-08-26 11:50:06 +00:00
Miles Bader
19feb949ce (set-face-attribute):
Update doc string.
(face-attribute-name-alist):
  Add :inherit.
(face-valid-attribute-values):
  Handle :inherit.
(face-read-string):
  Rephrase prompt to be less confusing.
  Assume that DEFAULT is a string, since we must return a string.
(face-read-integer):
  Use `format' to turn DEFAULT into an acceptable default for face-read-string.
  Match NEW-VALUE against the string "unspecified", not the symbol
    `unspecified', since that's what face-read-string returns.
(read-face-attribute):
  Lookup a name for old-value in valid, and use it as a default if we find one.
  Treat all values from face-read-string as strings.
  If the default is used, don't do any more processing on the value,
    just use the old value directly.
(read-face-and-attribute, modify-face):
  Tweak prompt.
(read-face-name):
  Don't assume prompt ends with a space.
2000-08-26 10:59:51 +00:00
Miles Bader
25ac7b52b0 (describe-face): Add support for :inherit attribute. 2000-08-26 05:51:52 +00:00
Miles Bader
a9de7d29be (face-attr-match-p):
Don't return true if ATTRS are merely a subset of FACE's attributes.
2000-08-20 12:02:24 +00:00
Gerd Moellmann
94354bddf1 (face-font-selection-order)
(face-font-family-alternatives): Add custom type.
2000-07-18 19:07:15 +00:00
Gerd Moellmann
01eac4fdef (frame-background-mode): Doc fix. 2000-07-13 17:43:58 +00:00
Gerd Moellmann
c96308624c (face-spec-set): Ignore invalid attributes like 20.x.
(face-x-resources): Remove duplicate entry for :font.
2000-07-03 13:47:23 +00:00
Gerd Moellmann
0a9c90a068 (region): Change background color for light background. 2000-06-28 20:19:02 +00:00
Gerd Moellmann
d6d5905738 (fringe): Change face for different backgrounds. 2000-06-26 15:05:34 +00:00
Gerd Moellmann
f6478c6609 (tool-bar, mode-line, header-line): Specify foreground
color.
2000-06-23 05:57:18 +00:00