emacs: src/dispnew.c comparison

comparison src/dispnew.c @ 39448:b74c165ef22f

(required_matrix_width, required_matrix_height): New functions. (allocate_matrices_for_window_redisplay) (allocate_matrices_for_frame_redisplay: Use them. Remove parameters CH_DIM.

author	Gerd Moellmann <gerd@gnu.org>
date	Wed, 26 Sep 2001 11:15:40 +0000
parents	73dd40615520
children	5f60884970a8

comparison

equal deleted inserted replaced

-:97363868cbb1
+:b74c165ef22f
 static int count_match P_ ((struct glyph *, struct glyph *,
 			    struct glyph *, struct glyph *));
 static unsigned line_draw_cost P_ ((struct glyph_matrix *, int));
 static void update_frame_line P_ ((struct frame *, int));
 static struct dim allocate_matrices_for_frame_redisplay
-P_ ((Lisp_Object, int, int, struct dim, int, int *));
+P_ ((Lisp_Object, int, int, int, int *));
-static void allocate_matrices_for_window_redisplay P_ ((struct window *,
+static void allocate_matrices_for_window_redisplay P_ ((struct window *));
-							struct dim));
 static int realloc_glyph_pool P_ ((struct glyph_pool *, struct dim));
 static void adjust_frame_glyphs P_ ((struct frame *));
 struct glyph_matrix *new_glyph_matrix P_ ((struct glyph_pool *));
 static void free_glyph_matrix P_ ((struct glyph_matrix *));
 static void adjust_glyph_matrix P_ ((struct window *, struct glyph_matrix *,
 size.  */
 #define CHANGED_LEAF_MATRIX	(1 << 1)
 static struct dim
-allocate_matrices_for_frame_redisplay (window, x, y, ch_dim,
+allocate_matrices_for_frame_redisplay (window, x, y, dim_only_p,
-				       dim_only_p, window_change_flags)
+				       window_change_flags)
 Lisp_Object window;
 int x, y;
-struct dim ch_dim;
 int dim_only_p;
 int *window_change_flags;
 {
 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
 int x0 = x, y0 = y;
 w = XWINDOW (window);
 /* Get the dimension of the window sub-matrix for W, depending
 	 on whether this a combination or a leaf window.  */
 if (!NILP (w->hchild))
-	dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y, ch_dim,
+	dim = allocate_matrices_for_frame_redisplay (w->hchild, x, y,
 						     dim_only_p,
 						     window_change_flags);
 else if (!NILP (w->vchild))
-	dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y, ch_dim,
+	dim = allocate_matrices_for_frame_redisplay (w->vchild, x, y,
 						     dim_only_p,
 						     window_change_flags);
 else
 	{
 	  /* If not already done, allocate sub-matrix structures.  */
 	      *window_change_flags |= NEW_LEAF_MATRIX;
 	    }
 	  /* Width and height MUST be chosen so that there are no
 	     holes in the frame matrix.  */
-	  dim.width = XINT (w->width);
+	  dim.width = required_matrix_width (w);
-	  dim.height = XINT (w->height);
+	  dim.height = required_matrix_height (w);
 	  /* Will matrix be re-allocated?  */
 	  if (x != w->desired_matrix->matrix_x
 	      || y != w->desired_matrix->matrix_y
 	      || dim.width != w->desired_matrix->matrix_w
 return total;
 }
+/* Return the required height of glyph matrices for window W.  */
+int
+required_matrix_height (w)
+struct window *w;
+{
+#ifdef HAVE_WINDOW_SYSTEM
+struct frame *f = XFRAME (w->frame);
+if (FRAME_WINDOW_P (f))
+{
+int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f);
+int window_pixel_height = window_box_height (w) + abs (w->vscroll);
+return (((window_pixel_height + ch_height - 1)
+	       / ch_height)
+	      /* One partially visible line at the top and
+		 bottom of the window.  */
+	      + 2
+	      /* 2 for top and mode line.  */
+	      + 2);
+}
+#endif /* HAVE_WINDOW_SYSTEM */
+return XINT (w->height);
+}
+/* Return the required width of glyph matrices for window W.  */
+int
+required_matrix_width (w)
+struct window *w;
+{
+#ifdef HAVE_WINDOW_SYSTEM
+struct frame *f = XFRAME (w->frame);
+if (FRAME_WINDOW_P (f))
+{
+int ch_width = FRAME_SMALLEST_CHAR_WIDTH (f);
+int window_pixel_width = XFLOATINT (w->width) * CANON_X_UNIT (f);
+/* Compute number of glyphs needed in a glyph row.  */
+return (((window_pixel_width + ch_width - 1)
+	       / ch_width)
+	      /* 2 partially visible columns in the text area.  */
+	      + 2
+	      /* One partially visible column at the right
+		 edge of each marginal area.  */
+	      + 1 + 1);
+}
+#endif /* HAVE_WINDOW_SYSTEM */
+return XINT (w->width);
+}
 /* Allocate window matrices for window-based redisplay.  W is the
 window whose matrices must be allocated/reallocated.  CH_DIM is the
 size of the smallest character that could potentially be used on W.  */
 static void
-allocate_matrices_for_window_redisplay (w, ch_dim)
+allocate_matrices_for_window_redisplay (w)
 struct window *w;
-struct dim ch_dim;
+{
-{
-struct frame *f = XFRAME (w->frame);
 while (w)
 {
 if (!NILP (w->vchild))
-	allocate_matrices_for_window_redisplay (XWINDOW (w->vchild), ch_dim);
+	allocate_matrices_for_window_redisplay (XWINDOW (w->vchild));
 else if (!NILP (w->hchild))
-	allocate_matrices_for_window_redisplay (XWINDOW (w->hchild), ch_dim);
+	allocate_matrices_for_window_redisplay (XWINDOW (w->hchild));
 else
 	{
 	  /* W is a leaf window.  */
-	  int window_pixel_width = XFLOATINT (w->width) * CANON_X_UNIT (f);
-	  int window_pixel_height = window_box_height (w) + abs (w->vscroll);
 	  struct dim dim;
 	  /* If matrices are not yet allocated, allocate them now.  */
 	  if (w->desired_matrix == NULL)
 	    {
 	      w->desired_matrix = new_glyph_matrix (NULL);
 	      w->current_matrix = new_glyph_matrix (NULL);
 	    }
-	  /* Compute number of glyphs needed in a glyph row.  */
+	  dim.width = required_matrix_width (w);
-	  dim.width = (((window_pixel_width + ch_dim.width - 1)
+	  dim.height = required_matrix_height (w);
-			/ ch_dim.width)
-		       /* 2 partially visible columns in the text area.  */
-		       + 2
-		       /* One partially visible column at the right
-			  edge of each marginal area.  */
-		       + 1 + 1);
-	  /* Compute number of glyph rows needed.  */
-	  dim.height = (((window_pixel_height + ch_dim.height - 1)
-			 / ch_dim.height)
-			/* One partially visible line at the top and
-			   bottom of the window.  */
-			+ 2
-			/* 2 for top and mode line.  */
-			+ 2);
-	  /* Change matrices.  */
 	  adjust_glyph_matrix (w, w->desired_matrix, 0, 0, dim);
 	  adjust_glyph_matrix (w, w->current_matrix, 0, 0, dim);
 	}
 w = NILP (w->next) ? NULL : XWINDOW (w->next);
 matrix.  */
 window_change_flags = 0;
 matrix_dim
 = allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f),
 					     0, top_window_y,
-					     ch_dim, 1,
+					     1,
 					     &window_change_flags);
 /* Add in menu bar lines, if any.  */
 matrix_dim.height += top_window_y;
 absolutely necessary since it requires a frame redraw.  */
 if (pool_changed_p || window_change_flags)
 {
 /* Do it for window matrices.  */
 allocate_matrices_for_frame_redisplay (FRAME_ROOT_WINDOW (f),
-					     0, top_window_y, ch_dim, 0,
+					     0, top_window_y, 0,
 					     &window_change_flags);
 /* Size of frame matrices must equal size of frame.  Note
 	 that we are called for X frames with window widths NOT equal
 	 to the frame width (from CHANGE_FRAME_SIZE_1).  */
 #else
 ch_dim.width = ch_dim.height = 1;
 #endif
 /* Allocate/reallocate window matrices.  */
-allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f)),
+allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f)));
-					  ch_dim);
 /* Allocate/ reallocate matrices of the dummy window used to display
 the menu bar under X when no X toolkit support is available.  */
 #ifndef USE_X_TOOLKIT
 {
 adjust glyph matrices of W.  */
 XSETFASTINT (w->top, 0);
 XSETFASTINT (w->left, 0);
 XSETFASTINT (w->height, FRAME_MENU_BAR_LINES (f));
 XSETFASTINT (w->width, FRAME_WINDOW_WIDTH (f));
-allocate_matrices_for_window_redisplay (w, ch_dim);
+allocate_matrices_for_window_redisplay (w);
 }
 #endif /* not USE_X_TOOLKIT */
 /* Allocate/ reallocate matrices of the tool bar window.  If we
 don't have a tool bar window yet, make one.  */
 XSETFASTINT (w->top, FRAME_MENU_BAR_LINES (f));
 XSETFASTINT (w->left, 0);
 XSETFASTINT (w->height, FRAME_TOOL_BAR_LINES (f));
 XSETFASTINT (w->width, FRAME_WINDOW_WIDTH (f));
-allocate_matrices_for_window_redisplay (w, ch_dim);
+allocate_matrices_for_window_redisplay (w);
 }
 /* Adjust/ allocate message buffer of frame F.

Mercurial > emacs

comparison src/dispnew.c @ 39448:b74c165ef22f