emacs: src/xdisp.c comparison

comparison src/xdisp.c @ 90519:138ce2701550

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 320-342) - Update from CVS - Merge from gnus--rel--5.10 - lisp/play/cookie1.el (cookie): Work properly when there's only one entry - Add note about "link" button-class to etc/TODO * gnus--rel--5.10 (patch 108-112) - Merge from emacs--devo--0 - Clean up merge mistakes - Update from CVS - Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo. Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86

author	Miles Bader <miles@gnu.org>
date	Thu, 06 Jul 2006 08:59:39 +0000
parents	138027c8c982 0b31608be4a1
children	8a8e69664178

comparison

equal deleted inserted replaced

-:64c755511769
+:138ce2701550
 		 overlays even if the actual buffer text is replaced.  */
 	      if (!handle_overlay_change_p || it->sp > 1)
 		return;
 	      if (!get_overlay_strings_1 (it, 0, 0))
 		return;
+	      it->ignore_overlay_strings_at_pos_p = 1;
 	      it->string_from_display_prop_p = 0;
 	      handle_overlay_change_p = 0;
 	      handled = HANDLED_RECOMPUTE_PROPS;
 	      break;
 	    }
 		  IT_CHARPOS (*it) = end;
 		  IT_BYTEPOS (*it) = CHAR_TO_BYTE (end);
 		}
 	      return HANDLED_RECOMPUTE_PROPS;
 	    }
+	  it->stop_charpos = end;
+	  push_it (it);
 	  it->method = GET_FROM_COMPOSITION;
 	  it->cmp_id = id;
 	  it->cmp_len = COMPOSITION_LENGTH (prop);
 #ifdef USE_FONT_BACKEND
 	  if (composition_table[id]->method == COMPOSITION_WITH_GLYPH_STRING)
 components.  */
 	  it->c = COMPOSITION_GLYPH (composition_table[id], 0);
 	  it->len = (STRINGP (it->string)
 		     ? string_char_to_byte (it->string, end)
 		     : CHAR_TO_BYTE (end)) - pos_byte;
-	  it->stop_charpos = end;
 	  handled = HANDLED_RETURN;
 	}
 }
 return handled;
 break;
 case GET_FROM_STRETCH:
 p->u.stretch.object = it->object;
 break;
 }
-p->pos = it->current;
+p->position = it->position;
+p->current = it->current;
 p->end_charpos = it->end_charpos;
 p->string_nchars = it->string_nchars;
 p->area = it->area;
 p->multibyte_p = it->multibyte_p;
 p->space_width = it->space_width;
 xassert (it->sp > 0);
 --it->sp;
 p = it->stack + it->sp;
 it->stop_charpos = p->stop_charpos;
 it->face_id = p->face_id;
-it->current = p->pos;
+it->current = p->current;
+it->position = p->position;
 it->string = p->string;
 if (NILP (it->string))
 SET_TEXT_POS (it->current.string_pos, -1, -1);
 it->method = p->method;
 switch (it->method)
 struct it *it;
 {
 while (IT_CHARPOS (*it) > BEGV)
 {
 back_to_previous_line_start (it);
 if (IT_CHARPOS (*it) <= BEGV)
 	break;
 /* If selective > 0, then lines indented more than that values
 	 are invisible.  */
 	}
 break;
 case GET_FROM_COMPOSITION:
 xassert (it->cmp_id >= 0 && it->cmp_id < n_compositions);
-if (STRINGP (it->string))
+xassert (it->sp > 0);
+pop_it (it);
+if (it->method == GET_FROM_STRING)
 	{
 	  IT_STRING_BYTEPOS (*it) += it->len;
 	  IT_STRING_CHARPOS (*it) += it->cmp_len;
-	  it->method = GET_FROM_STRING;
 	  it->object = it->string;
 	  goto consider_string_end;
 	}
-else
+else if (it->method == GET_FROM_BUFFER)
 	{
 	  IT_BYTEPOS (*it) += it->len;
 	  IT_CHARPOS (*it) += it->cmp_len;
-	  it->method = GET_FROM_BUFFER;
 	  it->object = it->w->buffer;
 	}
 break;
 case GET_FROM_C_STRING:
 	  if (x + glyph->pixel_width > max_x)
 	    {
 	      /* Glyph doesn't fit on line.  Backtrack.  */
 	      row->used[TEXT_AREA] = n_glyphs_before;
 	      *it = it_before;
+	      /* If this is the only glyph on this line, it will never fit on the
+		 toolbar, so skip it.   But ensure there is at least one glyph,
+		 so we don't accidentally disable the tool-bar.  */
+	      if (n_glyphs_before == 0
+		  && (it->vpos > 0 || IT_STRING_CHARPOS (*it) < it->end_charpos-1))
+		break;
 	      goto out;
 	    }
 	  ++it->hpos;
 	  x += glyph->pixel_width;
 ++it->vpos;
 ++it->glyph_row;
 }
+/* Max tool-bar height.  */
+#define MAX_FRAME_TOOL_BAR_HEIGHT(f) \
+((FRAME_LINE_HEIGHT (f) * FRAME_LINES (f)))
 /* Value is the number of screen lines needed to make all tool-bar
 items of frame F visible.  The number of actual rows needed is
 returned in *N_ROWS if non-NULL.  */
 static int
 struct frame *f;
 int *n_rows;
 {
 struct window *w = XWINDOW (f->tool_bar_window);
 struct it it;
-struct glyph_row *temp_row = w->desired_matrix->rows;
+/* tool_bar_lines_needed is called from redisplay_tool_bar after building
+the desired matrix, so use (unused) mode-line row as temporary row to
+avoid destroying the first tool-bar row.  */
+struct glyph_row *temp_row = MATRIX_MODE_LINE_ROW (w->desired_matrix);
 /* Initialize an iterator for iteration over
 F->desired_tool_bar_string in the tool-bar window of frame F.  */
 init_iterator (&it, w, -1, -1, temp_row, TOOL_BAR_FACE_ID);
 it.first_visible_x = 0;
 	  extern Lisp_Object Qtool_bar_lines;
 	  Lisp_Object frame;
 	  int old_height = WINDOW_TOTAL_LINES (w);
 	  XSETFRAME (frame, f);
-	  clear_glyph_matrix (w->desired_matrix);
 	  Fmodify_frame_parameters (frame,
 				    Fcons (Fcons (Qtool_bar_lines,
 						  make_number (nlines)),
 					   Qnil));
 	  if (WINDOW_TOTAL_LINES (w) != old_height)
 	    {
+	      clear_glyph_matrix (w->desired_matrix);
 	      fonts_changed_p = 1;
 	      return 1;
 	    }
 	}
 }
 w->desired_matrix->no_scrolling_p = 1;
 w->must_be_updated_p = 1;
 if (auto_resize_tool_bars_p)
 {
-int nlines;
+int nlines, nrows;
+int max_tool_bar_height = MAX_FRAME_TOOL_BAR_HEIGHT (f);
 /* If we couldn't display everything, change the tool-bar's
-	 height.  */
+	 height if there is room for more.  */
-if (IT_STRING_CHARPOS (it) < it.end_charpos)
+if (IT_STRING_CHARPOS (it) < it.end_charpos
+	  && it.current_y < max_tool_bar_height)
 	change_height_p = 1;
+row = it.glyph_row - 1;
 /* If there are blank lines at the end, except for a partially
 	 visible blank line at the end that is smaller than
 	 FRAME_LINE_HEIGHT, change the tool-bar's height.  */
-row = it.glyph_row - 1;
 if (!row->displays_text_p
 	  && row->height >= FRAME_LINE_HEIGHT (f))
 	change_height_p = 1;
 /* If row displays tool-bar items, but is partially visible,
 	 change the tool-bar's height.  */
 if (row->displays_text_p
-	  && MATRIX_ROW_BOTTOM_Y (row) > it.last_visible_y)
+	  && MATRIX_ROW_BOTTOM_Y (row) > it.last_visible_y
+	  && MATRIX_ROW_BOTTOM_Y (row) < max_tool_bar_height)
 	change_height_p = 1;
 /* Resize windows as needed by changing the `tool-bar-lines'
 	 frame parameter.  */
 if (change_height_p
-	  && (nlines = tool_bar_lines_needed (f, &f->n_tool_bar_rows),
+	  && (nlines = tool_bar_lines_needed (f, &nrows),
 	      nlines != WINDOW_TOTAL_LINES (w)))
 	{
 	  extern Lisp_Object Qtool_bar_lines;
 	  Lisp_Object frame;
 	  int old_height = WINDOW_TOTAL_LINES (w);
 	  XSETFRAME (frame, f);
-	  clear_glyph_matrix (w->desired_matrix);
 	  Fmodify_frame_parameters (frame,
 				    Fcons (Fcons (Qtool_bar_lines,
 						  make_number (nlines)),
 					   Qnil));
 	  if (WINDOW_TOTAL_LINES (w) != old_height)
-	    fonts_changed_p = 1;
+	    {
+	      clear_glyph_matrix (w->desired_matrix);
+	      f->n_tool_bar_rows = nrows;
+	      fonts_changed_p = 1;
+	    }
 	}
 }
 return change_height_p;
 }
 	 are from string.  As there's no easy way to know the
 	 character position of the current glyph, find the correct
 	 glyph on point by scanning from string_start again.  */
 Lisp_Object limit;
 Lisp_Object string;
+struct glyph *stop = glyph;
 int pos;
 limit = make_number (pt_old + 1);
-end = glyph;
 glyph = string_start;
 x = string_start_x;
 string = glyph->object;
 pos = string_buffer_position (w, string, string_before_pos);
 /* If STRING is from overlay, LAST_POS == 0.  We skip such glyphs
 	 because we always put cursor after overlay strings.  */
-while (pos == 0 && glyph < end)
+while (pos == 0 && glyph < stop)
 	{
 	  string = glyph->object;
-	  SKIP_GLYPHS (glyph, end, x, EQ (glyph->object, string));
+	  SKIP_GLYPHS (glyph, stop, x, EQ (glyph->object, string));
-	  if (glyph < end)
+	  if (glyph < stop)
 	    pos = string_buffer_position (w, glyph->object, string_before_pos);
 	}
-while (glyph < end)
+while (glyph < stop)
 	{
 	  pos = XINT (Fnext_single_char_property_change
 		      (make_number (pos), Qdisplay, Qnil, limit));
 	  if (pos > pt_old)
 	    break;
 	  /* Skip glyphs from the same string.  */
 	  string = glyph->object;
-	  SKIP_GLYPHS (glyph, end, x, EQ (glyph->object, string));
+	  SKIP_GLYPHS (glyph, stop, x, EQ (glyph->object, string));
 	  /* Skip glyphs from an overlay.  */
-	  while (glyph < end
+	  while (glyph < stop
 		 && ! string_buffer_position (w, glyph->object, pos))
 	    {
 	      string = glyph->object;
-	      SKIP_GLYPHS (glyph, end, x, EQ (glyph->object, string));
+	      SKIP_GLYPHS (glyph, stop, x, EQ (glyph->object, string));
 	    }
 	}
 /* If we reached the end of the line, and end was from a string,
 	 cursor is not on this line.  */

Mercurial > emacs

comparison src/xdisp.c @ 90519:138ce2701550