comparison src/xdisp.c @ 35246:4e6bbe9c1780

(build_desired_tool_bar_string): Correct the computation of the size needed for the tool bar string. For the last image, use a `display' property that reaches to the end of the string.

35245:be1c0993aea3

static void
build_desired_tool_bar_string (f)
     struct frame *f;
{
  int i, size, size_needed, string_idx;
  struct gcpro gcpro1, gcpro2, gcpro3;
  Lisp_Object image, plist, props;

  image = plist = props = Qnil;
  GCPRO3 (image, plist, props);

  /* The size of the string we might be able to reuse.  */
  size = (STRINGP (f->desired_tool_bar_string)
	  ? XSTRING (f->desired_tool_bar_string)->size
	  : 0);

  /* Each image in the string we build is preceded by a space,
     and there is a space at the end.  */
  size_needed = f->n_tool_bar_items + 1;

  /* Reuse f->desired_tool_bar_string, if possible.  */
  if (size < size_needed)
    f->desired_tool_bar_string = Fmake_string (make_number (size_needed),
					       make_number (' '));
  else
    {

    }

  /* Put a `display' property on the string for the images to display,
     put a `menu_item' property on tool-bar items with a value that
     is the index of the item in F's tool-bar item vector.  */
  for (i = 0, string_idx = 0;
       i < f->n_tool_bar_items;
       ++i, string_idx += 1)
    {
#define PROP(IDX) AREF (f->tool_bar_items, i * TOOL_BAR_ITEM_NSLOTS + (IDX))

      int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
      int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
      int margin, relief, idx;
      extern Lisp_Object QCrelief, QCmargin, QCalgorithm, Qimage;
      extern Lisp_Object Qlaplace;

      /* If image is a vector, choose the image according to the
	 button state.  */

	 display.  Put a `menu-item' property on the string that gives
	 the start of this item's properties in the tool-bar items
	 vector.  */
      image = Fcons (Qimage, plist);
      props = list4 (Qdisplay, image,
		     Qmenu_item, make_number (i * TOOL_BAR_ITEM_NSLOTS)),
      Fadd_text_properties (make_number (string_idx),
			    make_number (string_idx + 1),
			    props, f->desired_tool_bar_string);
#undef PROP
    }

  UNGCPRO;

35246:4e6bbe9c1780

static void
build_desired_tool_bar_string (f)
     struct frame *f;
{
  int i, size, size_needed;
  struct gcpro gcpro1, gcpro2, gcpro3;
  Lisp_Object image, plist, props;

  image = plist = props = Qnil;
  GCPRO3 (image, plist, props);

  /* The size of the string we might be able to reuse.  */
  size = (STRINGP (f->desired_tool_bar_string)
	  ? XSTRING (f->desired_tool_bar_string)->size
	  : 0);

  /* Reuse f->desired_tool_bar_string, if possible.  */
  size_needed = f->n_tool_bar_items;
  if (size < size_needed)
    f->desired_tool_bar_string = Fmake_string (make_number (size_needed),
					       make_number (' '));
  else
    {

    }

  /* Put a `display' property on the string for the images to display,
     put a `menu_item' property on tool-bar items with a value that
     is the index of the item in F's tool-bar item vector.  */
  for (i = 0; i < f->n_tool_bar_items; ++i)
    {
#define PROP(IDX) AREF (f->tool_bar_items, i * TOOL_BAR_ITEM_NSLOTS + (IDX))

      int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
      int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
      int margin, relief, idx, end;
      extern Lisp_Object QCrelief, QCmargin, QCalgorithm, Qimage;
      extern Lisp_Object Qlaplace;

      /* If image is a vector, choose the image according to the
	 button state.  */

	 display.  Put a `menu-item' property on the string that gives
	 the start of this item's properties in the tool-bar items
	 vector.  */
      image = Fcons (Qimage, plist);
      props = list4 (Qdisplay, image,
		     Qmenu_item, make_number (i * TOOL_BAR_ITEM_NSLOTS));

      /* Let the last image hide all remaining spaces in the tool bar
         string.  The string can be longer than needed when we reuse a
         previous string.  */
      if (i + 1 == f->n_tool_bar_items)
	end = XSTRING (f->desired_tool_bar_string)->size;
      else
	end = i + 1;
      Fadd_text_properties (make_number (i), make_number (end),
			    props, f->desired_tool_bar_string);
#undef PROP
    }

  UNGCPRO;