/[emacs]/emacs/src/dispnew.c
ViewVC logotype

Diff of /emacs/src/dispnew.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.332 by kfstorm, Tue Apr 20 22:16:19 2004 UTC revision 1.333 by kfstorm, Wed Jul 21 21:08:23 2004 UTC
# Line 579  margin_glyphs_to_reserve (w, total_glyph Line 579  margin_glyphs_to_reserve (w, total_glyph
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;
# Line 1911  allocate_matrices_for_frame_redisplay (w Line 1911  allocate_matrices_for_frame_redisplay (w
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    
# Line 1982  required_matrix_height (w) Line 1982  required_matrix_height (w)
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
# Line 2010  required_matrix_width (w) Line 2010  required_matrix_width (w)
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

Legend:
Removed from v.1.332  
changed lines
  Added in v.1.333

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26