579 |
int width = XFASTINT (w->total_cols); |
int width = XFASTINT (w->total_cols); |
580 |
double d = max (0, XFLOATINT (margin)); |
double d = max (0, XFLOATINT (margin)); |
581 |
d = min (width / 2 - 1, d); |
d = min (width / 2 - 1, d); |
582 |
n = (int) ((double) total_glyphs / width * d); |
n = (int) ((double) total_glyphs / width * d) * w->ncols_scale_factor; |
583 |
} |
} |
584 |
else |
else |
585 |
n = 0; |
n = 0; |
1911 |
|| dim.width != w->desired_matrix->matrix_w |
|| dim.width != w->desired_matrix->matrix_w |
1912 |
|| dim.height != w->desired_matrix->matrix_h |
|| dim.height != w->desired_matrix->matrix_h |
1913 |
|| (margin_glyphs_to_reserve (w, dim.width, |
|| (margin_glyphs_to_reserve (w, dim.width, |
1914 |
w->right_margin_cols) |
w->left_margin_cols) |
1915 |
!= w->desired_matrix->left_margin_glyphs) |
!= w->desired_matrix->left_margin_glyphs) |
1916 |
|| (margin_glyphs_to_reserve (w, dim.width, |
|| (margin_glyphs_to_reserve (w, dim.width, |
1917 |
w->left_margin_cols) |
w->right_margin_cols) |
1918 |
!= w->desired_matrix->right_margin_glyphs)) |
!= w->desired_matrix->right_margin_glyphs)) |
1919 |
*window_change_flags |= CHANGED_LEAF_MATRIX; |
*window_change_flags |= CHANGED_LEAF_MATRIX; |
1920 |
|
|
1982 |
int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f); |
int ch_height = FRAME_SMALLEST_FONT_HEIGHT (f); |
1983 |
int window_pixel_height = window_box_height (w) + abs (w->vscroll); |
int window_pixel_height = window_box_height (w) + abs (w->vscroll); |
1984 |
return (((window_pixel_height + ch_height - 1) |
return (((window_pixel_height + ch_height - 1) |
1985 |
/ ch_height) |
/ ch_height) * w->nrows_scale_factor |
1986 |
/* One partially visible line at the top and |
/* One partially visible line at the top and |
1987 |
bottom of the window. */ |
bottom of the window. */ |
1988 |
+ 2 |
+ 2 |
2010 |
|
|
2011 |
/* Compute number of glyphs needed in a glyph row. */ |
/* Compute number of glyphs needed in a glyph row. */ |
2012 |
return (((window_pixel_width + ch_width - 1) |
return (((window_pixel_width + ch_width - 1) |
2013 |
/ ch_width) |
/ ch_width) * w->ncols_scale_factor |
2014 |
/* 2 partially visible columns in the text area. */ |
/* 2 partially visible columns in the text area. */ |
2015 |
+ 2 |
+ 2 |
2016 |
/* One partially visible column at the right |
/* One partially visible column at the right |