Mercurial > hg > xemacs-beta
diff src/window.c @ 793:e38acbeb1cae
[xemacs-hg @ 2002-03-29 04:46:17 by ben]
lots o' fixes
etc/ChangeLog: New file.
Separated out all entries for etc/ into their own ChangeLog.
Includes entries for the following files:
etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad,
etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL,
etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS,
etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL,
etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se,
etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh,
etc/custom/example-themes/europe-theme.el,
etc/custom/example-themes/ex-custom-file,
etc/custom/example-themes/example-theme.el, etc/e/eterm.ti,
etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1,
etc/gnuserv.README, etc/package-index.LATEST.gpg,
etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm,
etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs,
etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E,
etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm,
etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm,
etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar,
etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1,
etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL,
etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el,
etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\*
unicode/unicode-consortium/8859-16.TXT: New file.
mule/english.el: Define this charset now, since a bug was fixed that formerly
prevented it.
mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be
integers.
Makefile.in.in: Always include gui.c, to fix compile error when TTY-only.
EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo().
Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate
nearly all uses of Lisp_String * in favor of Lisp_Object, and
correct macros so most of them favor Lisp_Object.
Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings,
but at level `debug' (usually ignored). Use it when instantiating
specifiers, so problems can be debugged. Move
log-warning-minimum-level into C so that we can optimize
ERROR_ME_DEBUG_WARN.
Fix warning levels consistent with new definitions.
Add default_ and parent fields to char table; not yet implemented.
New fun Dynarr_verify(); use for further error checking on Dynarrs.
Rearrange code at top of lisp.h in conjunction with dynarr changes.
Fix eifree(). Use Eistrings in various places
(format_event_object(), where_is_to_char(), and callers thereof)
to avoid fixed-size strings buffers. New fun write_eistring().
Reindent and fix GPM code to follow standards.
Set default MS Windows font to Lucida Console (same size as
Courier New but less interline spacing, so more lines fit).
Increase default frame size on Windows to 50 lines. (If that's too
big for the workspace, the frame will be shrunk as necessary.)
Fix problem with text files with no newlines (). (Change
`convert-eol' coding system to use `nil' for autodetect,
consistent with make-coding-system.)
Correct compile warnings in vm-limit.c.
Fix handling of reverse-direction charsets to avoid errors when
opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el.
Recode some object printing methods to use write_fmt_string()
instead of a fixed buffer and sprintf.
Turn on display of png comments as warnings (level `info'), now
that they're unobtrusive.
Revamped the sound documentation.
Fixed bug in redisplay w.r.t. hscroll/truncation/continuation
glyphs causing jumping up and down of the lines, since they're
bigger than the line size. (It was seen most obviously when
there's a horizontal scroll bar, e.g. do C-h a glyph or something
like that.) The problem was that the glyph-contrib-p setting on
glyphs was ignored even if it was set properly, which it wasn't
until now.
| author | ben |
|---|---|
| date | Fri, 29 Mar 2002 04:49:13 +0000 |
| parents | 943eaba38521 |
| children | a5954632b187 |
line wrap: on
line diff
--- a/src/window.c Sat Mar 23 05:08:52 2002 +0000 +++ b/src/window.c Fri Mar 29 04:49:13 2002 +0000 @@ -1,7 +1,7 @@ /* Window creation, deletion and examination for XEmacs. Copyright (C) 1985-1987, 1992-1995 Free Software Foundation, Inc. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. - Copyright (C) 1995, 1996 Ben Wing. + Copyright (C) 1995, 1996, 2002 Ben Wing. Copyright (C) 1996 Chuck Thompson. This file is part of XEmacs. @@ -241,7 +241,7 @@ struct window *p = alloc_lcrecord_type (struct window, &lrecord_window); zero_lcrecord (p); - XSETWINDOW (val, p); + val = wrap_window (p); p->dead = 0; @@ -636,7 +636,7 @@ { Lisp_Object parent, current_ancestor, window; - XSETWINDOW (window, w); + window = wrap_window (w); parent = XWINDOW (window)->parent; current_ancestor = window; @@ -659,7 +659,7 @@ { Lisp_Object parent, current_ancestor, window; - XSETWINDOW (window, w); + window = wrap_window (w); parent = XWINDOW (window)->parent; current_ancestor = window; @@ -688,7 +688,7 @@ { Lisp_Object parent, current_ancestor, window; - XSETWINDOW (window, w); + window = wrap_window (w); parent = XWINDOW (window)->parent; current_ancestor = window; @@ -716,7 +716,7 @@ { Lisp_Object parent, current_ancestor, window; - XSETWINDOW (window, w); + window = wrap_window (w); parent = XWINDOW (window)->parent; current_ancestor = window; @@ -994,7 +994,7 @@ if (MINI_WINDOW_P (w)) return 0; - XSETWINDOW (window, w); + window = wrap_window (w); b = XBUFFER (w->buffer); margin_cwidth = (left_margin ? XINT (w->left_margin_width) : XINT (w->right_margin_width)); @@ -2285,7 +2285,7 @@ If that happens, go back to the selected frame so we can complete the cycle. */ if (EQ (tem, tem1)) - XSETFRAME (tem, selected_frame ()); + tem = wrap_frame (selected_frame ()); } tem = FRAME_ROOT_WINDOW (XFRAME (tem)); @@ -2440,7 +2440,7 @@ If that happens, go back to the selected frame so we can complete the cycle. */ if (EQ (tem, tem1)) - XSETFRAME (tem, selected_frame ()); + tem = wrap_frame (selected_frame ()); } /* If this frame has a minibuffer, find that window first, @@ -2489,7 +2489,7 @@ { Lisp_Object root; struct window *w = decode_window (window); - XSETWINDOW (window, w); + window = wrap_window (w); if (MINI_WINDOW_P (XWINDOW (window))) return Qnil; @@ -2647,7 +2647,7 @@ Lisp_Object the_frame; if (frame) - XSETFRAME (the_frame, frame); + the_frame = wrap_frame (frame); else the_frame = DEVICE_SELECTED_FRAME (XDEVICE (device)); @@ -2859,8 +2859,8 @@ { Lisp_Object buffer, frame; - XSETFRAME (frame, f); - XSETBUFFER (buffer, b); + frame = wrap_frame (f); + buffer = wrap_buffer (b); return XINT (window_loop (GET_BUFFER_WINDOW_COUNT, buffer, 0, frame, 1, Qnil)); @@ -3040,7 +3040,7 @@ Charbpos start_pos; int old_top = WINDOW_TOP (w); - XSETWINDOW (window, w); + window = wrap_window (w); if (MINI_WINDOW_P (w) && old_top > 0) invalid_operation ("Can't expand minibuffer to full frame", Qunbound); @@ -3126,8 +3126,8 @@ value = list_windows (XWINDOW (w->vchild), value); else { - Lisp_Object window; - XSETWINDOW (window, w); + Lisp_Object window = wrap_window (w); + value = Fcons (window, value); } if (NILP (w->next)) @@ -3663,7 +3663,7 @@ struct window *o = XWINDOW (window); struct window *p = alloc_lcrecord_type (struct window, &lrecord_window); - XSETWINDOW (new, p); + new = wrap_window (p); copy_lcrecord (p, o); /* Don't copy the pointers to the line start cache or the face @@ -3899,9 +3899,8 @@ int avail_height; int defheight, defwidth; int char_height; - Lisp_Object window; - - XSETWINDOW (window, w); + Lisp_Object window = wrap_window (w); + avail_height = (pixel_height - (include_gutters_p ? 0 : @@ -3928,9 +3927,8 @@ int defheight, defwidth; int pixel_height; - Lisp_Object window; - - XSETWINDOW (window, w); + Lisp_Object window = wrap_window (w); + default_face_height_and_width (window, &defheight, &defwidth); @@ -3991,7 +3989,7 @@ Lisp_Object window; int defheight, defwidth; - XSETWINDOW (window, w); + window = wrap_window (w); if (dl->modeline) { @@ -4045,9 +4043,8 @@ int avail_width; int char_width; int defheight, defwidth; - Lisp_Object window; - - XSETWINDOW (window, w); + Lisp_Object window = wrap_window (w); + avail_width = (pixel_width - window_left_gutter_width (w, 0) - @@ -4074,9 +4071,8 @@ int avail_width; int pixel_width; int defheight, defwidth; - Lisp_Object window; - - XSETWINDOW (window, w); + Lisp_Object window = wrap_window (w); + default_face_height_and_width (window, &defheight, &defwidth); @@ -4156,7 +4152,7 @@ check_min_window_sizes (); - XSETWINDOW (window, win); + window = wrap_window (win); f = XFRAME (win->frame); if (EQ (window, FRAME_ROOT_WINDOW (f))) invalid_operation ("Won't change only window", Qunbound); @@ -4819,7 +4815,7 @@ /* #### Is this going to work right when at eob? */ arg = Fprefix_numeric_value (arg); if (XINT (arg) < 0) - XSETINT (arg, XINT (arg) + height); + arg = make_int (XINT (arg) + height); } start = marker_position (w->start[CURRENT_DISP]); @@ -5104,7 +5100,6 @@ #define SAVED_WINDOW_N(conf, n) (&((conf)->saved_windows[(n)])) #define XWINDOW_CONFIGURATION(x) XRECORD (x, window_configuration, struct window_config) -#define XSETWINDOW_CONFIGURATION(x, p) XSETRECORD (x, p, window_configuration) #define wrap_window_configuration(p) wrap_record (p, window_configuration) #define WINDOW_CONFIGURATIONP(x) RECORDP (x, window_configuration) #define CHECK_WINDOW_CONFIGURATION(x) CHECK_RECORD (x, window_configuration) @@ -5948,7 +5943,7 @@ config = (struct window_config *) alloc_lcrecord (sizeof_window_config_for_n_windows (n_windows), &lrecord_window_configuration); - XSETWINDOW_CONFIGURATION (result, config); + result = wrap_window_configuration (config); /* config->frame_width = FRAME_WIDTH (f); config->frame_height = FRAME_HEIGHT (f); */ @@ -5966,7 +5961,7 @@ config->current_window = FRAME_LAST_NONMINIBUF_WINDOW (f); #endif config->current_window = FRAME_SELECTED_WINDOW (f); - XSETBUFFER (config->current_buffer, current_buffer); + config->current_buffer = wrap_buffer (current_buffer); config->minibuffer_scroll_window = Vminibuffer_scroll_window; config->root_window = FRAME_ROOT_WINDOW (f); config->min_height = window_min_height; @@ -5977,7 +5972,7 @@ /* save the minibuffer height using the heuristics from change_frame_size_1 */ - XSETFRAME (frame, f); /* frame could have been nil ! */ + frame = wrap_frame (f); /* frame could have been nil ! */ default_face_height_and_width (frame, &real_font_height, 0); assert(real_font_height > 0);