emacs: src/window.c comparison

comparison src/window.c @ 90602:b5c13d1564a9

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 437-446) - Update from CVS - lisp/url/url-methods.el: Fix format error when http_proxy is empty string - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 137-140) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-111

author	Miles Bader <miles@gnu.org>
date	Wed, 20 Sep 2006 06:04:23 +0000
parents	84dd84b43e1b 79ada95d4018
children	bb0e318b7c53

comparison

equal deleted inserted replaced

-:a1a25ac6c88a
+:b5c13d1564a9
 If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil,
 return value is a list of 2 or 6 elements (X Y [RTOP RBOT ROWH VPOS]),
 where X and Y are the pixel coordinates relative to the top left corner
 of the window.  The remaining elements are omitted if the character after
 POS is fully visible; otherwise, RTOP and RBOT are the number of pixels
-invisible at the top and bottom of the row, ROWH is the height of the display
+off-screen at the top and bottom of the row, ROWH is the height of the
-row, and VPOS is the row number (0-based) containing POS.  */)
+display row, and VPOS is the row number (0-based) containing POS.  */)
 (pos, window, partially)
 Lisp_Object pos, window, partially;
 {
 register struct window *w;
 register int posint;
 }
 return in_window;
 }
+DEFUN ("window-line-height", Fwindow_line_height,
+Swindow_line_height, 0, 2, 0,
+doc: /* Return height in pixels of text line LINE in window WINDOW.
+If WINDOW is nil or omitted, use selected window.
+Return height of current line if LINE is omitted or nil.  Return height of
+header or mode line if LINE is `header-line' and `mode-line'.
+Otherwise, LINE is a text line number starting from 0.  A negative number
+counts from the end of the window.
+Value is a list (HEIGHT VPOS YPOS OFFBOT), where HEIGHT is the height
+in pixels of the visible part of the line, VPOS and YPOS are the
+vertical position in lines and pixels of the row, relative to the top
+of the first text line, and OFFBOT is the number of off-screen pixels at
+the bottom of the text row.  If there are off-screen pixels at the top
+of the (first) text row, YPOS is negative.
+Return nil if window display is not up-to-date.  In that case, use
+`pos-visible-in-window-p' to obtain the information.  */)
+(line, window)
+Lisp_Object line, window;
+{
+register struct window *w;
+register struct buffer *b;
+struct glyph_row *row, *end_row;
+int max_y, crop, i, n;
+w = decode_window (window);
+if (noninteractive
+|| w->pseudo_window_p)
+return Qnil;
+CHECK_BUFFER (w->buffer);
+b = XBUFFER (w->buffer);
+/* Fail if current matrix is not up-to-date.  */
+if (NILP (w->window_end_valid)
+|| current_buffer->clip_changed
+|| current_buffer->prevent_redisplay_optimizations_p
+|| XFASTINT (w->last_modified) < BUF_MODIFF (b)
+|| XFASTINT (w->last_overlay_modified) < BUF_OVERLAY_MODIFF (b))
+return Qnil;
+if (NILP (line))
+{
+i = w->cursor.vpos;
+if (i < 0 || i >= w->current_matrix->nrows
+	  || (row = MATRIX_ROW (w->current_matrix, i), !row->enabled_p))
+	return Qnil;
+max_y = window_text_bottom_y (w);
+goto found_row;
+}
+if (EQ (line, Qheader_line))
+{
+if (!WINDOW_WANTS_HEADER_LINE_P (w))
+	return Qnil;
+row = MATRIX_HEADER_LINE_ROW (w->current_matrix);
+if (!row->enabled_p)
+	return Qnil;
+return list4 (make_number (row->height),
+		    make_number (0), make_number (0),
+		    make_number (0));
+}
+if (EQ (line, Qmode_line))
+{
+row = MATRIX_MODE_LINE_ROW (w->current_matrix);
+if (!row->enabled_p)
+	return Qnil;
+return list4 (make_number (row->height),
+		    make_number (0), /* not accurate */
+		    make_number (WINDOW_HEADER_LINE_HEIGHT (w)
+				 + window_text_bottom_y (w)),
+		    make_number (0));
+}
+CHECK_NUMBER (line);
+n = XINT (line);
+row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
+end_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w);
+max_y = window_text_bottom_y (w);
+i = 0;
+while ((n < 0 || i < n)
+	 && row <= end_row && row->enabled_p
+	 && row->y + row->height < max_y)
+row++, i++;
+if (row > end_row || !row->enabled_p)
+return Qnil;
+if (++n < 0)
+{
+if (-n > i)
+	return Qnil;
+row += n;
+i += n;
+}
+found_row:
+crop = max (0, (row->y + row->height) - max_y);
+return list4 (make_number (row->height + min (0, row->y) - crop),
+		make_number (i),
+		make_number (row->y),
+		make_number (crop));
+}
 static struct window *
 decode_window (window)
 register Lisp_Object window;
 {
 DEFUN ("set-window-hscroll", Fset_window_hscroll, Sset_window_hscroll, 2, 2, 0,
 doc: /* Set number of columns WINDOW is scrolled from left margin to NCOL.
 Return NCOL.  NCOL should be zero or positive.
 Note that if `automatic-hscrolling' is non-nil, you cannot scroll the
-window so that the location of point becomes invisible.  */)
+window so that the location of point moves off-screen.  */)
 (window, ncol)
 Lisp_Object window, ncol;
 {
 struct window *w = decode_window (window);
 int hscroll;
 Lisp_Object window, update;
 {
 Lisp_Object value;
 struct window *w = decode_window (window);
 Lisp_Object buf;
+struct buffer *b;
 buf = w->buffer;
 CHECK_BUFFER (buf);
+b = XBUFFER (buf);
 #if 0 /* This change broke some things.  We should make it later.  */
 /* If we don't know the end position, return nil.
 The user can compute it with vertical-motion if he wants to.
 It would be nicer to do it automatically,
 return Qnil;
 #endif
 if (! NILP (update)
 && ! (! NILP (w->window_end_valid)
-	    && XFASTINT (w->last_modified) >= MODIFF)
+	    && XFASTINT (w->last_modified) >= BUF_MODIFF (b))
 && !noninteractive)
 {
 struct text_pos startp;
 struct it it;
-struct buffer *old_buffer = NULL, *b = XBUFFER (buf);
+struct buffer *old_buffer = NULL;
+/* Cannot use Fvertical_motion because that function doesn't
+	 cope with variable-height lines.  */
+if (b != current_buffer)
+	{
+	  old_buffer = current_buffer;
+	  set_buffer_internal (b);
+	}
 /* In case W->start is out of the range, use something
 reasonable.  This situation occurred when loading a file with
 `-l' containing a call to `rmail' with subsequent other
 commands.  At the end, W->start happened to be BEG, while
 else if (XMARKER (w->start)->charpos > ZV)
 	SET_TEXT_POS (startp, ZV, ZV_BYTE);
 else
 	SET_TEXT_POS_FROM_MARKER (startp, w->start);
-/* Cannot use Fvertical_motion because that function doesn't
-	 cope with variable-height lines.  */
-if (b != current_buffer)
-	{
-	  old_buffer = current_buffer;
-	  set_buffer_internal (b);
-	}
 start_display (&it, w, startp);
 move_it_vertically (&it, window_box_height (w));
 if (it.current_y < it.last_visible_y)
 	move_it_past_eol (&it);
 value = make_number (IT_CHARPOS (it));
 if (old_buffer)
 	set_buffer_internal (old_buffer);
 }
 else
-XSETINT (value, BUF_Z (XBUFFER (buf)) - XFASTINT (w->window_end_pos));
+XSETINT (value, BUF_Z (b) - XFASTINT (w->window_end_pos));
 return value;
 }
 DEFUN ("set-window-point", Fset_window_point, Sset_window_point, 2, 2, 0,
 defsubr (&Sminibuffer_window);
 defsubr (&Swindow_minibuffer_p);
 defsubr (&Swindowp);
 defsubr (&Swindow_live_p);
 defsubr (&Spos_visible_in_window_p);
+defsubr (&Swindow_line_height);
 defsubr (&Swindow_buffer);
 defsubr (&Swindow_height);
 defsubr (&Swindow_width);
 defsubr (&Swindow_hscroll);
 defsubr (&Sset_window_hscroll);

Mercurial > emacs

comparison src/window.c @ 90602:b5c13d1564a9