comparison src/xdisp.c @ 28464:cad4cc0508a0

Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type: * xdisp.c (compute_string_pos): Fix order of arguments to string_pos_nchars_ahead. (handle_fontified_prop, add_to_log): Pass int, not Lisp_Object, as count arg to variable-arg routines like Frun_hook_with_args and Fformat. (back_to_previous_visible_line_start, build_desired_tool_bar_string): Pass Lisp_Object, not int, to fixed-arg routines like Fget_char_property and Fmake_string. (reconsider_clip_changes): Use XINT when comparing integer lisp objects, or passing them as int arguments. (mark_window_display_accurate, insert_left_trunc_glyphs, append_space, extend_face_to_end_of_line): Use make_number when storing or passing integer values as lisp objects. (set_cursor_from_row, highlight_trailing_whitespace): Use INTEGERP, not implicit test against zero, for glyph object. (try_window_id): Don't use make_number when we want an int value. * xfaces.c (xlfd_symbolic_value): Make last argument a Lisp_Object, to be consistent with callers. (Fbitmap_spec_p): Use XINT to get numeric value of height. (lface_hash): Apply XFASTINT to lisp values before folding in. * xfns.c (Fx_show_tip): Use make_number to get lisp objects to fill in window width and height. Pass an int, not a lisp object, as first arg to Finsert.

28463:4591d285fb65

{
  xassert (STRINGP (string));
  xassert (CHARPOS (*newpos) >= CHARPOS (pos));
  
  if (STRING_MULTIBYTE (string))
    *newpos = string_pos_nchars_ahead (pos, CHARPOS (*newpos) - CHARPOS (pos),
				       string);
  else
    BYTEPOS (*newpos) = CHARPOS (*newpos);
}

      GCPRO1 (pos);
      /* Run the hook functions.  */
      args[0] = Qfontification_functions;
      args[1] = pos;
      Frun_hook_with_args (make_number (2), args);

      /* Return HANDLED_RECOMPUTE_PROPS only if function fontified
	 something.  This avoids an endless loop if they failed to
	 fontify the text for which reason ever.  */
      if (!NILP (Fget_char_property (pos, Qfontified, Qnil)))

	visible_p = 0;
      else 
	{
	  Lisp_Object prop;

	  prop = Fget_char_property (IT_CHARPOS (*it), Qinvisible, it->window);
	  if (TEXT_PROP_MEANS_INVISIBLE (prop))
	    visible_p = 0;
	}

      /* Back one more newline if the current one is invisible.  */

  GCPRO4 (fmt, msg, arg1, arg2);
  
  args[0] = fmt = build_string (format);
  args[1] = arg1;
  args[2] = arg2;
  msg = Fformat (make_number (3), args);

  len = STRING_BYTES (XSTRING (msg)) + 1;
  buffer = (char *) alloca (len);
  strcpy (buffer, XSTRING (msg)->data);
  

     and there is a space at the end.  */
  size_needed = f->n_desired_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), ' ');
  else
    {
      props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil);
      Fremove_text_properties (make_number (0), make_number (size),
			       props, f->desired_tool_bar_string);

	pt = BUF_PT (current_buffer);
      else
	pt = marker_position (w->pointm);

      if ((w->current_matrix->buffer != XBUFFER (w->buffer)
	   || pt != w->last_point)
	  && check_point_in_composition (w->current_matrix->buffer,
					 w->last_point,
					 XBUFFER (w->buffer), pt))
	b->clip_changed = 1;
    }
}

	      w->current_matrix->begv = BUF_BEGV (b);
	      w->current_matrix->zv = BUF_ZV (b);
	      w->last_cursor = w->cursor;
	      w->last_cursor_off_p = w->cursor_off_p;
	      if (w == XWINDOW (selected_window))
		w->last_point = BUF_PT (b);
	      else
		w->last_point = XMARKER (w->pointm)->charpos;
	    }
	}

      w->window_end_valid = w->buffer;
      w->update_mode_line = Qnil;

  /* Skip over glyphs not having an object at the start of the row.
     These are special glyphs like truncation marks on terminal
     frames.  */
  if (row->displays_text_p)
    while (glyph < end
	   && !glyph->object
	   && glyph->charpos < 0)
      {
	x += glyph->pixel_width;
	++glyph;
      }

  while (glyph < end
	 && glyph->object
	 && (!BUFFERP (glyph->object)
	     || glyph->charpos < pt_old))
    {
      x += glyph->pixel_width;
      ++glyph;

      /* We have to update window end positions because the buffer's
	 size has changed.  */
      w->window_end_pos
	= make_number (Z - MATRIX_ROW_END_CHARPOS (row));
      w->window_end_bytepos
	= make_number (Z_BYTE - MATRIX_ROW_END_BYTEPOS (row));
      return 1;
    }

  /* Return quickly if changes are all below what is displayed in the
     window, and if PT is in the window.  */

      /* We have to update window end positions because the buffer's
	 size has changed.  */
      w->window_end_pos
	= make_number (Z - MATRIX_ROW_END_CHARPOS (row));
      w->window_end_bytepos
	= make_number (Z_BYTE - MATRIX_ROW_END_BYTEPOS (row));
      return 1;
    }

  /* Check that window start agrees with the start of the first glyph
     row in its current matrix.  Check this after we know the window

  truncate_it.current_x = 0;
  truncate_it.face_id = DEFAULT_FACE_ID;
  truncate_it.glyph_row = &scratch_glyph_row;
  truncate_it.glyph_row->used[TEXT_AREA] = 0;
  CHARPOS (truncate_it.position) = BYTEPOS (truncate_it.position) = -1;
  truncate_it.object = 0;
  produce_special_glyphs (&truncate_it, IT_TRUNCATION);
  
  /* Overwrite glyphs from IT with truncation glyphs.  */
  from = truncate_it.glyph_row->glyphs[TEXT_AREA];
  end = from + truncate_it.glyph_row->used[TEXT_AREA];

	  saved_object = it->object;
	  saved_pos = it->position;
	  
	  it->what = IT_CHARACTER;
	  bzero (&it->position, sizeof it->position);
	  it->object = 0;
	  it->c = ' ';
	  it->len = 1;

	  if (default_face_p)
	    it->face_id = DEFAULT_FACE_ID;

      saved_object = it->object;
      saved_pos = it->position;
  
      it->what = IT_CHARACTER;
      bzero (&it->position, sizeof it->position);
      it->object = 0;
      it->c = ' ';
      it->len = 1;
      
      PRODUCE_GLYPHS (it);
      

      /* Skip over the space glyph inserted to display the
	 cursor at the end of a line.  */
      if (glyph->type == CHAR_GLYPH
	  && glyph->u.ch == ' '
	  && glyph->object == 0)
	--glyph;

      /* If last glyph is a space or stretch, and it's trailing
	 whitespace, set the face of all trailing whitespace glyphs in
	 IT->glyph_row to `trailing-whitespace'.  */

28464:cad4cc0508a0

{
  xassert (STRINGP (string));
  xassert (CHARPOS (*newpos) >= CHARPOS (pos));
  
  if (STRING_MULTIBYTE (string))
    *newpos = string_pos_nchars_ahead (pos, string,
				       CHARPOS (*newpos) - CHARPOS (pos));
  else
    BYTEPOS (*newpos) = CHARPOS (*newpos);
}

      GCPRO1 (pos);
      /* Run the hook functions.  */
      args[0] = Qfontification_functions;
      args[1] = pos;
      Frun_hook_with_args (2, args);

      /* Return HANDLED_RECOMPUTE_PROPS only if function fontified
	 something.  This avoids an endless loop if they failed to
	 fontify the text for which reason ever.  */
      if (!NILP (Fget_char_property (pos, Qfontified, Qnil)))

	visible_p = 0;
      else 
	{
	  Lisp_Object prop;

	  prop = Fget_char_property (make_number (IT_CHARPOS (*it)),
				     Qinvisible, it->window);
	  if (TEXT_PROP_MEANS_INVISIBLE (prop))
	    visible_p = 0;
	}

      /* Back one more newline if the current one is invisible.  */

  GCPRO4 (fmt, msg, arg1, arg2);
  
  args[0] = fmt = build_string (format);
  args[1] = arg1;
  args[2] = arg2;
  msg = Fformat (3, args);

  len = STRING_BYTES (XSTRING (msg)) + 1;
  buffer = (char *) alloca (len);
  strcpy (buffer, XSTRING (msg)->data);
  

     and there is a space at the end.  */
  size_needed = f->n_desired_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
    {
      props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil);
      Fremove_text_properties (make_number (0), make_number (size),
			       props, f->desired_tool_bar_string);

	pt = BUF_PT (current_buffer);
      else
	pt = marker_position (w->pointm);

      if ((w->current_matrix->buffer != XBUFFER (w->buffer)
	   || pt != XINT (w->last_point))
	  && check_point_in_composition (w->current_matrix->buffer,
					 XINT (w->last_point),
					 XBUFFER (w->buffer), pt))
	b->clip_changed = 1;
    }
}

	      w->current_matrix->begv = BUF_BEGV (b);
	      w->current_matrix->zv = BUF_ZV (b);
	      w->last_cursor = w->cursor;
	      w->last_cursor_off_p = w->cursor_off_p;
	      if (w == XWINDOW (selected_window))
		w->last_point = make_number (BUF_PT (b));
	      else
		w->last_point = make_number (XMARKER (w->pointm)->charpos);
	    }
	}

      w->window_end_valid = w->buffer;
      w->update_mode_line = Qnil;

  /* Skip over glyphs not having an object at the start of the row.
     These are special glyphs like truncation marks on terminal
     frames.  */
  if (row->displays_text_p)
    while (glyph < end
	   && INTEGERP (glyph->object)
	   && glyph->charpos < 0)
      {
	x += glyph->pixel_width;
	++glyph;
      }

  while (glyph < end
	 && !INTEGERP (glyph->object)
	 && (!BUFFERP (glyph->object)
	     || glyph->charpos < pt_old))
    {
      x += glyph->pixel_width;
      ++glyph;

      /* We have to update window end positions because the buffer's
	 size has changed.  */
      w->window_end_pos
	= make_number (Z - MATRIX_ROW_END_CHARPOS (row));
      w->window_end_bytepos
	= Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
      return 1;
    }

  /* Return quickly if changes are all below what is displayed in the
     window, and if PT is in the window.  */

      /* We have to update window end positions because the buffer's
	 size has changed.  */
      w->window_end_pos
	= make_number (Z - MATRIX_ROW_END_CHARPOS (row));
      w->window_end_bytepos
	= Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
      return 1;
    }

  /* Check that window start agrees with the start of the first glyph
     row in its current matrix.  Check this after we know the window

  truncate_it.current_x = 0;
  truncate_it.face_id = DEFAULT_FACE_ID;
  truncate_it.glyph_row = &scratch_glyph_row;
  truncate_it.glyph_row->used[TEXT_AREA] = 0;
  CHARPOS (truncate_it.position) = BYTEPOS (truncate_it.position) = -1;
  truncate_it.object = make_number (0);
  produce_special_glyphs (&truncate_it, IT_TRUNCATION);
  
  /* Overwrite glyphs from IT with truncation glyphs.  */
  from = truncate_it.glyph_row->glyphs[TEXT_AREA];
  end = from + truncate_it.glyph_row->used[TEXT_AREA];

	  saved_object = it->object;
	  saved_pos = it->position;
	  
	  it->what = IT_CHARACTER;
	  bzero (&it->position, sizeof it->position);
	  it->object = make_number (0);
	  it->c = ' ';
	  it->len = 1;

	  if (default_face_p)
	    it->face_id = DEFAULT_FACE_ID;

      saved_object = it->object;
      saved_pos = it->position;
  
      it->what = IT_CHARACTER;
      bzero (&it->position, sizeof it->position);
      it->object = make_number (0);
      it->c = ' ';
      it->len = 1;
      
      PRODUCE_GLYPHS (it);
      

      /* Skip over the space glyph inserted to display the
	 cursor at the end of a line.  */
      if (glyph->type == CHAR_GLYPH
	  && glyph->u.ch == ' '
	  && INTEGERP (glyph->object))
	--glyph;

      /* If last glyph is a space or stretch, and it's trailing
	 whitespace, set the face of all trailing whitespace glyphs in
	 IT->glyph_row to `trailing-whitespace'.  */