comparison src/dispnew.c @ 83544:58cf725f5330

Merged from [e-mail]. Patches applied: * [e-mail]/emacs--devo--0--patch-474 Update from CVS * [e-mail]/emacs--devo--0--patch-475 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-476 Update from CVS * [e-mail]/emacs--devo--0--patch-477 Update from CVS * [e-mail]/emacs--devo--0--patch-478 Update from CVS * [e-mail]/gnus--rel--5.10--patch-150 Update from CVS * [e-mail]/gnus--rel--5.10--patch-151 Update from CVS * [e-mail]/gnus--rel--5.10--patch-152 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-584

83543:6b25ef5cc276

/* Allocate glyph matrices over a window tree for a frame-based
   redisplay

   X and Y are column/row within the frame glyph matrix where
   sub-matrices for the window tree rooted at WINDOW must be
   allocated.  CH_DIM contains the dimensions of the smallest
   character that could be used during display.  DIM_ONLY_P non-zero
   means that the caller of this function is only interested in the
   result matrix dimension, and matrix adjustments should not be
   performed.

   The function returns the total width/height of the sub-matrices of
   the window tree.  If called on a frame root window, the computation
   will take the mini-buffer window into account.

  return XINT (w->total_cols);
}


/* 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)
     struct window *w;
{

static void
adjust_frame_glyphs_for_frame_redisplay (f)
     struct frame *f;
{
  struct dim ch_dim;
  struct dim matrix_dim;
  int pool_changed_p;
  int window_change_flags;
  int top_window_y;

  if (!FRAME_LIVE_P (f))
    return;

  /* Determine the smallest character in any font for F.  On
     console windows, all characters have dimension (1, 1).  */
  ch_dim.width = ch_dim.height = 1;

  top_window_y = FRAME_TOP_MARGIN (f);

  /* Allocate glyph pool structures if not already done.  */
  if (f->desired_pool == NULL)

static void
adjust_frame_glyphs_for_window_redisplay (f)
     struct frame *f;
{
  struct dim ch_dim;
  struct window *w;

  xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f));

  /* Get minimum sizes.  */
#ifdef HAVE_WINDOW_SYSTEM
  ch_dim.width = FRAME_SMALLEST_CHAR_WIDTH (f);
  ch_dim.height = FRAME_SMALLEST_FONT_HEIGHT (f);
#else
  ch_dim.width = ch_dim.height = 1;
#endif

  /* Allocate/reallocate window matrices.  */
  allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f)));

  /* Allocate/ reallocate matrices of the dummy window used to display
     the menu bar under X when no X toolkit support is available.  */
#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
  {
    /* Allocate a dummy window if not already done.  */

    XSETFASTINT (w->left_col, 0);
    XSETFASTINT (w->total_lines, FRAME_MENU_BAR_LINES (f));
    XSETFASTINT (w->total_cols, FRAME_TOTAL_COLS (f));
    allocate_matrices_for_window_redisplay (w);
  }
#endif /* not USE_X_TOOLKIT */

#ifndef USE_GTK
  /* Allocate/ reallocate matrices of the tool bar window.  If we
     don't have a tool bar window yet, make one.  */
  if (NILP (f->tool_bar_window))

83544:58cf725f5330

/* Allocate glyph matrices over a window tree for a frame-based
   redisplay

   X and Y are column/row within the frame glyph matrix where
   sub-matrices for the window tree rooted at WINDOW must be
   allocated.  DIM_ONLY_P non-zero means that the caller of this
   function is only interested in the result matrix dimension, and
   matrix adjustments should not be performed.

   The function returns the total width/height of the sub-matrices of
   the window tree.  If called on a frame root window, the computation
   will take the mini-buffer window into account.

  return XINT (w->total_cols);
}


/* Allocate window matrices for window-based redisplay.  W is the
   window whose matrices must be allocated/reallocated.  */

static void
allocate_matrices_for_window_redisplay (w)
     struct window *w;
{

static void
adjust_frame_glyphs_for_frame_redisplay (f)
     struct frame *f;
{
  struct dim matrix_dim;
  int pool_changed_p;
  int window_change_flags;
  int top_window_y;

  if (!FRAME_LIVE_P (f))
    return;

  top_window_y = FRAME_TOP_MARGIN (f);

  /* Allocate glyph pool structures if not already done.  */
  if (f->desired_pool == NULL)

static void
adjust_frame_glyphs_for_window_redisplay (f)
     struct frame *f;
{
  struct window *w;

  xassert (FRAME_WINDOW_P (f) && FRAME_LIVE_P (f));

  /* Allocate/reallocate window matrices.  */
  allocate_matrices_for_window_redisplay (XWINDOW (FRAME_ROOT_WINDOW (f)));

#ifdef HAVE_X_WINDOWS
  /* Allocate/ reallocate matrices of the dummy window used to display
     the menu bar under X when no X toolkit support is available.  */
#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
  {
    /* Allocate a dummy window if not already done.  */

    XSETFASTINT (w->left_col, 0);
    XSETFASTINT (w->total_lines, FRAME_MENU_BAR_LINES (f));
    XSETFASTINT (w->total_cols, FRAME_TOTAL_COLS (f));
    allocate_matrices_for_window_redisplay (w);
  }
#endif /* not USE_X_TOOLKIT && not USE_GTK */
#endif /* HAVE_X_WINDOWS */

#ifndef USE_GTK
  /* Allocate/ reallocate matrices of the tool bar window.  If we
     don't have a tool bar window yet, make one.  */
  if (NILP (f->tool_bar_window))