# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1156717387 0
# Node ID 666bd542be1986a2c517332fd1383c26e896d658
# Parent  3882e4292e7ae0f113f177068fb6d7293a4ab01c
(get_window_cursor_type): Replace BOX cursor on images
with a hollow box cursor if image is larger than 32x32 (or the default
frame font if that is bigger).  Replace any other cursor on images
with hollow box cursor, as redisplay doesn't support bar and hbar
cursors on images.

diff -r 3882e4292e7a -r 666bd542be19 src/xdisp.c
--- a/src/xdisp.c	Sun Aug 27 22:22:38 2006 +0000
+++ b/src/xdisp.c	Sun Aug 27 22:23:07 2006 +0000
@@ -21213,9 +21213,30 @@
   /* Use normal cursor if not blinked off.  */
   if (!w->cursor_off_p)
     {
-      if (glyph != NULL && glyph->type == IMAGE_GLYPH) {
-	if (cursor_type == FILLED_BOX_CURSOR)
-	  cursor_type = HOLLOW_BOX_CURSOR;
+      if (glyph != NULL && glyph->type == IMAGE_GLYPH)
+	{
+	  if (cursor_type == FILLED_BOX_CURSOR)
+	    {
+	      /* Using a block cursor on large images can be very annoying.
+		 So use a hollow cursor for "large" images.  */
+	      struct image *img = IMAGE_FROM_ID (f, glyph->u.img_id);
+	      if (img != NULL && IMAGEP (img->spec))
+		{
+		  /* Arbitrarily, interpret "Large" as >32x32 and >NxN
+		     where N = size of default frame font size.
+		     This should cover most of the "tiny" icons people may use.  */
+		  if (img->width > max (32, WINDOW_FRAME_COLUMN_WIDTH (w))
+		      || img->height > max (32, WINDOW_FRAME_LINE_HEIGHT (w)))
+		    cursor_type = HOLLOW_BOX_CURSOR;
+		}
+	    }
+	  else if (cursor_type != NO_CURSOR)
+	    {
+	      /* Display current only supports BOX and HOLLOW cursors for images.
+		 So for now, unconditionally use a HOLLOW cursor when cursor is
+		 not a solid box cursor.  */
+	      cursor_type = HOLLOW_BOX_CURSOR;
+	    }
       }
       return cursor_type;
     }