Jim Blandy [Wed, 19 Aug 1992 06:51:44 +0000 (06:51 +0000)]
* xterm.c (x_wm_hints): Variable deleted. This has to be
per-screen. Duh.
* xterm.c (x_wm_set_window_state, x_wm_set_icon_pixmap,
x_wm_set_icon_position): Use F->display.x->wm_hints, rather than
x_wm_hints.
(x_term_init): Don't initialize x_wm_hints here.
* xterm.c (x_set_text_property): Properly balance the BLOCK_INPUTs
and UNBLOCK_INPUTs. And remember that VALUE is the strin we want
to set the name to, not PROPERTY.
* xterm.c (x_set_text_property): Define this appropriately for
X11R3 and X11R4.
* xterm.c (x_set_text_property): Make this take a Lisp_Object
string as an argument, rather than a pointer and a length.
* xterm.c: Doc fixes.
* xterm.c [USG5]: Don't include <sys/types.h>.
* xterm.c (x_make_frame_invisible): Instead of calling XWithdraw
window, which isn't widely available, write out what it does,
since that's not much.
(x_iconify_frame): Explicitly perform both the X11R3 and X11R4
methods for iconification; don't use XIconifyWindow, since that's
not present in R3.
* xterm.c (x_wm_set_size_hint): Don't bother setting the
base_width and base_height members; their function is performed
just as well by the min_width and min_height members, and if we
use XSetNormalHints instead of XSetWMNormalHints, we can be
compatible with R3.
* xterm.c (x_error_handler): There is no way to invoke the default
error handler which works on all versions of X11, so don't bother;
call XGetErrorText and print the message ourselves.
* xterm.c (x_term_init): Don't use MAXHOSTNAMELEN; this isn't
defined on all systems. Since we only use that as an initial
guess anyway, it's not very important.
Jim Blandy [Wed, 19 Aug 1992 06:51:17 +0000 (06:51 +0000)]
* xrdb.c [USG5]: Define SYSV, and then include <unistd.h>. I
wish I knew why.
Don't include <sys/types.h>; just declare getuid to return an
int. Big deal.
(MAXPATHLEN): If this is not defined by the system's include
files, give it a value of 256.
(get_user_db): Fetch the defaults directly from the display
structure, rather than using XResourceManagerString; that
function doesn't exist in the older versions of X.
Jim Blandy [Wed, 19 Aug 1992 06:46:08 +0000 (06:46 +0000)]
* xfns.c (x_set_name): Take new argument EXPLICIT, instead of
OLDVAL.
(x_explicitly_set_name, x_implicitly_set_name): New functions.
(x_frame_parms): Use x_explicitly_set_name here.
(x_window): Use x_implicitly_set_name here.
* xfns.c (x_set_name): Call x_set_text_property with a Lisp_Object
string as an argument, rather than a pointer and a length.
* xfns.c (x_get_arg): Accept a new type - symbol. If we've
retrieved a string from the xrdb database and the user wants a
symbol, intern it.
(Fx_create_frame): Use the symbol type here.
* xfns.c (x_figure_window_size, x_icon, Fx_create_frame): Use
values from enum resource_types for the last arg to x_get_arg,
instead of passing numbers.
* xfns.c (Fx_create_frame): When setting up the scroll bars, use
the type parameter to x_default_parameter, rather than prefixing
the resource name with a question mark.
* xfns.c [not HAVE_X11] (Fx_create_frame): The resource which
determines whether or not to use a bitmapped icon is called
"IconType", not "BitmapIcon". Update this.
* xfns.c (x_set_name): Used x_set_text_property instead of XSetWMName and
XSetWMIconName.
* xfns.c (select_visual): Fetch the visual id directly from v;
don't call XVisualIDFromVisual, since that function is not
available in earlier versions of X.
* xfns.c (x_make_gc): cursor_bits can't be local to the function;
it's static.
* xfns.c (Fx_create_frame): Make the default for the icon-type
parameter nil, not t. It seems to cause problems with some X
servers.
Jim Blandy [Wed, 19 Aug 1992 06:40:02 +0000 (06:40 +0000)]
* window.c (Fset_window_configuration): Removed #if 0'd code which
assumes that minibuf_window is on the same frame as the window
configuration. Removed special case for windows whose prevs
point to themselves.
* window.c (Fset_window_configuration): Rename the argument from
ARG to CONFIGURATION, so it matches the docstring. The
make-docfile program cares.
* window.c [MULTI_FRAME] (syms_of_window): Don't staticpro
minibuf_window; the frame list will take care of it.
* window.c (window_loop): This used to keep track of the first
window processed and wait until we came back around to it. Sadly,
this doesn't work if that window gets deleted. So instead, use
Fprevious_window to find the last window to process, and loop
until we've done that one.
* window.c [not MULTI_FRAME] (init_window_once): Don't forget to
set the `mini_p' flag on the new minibuffer window to t.
* window.c (Fwindow_at): Don't check the type of the frame
argument.
* window.c [not MULTI_FRAME] (window_loop): Set frame to zero,
instead of trying to decode it.
* window.c (init_window_once): Initialize minibuf_window before
FRAME_ROOT_WINDOW, so the latter actually points to something.
Jim Blandy [Wed, 19 Aug 1992 06:38:40 +0000 (06:38 +0000)]
* term.c (term_get_fkeys): Some systems define `static' to be the
empty string, which means that you can't have constant
initialized arrays inside a function. So move the `keys' array
outside of the function.
* term.c (keys): Include definitions for "K2" (the center key on
an IBM keypad), "F1" (F11), and "F2" (F12). Handle "k0" and "k;"
specially; see the code for details.
* term.c (clear_end_of_line): Remember that on some systems,
"static" gets defined to be the null string, so we can't declare
an array to be static and then initialize it. Since the array in
question (buf) is only one element long, just make it a scalar
rather than an array; it can then be initialized, even if it's
not static.
Jim Blandy [Wed, 19 Aug 1992 06:37:58 +0000 (06:37 +0000)]
* sysdep.c (select): There's no need to cast the return value of
signal anymore, since we have the SIGTYPE macro defined.
* sysdep.c (read_input_waiting): When scanning for quit
characters, use the value of quit_char, rather than assuming that
C-g is the quit character. And don't forget to declare i.
Jim Blandy [Wed, 19 Aug 1992 06:36:35 +0000 (06:36 +0000)]
* ralloc.c (get_bloc): When initializing new_bloc->variable, cast
NIL to (POINTER *).
(malloc_init): Give warning if sbrk returns zero. Wonder what
that's supposed to mean.
Jim Blandy [Wed, 19 Aug 1992 06:35:23 +0000 (06:35 +0000)]
* process.c (process_send_signal): Don't send SIGTSTP if the
system doesn't have that facility.
* process.c: [USG5] Don't include <fcntl.h>.
[USG] Don't bother including termios, termio, or fcntl; systerm.h
takes care of all that.
Remove the "mis;tak-+;;" line from the code; apparently this
section of code does get used.
* process.c (wait_reading_process_input): Put comments around
text following #endif.
Jim Blandy [Wed, 19 Aug 1992 06:33:46 +0000 (06:33 +0000)]
* minibuf.c (Fread_from_minibuffer): Put this function's doc
string into a comment; it's too long for the PCC preprocessor.
Rah.
(Fcompleting_read): Same deal.
* keyboard.c (Fexecute_mouse_event): dyked-out function deleted.
We're not going to use this mouse interface.
(Vmouse_window, Vmouse_event, Vmouse_event_function,
Vmouse_left_hook, Vmap_frame_hook, Vunmap_frame_hook,
Vmouse_motion_handler): Variables deleted; they were to be used by
Fexecute_mouse_event.
(syms_of_keyboard): Same.
(command_loop_1): Remove dyked-out code to support
Fexecute_mouse_event.
(read_char): Same.
* keyboard.c (Vlast_event_frame): Don't define this window if
MULTI_FRAME is not #defined.
(syms_of_keyboard): Same.
(kbd_buffer_store_event): Don't try to work with Vlast_event_frame
if MULTI_FRAME is not #defined.
(kbd_buffer_get_event): Same.
* keyboard.c (Fdiscard_input): Removed dyked-out code from when
unread_command_char's quiescent value was -1, not nil.
Jim Blandy [Wed, 19 Aug 1992 06:19:22 +0000 (06:19 +0000)]
* data.c [USG] (Frem): Call fmod, rather than drem. Rah.
* data.c (store_symval_forwarding): When storing through a
Lisp_Buffer_Objfwd, check if the slot requires a particular type,
and report an error if the types clash.
Jim Blandy [Wed, 19 Aug 1992 06:18:37 +0000 (06:18 +0000)]
* buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
TYPE argument.
* buffer.c (buffer_local_types): New variable.
(buffer_slot_type_mismatch): New function.
Jim Blandy [Wed, 19 Aug 1992 06:18:07 +0000 (06:18 +0000)]
* alloc.c (Fmake_marker): Removed the test for being called from a
signal handler. The original bug is probably gone, the test
wasn't written portably, and it should probably go somewhere else
anyway - say, funcall or eval.
Jim Blandy [Fri, 14 Aug 1992 02:29:49 +0000 (02:29 +0000)]
* keyboard.c (Fexecute_mouse_event): dyked-out function deleted.
We're not going to use this mouse interface.
(Vmouse_window, Vmouse_event, Vmouse_event_function,
Vmouse_left_hook, Vmap_frame_hook, Vunmap_frame_hook,
Vmouse_motion_handler): Variables deleted; they were to be used by
Fexecute_mouse_event.
(syms_of_keyboard): Same.
(command_loop_1): Remove dyked-out code to support
Fexecute_mouse_event.
(read_char): Same.
* keyboard.c (Vlast_event_frame): Don't define this window if
MULTI_FRAME is not #defined.
(syms_of_keyboard): Same.
(kbd_buffer_store_event): Don't try to work with Vlast_event_frame
if MULTI_FRAME is not #defined.
(kbd_buffer_get_event): Same.
* keyboard.c (Fdiscard_input): Removed dyked-out code from when
unread_command_char's quiescent value was -1, not nil.
Jim Blandy [Fri, 14 Aug 1992 02:27:26 +0000 (02:27 +0000)]
* window.c (window_loop): This used to keep track of the first
window processed and wait until we came back around to it. Sadly,
this doesn't work if that window gets deleted. So instead, use
Fprevious_window to find the last window to process, and loop
until we've done that one.
* window.c [not MULTI_FRAME] (init_window_once): Don't forget to
set the `mini_p' flag on the new minibuffer window to t.
* window.c (Fwindow_at): Don't check the type of the frame
argument.
* window.c [not MULTI_FRAME] (window_loop): Set frame to zero,
instead of trying to decode it.
* window.c (init_window_once): Initialize minibuf_window before
FRAME_ROOT_WINDOW, so the latter actually points to something.
Jim Blandy [Wed, 12 Aug 1992 14:40:00 +0000 (14:40 +0000)]
* xterm.c (x_wm_hints): New variable.
(x_wm_set_window_state, x_wm_set_icon_pixmap,
x_wm_set_icon_position): Use x_wm_hints.
(x_term_init): Set the `input' field of x_wm_hints, and its flag.
* xterm.c (x_text_icon): Call x_wm_set_icon_pixmap with a pixmap
of zero, to clear the pixmap.
(x_wm_set_icon_pixmap): Accept this protocol; if pixmap is zero,
specify no pixmap for the icon.
* xterm.c (x_set_window_size): Call check_frame_size to make sure
that the requested dimensions are within acceptable limits.
Store the new size information in the frame structure.
* xterm.c (x_wm_set_size_hint): Don't try to set the base_height
and base_width elements of size_hints if PBaseSize is not
#defined. Set the minimum frame size according to the information
returned by check_frame_size.
* xterm.c (XTread_socket, x_do_pending_expose): Call
change_frame_size with a DELAY of 1.
* xterm.c (in_display): Deleted this; it's never used in xterm.c,
and there is another variable by the same name in dispnew.c.
* xterm.c (FRAME_IS_TERMCAP, FRAME_IS_X, FRAME_HAS_MINIBUF):
Renamed these to FRAME_TERMCAP_P, FRAME_X_P, and
FRAME_HAS_MINIBUF_P, for consistency with the rest of the
frame macros.
Jim Blandy [Wed, 12 Aug 1992 14:33:03 +0000 (14:33 +0000)]
* xfns.c (x_get_arg): Return Qunbound for an unspecified
resource, not nil. That way, we can tell the difference between a
false resource and an unspecified resource.
(x_default_error): Use DEFLT if x_get_arg returns Qunbound, not Qnil.
(x_figure_window_size, x_icon, Fx_create_frame): Deal with
Qunbound and Qnil properly.
* xfns.c (Fx_create_frame): Pass the correct number of arguments
to x_set_font.
* xfns.c [not HAVE_X11] (Fx_create_frame): Delete section that's
only included if we *do* have X11. Blind patching.
* xfns.c (x_icon): Rewritten to call x_wm_set_icon_position and
x_wm_set_window_state instead of calling XSetWMHints directly.
(x_wm_set_window_state, x_wm_set_icon_pixmap,
x_wm_set_icon_position): Use x_wm_hints.
(x_term_init): Set the `input' field of x_wm_hints, and its flag.
* xfns.c (x_default_parameter): Don't call store_frame_param here;
it's already taken care of by x_set_frame_parameters.
* xfns.c (Fx_create_frame): Check for the `icon-type',
`auto-raise', and `auto-lower' parameters. Have `icon-type'
default to t, indicating that we want the nifty gnu in our icons.
(Qauto_lower): New symbol.
* xfns.c (x_set_icon_type): UNBLOCK_INPUT before reporting the
error, not after. error doesn't return, sklitch-brain.
* xfns.c (x_set_frame_parameters): Properly recognize changes to
the height of the frame. Recognize changes of the frame's
position.
* xfns.c (x_set_frame_parameters): Iterate over ALIST while the
current element is cons, not while it's non-nil.
(syms_of_xfns): Call init_x_parm_symbols after interning all the
other atoms; init_x_parm_symbols expects Qx_frame_parameter to be
initialized.
* xfns.c (Qbackground_color, Qborder_color, Qborder_width,
Qcursor_color, Qfont, Qforeground_color, Qgeometry,
Qhorizontal_scroll_bar, Qicon_left, Qicon_top, Qiconic_startup,
Qinternal_border_width, Qleft, Qmouse_color, Qparent_id,
Qsuppress_icon, Qsuppress_initial_map, Qtop, Qundefined_color,
Qvertical_scroll_bar, Qwindow_id, Qx_frame_parameter): New
symbols, with lisp code to rebuild syms_of_xfns.
(syms_of_xfns): Initialize and staticpro them.
(Qheight, Qminibuffer, Qname, Qnone, Qonly, Qwidth,
Qunsplittable): Add extern declaration for these.
(x_init_parm_symbols): Don't initialize Qx_frame_parameter here;
it's done in syms_of_xfns.
(x_default_parameter): Change the argument char *PROPNAME into a
Lisp_Object PROP; let the caller take care of interning the atom.
(Fx_geometry, x_figure_window_size, x_icon, Fx_create_frame): Use
the new Q... variables, instead of interning things.
* xfns.c (x_set_frame_param): Replaced by x_set_frame_parameters.
(x_set_frame_parameters): Process the alist of parameters here.
Notice `width', `height', `top', and `left' parameters.
Hold off changing the frame size and position until the end, so we
can do both parameters at once when they are both specified.
(x_default_parameter): Call x_set_frame_parameters, not
x_set_frame_param.
* xfns.c (x_figure_window_size): Indicate that this function
returns an int, rather than just leaving it unstated.
* xfns.c (Fx_create_frame): Call change_frame_size with a DELAY of 0.
Jim Blandy [Wed, 12 Aug 1992 14:30:09 +0000 (14:30 +0000)]
* xdisp.c (FRAME_IS_TERMCAP, FRAME_IS_X, FRAME_HAS_MINIBUF):
Renamed these to FRAME_TERMCAP_P, FRAME_X_P, and
FRAME_HAS_MINIBUF_P, for consistency with the rest of the
frame macros.
Jim Blandy [Wed, 12 Aug 1992 14:28:27 +0000 (14:28 +0000)]
* window.c (MIN_SAFE_WINDOW_HEIGHT, MIN_SAFE_WINDOW_WIDTH): Macros
defined here now, rather than window.h.
(check_frame_size): New function.
* window.c (FRAME_IS_TERMCAP, FRAME_IS_X, FRAME_HAS_MINIBUF):
Renamed these to FRAME_TERMCAP_P, FRAME_X_P, and
FRAME_HAS_MINIBUF_P, for consistency with the rest of the
frame macros.
* window.c (check_min_window_sizes): New function.
(set_window_height): Call it.
(Fsplit_window, change_window_height): Call it, instead of writing
out its code.
Jim Blandy [Wed, 12 Aug 1992 14:18:28 +0000 (14:18 +0000)]
* term.c (FRAME_IS_TERMCAP, FRAME_IS_X, FRAME_HAS_MINIBUF):
Renamed these to FRAME_TERMCAP_P, FRAME_X_P, and
FRAME_HAS_MINIBUF_P, for consistency with the rest of the
frame macros.
Jim Blandy [Wed, 12 Aug 1992 14:16:14 +0000 (14:16 +0000)]
* scroll.c (FRAME_IS_TERMCAP, FRAME_IS_X, FRAME_HAS_MINIBUF):
Renamed these to FRAME_TERMCAP_P, FRAME_X_P, and
FRAME_HAS_MINIBUF_P, for consistency with the rest of the
frame macros.
Jim Blandy [Wed, 12 Aug 1992 14:08:21 +0000 (14:08 +0000)]
* minibuf.c (Fcompleting_read): Stop subtracting one from the
starting position, so this function lives up to its doc
string, which I think specifies an okay way to work.
Jim Blandy [Wed, 12 Aug 1992 14:05:56 +0000 (14:05 +0000)]
* keyboard.c (Fsuspend_emacs): Call change_frame_size with the
proper arguments - the height and width are the second and third
arguments, not the first and second. Pass 0 for DELAY.
* keyboard.c (FRAME_IS_TERMCAP, FRAME_IS_X,
FRAME_HAS_MINIBUF): Renamed these to FRAME_TERMCAP_P,
FRAME_X_P, and FRAME_HAS_MINIBUF_P, for consistency with the
rest of the frame macros.
Jim Blandy [Wed, 12 Aug 1992 13:55:21 +0000 (13:55 +0000)]
* frame.c (Qheight, Qicon, Qmodeline, Qname, Qnone, Qonly,
Qunsplittable, Qwidth, Qx): New symbols, with lisp code to rebuild
syms_of_frame.
(syms_of_xfns): Initialize and staticpro them.
(Fframep, Fframe_visible_p, Fframe_parameters): Use
the new Q... variables, instead of interning things.
(store_in_alist): Change the argument char *PROPNAME into a
Lisp_Object PROP; let the caller take care of interning the atom.
* frame.c (Fframe_visible_p): Doc fix.
* frame.c (Fframe_parameters): When figuring the `minibuffer'
parameter, if FRAME doesn't have a minibuffer, return `none', not
nil. If it does have a minibuffer with other windows, return the
window.
* frame.c (Fmodify_frame_parameters): Don't write out the loop for
processing X frame parameters here; do it in the x specific code.
Call the function which deals with this stuff
x_set_frame_parameters, not x_set_frame_parameter.
* frame.c [MULTI_SCREEN] (Fset_frame_height, Fset_frame_width,
Fset_frame_size): Call change_frame_size with a DELAY of 0.
[not MULTI_SCREEN] (Fset_frame_height, Fset_frame_width,
Fset_frame_size, Fset_screen_height, Fset_screen_width): Same.
* frame.c [not MULTI_SCREEN] (Fset_frame_height, Fset_frame_width,
Fset_frame_size, Fframe_height, Fframe_width): New functions, for
use when Emacs is not compiled with multiple screens.
[not MULTI_SCREEN] (Fset_screen_height, Fset_screen_width):
Functions added for backward compatibility with Emacs 18. These
would be just aliases, except that the version 18 functions don't
take a FRAME argument.
[not MULTI_SCREEN] (syms_of_frame): New function, to defsubr the
above and add screen-height and screen-width as aliases for
Fframe_height and Fframe_width.
* frame.c (Fset_frame_width): Change the size of FRAME, not of
selected_frame.
* frame.c (Fset_frame_width, Fset_frame_height): Declare the
`frame' argument to be a Lisp_Object. It used to be undeclared.
* frame.c (FRAME_IS_TERMCAP, FRAME_IS_X, FRAME_HAS_MINIBUF):
Renamed these to FRAME_TERMCAP_P, FRAME_X_P, and
FRAME_HAS_MINIBUF_P, for consistency with the rest of the
frame macros.
Jim Blandy [Wed, 12 Aug 1992 13:51:24 +0000 (13:51 +0000)]
* fileio.c (Fread_filename): When calling Fcompleting_read,
don't add one to the initial cursor position here. Do it in
Fcompleting_read, because that makes it live up to its
documentation.
Jim Blandy [Wed, 12 Aug 1992 13:48:45 +0000 (13:48 +0000)]
* emacs.c (main): Call syms_of_frame unconditionally. When
MULTI_FRAME is not defined, it still provides the Fframe_width,
Fframe_height, Fset_frame_width, and Fset_frame_height functions.
Jim Blandy [Wed, 12 Aug 1992 13:36:49 +0000 (13:36 +0000)]
* dispnew.c (Fredraw_frame): Call clear_frame_records before
calling update_end, so that x_display_box_cursor can rely on the
contents of f->current_glyphs.
* dispnew.c (change_frame_size): Call check_frame_size here,
rather than writing out its code. Don't declare newheight and
newwidth to be register variables, since we take their address.
* dispnew.c (in_display): Variable deleted; it's only ever used as
an unofficial parameter to change_frame_size.
(change_frame_size): New argument, DELAY, which when non-zero
indicates to delay the size change until later. This should be
passed as one from signal handlers.
(window_change_signal): Call change_frame_size with a DELAY of 1.
(do_pending_window_change): Call change_frame_size with DELAY of 0.
* dispnew.c, frame.c, frame.h, keyboard.c, scroll.c, term.c,
window.c, xdisp.c, xfns.c xterm.c (FRAME_IS_TERMCAP, FRAME_IS_X,
FRAME_HAS_MINIBUF): Renamed these to FRAME_TERMCAP_P, FRAME_X_P,
and FRAME_HAS_MINIBUF_P, for consistency with the rest of the
frame macros.
Jim Blandy [Wed, 5 Aug 1992 05:18:27 +0000 (05:18 +0000)]
Clear the eighth bit of the character from the key sequence, NOT the
index of the character IN the key sequence. How many tries will it
take to get it right?