xemacs-beta: src/frame.c comparison

comparison src/frame.c @ 1318:b531bf8658e9

[xemacs-hg @ 2003-02-21 06:56:46 by ben] redisplay fixes et al. PROBLEMS: Add comment about Cygwin, unexec and sysmalloc. Move some non-general stuff out of general. Make a section for x86. configure.in: Add check for broken alloca in funcalls. mule/mule-cmds.el: Alias file-name to native not vice-versa. Do set EOL of native but not of process output to fix various problems and be consistent with code-init.el. code-cmds.el: Return a name not a coding system. code-init.el: Reindent. Remove `file-name' since it should always be the same as native. unicode.el: Rename to load-unicode-mapping-table as suggested by the anonymous (but rather Turnbullian) comment in unicode.c. xemacs.dsp: Add /k to default build. alloc.c: Make gc_currently_forbidden static. config.h.in, lisp.h: Move some stuff to lisp.h. console-gtk.h, console-impl.h, console-msw.h, console-x.h, event-Xt.c, event-msw.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, gtk-xemacs.c: Remove duplicated code to redraw exposed area. Add deadbox method needed by the generalized redraw code. Defer redrawing if already in redisplay. frame-msw.c, event-stream.c, frame.c: Add comments about calling Lisp. debug.c, general-slots.h: Move generalish symbols to general-slots.h. doprnt.c: reindent. lisp.h, dynarr.c: Add debug code for locking a dynarr to catch invalid mods. Use in redisplay.c. eval.c: file-coding.c: Define file-name as alias for native not vice-versa. frame-gtk.c, frame-x.c: Move Qwindow_id to general-slots. dialog-msw.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, gui.c, gui.h, menubar-msw.c, menubar.c: Ensure that various glyph functions that eval within redisplay protect the evals. Same for calls to internal_equal(). Modify various functions, e.g. gui_item_*(), to protect evals within redisplay, taking an in_redisplay parameter if it's possible for them to be called both inside and outside of redisplay. gutter.c: Defer specifier-changed updating till after redisplay, if necessary, since we need to enter redisplay to do it. gutter.c: Do nothing if in redisplay. lisp.h: Add version of alloca() for use in function calls. lisp.h: Add XCAD[D+]R up to 6 D's, and aliases X1ST, X2ND, etc. frame.c, frame.h, redisplay.c, redisplay.h, signal.c, toolbar.c: Redo critical-section code and move from frame.c to redisplay.c. Require that every place inside of redisplay catch errors itself, not at the edge of the critical section (thereby bypassing the rest of redisplay and leaving things in an inconsistent state). Introduce separate means of holding frame-size changes without entering a complete critical section. Introduce "post-redisplay" methods for deferring things till after redisplay. Abort if we enter redisplay reentrantly. Disable all quit checking in redisplay since it's too dangerous. Ensure that all calls to QUIT trigger an abort if unprotected. redisplay.c, scrollbar-gtk.c, scrollbar-x.c, scrollbar.c: Create enter/exit_redisplay_critical_section_maybe() for code that needs to ensure it's in a critical section but doesn't interfere with an existing critical section. sysdep.c: Use _wexecve() when under Windows NT for Unicode correctness. text.c, text.h: Add new_dfc() functions, which return an alloca()ed value rather than requiring an lvalue. (Not really used yet; used in another workspace, to come.) Add some macros for SIZED_EXTERNAL. Update the encoding aliases after involved scrutinization of the X manual. unicode.c: Answer the anonymous but suspiciously Turnbullian questions. Rename parse-unicode-translation-table to load-unicode-mapping-table, as suggested.

author	ben
date	Fri, 21 Feb 2003 06:57:21 +0000
parents	671b65f2b075
children	969b7290edca

comparison

equal deleted inserted replaced

-:d9d08dc5e617
+:b531bf8658e9
 /* Generic frame functions.
 Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-Copyright (C) 1995, 1996, 2002 Ben Wing.
+Copyright (C) 1995, 1996, 2002, 2003 Ben Wing.
 Copyright (C) 1995 Sun Microsystems, Inc.
 This file is part of XEmacs.
 XEmacs is free software; you can redistribute it and/or modify it
 {
 return FRAME_LIVE_P (f);
 }
-#ifdef ERROR_CHECK_TRAPPING_PROBLEMS
-static Lisp_Object
-commit_ritual_suicide (Lisp_Object ceci_nest_pas_une_pipe)
-{
-assert (!in_display);
-return Qnil;
-}
-#endif
-/*
-* window size changes are held up during critical regions.  Afterwards,
-* we want to deal with any delayed changes.
-*/
-int
-enter_redisplay_critical_section (void)
-{
-int depth = specpdl_depth ();
-/* NOTE NOTE NOTE: Inside the redisplay critical section, every place
-that could QUIT or call Lisp code needs to be wrapped, since GC
-or a non-local exit will be fatal.  The way to do this is with
-call_trapping_problems(..., INHIBIT_GC), or the like. */
-#ifdef ERROR_CHECK_TRAPPING_PROBLEMS
-/* Force every call to QUIT to check for in_displayness.  This will
-verify proper wrapping, as in the previous comment, aborting if not. */
-something_happened++;
-record_unwind_protect (commit_ritual_suicide, Qnil);
-#endif
-begin_gc_forbidden ();
-in_display = 1;
-return depth;
-}
-void
-exit_redisplay_critical_section (int depth)
-{
-Lisp_Object frmcons, devcons, concons;
-in_display = 0;
-unbind_to (depth);
-#ifdef ERROR_CHECK_TRAPPING_PROBLEMS
-something_happened--;
-#endif
-/* we used to have a function to do this for only one frame, and
-it was typical to call it at the end of a critical section
-(which occurs once per frame); but what then happens if multiple
-frames have frame changes held up?
-this means we are O(N^2) over frames.  i seriously doubt it matters.
---ben */
-FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
-{
-struct frame *f = XFRAME (XCAR (frmcons));
-if (f->size_change_pending)
-	change_frame_size (f, f->new_height, f->new_width, 0);
-}
-}
 void
 invalidate_vertical_divider_cache_in_frame (struct frame *f)
 {
 /* Invalidate cached value of needs_vertical_divider_p in
 every and all windows */
 * frame.
 */
 void
 adjust_frame_size (struct frame *f)
 {
+/* This can call Lisp. */
 int keep_char_size = 0;
 Lisp_Object frame = wrap_frame (f);
 if (!f->size_slipped)
 return;
 /* Don't adjust tty frames. #### May break when TTY have menubars.
 				     int pretend);
 static void
 store_minibuf_frame_prop (struct frame *f, Lisp_Object val)
 {
+/* This can call Lisp. */
 Lisp_Object frame = wrap_frame (f);
 if (WINDOWP (val))
 {
 if (! MINI_WINDOW_P (XWINDOW (val)))
 	gui_error
 and `default-mswindows-frame-plist' for a description of the properties
 recognized for particular types of frames.
 */
 (frame, plist))
 {
+/* This can call Lisp. */
 struct frame *f = decode_frame (frame);
 Lisp_Object tail;
 Lisp_Object *tailp;
 struct gcpro gcpro1, gcpro2;
 }
 static void
 internal_set_frame_size (struct frame *f, int cols, int rows, int pretend)
 {
+/* This can call Lisp.  See mswindows_set_frame_size(). */
 /* An explicit size change cancels any pending frame size adjustment */
-CLEAR_FRAME_SIZE_SLIPPED(f);
+CLEAR_FRAME_SIZE_SLIPPED (f);
 if (pretend || !HAS_FRAMEMETH_P (f, set_frame_size))
 change_frame_size (f, rows, cols, 0);
 else
 FRAMEMETH (f, set_frame_size, (f, cols, rows));
 Optional third arg non-nil means that redisplay should use LINES lines
 but that the idea of the actual height of the frame should not be changed.
 */
 (frame, lines, pretend))
 {
+/* This can call Lisp. */
 struct frame *f = decode_frame (frame);
 int height, width;
 frame = wrap_frame (f);
 CHECK_INT (lines);
 Optional third arg non-nil means that redisplay should be HEIGHT pixels tall
 but that the idea of the actual height of the frame should not be changed.
 */
 (frame, height, pretend))
 {
+/* This can call Lisp. */
 struct frame *f = decode_frame (frame);
 int pheight, width;
 frame = wrap_frame (f);
 CHECK_INT (height);
 Optional third arg non-nil means that redisplay should be HEIGHT pixels tall
 but that the idea of the actual height of the frame should not be changed.
 */
 (frame, height, pretend))
 {
+/* This can call Lisp. */
 struct frame *f = decode_frame (frame);
 int pheight, width;
 frame = wrap_frame (f);
 CHECK_INT (height);
 Optional third arg non-nil means that redisplay should use COLS columns
 but that the idea of the actual width of the frame should not be changed.
 */
 (frame, cols, pretend))
 {
+/* This can call Lisp. */
 struct frame *f = decode_frame (frame);
 int width, height;
 frame = wrap_frame (f);
 CHECK_INT (cols);
 Optional third arg non-nil means that redisplay should be WIDTH wide
 but that the idea of the actual height of the frame should not be changed.
 */
 (frame, width, pretend))
 {
+/* This can call Lisp. */
 struct frame *f = decode_frame (frame);
 int height, pwidth;
 frame = wrap_frame (f);
 CHECK_INT (width);
 Optional third arg non-nil means that redisplay should be WIDTH wide
 but that the idea of the actual height of the frame should not be changed.
 */
 (frame, width, pretend))
 {
+/* This can call Lisp. */
 struct frame *f = decode_frame (frame);
 int height, pwidth;
 frame = wrap_frame (f);
 CHECK_INT (width);
 Optional fourth arg non-nil means that redisplay should use COLS by ROWS
 but that the idea of the actual size of the frame should not be changed.
 */
 (frame, cols, rows, pretend))
 {
+/* This can call Lisp. */
 struct frame *f = decode_frame (frame);
 int height, width;
 frame = wrap_frame (f);
 CHECK_INT (cols);
 CHECK_INT (rows);
 Optional fourth arg non-nil means that redisplay should use WIDTH by HEIGHT
 but that the idea of the actual size of the frame should not be changed.
 */
 (frame, width, height, pretend))
 {
+/* This can call Lisp. */
 struct frame *f = decode_frame (frame);
 int pheight, pwidth;
 frame = wrap_frame (f);
 CHECK_INT (width);
 CHECK_INT (height);
 Optional fourth arg non-nil means that redisplay should use WIDTH by HEIGHT
 but that the idea of the actual size of the frame should not be changed.
 */
 (frame, width, height, pretend))
 {
+/* This can call Lisp. */
 struct frame *f = decode_frame (frame);
 int pheight, pwidth;
 frame = wrap_frame (f);
 CHECK_INT (width);
 CHECK_INT (height);
 is being "changed" to its existing size, and do nothing if so? */
 /* No, because it would hose toolbar updates.  The toolbar
 update code relies on this function to cause window `top' and
 `left' coordinates to be recomputed even though no frame size
 change occurs. --kyle */
-if (in_display)
+if (in_display || hold_frame_size_changes)
 abort ();
 frame = wrap_frame (f);
 default_face_height_and_width (frame, &real_font_height, 0);
 fact. f->size_change_pending will get reset below. The most that
 can happen is that we will cycle through redisplay once more
 --andy. */
 MARK_FRAME_SIZE_CHANGED (f);
-if (delay || in_display || gc_in_progress)
+if (delay || hold_frame_size_changes || gc_in_progress)
 {
 f->new_width = newwidth;
 f->new_height = newheight;
 return;
 }

Mercurial > hg > xemacs-beta

comparison src/frame.c @ 1318:b531bf8658e9