emacs: src/xdisp.c comparison

comparison src/xdisp.c @ 90428:a8190f7e546e

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 285-296) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: admin/FOR-RELEASE: Update refcard section. * gnus--rel--5.10 (patch 102-104) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64

author	Miles Bader <miles@gnu.org>
date	Wed, 07 Jun 2006 18:05:10 +0000
parents	4ee003f8531c 938915517680
children	138027c8c982

comparison

equal deleted inserted replaced

-:ddb25860d044
+:a8190f7e546e
 /* EXPORT:
 Return the position and height of the phys cursor in window W.
 Set w->phys_cursor_width to width of phys cursor.
 */
-int
+void
-get_phys_cursor_geometry (w, row, glyph, heightp)
+get_phys_cursor_geometry (w, row, glyph, xp, yp, heightp)
 struct window *w;
 struct glyph_row *row;
 struct glyph *glyph;
-int *heightp;
+int *xp, *yp, *heightp;
 {
 struct frame *f = XFRAME (WINDOW_FRAME (w));
-int y, wd, h, h0, y0;
+int x, y, wd, h, h0, y0;
 /* Compute the width of the rectangle to draw.  If on a stretch
 glyph, and `x-stretch-block-cursor' is nil, don't draw a
 rectangle as wide as the glyph, but use a canonical character
 width instead.  */
 wd = glyph->pixel_width - 1;
 #ifdef HAVE_NTGUI
 wd++; /* Why? */
 #endif
+x = w->phys_cursor.x;
+if (x < 0)
+{
+wd += x;
+x = 0;
+}
 if (glyph->type == STRETCH_GLYPH
 && !x_stretch_cursor_p)
 wd = min (FRAME_COLUMN_WIDTH (f), wd);
 w->phys_cursor_width = wd;
 	  h += y - y0;
 	  y = y0;
 	}
 }
+*xp = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, x);
+*yp = WINDOW_TO_FRAME_PIXEL_Y (w, y);
 *heightp = h;
-return WINDOW_TO_FRAME_PIXEL_Y (w, y);
 }
 /*
 * Remember which glyph the mouse is over.
 */
 {
 it->what = IT_COMPOSITION;
 it->position = (STRINGP (it->string)
 		  ? it->current.string_pos
 		  : it->current.pos);
+if (STRINGP (it->string))
+it->object = it->string;
 return 1;
 }
 so there's no need to check the face here.  */
 it->start_of_box_run_p = 1;
 while (it->current_x < max_x)
 {
-int x_before, x, n_glyphs_before, i, nglyphs;
+int x, n_glyphs_before, i, nglyphs;
+struct it it_before;
 /* Get the next display element.  */
 if (!get_next_display_element (it))
 	{
 	  /* Don't count empty row if we are counting needed tool-bar lines.  */
 	    return;
 	  break;
 	}
 /* Produce glyphs.  */
-x_before = it->current_x;
+n_glyphs_before = row->used[TEXT_AREA];
-n_glyphs_before = it->glyph_row->used[TEXT_AREA];
+it_before = *it;
 PRODUCE_GLYPHS (it);
-nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before;
+nglyphs = row->used[TEXT_AREA] - n_glyphs_before;
 i = 0;
-x = x_before;
+x = it_before.current_x;
 while (i < nglyphs)
 	{
 	  struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i;
 	  if (x + glyph->pixel_width > max_x)
 	    {
-	      /* Glyph doesn't fit on line.  */
+	      /* Glyph doesn't fit on line.  Backtrack.  */
-	      it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i;
+	      row->used[TEXT_AREA] = n_glyphs_before;
-	      it->current_x = x;
+	      *it = it_before;
 	      goto out;
 	    }
 	  ++it->hpos;
 	  x += glyph->pixel_width;
 last->left_box_line_p = 1;
 /* Make line the desired height and center it vertically.  */
 if ((height -= it->max_ascent + it->max_descent) > 0)
 {
+/* Don't add more than one line height.  */
+height %= FRAME_LINE_HEIGHT (it->f);
 it->max_ascent += height / 2;
 it->max_descent += (height + 1) / 2;
 }
 compute_line_metrics (it);
 while ((glyph) < (end) && (condition))
 /* Set cursor position of W.  PT is assumed to be displayed in ROW.
 DELTA is the number of bytes by which positions recorded in ROW
-differ from current buffer positions.  */
+differ from current buffer positions.
-void
+Return 0 if cursor is not on this row.  1 otherwise.  */
+int
 set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
 struct window *w;
 struct glyph_row *row;
 struct glyph_matrix *matrix;
 int delta, delta_bytes, dy, dvpos;
 	    {
 	      string = glyph->object;
 	      SKIP_GLYPHS (glyph, end, 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.  */
+if (glyph == end && row->continued_p)
+	return 0;
 }
 w->cursor.hpos = glyph - row->glyphs[TEXT_AREA];
 w->cursor.x = x;
 w->cursor.vpos = MATRIX_ROW_VPOS (row, matrix) + dvpos;
 	  this_line_start_x = row->x;
 	}
 else
 	CHARPOS (this_line_start_pos) = 0;
 }
+return 1;
 }
 /* Run window scroll functions, if any, for WINDOW with new window
 start STARTP.  Sets the window start of WINDOW to that position.
 	    }
 	  else if (scroll_p)
 	    rc = CURSOR_MOVEMENT_MUST_SCROLL;
 	  else
 	    {
-	      set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
+	      do
-	      rc = CURSOR_MOVEMENT_SUCCESS;
+		{
+		  if (set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0))
+		    {
+		      rc = CURSOR_MOVEMENT_SUCCESS;
+		      break;
+		    }
+		  ++row;
+		}
+	      while (MATRIX_ROW_BOTTOM_Y (row) < last_y
+		     && MATRIX_ROW_START_CHARPOS (row) == PT
+		     && cursor_row_p (w, row));
 	    }
 	}
 }
 return rc;
 		: (STRINGP (glyph->object)
 		   ? 'S'
 		   : '-')),
 	       glyph->pixel_width,
 	       glyph->u.img_id,
+	       '.',
+	       glyph->face_id,
+	       glyph->left_box_line_p,
+	       glyph->right_box_line_p);
+}
+else if (glyph->type == COMPOSITE_GLYPH)
+{
+fprintf (stderr,
+	       "  %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
+	       glyph - row->glyphs[TEXT_AREA],
+	       '+',
+	       glyph->charpos,
+	       (BUFFERP (glyph->object)
+		? 'B'
+		: (STRINGP (glyph->object)
+		   ? 'S'
+		   : '-')),
+	       glyph->pixel_width,
+	       glyph->u.cmp_id,
 	       '.',
 	       glyph->face_id,
 	       glyph->left_box_line_p,
 	       glyph->right_box_line_p);
 }
 mouse_face_here_p = 1;
 /* Maybe clear the display under the cursor.  */
 if (w->phys_cursor_type == HOLLOW_BOX_CURSOR)
 {
-int x, y;
+int x, y, left_x;
 int header_line_height = WINDOW_HEADER_LINE_HEIGHT (w);
 int width;
 cursor_glyph = get_phys_cursor_glyph (w);
 if (cursor_glyph == NULL)
 	goto mark_cursor_off;
-x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
+width = cursor_glyph->pixel_width;
+left_x = window_box_left_offset (w, TEXT_AREA);
+x = w->phys_cursor.x;
+if (x < left_x)
+	width -= left_x - x;
+width = min (width, window_box_width (w, TEXT_AREA) - x);
 y = WINDOW_TO_FRAME_PIXEL_Y (w, max (header_line_height, cursor_row->y));
-width = min (cursor_glyph->pixel_width,
+x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, max (x, left_x));
-		   window_box_width (w, TEXT_AREA) - w->phys_cursor.x);
+if (width > 0)
 rif->clear_frame_area (f, x, y, width, cursor_row->visible_height);
 }
 /* Erase the cursor by redrawing the character underneath it.  */
 if (mouse_face_here_p)

Mercurial > emacs

comparison src/xdisp.c @ 90428:a8190f7e546e