Mercurial > hg > xemacs-beta
diff src/gutter.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 | e22b0213b713 |
| children | e809f7e2883c |
line wrap: on
line diff
--- a/src/gutter.c Thu Feb 20 22:52:51 2003 +0000 +++ b/src/gutter.c Fri Feb 21 06:57:21 2003 +0000 @@ -335,10 +335,11 @@ calculate_gutter_size (struct window *w, enum gutter_pos pos) { struct frame* f = XFRAME (WINDOW_FRAME (w)); - int count; - display_line_dynarr* ddla; + display_line_dynarr *ddla; Lisp_Object ret = Qnil; + /* Callers need to handle this. */ + assert (!in_display); /* degenerate case */ if (NILP (RAW_WINDOW_GUTTER (w, pos)) || @@ -347,26 +348,31 @@ NILP (w->buffer)) return Qnil; - /* Redisplay code that we use relies on GC not happening. Make it - so. */ - count = begin_gc_forbidden (); + if (!in_display) + { + int count; + + /* We are calling directly into redisplay from the outside, so turn on + critical section protection. */ + count = enter_redisplay_critical_section (); - ddla = Dynarr_new (display_line); - /* generate some display lines */ - generate_displayable_area (w, WINDOW_GUTTER (w, pos), - FRAME_LEFT_BORDER_END (f), - FRAME_TOP_BORDER_END (f), - FRAME_RIGHT_BORDER_START (f) - - FRAME_LEFT_BORDER_END (f), - FRAME_BOTTOM_BORDER_START (f) - - FRAME_TOP_BORDER_END (f), - ddla, 0, 0); + ddla = Dynarr_new (display_line); + /* generate some display lines */ + generate_displayable_area (w, WINDOW_GUTTER (w, pos), + FRAME_LEFT_BORDER_END (f), + FRAME_TOP_BORDER_END (f), + FRAME_RIGHT_BORDER_START (f) + - FRAME_LEFT_BORDER_END (f), + FRAME_BOTTOM_BORDER_START (f) + - FRAME_TOP_BORDER_END (f), + ddla, 0, 0); - /* Let GC happen again. */ - unbind_to (count); + /* Let GC happen again. */ + exit_redisplay_critical_section (count); - ret = make_int (calculate_gutter_size_from_display_lines (pos, ddla)); - free_display_lines (ddla); + ret = make_int (calculate_gutter_size_from_display_lines (pos, ddla)); + free_display_lines (ddla); + } return ret; } @@ -693,17 +699,13 @@ int height) { enum gutter_pos pos; - int depth; - /* We have to be "in display" when we output the gutter - make it - so. */ - depth = enter_redisplay_critical_section (); + /* We are already inside the critical section -- our caller did that. */ GUTTER_POS_LOOP (pos) { if (FRAME_GUTTER_VISIBLE (f, pos)) redraw_exposed_gutter (f, pos, x, y, width, height); } - exit_redisplay_critical_section (depth); } void @@ -749,13 +751,12 @@ if (cur != new) { - int depth; - /* The following calls will automatically cause the dirty flags to be set; we delay frame size changes to avoid lots of frame flickering. */ /* #### I think this should be GC protected. -sb */ - depth = enter_redisplay_critical_section (); + int depth = begin_hold_frame_size_changes (); + set_specifier_fallback (Vgutter[cur], list1 (Fcons (Qnil, Qnil))); set_specifier_fallback (Vgutter[new], Vdefault_gutter); set_specifier_fallback (Vgutter_size[cur], list1 (Fcons (Qnil, Qzero))); @@ -769,9 +770,9 @@ Vdefault_gutter_border_width); set_specifier_fallback (Vgutter_visible_p[cur], list1 (Fcons (Qnil, Qt))); set_specifier_fallback (Vgutter_visible_p[new], Vdefault_gutter_visible_p); + Vdefault_gutter_position = position; - Vdefault_gutter_position = position; - exit_redisplay_critical_section (depth); + unbind_to (depth); } run_hook (Qdefault_gutter_position_changed_hook); @@ -885,21 +886,39 @@ Fset_specifier_dirty_flag (real_one[pos]); } +static void gutter_specs_changed (Lisp_Object specifier, struct window *w, + Lisp_Object oldval, enum gutter_pos pos); + +static void +gutter_specs_changed_1 (Lisp_Object arg) +{ + gutter_specs_changed (X1ST (arg), XWINDOW (X2ND (arg)), + X3RD (arg), (enum gutter_pos) XINT (X4TH (arg))); + free_list (arg); +} + static void gutter_specs_changed (Lisp_Object specifier, struct window *w, - Lisp_Object oldval, enum gutter_pos pos) + Lisp_Object oldval, enum gutter_pos pos) { - w->real_gutter[pos] = construct_window_gutter_spec (w, pos); - w->real_gutter_size[pos] = w->gutter_size[pos]; + if (in_display) + register_post_redisplay_action (gutter_specs_changed_1, + list4 (specifier, wrap_window (w), + oldval, make_int (pos))); + else + { + w->real_gutter[pos] = construct_window_gutter_spec (w, pos); + w->real_gutter_size[pos] = w->gutter_size[pos]; - if (EQ (w->real_gutter_size[pos], Qautodetect) - && !NILP (w->gutter_visible_p[pos])) - { - w->real_gutter_size [pos] = calculate_gutter_size (w, pos); + if (EQ (w->real_gutter_size[pos], Qautodetect) + && !NILP (w->gutter_visible_p[pos])) + { + w->real_gutter_size [pos] = calculate_gutter_size (w, pos); + } + MARK_GUTTER_CHANGED; + MARK_MODELINE_CHANGED; + MARK_WINDOWS_CHANGED (w); } - MARK_GUTTER_CHANGED; - MARK_MODELINE_CHANGED; - MARK_WINDOWS_CHANGED (w); } /* We define all of these so we can access which actual gutter changed. */ @@ -938,24 +957,43 @@ recompute_overlaying_specifier (Vgutter); } +static void gutter_geometry_changed_in_window (Lisp_Object specifier, + struct window *w, + Lisp_Object oldval); + +static void +gutter_geometry_changed_in_window_1 (Lisp_Object arg) +{ + gutter_geometry_changed_in_window (X1ST (arg), XWINDOW (X2ND (arg)), + X3RD (arg)); + free_list (arg); +} + static void gutter_geometry_changed_in_window (Lisp_Object specifier, struct window *w, Lisp_Object oldval) { - enum gutter_pos pos; - GUTTER_POS_LOOP (pos) + if (in_display) + register_post_redisplay_action (gutter_geometry_changed_in_window_1, + list3 (specifier, wrap_window (w), + oldval)); + else { - w->real_gutter_size[pos] = w->gutter_size[pos]; - if (EQ (w->real_gutter_size[pos], Qautodetect) - && !NILP (w->gutter_visible_p[pos])) + enum gutter_pos pos; + GUTTER_POS_LOOP (pos) { - w->real_gutter_size [pos] = calculate_gutter_size (w, pos); + w->real_gutter_size[pos] = w->gutter_size[pos]; + if (EQ (w->real_gutter_size[pos], Qautodetect) + && !NILP (w->gutter_visible_p[pos])) + { + w->real_gutter_size [pos] = calculate_gutter_size (w, pos); + } } - } - MARK_GUTTER_CHANGED; - MARK_MODELINE_CHANGED; - MARK_WINDOWS_CHANGED (w); + MARK_GUTTER_CHANGED; + MARK_MODELINE_CHANGED; + MARK_WINDOWS_CHANGED (w); + } } static void @@ -1055,6 +1093,10 @@ { Lisp_Object devcons, concons; + /* Can't reentrantly enter redisplay */ + if (in_display) + return Qnil; + DEVICE_LOOP_NO_BREAK (devcons, concons) { struct device *d = XDEVICE (XCAR (devcons));