Lisp_Object Qgutter_visible;
Lisp_Object Qdefault_gutter_position_changed_hook;
+static void
+update_gutter_geometry (struct frame *f, enum gutter_pos pos);
+
#define SET_GUTTER_WAS_VISIBLE_FLAG(frame, pos, flag) \
do { \
switch (pos) \
return frame->right_gutter_was_visible;
default:
abort ();
+ return 0; /* To keep the compiler happy */
}
}
int line, border_width;
face_index findex;
display_line_dynarr* ddla, *cdla;
- struct display_line *dl;
+ struct display_line *dl = 0;
int cdla_len;
if (!WINDOW_LIVE_P (w))
}
/* grab coordinates of last line and blank after it. */
- dl = Dynarr_atp (ddla, Dynarr_length (ddla) - 1);
- ypos = dl->ypos + dl->descent - dl->clip;
+ if (Dynarr_length (ddla) > 0)
+ {
+ dl = Dynarr_atp (ddla, Dynarr_length (ddla) - 1);
+ ypos = dl->ypos + dl->descent - dl->clip;
+ }
+ else
+ ypos = y;
+
redisplay_clear_region (window, findex, x + border_width , ypos,
width - 2 * border_width, height - (ypos - y) - border_width);
+ /* If, for some reason, we have more to display than we have
+ room for, and we are allowed to resize the gutter, then make
+ sure this happens before the next time we try and
+ output. This can happen when face font sizes change. */
+ if (dl && dl->clip > 0 && EQ (w->gutter_size[pos], Qautodetect))
+ {
+ /* #### Ideally we would just mark the specifier as dirty
+ and everything else would "just work". Unfortunately we have
+ two problems with this. One is that the specifier cache
+ won't be recalculated unless the specifier code thinks the
+ cached value has actually changed, even though we have
+ marked the specifier as dirty. Additionally, although doing
+ this results in a gutter size change, we never seem to get
+ back into redisplay so that the frame size can be updated. I
+ think this is because we are already in redisplay and later
+ on the frame will be marked as clean. Thus we also have to
+ force a pending recalculation of the frame size. */
+ w->gutter_size[pos] = Qnil;
+ Fset_specifier_dirty_flag (Vgutter_size[pos]);
+ update_gutter_geometry (f, pos);
+ }
+
/* bevel the gutter area if so desired */
if (border_width != 0)
{
/* We have to change the gutter geometry separately to the gutter
update since it needs to occur outside of redisplay proper. */
+static void
+update_gutter_geometry (struct frame *f, enum gutter_pos pos)
+{
+ /* If the gutter geometry has changed then re-layout the
+ frame. If we are in display there is almost no point in doing
+ anything else since the frame size changes will be delayed
+ until we are out of redisplay proper. */
+ if (FRAME_GUTTER_BOUNDS (f, pos) != f->current_gutter_bounds[pos])
+ {
+ int width, height;
+ pixel_to_char_size (f, FRAME_PIXWIDTH (f), FRAME_PIXHEIGHT (f),
+ &width, &height);
+ change_frame_size (f, height, width, 0);
+ }
+
+ /* Mark sizes as up-to-date. */
+ f->current_gutter_bounds[pos] = FRAME_GUTTER_BOUNDS (f, pos);
+}
+
void
update_frame_gutter_geometry (struct frame *f)
{
until we are out of redisplay proper. */
GUTTER_POS_LOOP (pos)
{
- if (FRAME_GUTTER_BOUNDS (f, pos) != f->current_gutter_bounds[pos])
- {
- int width, height;
- pixel_to_char_size (f, FRAME_PIXWIDTH (f), FRAME_PIXHEIGHT (f),
- &width, &height);
- change_frame_size (f, height, width, 0);
- break;
- }
- }
-
- GUTTER_POS_LOOP (pos)
- {
- /* Mark sizes as up-to-date. */
- f->current_gutter_bounds[pos] = FRAME_GUTTER_BOUNDS (f, pos);
+ update_gutter_geometry (f, pos);
}
}
}
if (((x + width) < g_x) || (x > (g_x + g_width)))
return;
+#ifdef DEBUG_WIDGETS
+ printf ("redrawing gutter after expose %d+%d, %dx%d\n",
+ x, y, width, height);
+#endif
/* #### optimize this - redrawing the whole gutter for every expose
is very expensive. We reset the current display lines because if
they're being exposed they are no longer current. */
int height)
{
enum gutter_pos pos;
+
+ /* We have to be "in display" when we output the gutter - make it
+ so. */
+ hold_frame_size_changes ();
GUTTER_POS_LOOP (pos)
{
if (FRAME_GUTTER_VISIBLE (f, pos))
redraw_exposed_gutter (f, pos, x, y, width, height);
}
+ unhold_one_frame_size_changes (f);
}
void
DEFUN ("gutter-specifier-p", Fgutter_specifier_p, 1, 1, 0, /*
Return non-nil if OBJECT is a gutter specifier.
-Gutter specifiers are used to specify the format of a gutter.
-The values of the variables `default-gutter', `top-gutter',
-`left-gutter', `right-gutter', and `bottom-gutter' are always
-gutter specifiers.
-
-Valid gutter instantiators are called "gutter descriptors" and are
-either strings or property-lists of strings. See `default-gutter' for
-a description of the exact format.
+
+See `make-gutter-specifier' for a description of possible gutter
+instantiators.
*/
(object))
{
DEFUN ("gutter-size-specifier-p", Fgutter_size_specifier_p, 1, 1, 0, /*
Return non-nil if OBJECT is a gutter-size specifier.
-Gutter-size specifiers are used to specify the size of a gutter. The
-values of the variables `default-gutter-size', `top-gutter-size',
-`left-gutter-size', `right-gutter-size', and `bottom-gutter-size' are
-always gutter-size specifiers.
-
-Valid gutter-size instantiators are either integers or the special
-symbol 'autodetect. If a gutter-size is set to 'autodetect them the
-size of the gutter will be adjusted to just accomodate the gutters
-contents. 'autodetect only works for top and bottom gutters.
+See `make-gutter-size-specifier' for a description of possible gutter-size
+instantiators.
*/
(object))
{
DEFUN ("gutter-visible-specifier-p", Fgutter_visible_specifier_p, 1, 1, 0, /*
Return non-nil if OBJECT is a gutter-visible specifier.
-Gutter-visible specifiers are used to specify the visibility of a
-gutter. The values of the variables `default-gutter-visible-p',
-`top-gutter-visible-p', `left-gutter-visible-p',
-`right-gutter-visible-p', and `bottom-gutter-visible-p' are always
-gutter-visible specifiers.
-
-Valid gutter-visible instantiators are t, nil or a list of symbols.
-If a gutter-visible instantiator is set to a list of symbols, and the
-correspondong gutter specification is a property-list strings, then
-elements of the gutter specification will only be visible if the
-corresponding symbol occurs in the gutter-visible instantiator.
+See `make-gutter-visible-specifier' for a description of possible
+gutter-visible instantiators.
*/
(object))
{
DEVICE_FRAME_LOOP (frmcons, d)
{
struct frame *f = XFRAME (XCAR (frmcons));
-
+
+ MAYBE_DEVMETH (d, frame_output_begin, (f));
+
/* Sequence is quite important here. We not only want to
redisplay the gutter area but we also want to flush any
frame size changes out so that the gutter redisplay happens
update_frame_gutters (f);
unhold_one_frame_size_changes (f);
}
- }
- /* We now call the output_end routine for tty frames. We delay
- doing so in order to avoid cursor flicker. So much for 100%
- encapsulation. */
- if (DEVICE_TTY_P (d))
- DEVMETH (d, output_end, (d));
+
+ MAYBE_DEVMETH (d, frame_output_end, (f));
+ }
d->gutter_changed = 0;
}
defsymbol (&Qgutter_size, "gutter-size");
defsymbol (&Qgutter_visible, "gutter-visible");
- defsymbol (&Qdefault_gutter_position_changed_hook,
- "default-gutter-position-changed");
+ defsymbol (&Qdefault_gutter_position_changed_hook,
+ "default-gutter-position-changed-hook");
}
void
projects / chise / xemacs-chise.git- / blobdiff