/[emacs]/emacs/src/macterm.c
ViewVC logotype

Diff of /emacs/src/macterm.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.99 by tamm, Mon Jan 24 17:59:36 2005 UTC revision 1.100 by kfstorm, Thu Jan 27 22:33:11 2005 UTC
# Line 4731  x_draw_hollow_cursor (w, row) Line 4731  x_draw_hollow_cursor (w, row)
4731    if (cursor_glyph == NULL)    if (cursor_glyph == NULL)
4732      return;      return;
4733    
4734    /* Compute the width of the rectangle to draw.  If on a stretch    /* Compute frame-relative coordinates for phys cursor.  */
      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 = cursor_glyph->pixel_width - 1;  
   if (cursor_glyph->type == STRETCH_GLYPH  
       && !x_stretch_cursor_p)  
     wd = min (FRAME_COLUMN_WIDTH (f), wd);  
   w->phys_cursor_width = wd;  
   
   /* Compute frame-relative coordinates from window-relative  
      coordinates.  */  
4735    x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);    x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
4736    y = WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y);    y = get_phys_cursor_geometry (w, row, cursor_glyph, &h);
4737      wd = w->phys_cursor_width;
   /* Compute the proper height and ascent of the rectangle, based  
      on the actual glyph.  Using the full height of the row looks  
      bad when there are tall images on that row.  */  
   h = max (min (FRAME_LINE_HEIGHT (f), row->height),  
            cursor_glyph->ascent + cursor_glyph->descent);  
   if (h < row->height)  
     y += row->ascent /* - w->phys_cursor_ascent */ + cursor_glyph->descent - h;  
   h--;  
4738    
4739    /* The foreground of cursor_gc is typically the same as the normal    /* The foreground of cursor_gc is typically the same as the normal
4740       background color, which can cause the cursor box to be invisible.  */       background color, which can cause the cursor box to be invisible.  */

Legend:
Removed from v.1.99  
changed lines
  Added in v.1.100

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26