Mercurial > hg > xemacs-beta
diff src/frame.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/frame.c Sat Mar 23 05:08:52 2002 +0000 +++ b/src/frame.c Fri Mar 29 04:49:13 2002 +0000 @@ -189,7 +189,7 @@ struct frame *f = alloc_lcrecord_type (struct frame, &lrecord_frame); nuke_all_frame_slots (f); - XSETFRAME (frame, f); + frame = wrap_frame (f); f->device = device; f->framemeths = XDEVICE (device)->devmeths; @@ -229,7 +229,7 @@ buf = Fcurrent_buffer (); /* If buf is a 'hidden' buffer (i.e. one whose name starts with a space), try to find another one. */ - if (string_char (XSTRING (Fbuffer_name (buf)), 0) == ' ') + if (XSTRING_CHAR (Fbuffer_name (buf), 0) == ' ') buf = Fother_buffer (buf, Qnil, Qnil); Fset_window_buffer (root_window, buf, Qnil); } @@ -241,9 +241,8 @@ setup_normal_frame (struct frame *f) { Lisp_Object mini_window; - Lisp_Object frame; - - XSETFRAME (frame, f); + Lisp_Object frame = wrap_frame (f); + mini_window = allocate_window (); XWINDOW (f->root_window)->next = mini_window; @@ -309,9 +308,8 @@ /* This function can GC */ /* First make a frame containing just a root window, no minibuffer. */ Lisp_Object mini_window; - Lisp_Object frame; - - XSETFRAME (frame, f); + Lisp_Object frame = wrap_frame (f); + f->no_split = 1; f->has_minibuffer = 1; @@ -380,7 +378,7 @@ int frame_name_is_defaulted = 1; d = decode_device (device); - XSETDEVICE (device, d); + device = wrap_device (d); /* PROPS and NAME may be freshly-created, so make sure to GCPRO. */ GCPRO3 (frame, props, name); @@ -411,7 +409,7 @@ syntax_error (". not allowed in frame names", name); f = allocate_frame_core (device); - XSETFRAME (frame, f); + frame = wrap_frame (f); specbind (Qframe_being_created, name); f->name = name; @@ -646,8 +644,8 @@ adjust_frame_size (struct frame *f) { int keep_char_size = 0; - Lisp_Object frame; - XSETFRAME (frame, f); + Lisp_Object frame = wrap_frame (f); + if (!f->size_slipped) return; @@ -812,8 +810,8 @@ Lisp_Object frame = DEVICE_SELECTED_FRAME (d); if (NILP (frame)) { - Lisp_Object device; - XSETDEVICE (device, d); + Lisp_Object device = wrap_device (d); + gui_error ("No frames exist on device", device); } return XFRAME (frame); @@ -904,7 +902,7 @@ { Lisp_Object result; - XSETCONSOLE (console, decode_console (console)); + console = wrap_console (decode_console (console)); /* Just in case the machinations in delete_frame_internal() resulted in the last-nonminibuf-frame getting out of sync, make sure and return the selected frame if it's acceptable. */ @@ -959,7 +957,7 @@ */ (frame, window)) { - XSETFRAME (frame, decode_frame (frame)); + frame = wrap_frame (decode_frame (frame)); CHECK_LIVE_WINDOW (window); if (! EQ (frame, WINDOW_FRAME (XWINDOW (window)))) @@ -1230,7 +1228,7 @@ */ (frame, which_frames, which_devices)) { - XSETFRAME (frame, decode_frame (frame)); + frame = wrap_frame (decode_frame (frame)); return next_frame (frame, which_frames, which_devices); } @@ -1248,7 +1246,7 @@ */ (frame, which_frames, which_devices)) { - XSETFRAME (frame, decode_frame (frame)); + frame = wrap_frame (decode_frame (frame)); return previous_frame (frame, which_frames, which_devices); } @@ -1285,9 +1283,8 @@ int other_visible_frames (struct frame *f) { - Lisp_Object frame; - - XSETFRAME (frame, f); + Lisp_Object frame = wrap_frame (f); + if (FRAME_STREAM_P (f)) return !EQ (frame, next_frame (frame, Qt, Qt)); return !EQ (frame, next_frame (frame, Qvisible_iconic_nomini, Qt)); @@ -1324,7 +1321,7 @@ if (! FRAME_LIVE_P (f)) return; - XSETFRAME (frame, f); + frame = wrap_frame (f); GCPRO1 (frame); device = FRAME_DEVICE (f); @@ -1700,7 +1697,7 @@ if (NILP (frame)) { f = selected_frame (); - XSETFRAME (frame, f); + frame = wrap_frame (f); } else { @@ -1766,13 +1763,13 @@ find_window_by_pixel_pos (intx, inty, XFRAME (frame)->root_window); if (w) { - XSETWINDOW (window, w); + window = wrap_window (w); /* Adjust the position to be relative to the window. */ intx -= w->pixel_left; inty -= w->pixel_top; - XSETINT (x, intx); - XSETINT (y, inty); + x = make_int (intx); + y = make_int (inty); } } else if (FRAMEP (frame)) @@ -1814,7 +1811,7 @@ { lisp_x = make_int (x); lisp_y = make_int (y); - XSETWINDOW (window, w); + window = wrap_window (w); } } else if (FRAMEP (frame)) @@ -2161,8 +2158,8 @@ static void store_minibuf_frame_prop (struct frame *f, Lisp_Object val) { - Lisp_Object frame; - XSETFRAME (frame, f); + Lisp_Object frame = wrap_frame (f); + if (WINDOWP (val)) { @@ -2204,7 +2201,7 @@ Lisp_Object *face_prop_out) { Lisp_Object list = Vbuilt_in_face_specifiers; - Lisp_String *s; + Lisp_Object s; if (!SYMBOLP (sym)) return 0; @@ -2214,23 +2211,23 @@ while (!NILP (list)) { Lisp_Object prop = Fcar (list); - Lisp_String *prop_name; + Lisp_Object prop_name; if (!SYMBOLP (prop)) continue; prop_name = symbol_name (XSYMBOL (prop)); - if (string_length (s) > string_length (prop_name) + 1 - && !memcmp (string_data (prop_name), - string_data (s) + string_length (s) - - string_length (prop_name), - string_length (prop_name)) - && string_data (s)[string_length (s) - string_length (prop_name) + if (XSTRING_LENGTH (s) > XSTRING_LENGTH (prop_name) + 1 + && !memcmp (XSTRING_DATA (prop_name), + XSTRING_DATA (s) + XSTRING_LENGTH (s) + - XSTRING_LENGTH (prop_name), + XSTRING_LENGTH (prop_name)) + && XSTRING_DATA (s)[XSTRING_LENGTH (s) - XSTRING_LENGTH (prop_name) - 1] == '-') { Lisp_Object face = - Ffind_face (make_string (string_data (s), - string_length (s) - - string_length (prop_name) + Ffind_face (make_string (XSTRING_DATA (s), + XSTRING_LENGTH (s) + - XSTRING_LENGTH (prop_name) - 1)); if (!NILP (face)) { @@ -2355,7 +2352,7 @@ Lisp_Object *tailp; struct gcpro gcpro1, gcpro2; - XSETFRAME (frame, f); + frame = wrap_frame (f); GCPRO2 (frame, plist); Fcheck_valid_plist (plist); plist = Fcopy_sequence (plist); @@ -2443,7 +2440,7 @@ struct frame *f = decode_frame (frame); Lisp_Object value; - XSETFRAME (frame, f); + frame = wrap_frame (f); property = get_property_alias (property); @@ -2522,7 +2519,7 @@ GCPRO1 (result); - XSETFRAME (frame, f); + frame = wrap_frame (f); /* #### for the moment (since old code uses `frame-parameters'), we call `copy-sequence' on f->plist. That allows frame-parameters @@ -2635,7 +2632,7 @@ { struct frame *f = decode_frame (frame); int height, width; - XSETFRAME (frame, f); + frame = wrap_frame (f); CHECK_INT (lines); if (window_system_pixelated_geometry (frame)) @@ -2662,7 +2659,7 @@ { struct frame *f = decode_frame (frame); int width, height; - XSETFRAME (frame, f); + frame = wrap_frame (f); CHECK_INT (cols); if (window_system_pixelated_geometry (frame)) @@ -2689,7 +2686,7 @@ { struct frame *f = decode_frame (frame); int height, width; - XSETFRAME (frame, f); + frame = wrap_frame (f); CHECK_INT (cols); CHECK_INT (rows); @@ -2740,7 +2737,7 @@ int obw, obh, bdr; Lisp_Object frame, window; - XSETFRAME (frame, f); + frame = wrap_frame (f); if (real_face) default_face_height_and_width (frame, &cph, &cpw); else @@ -2871,7 +2868,7 @@ if (in_display) abort (); - XSETFRAME (frame, f); + frame = wrap_frame (f); default_face_height_and_width (frame, &real_font_height, 0); default_face_height_and_width_1 (frame, &font_height, &font_width); @@ -3170,7 +3167,7 @@ Lisp_Object frame; Lisp_Object new_icon; - XSETFRAME (frame, f); + frame = wrap_frame (f); new_icon = glyph_image_instance (Vframe_icon_glyph, frame, ERROR_ME_WARN, 0); if (!EQ (new_icon, f->icon))