diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 8444aef3bdd..dc6fe3a0327 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1654,6 +1654,8 @@ Customization}). (The other attributes of this face have no effect; the text shown under the cursor is drawn using the frame's background color.) To change its shape, customize the buffer-local variable @code{cursor-type}; possible values are @code{box} (the default), +@code{(box . @var{SIZE})} (box cursor becoming a hollow box under +masked images larger than @var{SIZE} pixels in either dimension), @code{hollow} (a hollow box), @code{bar} (a vertical bar), @code{(bar . @var{n})} (a vertical bar @var{n} pixels wide), @code{hbar} (a horizontal bar), @code{(hbar . @var{n})} (a horizontal bar @var{n} diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 2bb505c1c7a..70ebe2e87d7 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -2220,6 +2220,9 @@ How to display the cursor. Legitimate values are: @table @code @item box Display a filled box. (This is the default.) +@item (box . @var{SIZE}) +Display a filled box. However, display it as a hollow box if point is +under masked image larger than @var{SIZE} pixels in either dimension. @item hollow Display a hollow box. @item nil diff --git a/etc/NEWS b/etc/NEWS index 6ab6a8aab3b..2c5133e1d24 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -64,6 +64,12 @@ It was declared obsolete in Emacs 27.1. * Changes in Emacs 28.1 +** Support for '(box . SIZE)' cursor-type. +By default, 'box' cursor always has a filled box shape. Unless you +specify cursor-type to be '(box . SIZE)'. In such case, cursor +becomes a hollow box if the point is under masked image larger than +'SIZE' pixels in any dimension. + * Editing Changes in Emacs 28.1 diff --git a/src/buffer.c b/src/buffer.c index 5c65d4d4d19..cc7d4e4817c 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -6247,6 +6247,9 @@ Values are interpreted as follows: t use the cursor specified for the frame nil don't display a cursor box display a filled box cursor + (box . SIZE) display a filled box cursor, but make it + hollow if cursor is under masked image larger than + SIZE pixels in either dimension. hollow display a hollow box cursor bar display a vertical bar cursor with default width (bar . WIDTH) display a vertical bar cursor with width WIDTH diff --git a/src/xdisp.c b/src/xdisp.c index 68a504fb2d4..038b8e53669 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -30741,14 +30741,6 @@ get_specified_cursor_type (Lisp_Object arg, int *width) return BAR_CURSOR; } - if (CONSP (arg) - && EQ (XCAR (arg), Qbar) - && RANGED_FIXNUMP (0, XCDR (arg), INT_MAX)) - { - *width = XFIXNUM (XCDR (arg)); - return BAR_CURSOR; - } - if (EQ (arg, Qhbar)) { *width = 2; @@ -30756,11 +30748,16 @@ get_specified_cursor_type (Lisp_Object arg, int *width) } if (CONSP (arg) - && EQ (XCAR (arg), Qhbar) && RANGED_FIXNUMP (0, XCDR (arg), INT_MAX)) { *width = XFIXNUM (XCDR (arg)); - return HBAR_CURSOR; + + if (EQ (XCAR (arg), Qbox)) + return FILLED_BOX_CURSOR; + else if (EQ (XCAR (arg), Qbar)) + return BAR_CURSOR; + else if (EQ (XCAR (arg), Qhbar)) + return HBAR_CURSOR; } /* Treat anything unknown as "hollow box cursor". @@ -30898,12 +30895,15 @@ get_window_cursor_type (struct window *w, struct glyph *glyph, int *width, struct image *img = IMAGE_OPT_FROM_ID (f, glyph->u.img_id); if (img != NULL && IMAGEP (img->spec)) { - /* Arbitrarily, interpret "Large" as >32x32 and >NxN + /* Interpret "large" as >SIZExSIZE and >NxN + where SIZE is the value from cursor-type in form (box . SIZE), where N = size of default frame font size. - This should cover most of the "tiny" icons people may use. */ + So, setting cursor-type to (box . 32) should cover most of + the "tiny" icons people may use. */ if (!img->mask - || img->width > max (32, WINDOW_FRAME_COLUMN_WIDTH (w)) - || img->height > max (32, WINDOW_FRAME_LINE_HEIGHT (w))) + || (CONSP (BVAR (b, cursor_type)) + && img->width > max (*width, WINDOW_FRAME_COLUMN_WIDTH (w)) + && img->height > max (*width, WINDOW_FRAME_LINE_HEIGHT (w)))) cursor_type = HOLLOW_BOX_CURSOR; } }