comparison src/xdisp.c @ 58394:914f38aa54fd

(IT_EXPAND_MATRIX_WIDTH): New macro. Do not expand matrix width for overflow in zero-width area. (append_glyph, append_composite_glyph, produce_image_glyph) (append_stretch_glyph): Use it to avoid loop in redisplay. (note_mode_line_or_margin_highlight): Don't let help-echo from string override help-echo from image map.

58393:5ebca6762883

  RELEASE_HDC (hdc, f);

  return x_reached;
}


/* Store one glyph for IT->char_to_display in IT->glyph_row.
   Called from x_produce_glyphs when IT->glyph_row is non-null.  */

static INLINE void

      glyph->u.ch = it->char_to_display;
      glyph->slice = null_glyph_slice;
      glyph->font_type = FONT_TYPE_UNKNOWN;
      ++it->glyph_row->used[area];
    }
  else if (!fonts_changed_p)
    {
      it->w->ncols_scale_factor++;
      fonts_changed_p = 1;
    }
}

/* Store one glyph for the composition IT->cmp_id in IT->glyph_row.
   Called from x_produce_glyphs when IT->glyph_row is non-null.  */

      glyph->u.cmp_id = it->cmp_id;
      glyph->slice = null_glyph_slice;
      glyph->font_type = FONT_TYPE_UNKNOWN;
      ++it->glyph_row->used[area];
    }
  else if (!fonts_changed_p)
    {
      it->w->ncols_scale_factor++;
      fonts_changed_p = 1;
    }
}


/* Change IT->ascent and IT->height according to the setting of
   IT->voffset.  */

	  glyph->u.img_id = img->id;
	  glyph->slice = slice;
	  glyph->font_type = FONT_TYPE_UNKNOWN;
	  ++it->glyph_row->used[area];
	}
      else if (!fonts_changed_p)
	{
	  it->w->ncols_scale_factor++;
	  fonts_changed_p = 1;
	}
    }
}


/* Append a stretch glyph to IT->glyph_row.  OBJECT is the source

      glyph->u.stretch.height = height;
      glyph->slice = null_glyph_slice;
      glyph->font_type = FONT_TYPE_UNKNOWN;
      ++it->glyph_row->used[area];
    }
  else if (!fonts_changed_p)
    {
      it->w->ncols_scale_factor++;
      fonts_changed_p = 1;
    }
}


/* Produce a stretch glyph for iterator IT.  IT->object is the value
   of the glyph property displayed.  The value must be a list

    {
      pos = make_number (charpos);
      /* If we're on a string with `help-echo' text property, arrange
	 for the help to be displayed.  This is done by setting the
	 global variable help_echo_string to the help string.  */
      help = Fget_text_property (pos, Qhelp_echo, string);
      if (!NILP (help))
	{
	  help_echo_string = help;
	  XSETWINDOW (help_echo_window, w);
	  help_echo_object = string;
	  help_echo_pos = charpos;
	}

      if (NILP (pointer))
	pointer = Fget_text_property (pos, Qpointer, string);

58394:914f38aa54fd

  RELEASE_HDC (hdc, f);

  return x_reached;
}

/* Expand row matrix if too narrow.  Don't expand if area
   is not present.  */

#define IT_EXPAND_MATRIX_WIDTH(it, area)		\
  {							\
    if (!fonts_changed_p				\
	&& (it->glyph_row->glyphs[area]			\
	    < it->glyph_row->glyphs[area + 1]))		\
      {							\
	it->w->ncols_scale_factor++;			\
	fonts_changed_p = 1;				\
      }							\
  }

/* Store one glyph for IT->char_to_display in IT->glyph_row.
   Called from x_produce_glyphs when IT->glyph_row is non-null.  */

static INLINE void

      glyph->u.ch = it->char_to_display;
      glyph->slice = null_glyph_slice;
      glyph->font_type = FONT_TYPE_UNKNOWN;
      ++it->glyph_row->used[area];
    }
  else
    IT_EXPAND_MATRIX_WIDTH (it, area);
}

/* Store one glyph for the composition IT->cmp_id in IT->glyph_row.
   Called from x_produce_glyphs when IT->glyph_row is non-null.  */

      glyph->u.cmp_id = it->cmp_id;
      glyph->slice = null_glyph_slice;
      glyph->font_type = FONT_TYPE_UNKNOWN;
      ++it->glyph_row->used[area];
    }
  else
    IT_EXPAND_MATRIX_WIDTH (it, area);
}


/* Change IT->ascent and IT->height according to the setting of
   IT->voffset.  */

	  glyph->u.img_id = img->id;
	  glyph->slice = slice;
	  glyph->font_type = FONT_TYPE_UNKNOWN;
	  ++it->glyph_row->used[area];
	}
      else
	IT_EXPAND_MATRIX_WIDTH (it, area);
    }
}


/* Append a stretch glyph to IT->glyph_row.  OBJECT is the source

      glyph->u.stretch.height = height;
      glyph->slice = null_glyph_slice;
      glyph->font_type = FONT_TYPE_UNKNOWN;
      ++it->glyph_row->used[area];
    }
  else
    IT_EXPAND_MATRIX_WIDTH (it, area);
}


/* Produce a stretch glyph for iterator IT.  IT->object is the value
   of the glyph property displayed.  The value must be a list

    {
      pos = make_number (charpos);
      /* If we're on a string with `help-echo' text property, arrange
	 for the help to be displayed.  This is done by setting the
	 global variable help_echo_string to the help string.  */
      if (NILP (help))
	{
	  help = Fget_text_property (pos, Qhelp_echo, string);
	  if (!NILP (help))
	    {
	      help_echo_string = help;
	      XSETWINDOW (help_echo_window, w);
	      help_echo_object = string;
	      help_echo_pos = charpos;
	    }
	}

      if (NILP (pointer))
	pointer = Fget_text_property (pos, Qpointer, string);