Mercurial > emacs
view src/=environ.c @ 26729:f5dded41adcc
Changes for automatic remapping of X colors on terminal frames:
* xfaces.c (XColor) [!HAVE_X_WINDOWS]: Provide a typedef for non-X
frames.
(Vface_tty_color_alist): Remove.
(tty_defined_color): New function.
(defined_color): Rewrite to support any type of frame.
(tty_color_name): New function.
(face_color_supported_p, Fface_color_gray_p,
Fface_color_supported_p): Support non-X frames.
(load_color): Enclose the color name in quotes, in the log
messages. Remove DOS-specific version of load_color.
(realize_tty_face): Take the supported colors from
tty-color-alist. Support translation of X colors to the closest
tty color, for both MSDOS and tty frames.
[MSDOS]: Don't invert face colors if they were taken from the
frame colors.
(Fface_register_tty_color, Fface_clear_tty_colors): Remove.
* frame.h (struct x_output) [!MSDOS, !WINDOWSNT, !HAVE_X_WINDOWS]:
Define a mostly empty surrogate.
(tty_display): Declare.
* frame.c (make_terminal_frame) [!macintosh]: Don't use
tty_display.
(Fframe_parameters): Don't invert colors of non-FRAME_WINDOW_P
frames when the frame's param_alist includes 'reverse.
(tty_display): Define.
(make_terminal_frame) [!MSDOS]: Assign &tty_display to the
output_data.x member.
(Fframe_parameters): Return foreground and background color names
on tty frames as well, in addition to MSDOS frames.
* msdos.h (DisplayWidth, DisplayHeight): Changes for Lisp_Object
selected_frame.
(struct x_output): Remove unused members; document who uses each
member.
(FRAME_PARAM_FACES, FRAME_N_PARAM_FACES, FRAME_DEFAULT_PARAM_FACE,
FRAME_MODE_LINE_PARAM_FACE, FRAME_COMPUTED_FACES,
FRAME_N_COMPUTED_FACES, FRAME_SIZE_COMPUTED_FACES,
FRAME_DEFAULT_FACE, FRAME_MODE_LINE_FACE, unload_color): Remove
unused macro definintions.
* msdos.c (IT_set_frame_parameters): Don't call
recompute_basic_faces, the next redisplay will, anyway.
(x_current_display): Remove unused variable.
Many functions: changes for Lisp_object selected_frame.
(IT_set_face): If the tty_reverse_p flag is set for the face,
reverse the foreground and background colors.
(Fmsdos_remember_default_colors): New function.
(syms_of_msdos): Defsubr it.
(IT_set_frame_parameters): Use initial_screen_colors[] when
creating a new frame. If the frame parameters include 'reverse,
swap the foreground and background colors.
(internal_terminal_init): Initialize initial_screen_colors to -1.
(syms_of_msdos): Add DEFVAR_BOOL for x-stretch-cursor, to shut up
cus-start.el.
* Makefile.in (lisp, shortlisp): Add lisp/term/tty-colors.elc.
* xfns.c (x_defined_color): Rename from defined_color. All
callers changed.
(Fxw_color_defined_p): Renamed from Fx_color_defined_p;
all callers changed.
(Fxw_color_values): Renamed from Fx_color_values; all callers
changed.
(Fxw_display_color_p): Renamed from Fx_display_color_p; all
callers changed.
(x_window_to_frame, x_any_window_to_frame,
x_non_menubar_window_to_frame, x_menubar_window_to_frame,
x_top_window_to_frame): Use !FRAME_X_P instead of
f->output_data.nothing.
* xterm.h (x_defined_color): Rename from defined_color.
* w32fns.c (x_window_to_frame): Use FRAME_W32_P instead of
f->output_data.nothing.
(Fxw_color_defined_p): Renamed from Fx_color_defined_p;
all callers changed.
(Fxw_color_values): Renamed from Fx_color_values; all callers
changed.
(Fxw_display_color_p): Renamed from Fx_display_color_p; all
callers changed.
* dispextern.h (tty_color_name): Add prototype.
* xmenu.c (menubar_id_to_frame): Use FRAME_WINDOW_P instead of
f->output_data.nothing.
* w32menu.c (menubar_id_to_frame): Likewise.
* w32term.h (w32_output): Declare.
* dosfns.c (Qmsdos_color_translate): Remove.
(msdos_stdcolor_name): Now returns a Lisp_Object.
* dosfns.h (Qmsdos_color_translate): Remove.
* s/msdos.h (INTERNAL_TERMINAL): Add entries for color support.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Mon, 06 Dec 1999 16:54:09 +0000 |
parents | c7c930b84dbb |
children |
line wrap: on
line source
/* Environment-hacking for GNU Emacs subprocess Copyright (C) 1986 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "config.h" #include "lisp.h" #ifdef MAINTAIN_ENVIRONMENT #ifdef VMS you lose -- this is un*x-only #endif /* alist of (name-string . value-string) */ Lisp_Object Venvironment_alist; extern char **environ; void set_environment_alist (str, val) register Lisp_Object str, val; { register Lisp_Object tem; tem = Fassoc (str, Venvironment_alist); if (NULL (tem)) if (NULL (val)) ; else Venvironment_alist = Fcons (Fcons (str, val), Venvironment_alist); else if (NULL (val)) Venvironment_alist = Fdelq (tem, Venvironment_alist); else XCONS (tem)->cdr = val; } static void initialize_environment_alist () { register unsigned char **e, *s; extern char *index (); for (e = (unsigned char **) environ; *e; e++) { s = (unsigned char *) index (*e, '='); if (s) set_environment_alist (make_string (*e, s - *e), build_string (s + 1)); } } unsigned char * getenv_1 (str, ephemeral) register unsigned char *str; int ephemeral; /* if ephmeral, don't need to gc-proof */ { register Lisp_Object env; int len = strlen (str); for (env = Venvironment_alist; CONSP (env); env = XCONS (env)->cdr) { register Lisp_Object car = XCONS (env)->car; register Lisp_Object tem = XCONS (car)->car; if ((len == XSTRING (tem)->size) && (!bcmp (str, XSTRING (tem)->data, len))) { /* Found it in the lisp environment */ tem = XCONS (car)->cdr; if (ephemeral) /* Caller promises that gc won't make him lose */ return XSTRING (tem)->data; else { register unsigned char **e; unsigned char *s; int ll = XSTRING (tem)->size; /* Look for element in the original unix environment */ for (e = (unsigned char **) environ; *e; e++) if (!bcmp (str, *e, len) && *(*e + len) == '=') { s = *e + len + 1; if (strlen (s) >= ll) /* User hasn't either hasn't munged it or has set it to something shorter -- we don't have to cons */ goto copy; else goto cons; }; cons: /* User has setenv'ed it to a diferent value, and our caller isn't guaranteeing that he won't stash it away somewhere. We can't just return a pointer to the lisp string, as that will be corrupted when gc happens. So, we cons (in such a way that it can't be freed -- though this isn't such a problem since the only callers of getenv (as opposed to those of egetenv) are very early, before the user -could- have frobbed the environment. */ s = (unsigned char *) xmalloc (ll + 1); copy: bcopy (XSTRING (tem)->data, s, ll + 1); return (s); } } } return ((unsigned char *) 0); } /* unsigned -- stupid delcaration in lisp.h */ char * getenv (str) register unsigned char *str; { return ((char *) getenv_1 (str, 0)); } unsigned char * egetenv (str) register unsigned char *str; { return (getenv_1 (str, 1)); } #if (1 == 1) /* use caller-alloca versions, rather than callee-malloc */ int size_of_current_environ () { register int size; Lisp_Object tem; tem = Flength (Venvironment_alist); size = (XINT (tem) + 1) * sizeof (unsigned char *); /* + 1 for environment-terminating 0 */ for (tem = Venvironment_alist; !NULL (tem); tem = XCONS (tem)->cdr) { register Lisp_Object str, val; str = XCONS (XCONS (tem)->car)->car; val = XCONS (XCONS (tem)->car)->cdr; size += (XSTRING (str)->size + XSTRING (val)->size + 2); /* 1 for '=', 1 for '\000' */ } return size; } void get_current_environ (memory_block) unsigned char **memory_block; { register unsigned char **e, *s; register int len; register Lisp_Object tem; e = memory_block; tem = Flength (Venvironment_alist); s = (unsigned char *) memory_block + (XINT (tem) + 1) * sizeof (unsigned char *); for (tem = Venvironment_alist; !NULL (tem); tem = XCONS (tem)->cdr) { register Lisp_Object str, val; str = XCONS (XCONS (tem)->car)->car; val = XCONS (XCONS (tem)->car)->cdr; *e++ = s; len = XSTRING (str)->size; bcopy (XSTRING (str)->data, s, len); s += len; *s++ = '='; len = XSTRING (val)->size; bcopy (XSTRING (val)->data, s, len); s += len; *s++ = '\000'; } *e = 0; } #else /* dead code (this function mallocs, caller frees) superseded by above (which allows caller to use alloca) */ unsigned char ** current_environ () { unsigned char **env; register unsigned char **e, *s; register int len, env_len; Lisp_Object tem; Lisp_Object str, val; tem = Flength (Venvironment_alist); env_len = (XINT (tem) + 1) * sizeof (char *); /* + 1 for terminating 0 */ len = 0; for (tem = Venvironment_alist; !NULL (tem); tem = XCONS (tem)->cdr) { str = XCONS (XCONS (tem)->car)->car; val = XCONS (XCONS (tem)->car)->cdr; len += (XSTRING (str)->size + XSTRING (val)->size + 2); } e = env = (unsigned char **) xmalloc (env_len + len); s = (unsigned char *) env + env_len; for (tem = Venvironment_alist; !NULL (tem); tem = XCONS (tem)->cdr) { str = XCONS (XCONS (tem)->car)->car; val = XCONS (XCONS (tem)->car)->cdr; *e++ = s; len = XSTRING (str)->size; bcopy (XSTRING (str)->data, s, len); s += len; *s++ = '='; len = XSTRING (val)->size; bcopy (XSTRING (val)->data, s, len); s += len; *s++ = '\000'; } *e = 0; return env; } #endif /* dead code */ DEFUN ("getenv", Fgetenv, Sgetenv, 1, 2, "sEnvironment variable: \np", "Return the value of environment variable VAR, as a string.\n\ When invoked interactively, print the value in the echo area.\n\ VAR is a string, the name of the variable,\n\ or the symbol t, meaning to return an alist representing the\n\ current environment.") (str, interactivep) Lisp_Object str, interactivep; { Lisp_Object val; if (str == Qt) /* If arg is t, return whole environment */ return (Fcopy_alist (Venvironment_alist)); CHECK_STRING (str, 0); val = Fcdr (Fassoc (str, Venvironment_alist)); if (!NULL (interactivep)) { if (NULL (val)) message ("%s not defined in environment", XSTRING (str)->data); else message ("\"%s\"", XSTRING (val)->data); } return val; } DEFUN ("setenv", Fsetenv, Ssetenv, 1, 2, "sEnvironment variable: \nsSet %s to value: ", "Set the value of environment variable VAR to VALUE.\n\ Both args must be strings. Returns VALUE.") (str, val) Lisp_Object str; Lisp_Object val; { Lisp_Object tem; CHECK_STRING (str, 0); if (!NULL (val)) CHECK_STRING (val, 0); set_environment_alist (str, val); return val; } syms_of_environ () { staticpro (&Venvironment_alist); defsubr (&Ssetenv); defsubr (&Sgetenv); } init_environ () { Venvironment_alist = Qnil; initialize_environment_alist (); } #endif /* MAINTAIN_ENVIRONMENT */