diff -ur freeciv/client/gui-gtk/mapview.c correct_focus/client/gui-gtk/mapview.c
--- freeciv/client/gui-gtk/mapview.c	Mon Mar 13 14:08:08 2000
+++ correct_focus/client/gui-gtk/mapview.c	Mon Mar 13 19:39:54 2000
@@ -555,10 +555,11 @@
 **************************************************************************/
 int tile_visible_and_not_on_border_mapcanvas(int x, int y)
 {
-  return (y>=map_view_y0+1 && y<map_view_y0+map_canvas_store_theight-1 &&
-	  ((x>=map_view_x0+1 && x<map_view_x0+map_canvas_store_twidth-1) ||
-	   (x+map.xsize>=map_view_x0+1 && 
-	    x+map.xsize<map_view_x0+map_canvas_store_twidth-1)));
+  return ((y>=map_view_y0+2 || (y >= map_view_y0 && map_view_y0 == 0))
+	  && (y<map_view_y0+map_canvas_store_theight-2 || (y<map_view_y0+map_canvas_store_theight && map_view_y0 + map_canvas_store_theight == map.ysize))
+	  && ((x>=map_view_x0+2 && x<map_view_x0+map_canvas_store_twidth-2) ||
+	      (x+map.xsize>=map_view_x0+2
+	       && x+map.xsize<map_view_x0+map_canvas_store_twidth-2)));
 }
 
 /**************************************************************************
diff -ur freeciv/client/gui-mui/mapview.c correct_focus/client/gui-mui/mapview.c
--- freeciv/client/gui-mui/mapview.c	Mon Mar 13 14:07:23 2000
+++ correct_focus/client/gui-mui/mapview.c	Mon Mar 13 19:39:11 2000
@@ -400,10 +400,11 @@
   LONG map_canvas_store_twidth = get_map_x_visible();
   LONG map_canvas_store_theight = get_map_y_visible();
 
-  return (y >= map_view_y0 + 1 && y < map_view_y0 + map_canvas_store_theight - 1 &&
-  ((x >= map_view_x0 + 1 && x < map_view_x0 + map_canvas_store_twidth - 1) ||
-   (x + map.xsize >= map_view_x0 + 1 &&
-    x + map.xsize < map_view_x0 + map_canvas_store_twidth - 1)));
+  return ((y>=map_view_y0+2 || (y >= map_view_y0 && map_view_y0 == 0))
+	  && (y<map_view_y0+map_canvas_store_theight-2 || (y<map_view_y0+map_canvas_store_theight && map_view_y0 + map_canvas_store_theight == map.ysize))
+	  && ((x>=map_view_x0+2 && x<map_view_x0+map_canvas_store_twidth-2) ||
+	      (x+map.xsize>=map_view_x0+2
+	       && x+map.xsize<map_view_x0+map_canvas_store_twidth-2)));
 }
 
 /**************************************************************************
diff -ur freeciv/client/gui-xaw/mapview.c correct_focus/client/gui-xaw/mapview.c
--- freeciv/client/gui-xaw/mapview.c	Mon Mar 13 14:07:22 2000
+++ correct_focus/client/gui-xaw/mapview.c	Mon Mar 13 19:37:54 2000
@@ -525,10 +525,11 @@
 **************************************************************************/
 int tile_visible_and_not_on_border_mapcanvas(int x, int y)
 {
-  return (y>=map_view_y0+1 && y<map_view_y0+map_canvas_store_theight-1 &&
-	  ((x>=map_view_x0+1 && x<map_view_x0+map_canvas_store_twidth-1) ||
-	   (x+map.xsize>=map_view_x0+1 && 
-	    x+map.xsize<map_view_x0+map_canvas_store_twidth-1)));
+  return ((y>=map_view_y0+2 || (y >= map_view_y0 && map_view_y0 == 0))
+	  && (y<map_view_y0+map_canvas_store_theight-2 || (y<map_view_y0+map_canvas_store_theight && map_view_y0 + map_canvas_store_theight == map.ysize))
+	  && ((x>=map_view_x0+2 && x<map_view_x0+map_canvas_store_twidth-2) ||
+	      (x+map.xsize>=map_view_x0+2
+	       && x+map.xsize<map_view_x0+map_canvas_store_twidth-2)));
 }
 
 /**************************************************************************