# HG changeset patch # User Christian Brabandt # Date 1708782303 -3600 # Node ID c5a945f7f3da081aaab1559c271bc29a25bea106 # Parent 6cbf38192e530af3e5b89b7aff1dde2b856703f5 patch 9.1.0133: MS-Windows: ligatures not rendering correctly Commit: https://github.com/vim/vim/commit/8b1e749ca6ca6d09a174c57de6999f69393ee567 Author: Erik S. V. Jansson Date: Sat Feb 24 14:26:52 2024 +0100 patch 9.1.0133: MS-Windows: ligatures not rendering correctly Problem: font ligatures don't render correctly in the Win32 GUI-version of gvim even when set rop=type:directx is used. Setting guiligatures also doesn't make any difference. This leads to broken font ligatures when the cursor passes through them. It does not recover from this, and they remain broken until you re-render the whole buffer (e.g. by using Ctrl+L). Solution: the problem is that we only re-draw the current and previous character in gui_undraw_cursor() and only have the special case for GTK when it comes to rendering ligatures. So let's enable gui_adjust_undraw_cursor_for_ligatures() to also happen for Win32 GUI if guiligatures is setup correctly (all this does is expand the range of gui_undraw_cursor() with ligature characters). related: #9181 related: #12901 closes: #14084 Signed-off-by: Erik S. V. Jansson Signed-off-by: Christian Brabandt diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 9.1. Last change: 2024 Jan 30 +*options.txt* For Vim version 9.1. Last change: 2024 Feb 24 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4000,7 +4000,7 @@ A jump table for the options with a shor *'guiligatures'* *'gli'* *E1243* 'guiligatures' 'gli' string (default "") global - {only for GTK GUI} + {only for GTK and Win32 GUI} List of ASCII characters that, when combined together, can create more complex shapes. Each character must be a printable ASCII character with a value in the 32-127 range. diff --git a/src/errors.h b/src/errors.h --- a/src/errors.h +++ b/src/errors.h @@ -3185,7 +3185,7 @@ EXTERN char e_separator_not_supported_st EXTERN char e_no_white_space_allowed_before_separator_str[] INIT(= N_("E1242: No white space allowed before separator: %s")); #endif -#ifdef FEAT_GUI_GTK +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) EXTERN char e_ascii_code_not_in_range[] INIT(= N_("E1243: ASCII code not in 32-127 range")); #endif diff --git a/src/gui.c b/src/gui.c --- a/src/gui.c +++ b/src/gui.c @@ -455,7 +455,7 @@ gui_init_check(void) gui.scrollbar_width = gui.scrollbar_height = SB_DEFAULT_WIDTH; gui.prev_wrap = -1; -#ifdef FEAT_GUI_GTK +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) CLEAR_FIELD(gui.ligatures_map); #endif @@ -1064,7 +1064,7 @@ gui_get_wide_font(void) return OK; } -#if defined(FEAT_GUI_GTK) || defined(PROTO) +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) || defined(PROTO) /* * Set list of ascii characters that combined can create ligature. * Store them in char map for quick access from gui_gtk2_draw_string. @@ -2691,7 +2691,7 @@ gui_undraw_cursor(void) int startcol = gui.cursor_col > 0 ? gui.cursor_col - 1 : gui.cursor_col; int endcol = gui.cursor_col; -#ifdef FEAT_GUI_GTK +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) gui_adjust_undraw_cursor_for_ligatures(&startcol, &endcol); #endif gui_redraw_block(gui.cursor_row, startcol, diff --git a/src/gui.h b/src/gui.h --- a/src/gui.h +++ b/src/gui.h @@ -389,10 +389,12 @@ typedef struct Gui char_u *browse_fname; // file name from filedlg guint32 event_time; +#endif // FEAT_GUI_GTK +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) char_u ligatures_map[256]; // ascii map for characters 0-255, value is // 1 if in 'guiligatures' -#endif // FEAT_GUI_GTK +#endif #if defined(FEAT_GUI_TABLINE) \ && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) \ diff --git a/src/option.h b/src/option.h --- a/src/option.h +++ b/src/option.h @@ -637,7 +637,7 @@ EXTERN char_u *p_guifontset; // 'guifont EXTERN char_u *p_guifontwide; // 'guifontwide' EXTERN int p_guipty; // 'guipty' #endif -#ifdef FEAT_GUI_GTK +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) EXTERN char_u *p_guiligatures; // 'guiligatures' # endif #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11) diff --git a/src/optiondefs.h b/src/optiondefs.h --- a/src/optiondefs.h +++ b/src/optiondefs.h @@ -1212,7 +1212,7 @@ static struct vimoption options[] = {(char_u *)50L, (char_u *)0L} SCTX_INIT}, {"guiligatures", "gli", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA|P_NODUP, -#if defined(FEAT_GUI_GTK) +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) (char_u *)&p_guiligatures, PV_NONE, did_set_guiligatures, NULL, {(char_u *)"", (char_u *)0L} diff --git a/src/optionstr.c b/src/optionstr.c --- a/src/optionstr.c +++ b/src/optionstr.c @@ -2438,7 +2438,7 @@ did_set_guifontwide(optset_T *args UNUSE } #endif -#if defined(FEAT_GUI_GTK) || defined(PROTO) +#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) || defined(PROTO) /* * The 'guiligatures' option is changed. */ diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -635,7 +635,7 @@ endfunc func Test_set_guiligatures() CheckX11BasedGui - if has('gui_gtk') || has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3') + if has('gui_gtk') || has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3') || has('win32') " Try correct value set guiligatures=<>=ab call assert_equal("<>=ab", &guiligatures) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 133, +/**/ 132, /**/ 131,