# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1048283324 0
# Node ID fef96ba449a2fed7c1633d0a76c3cd5a2d67e5d7
# Parent  3fb54e5a72018f5ebdaa8ff358bf19c28b9dc92b
(get_glyph_string_clip_rect): Use FRAME_INTERNAL_BORDER_WIDTH.

diff -r 3fb54e5a7201 -r fef96ba449a2 src/xdisp.c
--- a/src/xdisp.c	Fri Mar 21 21:47:46 2003 +0000
+++ b/src/xdisp.c	Fri Mar 21 21:48:44 2003 +0000
@@ -1579,7 +1579,7 @@
       /* If drawing a tool-bar window, draw it over the internal border
 	 at the top of the window.  */
       if (s->w == XWINDOW (s->f->tool_bar_window))
-	r.y -= s->f->output_data.x->internal_border_width;
+	r.y -= FRAME_INTERNAL_BORDER_WIDTH (s->f);
     }
 
   r.y = WINDOW_TO_FRAME_PIXEL_Y (s->w, r.y);
@@ -18920,8 +18920,9 @@
       w->phys_cursor.vpos = vpos;
     }
 
-  rif->draw_window_cursor (w, glyph_row, on, x, y,
-			   new_cursor_type, new_cursor_width);
+  rif->draw_window_cursor (w, glyph_row, x, y,
+			   new_cursor_type, new_cursor_width,
+			   on, active_cursor);
 }