Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-23 21:37:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

(get_window_cursor_type): Replace BOX cursor on images

Browse source 
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.
This commit is contained in:
Kim F. Storm 2006-08-27 22:23:07 +00:00
parent 7b9c9125c1
commit 7e87f9d8ae
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/xdisp.c
View file

@ -21213,9 +21213,30 @@ get_window_cursor_type (w, glyph, width, active_cursor)
/* 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;
}