# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1142078561 0
# Node ID 7902af5c098e78a588159d5840bbb1dd6b55a49d
# Parent  409cad7ec30a6760c02c662290cf56e2fa93edf1
(mac_draw_rectangle): Don't add 1 to width and height.
(x_draw_glyph_string_foreground)
(x_draw_composite_glyph_string_foreground)
(x_draw_image_foreground): Don't subtract 1 from width and height
arguments to mac_draw_rectangle.
(x_draw_hollow_cursor): Add 1 to w->phys_cursor_width.

diff -r 409cad7ec30a -r 7902af5c098e src/macterm.c
--- a/src/macterm.c	Sat Mar 11 12:02:05 2006 +0000
+++ b/src/macterm.c	Sat Mar 11 12:02:41 2006 +0000
@@ -598,7 +598,7 @@
   SetPortWindowPort (FRAME_MAC_WINDOW (f));
 
   RGBForeColor (GC_FORE_COLOR (gc));
-  SetRect (&r, x, y, x + width + 1, y + height + 1);
+  SetRect (&r, x, y, x + width, y + height);
 
   mac_begin_clip (gc);
   FrameRect (&r); /* using foreground color of gc */
@@ -2436,7 +2436,7 @@
 	{
 	  struct glyph *g = s->first_glyph + i;
 	  mac_draw_rectangle (s->f, s->gc, x, s->y,
-			      g->pixel_width - 1, s->height - 1);
+			      g->pixel_width, s->height);
 	  x += g->pixel_width;
 	}
     }
@@ -2515,7 +2515,7 @@
     {
       if (s->gidx == 0)
 	mac_draw_rectangle (s->f, s->gc, x, s->y,
-			    s->width - 1, s->height - 1);
+			    s->width, s->height);
     }
   else
     {
@@ -3068,15 +3068,15 @@
 	      int r = s->img->relief;
 	      if (r < 0) r = -r;
 	      mac_draw_rectangle (s->f, s->gc, x - r, y - r,
-				  s->slice.width + r*2 - 1,
-				  s->slice.height + r*2 - 1);
+				  s->slice.width + r*2,
+				  s->slice.height + r*2);
 	    }
 	}
     }
   else
     /* Draw a rectangle if image could not be loaded.  */
     mac_draw_rectangle (s->f, s->gc, x, y,
-			s->slice.width - 1, s->slice.height - 1);
+			s->slice.width, s->slice.height);
 }
 
 
@@ -5245,7 +5245,7 @@
   /* Compute frame-relative coordinates for phys cursor.  */
   x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
   y = get_phys_cursor_geometry (w, row, cursor_glyph, &h);
-  wd = w->phys_cursor_width;
+  wd = w->phys_cursor_width + 1;
 
   /* The foreground of cursor_gc is typically the same as the normal
      background color, which can cause the cursor box to be invisible.  */