Mercurial > emacs
view src/=environ.c @ 1719:48f539ac6921
* frame.h (struct frame): New fields `can_have_scrollbars' and
`has_vertical_scrollbars'.
(FRAME_CAN_HAVE_SCROLLBARS, FRAME_HAS_VERTICAL_SCROLLBARS): New
accessors, for both the MULTI_FRAME and non-MULTI_FRAME.
(VERTICAL_SCROLLBAR_WIDTH, WINDOW_VERTICAL_SCROLLBAR,
WINDOW_VERTICAL_SCROLLBAR_COLUMN,
WINDOW_VERTICAL_SCROLLBAR_HEIGHT): New macros.
* window.h (struct window): New field `vertical_scrollbar'.
* xterm.h (struct x_display): vertical_scrollbars,
judge_timestamp, vertical_scrollbar_extra: New fields.
(struct scrollbar): New struct.
(VERTICAL_SCROLLBAR_PIXEL_WIDTH, VERTICAL_SCROLLBAR_PIXEL_HEIGHT,
VERTICAL_SCROLLBAR_LEFT_BORDER, VERTICAL_SCROLLBAR_RIGHT_BORDER,
VERTICAL_SCROLLBAR_TOP_BORDER, VERTICAL_SCROLLBAR_BOTTOM_BORDER,
CHAR_TO_PIXEL_WIDTH, CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_WIDTH,
PIXEL_TO_CHAR_HEIGHT): New accessors and macros.
* frame.c (make_frame): Initialize the `can_have_scrollbars' and
`has_vertical_scrollbars' fields of the frame.
* term.c (term_init): Note that TERMCAP terminals don't support
scrollbars.
(mouse_position_hook): Document new args.
(set_vertical_scrollbar_hook, condemn_scrollbars_hook,
redeem_scrollbar_hook, judge_scrollbars_hook): New hooks.
* termhooks.h: Declare and document them.
(enum scrollbar_part): New type.
(struct input_event): Describe the new form of the scrollbar_click
event type. Change `part' from a Lisp_Object to an enum
scrollbar_part. Add a new field `scrollbar'.
* keyboard.c (kbd_buffer_get_event): Pass appropriate new
parameters to *mouse_position_hook, and make_lispy_movement.
* xfns.c (x_set_vertical_scrollbar): New function.
(x_figure_window_size): Use new macros to calculate frame size.
(Fx_create_frame): Note that X Windows frames do support scroll
bars. Default to "yes".
* xterm.c: #include <X11/cursorfont.h> and "window.h".
(x_vertical_scrollbar_cursor): New variable.
(x_term_init): Initialize it.
(last_mouse_bar, last_mouse_bar_frame, last_mouse_part,
last_mouse_scroll_range_start, last_mouse_scroll_range_end): New
variables.
(XTmouse_position): Use them to return scrollbar movement events.
Take new arguments, for that purpose.
(x_window_to_scrollbar, x_scrollbar_create,
x_scrollbar_set_handle, x_scrollbar_remove, x_scrollbar_move,
XTset_scrollbar, XTcondemn_scrollbars, XTredeem_scrollbar,
XTjudge_scrollbars, x_scrollbar_expose,
x_scrollbar_background_expose, x_scrollbar_handle_click,
x_scrollbar_handle_motion): New functions to implement scrollbars.
(x_term_init): Set the termhooks.h hooks to point to them.
(x_set_window_size): Use new macros to calculate frame size. Set
vertical_scrollbar_extra field.
(x_make_frame_visible): Use the frame accessor
FRAME_HAS_VERTICAL_SCROLLBARS to decide if we need to map the
frame's subwindows as well.
(XTread_socket): Use new size-calculation macros from xterm.h when
processing ConfigureNotify events.
(x_wm_set_size_hint): Use PIXEL_TO_CHAR_WIDTH and
PIXEL_TO_CHAR_HEIGHT macros.
* ymakefile (xdisp.o): This now depends on termhooks.h.
(xterm.o): This now depends on window.h.
* xterm.h (struct x_display): Delete v_scrollbar, v_thumbup,
v_thumbdown, v_slider, h_scrollbar, h_thumbup,
h_thumbdown, h_slider, v_scrollbar_width, h_scrollbar_height
fields.
* keyboard.c (Qvscrollbar_part, Qvslider_part, Qvthumbup_part,
Qvthumbdown_part, Qhscrollbar_part, Qhslider_part, Qhthumbup_part,
Qhthumbdown_part, Qscrollbar_click): Deleted; part of an obsolete
interface.
(head_table): Removed from here as well.
(syms_of_keyboard): And here.
* keyboard.h: And here.
(POSN_SCROLLBAR_BUTTON): Removed.
* xscrollbar.h: File removed - no longer necessary.
* xfns.c: Don't #include it any more.
(Qhorizontal_scroll_bar, Qvertical_scroll_bar): Deleted.
(syms_of_xfns): Don't initialize or staticpro them.
(gray_bits): Salvaged from xscrollbar.h.
(x_window_to_scrollbar): Deleted.
(x_set_horizontal_scrollbar): Deleted.
(enum x_frame_parm, x_frame_parms): Remove references to
x_set_horizontal_scrollbar.
(x_set_foreground_color, x_set_background_color,
x_set_border_pixel): Remove special code to support scrollbars.
(Fx_create_frame): Remove old scrollbar setup code.
(install_vertical_scrollbar, install_horizontal_scrollbar,
adjust_scrollbars, x_resize_scrollbars): Deleted.
* xterm.c (construct_mouse_click): This doesn't need to take care of
scrollbar clicks anymore.
(XTread_socket): Remove old code to support scrollbars. Call new
functions instead for events which occur in scrollbar windows.
(XTupdate_end): Remove call to adjust_scrollbars; the main
redisplay code takes care of that now.
(enum window_type): Deleted.
* ymakefile: Note that xfns.o no longer depends on xscrollbar.h.
* xfns.c (syms_of_xfns): Delete defvars for x_mouse_x and
x_mouse_y. That interface hasn't been live for years.
(x_mouse_x, x_mouse_y): Delete these variables.
* xfns.c (Fx_create_frame): Don't initialize the wm_hints field here.
(x_window): Do it here, along with all the similar stuff.
It's a pain to remember that you can't assign to FRAME->visible.
Let's change all references to the `visible' member of struct
frame to use the accessor macros, and then write a setter for the
`visible' field that does the right thing.
* frame.h (FRAME_VISIBLE_P): Make this not an l-value.
(FRAME_SET_VISIBLE): New macro.
* frame.c (make_terminal_frame, Fdelete_frame): Use FRAME_SET_VISIBLE.
(Fframe_visible_p, Fvisible_frame_list): Use FRAME_VISIBLE_P and
FRAME_ICONIFIED_P.
* dispnew.c (Fredraw_display): Use the FRAME_VISIBLE_P and
FRAME_GARBAGED_P accessors.
* xdisp.c (redisplay): Use the FRAME_VISIBLE_P accessor.
* xfns.c (x_set_foreground_color, x_set_background_color,
x_set_cursor_color, x_set_border_pixel, x_set_icon_type): Use the
FRAME_VISIBLE_P accessor.
(Fx_create_frame): Use FRAME_SET_VISIBILITY.
* xterm.c (clear_cursor, x_display_bar_cursor,
x_display_box_cursor): Use FRAME_SET_VISIBILITY.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Thu, 24 Dec 1992 06:19:31 +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 */