# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1090444103 0
# Node ID 069e4841ceb235e4b886b17322b71f54a443f69f
# Parent  83d7fd93f20849f12db1d9f0c53dcb1512ebcc8e
(margin_glyphs_to_reserve): Apply ncols_scale_factor.
(allocate_matrices_for_frame_redisplay): Fix left/right margin mix-up.
(required_matrix_height): Apply nrows_scale_factor.
(required_matrix_width): Apply ncols_scale_factor.

diff -r 83d7fd93f208 -r 069e4841ceb2 src/dispnew.c
--- a/src/dispnew.c	Wed Jul 21 21:07:59 2004 +0000
+++ b/src/dispnew.c	Wed Jul 21 21:08:23 2004 +0000
@@ -579,7 +579,7 @@
       int width = XFASTINT (w->total_cols);
       double d = max (0, XFLOATINT (margin));
       d = min (width / 2 - 1, d);
-      n = (int) ((double) total_glyphs / width * d);
+      n = (int) ((double) total_glyphs / width * d) * w->ncols_scale_factor;
     }
   else
     n = 0;
@@ -1911,10 +1911,10 @@
 	      || dim.width != w->desired_matrix->matrix_w
 	      || dim.height != w->desired_matrix->matrix_h
 	      || (margin_glyphs_to_reserve (w, dim.width,
-					    w->right_margin_cols)
+					    w->left_margin_cols)
 		  != w->desired_matrix->left_margin_glyphs)
 	      || (margin_glyphs_to_reserve (w, dim.width,
-					    w->left_margin_cols)
+					    w->right_margin_cols)
 		  != w->desired_matrix->right_margin_glyphs))
 	    *window_change_flags |= CHANGED_LEAF_MATRIX;
 
@@ -1982,7 +1982,7 @@
       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)
+	       / ch_height) * w->nrows_scale_factor
 	      /* One partially visible line at the top and
 		 bottom of the window.  */
 	      + 2
@@ -2010,7 +2010,7 @@
 
       /* Compute number of glyphs needed in a glyph row.  */
       return (((window_pixel_width + ch_width - 1)
-	       / ch_width)
+	       / ch_width) * w->ncols_scale_factor
 	      /* 2 partially visible columns in the text area.  */
 	      + 2
 	      /* One partially visible column at the right