comparison src/dispnew.c @ 89956:b9eee0a7bef5

Revision: [e-mail]--gnu-2004/emacs--unicode--0--patch-25 Merge from emacs--cvs-trunk--0 Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-459 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-463 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-464 Update from CVS: lisp/progmodes/make-mode.el: Fix comments. * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-465 Update from CVS

89955:7f8b53f94713

  if (NUMBERP (margin))
    {
      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);
    }
  else
    n = 0;

  return n;

	  if (x != w->desired_matrix->matrix_x
	      || y != w->desired_matrix->matrix_y
	      || 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->desired_matrix->left_margin_glyphs)
	      || (margin_glyphs_to_reserve (w, dim.width,
					    w->left_margin_cols)
		  != w->desired_matrix->right_margin_glyphs))
	    *window_change_flags |= CHANGED_LEAF_MATRIX;

	  /* Actually change matrices, if allowed.  Do not consider
	     CHANGED_LEAF_MATRIX computed above here because the pool

  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 header and mode line.  */
	      + 2);

      int ch_width = FRAME_SMALLEST_CHAR_WIDTH (f);
      int window_pixel_width = WINDOW_TOTAL_WIDTH (w);

      /* 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);

89956:b9eee0a7bef5

  if (NUMBERP (margin))
    {
      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) * w->ncols_scale_factor;
    }
  else
    n = 0;

  return n;

	  if (x != w->desired_matrix->matrix_x
	      || y != w->desired_matrix->matrix_y
	      || dim.width != w->desired_matrix->matrix_w
	      || dim.height != w->desired_matrix->matrix_h
	      || (margin_glyphs_to_reserve (w, dim.width,
					    w->left_margin_cols)
		  != w->desired_matrix->left_margin_glyphs)
	      || (margin_glyphs_to_reserve (w, dim.width,
					    w->right_margin_cols)
		  != w->desired_matrix->right_margin_glyphs))
	    *window_change_flags |= CHANGED_LEAF_MATRIX;

	  /* Actually change matrices, if allowed.  Do not consider
	     CHANGED_LEAF_MATRIX computed above here because the pool

  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) * w->nrows_scale_factor
	      /* One partially visible line at the top and
		 bottom of the window.  */
	      + 2
	      /* 2 for header and mode line.  */
	      + 2);

      int ch_width = FRAME_SMALLEST_CHAR_WIDTH (f);
      int window_pixel_width = WINDOW_TOTAL_WIDTH (w);

      /* Compute number of glyphs needed in a glyph row.  */
      return (((window_pixel_width + ch_width - 1)
	       / ch_width) * w->ncols_scale_factor
	      /* 2 partially visible columns in the text area.  */
	      + 2
	      /* One partially visible column at the right
		 edge of each marginal area.  */
	      + 1 + 1);