[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c [emacs-unicode-2]
|
From: |
Miles Bader |
|
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c [emacs-unicode-2] |
|
Date: |
Mon, 28 Jun 2004 03:55:15 -0400 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.843.2.14 emacs/src/xdisp.c:1.843.2.15
*** emacs/src/xdisp.c:1.843.2.14 Sat May 29 02:11:25 2004
--- emacs/src/xdisp.c Mon Jun 28 07:29:24 2004
***************
*** 199,206 ****
#endif
#ifdef MAC_OS
#include "macterm.h"
-
- Cursor No_Cursor;
#endif
#ifndef FRAME_X_OUTPUT
--- 199,204 ----
***************
*** 302,309 ****
--- 300,309 ----
Lisp_Object Vdisplay_pixels_per_inch;
Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height;
Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qraise;
+ Lisp_Object Qslice;
Lisp_Object Qcenter;
Lisp_Object Qmargin, Qpointer;
+ Lisp_Object Qline_height, Qtotal;
extern Lisp_Object Qheight;
extern Lisp_Object QCwidth, QCheight, QCascent;
extern Lisp_Object Qscroll_bar;
***************
*** 671,680 ****
/* How much to scroll horizontally when point is inside the above margin. */
Lisp_Object Vhscroll_step;
- /* A list of symbols, one for each supported image type. */
-
- Lisp_Object Vimage_types;
-
/* The variable `resize-mini-windows'. If nil, don't resize
mini-windows. If t, always resize them to fit the text they
display. If `grow-only', let mini-windows grow only until they
--- 671,676 ----
***************
*** 800,805 ****
--- 796,804 ----
Lisp_Object previous_help_echo_string;
+ /* Null glyph slice */
+
+ static struct glyph_slice null_glyph_slice = { 0, 0, 0, 0 };
/* Function prototypes. */
***************
*** 852,858 ****
static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *,
Lisp_Object));
static void extend_face_to_end_of_line P_ ((struct it *));
! static int append_space P_ ((struct it *, int));
static int make_cursor_line_fully_visible P_ ((struct window *, int));
static int try_scrolling P_ ((Lisp_Object, int, EMACS_INT, EMACS_INT, int,
int));
static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *));
--- 851,857 ----
static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *,
Lisp_Object));
static void extend_face_to_end_of_line P_ ((struct it *));
! static int append_space_for_newline P_ ((struct it *, int));
static int make_cursor_line_fully_visible P_ ((struct window *, int));
static int try_scrolling P_ ((Lisp_Object, int, EMACS_INT, EMACS_INT, int,
int));
static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *));
***************
*** 1238,1246 ****
and header-lines heights. */
int
! pos_visible_p (w, charpos, fully, exact_mode_line_heights_p)
struct window *w;
! int charpos, *fully, exact_mode_line_heights_p;
{
struct it it;
struct text_pos top;
--- 1237,1245 ----
and header-lines heights. */
int
! pos_visible_p (w, charpos, fully, x, y, exact_mode_line_heights_p)
struct window *w;
! int charpos, *fully, *x, *y, exact_mode_line_heights_p;
{
struct it it;
struct text_pos top;
***************
*** 1288,1301 ****
visible_p = 1;
*fully = bottom_y <= it.last_visible_y;
}
}
else if (it.current_y + it.max_ascent + it.max_descent > it.last_visible_y)
{
move_it_by_lines (&it, 1, 0);
if (charpos < IT_CHARPOS (it))
{
visible_p = 1;
! *fully = 0;
}
}
--- 1287,1313 ----
visible_p = 1;
*fully = bottom_y <= it.last_visible_y;
}
+ if (visible_p && x)
+ {
+ *x = it.current_x;
+ *y = max (top_y + it.max_ascent - it.ascent, window_top_y);
+ }
}
else if (it.current_y + it.max_ascent + it.max_descent > it.last_visible_y)
{
+ struct it it2;
+
+ it2 = it;
move_it_by_lines (&it, 1, 0);
if (charpos < IT_CHARPOS (it))
{
visible_p = 1;
! if (x)
! {
! move_it_to (&it2, charpos, -1, -1, -1, MOVE_TO_POS);
! *x = it2.current_x;
! *y = it2.current_y + it2.max_ascent - it2.ascent;
! }
}
}
***************
*** 1303,1308 ****
--- 1315,1321 ----
set_buffer_internal_1 (old_buffer);
current_header_line_height = current_mode_line_height = -1;
+
return visible_p;
}
***************
*** 2057,2062 ****
--- 2070,2078 ----
{
if (NATNUMP (current_buffer->extra_line_spacing))
it->extra_line_spacing = XFASTINT (current_buffer->extra_line_spacing);
+ else if (FLOATP (current_buffer->extra_line_spacing))
+ it->extra_line_spacing = (XFLOAT_DATA
(current_buffer->extra_line_spacing)
+ * FRAME_LINE_HEIGHT (it->f));
else if (it->f->extra_line_spacing > 0)
it->extra_line_spacing = it->f->extra_line_spacing;
}
***************
*** 2070,2078 ****
if (FRAME_FACE_CACHE (it->f)->used == 0)
recompute_basic_faces (it->f);
! /* Current value of the `space-width', and 'height' properties. */
it->space_width = Qnil;
it->font_height = Qnil;
/* Are control characters displayed as `^C'? */
it->ctl_arrow_p = !NILP (current_buffer->ctl_arrow);
--- 2086,2096 ----
if (FRAME_FACE_CACHE (it->f)->used == 0)
recompute_basic_faces (it->f);
! /* Current value of the `slice', `space-width', and 'height' properties. */
! it->slice.x = it->slice.y = it->slice.width = it->slice.height = Qnil;
it->space_width = Qnil;
it->font_height = Qnil;
+ it->override_ascent = -1;
/* Are control characters displayed as `^C'? */
it->ctl_arrow_p = !NILP (current_buffer->ctl_arrow);
***************
*** 2713,2731 ****
int noverlays;
int endpos;
Lisp_Object *overlays;
- int len;
int i;
/* Get all overlays at the given position. */
! len = 10;
! overlays = (Lisp_Object *) alloca (len * sizeof *overlays);
! noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1);
! if (noverlays > len)
! {
! len = noverlays;
! overlays = (Lisp_Object *) alloca (len * sizeof *overlays);
! noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1);
! }
/* If any of these overlays ends before endpos,
use its ending point instead. */
--- 2731,2740 ----
int noverlays;
int endpos;
Lisp_Object *overlays;
int i;
/* Get all overlays at the given position. */
! GET_OVERLAYS_AT (pos, overlays, noverlays, &endpos, 1);
/* If any of these overlays ends before endpos,
use its ending point instead. */
***************
*** 3278,3285 ****
}
/* Reset those iterator values set from display property values. */
! it->font_height = Qnil;
it->space_width = Qnil;
it->voffset = 0;
/* We don't support recursive `display' properties, i.e. string
--- 3287,3295 ----
}
/* Reset those iterator values set from display property values. */
! it->slice.x = it->slice.y = it->slice.width = it->slice.height = Qnil;
it->space_width = Qnil;
+ it->font_height = Qnil;
it->voffset = 0;
/* We don't support recursive `display' properties, i.e. string
***************
*** 3298,3303 ****
--- 3308,3314 ----
&& !EQ (XCAR (prop), Qimage)
&& !EQ (XCAR (prop), Qspace)
&& !EQ (XCAR (prop), Qwhen)
+ && !EQ (XCAR (prop), Qslice)
&& !EQ (XCAR (prop), Qspace_width)
&& !EQ (XCAR (prop), Qheight)
&& !EQ (XCAR (prop), Qraise)
***************
*** 3494,3499 ****
--- 3505,3534 ----
it->space_width = value;
}
else if (CONSP (prop)
+ && EQ (XCAR (prop), Qslice))
+ {
+ /* `(slice X Y WIDTH HEIGHT)'. */
+ Lisp_Object tem;
+
+ if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
+ return 0;
+
+ if (tem = XCDR (prop), CONSP (tem))
+ {
+ it->slice.x = XCAR (tem);
+ if (tem = XCDR (tem), CONSP (tem))
+ {
+ it->slice.y = XCAR (tem);
+ if (tem = XCDR (tem), CONSP (tem))
+ {
+ it->slice.width = XCAR (tem);
+ if (tem = XCDR (tem), CONSP (tem))
+ it->slice.height = XCAR (tem);
+ }
+ }
+ }
+ }
+ else if (CONSP (prop)
&& EQ (XCAR (prop), Qraise)
&& CONSP (XCDR (prop)))
{
***************
*** 4427,4432 ****
--- 4462,4468 ----
p->string_nchars = it->string_nchars;
p->area = it->area;
p->multibyte_p = it->multibyte_p;
+ p->slice = it->slice;
p->space_width = it->space_width;
p->font_height = it->font_height;
p->voffset = it->voffset;
***************
*** 4459,4464 ****
--- 4495,4501 ----
it->string_nchars = p->string_nchars;
it->area = p->area;
it->multibyte_p = p->multibyte_p;
+ it->slice = p->slice;
it->space_width = p->space_width;
it->font_height = p->font_height;
it->voffset = p->voffset;
***************
*** 4616,4621 ****
--- 4653,4666 ----
visible_p = 0;
}
+ if (visible_p)
+ {
+ struct it it2 = *it;
+
+ if (handle_display_prop (&it2) == HANDLED_RETURN)
+ visible_p = 0;
+ }
+
/* Back one more newline if the current one is invisible. */
if (!visible_p)
back_to_previous_line_start (it);
***************
*** 9539,9545 ****
if (!SYMBOLP (var))
continue;
! if (up_to_date)
{
Lisp_Object val = find_symbol_value (var);
Fput (var, Qlast_arrow_position,
--- 9584,9590 ----
if (!SYMBOLP (var))
continue;
! if (up_to_date > 0)
{
Lisp_Object val = find_symbol_value (var);
Fput (var, Qlast_arrow_position,
***************
*** 10862,10876 ****
if (!MATRIX_ROW_PARTIALLY_VISIBLE_P (row))
return 1;
- if (force_p)
- return 0;
-
/* If the row the cursor is in is taller than the window's height,
it's not clear what to do, so do nothing. */
window_height = window_box_height (w);
if (row->height >= window_height)
! return 1;
!
return 0;
#if 0
--- 10907,10920 ----
if (!MATRIX_ROW_PARTIALLY_VISIBLE_P (row))
return 1;
/* If the row the cursor is in is taller than the window's height,
it's not clear what to do, so do nothing. */
window_height = window_box_height (w);
if (row->height >= window_height)
! {
! if (!force_p || w->vscroll)
! return 1;
! }
return 0;
#if 0
***************
*** 10979,10984 ****
--- 11023,11034 ----
else
this_scroll_margin = 0;
+ /* Force scroll_conservatively to have a reasonable value so it doesn't
+ cause an overflow while computing how much to scroll. */
+ if (scroll_conservatively)
+ scroll_conservatively = min (scroll_conservatively,
+ MOST_POSITIVE_FIXNUM / FRAME_LINE_HEIGHT
(f));
+
/* Compute how much we should try to scroll maximally to bring point
into view. */
if (scroll_step || scroll_conservatively || temp_scroll_step)
***************
*** 11054,11060 ****
aggressive = current_buffer->scroll_up_aggressively;
height = WINDOW_BOX_TEXT_HEIGHT (w);
if (NUMBERP (aggressive))
! amount_to_scroll = XFLOATINT (aggressive) * height;
}
if (amount_to_scroll <= 0)
--- 11104,11115 ----
aggressive = current_buffer->scroll_up_aggressively;
height = WINDOW_BOX_TEXT_HEIGHT (w);
if (NUMBERP (aggressive))
! {
! double float_amount = XFLOATINT (aggressive) * height;
! amount_to_scroll = float_amount;
! if (amount_to_scroll == 0 && float_amount > 0)
! amount_to_scroll = 1;
! }
}
if (amount_to_scroll <= 0)
***************
*** 11112,11118 ****
aggressive = current_buffer->scroll_down_aggressively;
height = WINDOW_BOX_TEXT_HEIGHT (w);
if (NUMBERP (aggressive))
! amount_to_scroll = XFLOATINT (aggressive) * height;
}
if (amount_to_scroll <= 0)
--- 11167,11178 ----
aggressive = current_buffer->scroll_down_aggressively;
height = WINDOW_BOX_TEXT_HEIGHT (w);
if (NUMBERP (aggressive))
! {
! double float_amount = XFLOATINT (aggressive) * height;
! amount_to_scroll = float_amount;
! if (amount_to_scroll == 0 && float_amount > 0)
! amount_to_scroll = 1;
! }
}
if (amount_to_scroll <= 0)
***************
*** 11307,11313 ****
&& (FRAME_WINDOW_P (f)
|| !overlay_arrow_in_current_buffer_p ()))
{
! int this_scroll_margin;
struct glyph_row *row = NULL;
#if GLYPH_DEBUG
--- 11367,11373 ----
&& (FRAME_WINDOW_P (f)
|| !overlay_arrow_in_current_buffer_p ()))
{
! int this_scroll_margin, top_scroll_margin;
struct glyph_row *row = NULL;
#if GLYPH_DEBUG
***************
*** 11320,11325 ****
--- 11380,11389 ----
this_scroll_margin = min (this_scroll_margin, WINDOW_TOTAL_LINES (w) /
4);
this_scroll_margin *= FRAME_LINE_HEIGHT (f);
+ top_scroll_margin = this_scroll_margin;
+ if (WINDOW_WANTS_HEADER_LINE_P (w))
+ top_scroll_margin += CURRENT_HEADER_LINE_HEIGHT (w);
+
/* Start with the row the cursor was displayed during the last
not paused redisplay. Give up if that row is not valid. */
if (w->last_cursor.vpos < 0
***************
*** 11380,11386 ****
&& (MATRIX_ROW_START_CHARPOS (row) > PT
|| (MATRIX_ROW_START_CHARPOS (row) == PT
&& MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P (row)))
! && (row->y > this_scroll_margin
|| CHARPOS (startp) == BEGV))
{
xassert (row->enabled_p);
--- 11444,11450 ----
&& (MATRIX_ROW_START_CHARPOS (row) > PT
|| (MATRIX_ROW_START_CHARPOS (row) == PT
&& MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P (row)))
! && (row->y > top_scroll_margin
|| CHARPOS (startp) == BEGV))
{
xassert (row->enabled_p);
***************
*** 11408,11414 ****
++row;
/* If within the scroll margin, scroll. */
! if (row->y < this_scroll_margin
&& CHARPOS (startp) != BEGV)
scroll_p = 1;
}
--- 11472,11478 ----
++row;
/* If within the scroll margin, scroll. */
! if (row->y < top_scroll_margin
&& CHARPOS (startp) != BEGV)
scroll_p = 1;
}
***************
*** 12578,12586 ****
position. */
if (pt_row)
{
! w->cursor.vpos -= MATRIX_ROW_VPOS (first_reusable_row,
! w->current_matrix);
! w->cursor.y -= first_reusable_row->y;
}
/* Scroll the display. */
--- 12642,12649 ----
position. */
if (pt_row)
{
! w->cursor.vpos -= nrows_scrolled;
! w->cursor.y -= first_reusable_row->y - start_row->y;
}
/* Scroll the display. */
***************
*** 12625,12630 ****
--- 12688,12716 ----
for (row -= nrows_scrolled; row < bottom_row; ++row)
row->enabled_p = 0;
+ /* Point may have moved to a different line, so we cannot assume that
+ the previous cursor position is valid; locate the correct row. */
+ if (pt_row)
+ {
+ for (row = MATRIX_ROW (w->current_matrix, w->cursor.vpos);
+ row < bottom_row && PT >= MATRIX_ROW_END_CHARPOS (row);
+ row++)
+ {
+ w->cursor.vpos++;
+ w->cursor.y = row->y;
+ }
+ if (row < bottom_row)
+ {
+ struct glyph *glyph = row->glyphs[TEXT_AREA] + w->cursor.hpos;
+ while (glyph->charpos < PT)
+ {
+ w->cursor.hpos++;
+ w->cursor.x += glyph->pixel_width;
+ glyph++;
+ }
+ }
+ }
+
/* Adjust window end. A null value of last_text_row means that
the window end is in reused rows which in turn means that
only its vpos can have changed. */
***************
*** 13408,13416 ****
if ((w->cursor.y < this_scroll_margin
&& CHARPOS (start) > BEGV)
! /* Don't take scroll margin into account at the bottom because
! old redisplay didn't do it either. */
! || w->cursor.y + cursor_height > it.last_visible_y)
{
w->cursor.vpos = -1;
clear_glyph_matrix (w->desired_matrix);
--- 13494,13502 ----
if ((w->cursor.y < this_scroll_margin
&& CHARPOS (start) > BEGV)
! /* Old redisplay didn't take scroll margin into account at the bottom,
! but then global-hl-line-mode doesn't scroll. KFS 2004-06-14 */
! || w->cursor.y + cursor_height + this_scroll_margin > it.last_visible_y)
{
w->cursor.vpos = -1;
clear_glyph_matrix (w->desired_matrix);
***************
*** 14196,14203 ****
/* Append one space to the glyph row of iterator IT if doing a
! window-based redisplay. DEFAULT_FACE_P non-zero means let the
! space have the default face, otherwise let it have the same face as
IT->face_id. Value is non-zero if a space was added.
This function is called to make sure that there is always one glyph
--- 14282,14288 ----
/* Append one space to the glyph row of iterator IT if doing a
! window-based redisplay. The space has the same face as
IT->face_id. Value is non-zero if a space was added.
This function is called to make sure that there is always one glyph
***************
*** 14209,14215 ****
end of the line if the row ends in italic text. */
static int
! append_space (it, default_face_p)
struct it *it;
int default_face_p;
{
--- 14294,14300 ----
end of the line if the row ends in italic text. */
static int
! append_space_for_newline (it, default_face_p)
struct it *it;
int default_face_p;
{
***************
*** 14223,14229 ****
/* Save some values that must not be changed.
Must save IT->c and IT->len because otherwise
ITERATOR_AT_END_P wouldn't work anymore after
! append_space has been called. */
enum display_element_type saved_what = it->what;
int saved_c = it->c, saved_len = it->len;
int saved_x = it->current_x;
--- 14308,14314 ----
/* Save some values that must not be changed.
Must save IT->c and IT->len because otherwise
ITERATOR_AT_END_P wouldn't work anymore after
! append_space_for_newline has been called. */
enum display_element_type saved_what = it->what;
int saved_c = it->c, saved_len = it->len;
int saved_x = it->current_x;
***************
*** 14250,14255 ****
--- 14335,14342 ----
PRODUCE_GLYPHS (it);
+ it->override_ascent = -1;
+ it->constrain_row_ascent_descent_p = 0;
it->current_x = saved_x;
it->object = saved_object;
it->position = saved_pos;
***************
*** 14531,14537 ****
row->exact_window_width_line_p = 1;
else
#endif /* HAVE_WINDOW_SYSTEM */
! if ((append_space (it, 1) && row->used[TEXT_AREA] == 1)
|| row->used[TEXT_AREA] == 0)
{
row->glyphs[TEXT_AREA]->charpos = -1;
--- 14618,14624 ----
row->exact_window_width_line_p = 1;
else
#endif /* HAVE_WINDOW_SYSTEM */
! if ((append_space_for_newline (it, 1) && row->used[TEXT_AREA] == 1)
|| row->used[TEXT_AREA] == 0)
{
row->glyphs[TEXT_AREA]->charpos = -1;
***************
*** 14773,14779 ****
/* Add a space at the end of the line that is used to
display the cursor there. */
if (!IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
! append_space (it, 0);
#endif /* HAVE_WINDOW_SYSTEM */
/* Extend the face to the end of the line. */
--- 14860,14866 ----
/* Add a space at the end of the line that is used to
display the cursor there. */
if (!IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
! append_space_for_newline (it, 0);
#endif /* HAVE_WINDOW_SYSTEM */
/* Extend the face to the end of the line. */
***************
*** 17400,17405 ****
--- 17487,17493 ----
xassert (s->first_glyph->type == IMAGE_GLYPH);
s->img = IMAGE_FROM_ID (s->f, s->first_glyph->u.img_id);
xassert (s->img);
+ s->slice = s->first_glyph->slice;
s->face = FACE_FROM_ID (s->f, s->first_glyph->face_id);
s->font = s->face->font;
s->width = s->first_glyph->pixel_width;
***************
*** 18146,18151 ****
--- 18234,18240 ----
glyph->glyph_not_available_p = it->glyph_not_available_p;
glyph->face_id = it->face_id;
glyph->u.ch = it->char_to_display;
+ glyph->slice = null_glyph_slice;
glyph->font_type = FONT_TYPE_UNKNOWN;
++it->glyph_row->used[area];
}
***************
*** 18182,18187 ****
--- 18271,18277 ----
glyph->glyph_not_available_p = 0;
glyph->face_id = it->face_id;
glyph->u.cmp_id = it->cmp_id;
+ glyph->slice = null_glyph_slice;
glyph->font_type = FONT_TYPE_UNKNOWN;
++it->glyph_row->used[area];
}
***************
*** 18200,18206 ****
if (it->voffset < 0)
/* Increase the ascent so that we can display the text higher
in the line. */
! it->ascent += abs (it->voffset);
else
/* Increase the descent so that we can display the text lower
in the line. */
--- 18290,18296 ----
if (it->voffset < 0)
/* Increase the ascent so that we can display the text higher
in the line. */
! it->ascent -= it->voffset;
else
/* Increase the descent so that we can display the text lower
in the line. */
***************
*** 18220,18225 ****
--- 18310,18316 ----
struct image *img;
struct face *face;
int face_ascent, glyph_ascent;
+ struct glyph_slice slice;
xassert (it->what == IT_IMAGE);
***************
*** 18243,18261 ****
/* Make sure X resources of the image is loaded. */
prepare_image_for_display (it->f, img);
! it->ascent = it->phys_ascent = glyph_ascent = image_ascent (img, face);
! it->descent = it->phys_descent = img->height + 2 * img->vmargin -
it->ascent;
! it->pixel_width = img->width + 2 * img->hmargin;
/* It's quite possible for images to have an ascent greater than
their height, so don't get confused in that case. */
if (it->descent < 0)
it->descent = 0;
/* If this glyph is alone on the last line, adjust it.ascent to minimum row
ascent. */
face_ascent = face->font ? FONT_BASE (face->font) : FRAME_BASELINE_OFFSET
(it->f);
if (face_ascent > it->ascent)
it->ascent = it->phys_ascent = face_ascent;
it->nglyphs = 1;
--- 18334,18401 ----
/* Make sure X resources of the image is loaded. */
prepare_image_for_display (it->f, img);
! slice.x = slice.y = 0;
! slice.width = img->width;
! slice.height = img->height;
!
! if (INTEGERP (it->slice.x))
! slice.x = XINT (it->slice.x);
! else if (FLOATP (it->slice.x))
! slice.x = XFLOAT_DATA (it->slice.x) * img->width;
!
! if (INTEGERP (it->slice.y))
! slice.y = XINT (it->slice.y);
! else if (FLOATP (it->slice.y))
! slice.y = XFLOAT_DATA (it->slice.y) * img->height;
!
! if (INTEGERP (it->slice.width))
! slice.width = XINT (it->slice.width);
! else if (FLOATP (it->slice.width))
! slice.width = XFLOAT_DATA (it->slice.width) * img->width;
!
! if (INTEGERP (it->slice.height))
! slice.height = XINT (it->slice.height);
! else if (FLOATP (it->slice.height))
! slice.height = XFLOAT_DATA (it->slice.height) * img->height;
!
! if (slice.x >= img->width)
! slice.x = img->width;
! if (slice.y >= img->height)
! slice.y = img->height;
! if (slice.x + slice.width >= img->width)
! slice.width = img->width - slice.x;
! if (slice.y + slice.height > img->height)
! slice.height = img->height - slice.y;
!
! if (slice.width == 0 || slice.height == 0)
! return;
!
! it->ascent = it->phys_ascent = glyph_ascent = image_ascent (img, face,
&slice);
!
! it->descent = slice.height - glyph_ascent;
! if (slice.y == 0)
! it->descent += img->vmargin;
! if (slice.y + slice.height == img->height)
! it->descent += img->vmargin;
! it->phys_descent = it->descent;
!
! it->pixel_width = slice.width;
! if (slice.x == 0)
! it->pixel_width += img->hmargin;
! if (slice.x + slice.width == img->width)
! it->pixel_width += img->hmargin;
/* It's quite possible for images to have an ascent greater than
their height, so don't get confused in that case. */
if (it->descent < 0)
it->descent = 0;
+ #if 0 /* this breaks image tiling */
/* If this glyph is alone on the last line, adjust it.ascent to minimum row
ascent. */
face_ascent = face->font ? FONT_BASE (face->font) : FRAME_BASELINE_OFFSET
(it->f);
if (face_ascent > it->ascent)
it->ascent = it->phys_ascent = face_ascent;
+ #endif
it->nglyphs = 1;
***************
*** 18263,18275 ****
{
if (face->box_line_width > 0)
{
! it->ascent += face->box_line_width;
! it->descent += face->box_line_width;
}
! if (it->start_of_box_run_p)
it->pixel_width += abs (face->box_line_width);
! if (it->end_of_box_run_p)
it->pixel_width += abs (face->box_line_width);
}
--- 18403,18417 ----
{
if (face->box_line_width > 0)
{
! if (slice.y == 0)
! it->ascent += face->box_line_width;
! if (slice.y + slice.height == img->height)
! it->descent += face->box_line_width;
}
! if (it->start_of_box_run_p && slice.x == 0)
it->pixel_width += abs (face->box_line_width);
! if (it->end_of_box_run_p && slice.x + slice.width == img->width)
it->pixel_width += abs (face->box_line_width);
}
***************
*** 18298,18303 ****
--- 18440,18446 ----
glyph->glyph_not_available_p = 0;
glyph->face_id = it->face_id;
glyph->u.img_id = img->id;
+ glyph->slice = slice;
glyph->font_type = FONT_TYPE_UNKNOWN;
++it->glyph_row->used[area];
}
***************
*** 18340,18345 ****
--- 18483,18489 ----
glyph->face_id = it->face_id;
glyph->u.stretch.ascent = ascent;
glyph->u.stretch.height = height;
+ glyph->slice = null_glyph_slice;
glyph->font_type = FONT_TYPE_UNKNOWN;
++it->glyph_row->used[area];
}
***************
*** 18505,18510 ****
--- 18649,18755 ----
take_vertical_position_into_account (it);
}
+ /* Calculate line-height and line-spacing properties.
+ An integer value specifies explicit pixel value.
+ A float value specifies relative value to current face height.
+ A cons (float . face-name) specifies relative value to
+ height of specified face font.
+
+ Returns height in pixels, or nil. */
+
+ static Lisp_Object
+ calc_line_height_property (it, prop, font, boff, total)
+ struct it *it;
+ Lisp_Object prop;
+ XFontStruct *font;
+ int boff, *total;
+ {
+ Lisp_Object position, val;
+ Lisp_Object face_name = Qnil;
+ int ascent, descent, height, override;
+
+ if (STRINGP (it->object))
+ position = make_number (IT_STRING_CHARPOS (*it));
+ else
+ position = make_number (IT_CHARPOS (*it));
+
+ val = Fget_char_property (position, prop, it->object);
+
+ if (NILP (val))
+ return val;
+
+ if (total && CONSP (val) && EQ (XCAR (val), Qtotal))
+ {
+ *total = 1;
+ val = XCDR (val);
+ }
+
+ if (INTEGERP (val))
+ return val;
+
+ if (CONSP (val))
+ {
+ face_name = XCDR (val);
+ val = XCAR (val);
+ }
+ else if (SYMBOLP (val))
+ {
+ face_name = val;
+ val = Qnil;
+ }
+
+ override = EQ (prop, Qline_height);
+
+ if (NILP (face_name))
+ {
+ font = FRAME_FONT (it->f);
+ boff = FRAME_BASELINE_OFFSET (it->f);
+ }
+ else if (EQ (face_name, Qt))
+ {
+ override = 0;
+ }
+ else
+ {
+ int face_id;
+ struct face *face;
+ struct font_info *font_info;
+
+ face_id = lookup_named_face (it->f, face_name);
+ if (face_id < 0)
+ return make_number (-1);
+
+ face = FACE_FROM_ID (it->f, face_id);
+ font = face->font;
+ if (font == NULL)
+ return make_number (-1);
+
+ font_info = FONT_INFO_FROM_ID (it->f, face->font_info_id);
+ boff = font_info->baseline_offset;
+ if (font_info->vertical_centering)
+ boff = VCENTER_BASELINE_OFFSET (font, it->f) - boff;
+ }
+
+ ascent = FONT_BASE (font) + boff;
+ descent = FONT_DESCENT (font) - boff;
+
+ if (override)
+ {
+ it->override_ascent = ascent;
+ it->override_descent = descent;
+ it->override_boff = boff;
+ }
+
+ height = ascent + descent;
+ if (FLOATP (val))
+ height = (int)(XFLOAT_DATA (val) * height);
+ else if (INTEGERP (val))
+ height *= XINT (val);
+
+ return make_number (height);
+ }
+
+
/* RIF:
Produce glyphs/get display metrics for the display element IT is
loaded with. See the description of struct display_iterator in
***************
*** 18514,18519 ****
--- 18759,18766 ----
x_produce_glyphs (it)
struct it *it;
{
+ int extra_line_spacing = it->extra_line_spacing;
+
it->glyph_not_available_p = 0;
if (it->what == IT_CHARACTER)
***************
*** 18585,18592 ****
pcm = rif->per_char_metric (font, &char2b,
FONT_TYPE_FOR_UNIBYTE (font,
it->char_to_display));
! it->ascent = FONT_BASE (font) + boff;
! it->descent = FONT_DESCENT (font) - boff;
if (pcm)
{
--- 18832,18849 ----
pcm = rif->per_char_metric (font, &char2b,
FONT_TYPE_FOR_UNIBYTE (font,
it->char_to_display));
!
! if (it->override_ascent >= 0)
! {
! it->ascent = it->override_ascent;
! it->descent = it->override_descent;
! boff = it->override_boff;
! }
! else
! {
! it->ascent = FONT_BASE (font) + boff;
! it->descent = FONT_DESCENT (font) - boff;
! }
if (pcm)
{
***************
*** 18597,18607 ****
else
{
it->glyph_not_available_p = 1;
! it->phys_ascent = FONT_BASE (font) + boff;
! it->phys_descent = FONT_DESCENT (font) - boff;
it->pixel_width = FONT_WIDTH (font);
}
/* If this is a space inside a region of text with
`space-width' property, change its width. */
stretched_p = it->char_to_display == ' ' && !NILP (it->space_width);
--- 18854,18881 ----
else
{
it->glyph_not_available_p = 1;
! it->phys_ascent = it->ascent;
! it->phys_descent = it->descent;
it->pixel_width = FONT_WIDTH (font);
}
+ if (it->constrain_row_ascent_descent_p)
+ {
+ if (it->descent > it->max_descent)
+ {
+ it->ascent += it->descent - it->max_descent;
+ it->descent = it->max_descent;
+ }
+ if (it->ascent > it->max_ascent)
+ {
+ it->descent = min (it->max_descent, it->descent + it->ascent
- it->max_ascent);
+ it->ascent = it->max_ascent;
+ }
+ it->phys_ascent = min (it->phys_ascent, it->ascent);
+ it->phys_descent = min (it->phys_descent, it->descent);
+ extra_line_spacing = 0;
+ }
+
/* If this is a space inside a region of text with
`space-width' property, change its width. */
stretched_p = it->char_to_display == ' ' && !NILP (it->space_width);
***************
*** 18634,18639 ****
--- 18908,18921 ----
if (face->overline_p)
it->ascent += 2;
+ if (it->constrain_row_ascent_descent_p)
+ {
+ if (it->ascent > it->max_ascent)
+ it->ascent = it->max_ascent;
+ if (it->descent > it->max_descent)
+ it->descent = it->max_descent;
+ }
+
take_vertical_position_into_account (it);
/* If we have to actually produce glyphs, do it. */
***************
*** 18660,18676 ****
}
else if (it->char_to_display == '\n')
{
! /* A newline has no width but we need the height of the line. */
it->pixel_width = 0;
it->nglyphs = 0;
- it->ascent = it->phys_ascent = FONT_BASE (font) + boff;
- it->descent = it->phys_descent = FONT_DESCENT (font) - boff;
! if (face->box != FACE_NO_BOX
! && face->box_line_width > 0)
{
! it->ascent += face->box_line_width;
! it->descent += face->box_line_width;
}
}
else if (it->char_to_display == '\t')
--- 18942,19014 ----
}
else if (it->char_to_display == '\n')
{
! /* A newline has no width but we need the height of the line.
! But if previous part of the line set a height, don't
! increase that height */
!
! Lisp_Object height;
!
! it->override_ascent = -1;
it->pixel_width = 0;
it->nglyphs = 0;
! height = calc_line_height_property(it, Qline_height, font, boff, 0);
!
! if (it->override_ascent >= 0)
{
! it->ascent = it->override_ascent;
! it->descent = it->override_descent;
! boff = it->override_boff;
! }
! else
! {
! it->ascent = FONT_BASE (font) + boff;
! it->descent = FONT_DESCENT (font) - boff;
! }
!
! if (EQ (height, make_number(0)))
! {
! if (it->descent > it->max_descent)
! {
! it->ascent += it->descent - it->max_descent;
! it->descent = it->max_descent;
! }
! if (it->ascent > it->max_ascent)
! {
! it->descent = min (it->max_descent, it->descent + it->ascent
- it->max_ascent);
! it->ascent = it->max_ascent;
! }
! it->phys_ascent = min (it->phys_ascent, it->ascent);
! it->phys_descent = min (it->phys_descent, it->descent);
! it->constrain_row_ascent_descent_p = 1;
! extra_line_spacing = 0;
! }
! else
! {
! Lisp_Object spacing;
! int total = 0;
!
! it->phys_ascent = it->ascent;
! it->phys_descent = it->descent;
!
! if ((it->max_ascent > 0 || it->max_descent > 0)
! && face->box != FACE_NO_BOX
! && face->box_line_width > 0)
! {
! it->ascent += face->box_line_width;
! it->descent += face->box_line_width;
! }
! if (!NILP (height)
! && XINT (height) > it->ascent + it->descent)
! it->ascent = XINT (height) - it->descent;
!
! spacing = calc_line_height_property(it, Qline_spacing, font,
boff, &total);
! if (INTEGERP (spacing))
! {
! extra_line_spacing = XINT (spacing);
! if (total)
! extra_line_spacing -= (it->phys_ascent + it->phys_descent);
! }
}
}
else if (it->char_to_display == '\t')
***************
*** 19093,19099 ****
if (it->area == TEXT_AREA)
it->current_x += it->pixel_width;
! it->descent += it->extra_line_spacing;
it->max_ascent = max (it->max_ascent, it->ascent);
it->max_descent = max (it->max_descent, it->descent);
--- 19431,19438 ----
if (it->area == TEXT_AREA)
it->current_x += it->pixel_width;
! if (extra_line_spacing > 0)
! it->descent += extra_line_spacing;
it->max_ascent = max (it->max_ascent, it->ascent);
it->max_descent = max (it->max_descent, it->descent);
***************
*** 20390,20397 ****
return inside;
}
}
! else
! return 0;
}
Lisp_Object
--- 20729,20736 ----
return inside;
}
}
! /* If we don't understand the format, pretend we're not in the hot-spot. */
! return 0;
}
Lisp_Object
***************
*** 20426,20432 ****
Lisp_Object map;
Lisp_Object x, y;
{
- int ix, iy;
if (NILP (map))
return Qnil;
--- 20765,20770 ----
***************
*** 20466,20476 ****
cursor = FRAME_X_OUTPUT (f)->nontext_cursor;
}
- #ifndef HAVE_CARBON
if (cursor != No_Cursor)
- #else
- if (bcmp (&cursor, &No_Cursor, sizeof (Cursor)))
- #endif
rif->define_frame_cursor (f, cursor);
}
--- 20804,20810 ----
***************
*** 20492,20498 ****
Lisp_Object pointer = Qnil;
int charpos, dx, dy, width, height;
Lisp_Object string, object = Qnil;
! Lisp_Object pos, help, image;
if (area == ON_MODE_LINE || area == ON_HEADER_LINE)
string = mode_line_string (w, area, &x, &y, &charpos,
--- 20826,20832 ----
Lisp_Object pointer = Qnil;
int charpos, dx, dy, width, height;
Lisp_Object string, object = Qnil;
! Lisp_Object pos, help;
if (area == ON_MODE_LINE || area == ON_HEADER_LINE)
string = mode_line_string (w, area, &x, &y, &charpos,
***************
*** 20671,20677 ****
Lisp_Object object;
Lisp_Object mouse_face = Qnil, overlay = Qnil, position;
Lisp_Object *overlay_vec = NULL;
! int len, noverlays;
struct buffer *obuf;
int obegv, ozv, same_region;
--- 21005,21011 ----
Lisp_Object object;
Lisp_Object mouse_face = Qnil, overlay = Qnil, position;
Lisp_Object *overlay_vec = NULL;
! int noverlays;
struct buffer *obuf;
int obegv, ozv, same_region;
***************
*** 20687,20693 ****
Lisp_Object image_map, hotspot;
if ((image_map = Fplist_get (XCDR (img->spec), QCmap),
!NILP (image_map))
! && (hotspot = find_hot_spot (image_map, dx, dy),
CONSP (hotspot))
&& (hotspot = XCDR (hotspot), CONSP (hotspot)))
{
--- 21021,21029 ----
Lisp_Object image_map, hotspot;
if ((image_map = Fplist_get (XCDR (img->spec), QCmap),
!NILP (image_map))
! && (hotspot = find_hot_spot (image_map,
! glyph->slice.x + dx,
! glyph->slice.y + dy),
CONSP (hotspot))
&& (hotspot = XCDR (hotspot), CONSP (hotspot)))
{
***************
*** 20756,20774 ****
if (BUFFERP (object))
{
! /* Put all the overlays we want in a vector in overlay_vec.
! Store the length in len. If there are more than 10, make
! enough space for all, and try again. */
! len = 10;
! overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
! noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL, 0);
! if (noverlays > len)
! {
! len = noverlays;
! overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
! noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL,
NULL,0);
! }
!
/* Sort overlays into increasing priority order. */
noverlays = sort_overlays (overlay_vec, noverlays, w);
}
--- 21092,21099 ----
if (BUFFERP (object))
{
! /* Put all the overlays we want in a vector in overlay_vec. */
! GET_OVERLAYS_AT (pos, overlay_vec, noverlays, NULL, 0);
/* Sort overlays into increasing priority order. */
noverlays = sort_overlays (overlay_vec, noverlays, w);
}
***************
*** 21724,21729 ****
--- 22049,22056 ----
staticpro (&Qspace_width);
Qraise = intern ("raise");
staticpro (&Qraise);
+ Qslice = intern ("slice");
+ staticpro (&Qslice);
Qspace = intern ("space");
staticpro (&Qspace);
Qmargin = intern ("margin");
***************
*** 21736,21741 ****
--- 22063,22072 ----
staticpro (&Qright_margin);
Qcenter = intern ("center");
staticpro (&Qcenter);
+ Qline_height = intern ("line-height");
+ staticpro (&Qline_height);
+ Qtotal = intern ("total");
+ staticpro (&Qtotal);
QCalign_to = intern (":align-to");
staticpro (&QCalign_to);
QCrelative_width = intern (":relative-width");
***************
*** 22096,22106 ****
and `scroll-right' overrides this variable's effect. */);
Vhscroll_step = make_number (0);
- DEFVAR_LISP ("image-types", &Vimage_types,
- doc: /* List of supported image types.
- Each element of the list is a symbol for a supported image type. */);
- Vimage_types = Qnil;
-
DEFVAR_BOOL ("message-truncate-lines", &message_truncate_lines,
doc: /* If non-nil, messages are truncated instead of resizing the echo
area.
Bind this around calls to `message' to let it take effect. */);
--- 22427,22432 ----
- [Emacs-diffs] Changes to emacs/src/xdisp.c [emacs-unicode-2],
Miles Bader <=