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 <caffeineviking@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 78cac3f33a9140f11a2f0db63e91ded3a51d6d58..b70fb15d988f7cf4b9279a495761b1c047d7a53e 100644 (file)
--- 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 short description can be found at |Q_op|.
                                                *'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
index 00994312bb96dd1b3123978765739c1c1e2accc7..dd2bc95b76a9d69bd516ad03049e2f68d81925cf 100644 (file)
--- a/src/errors.h
+++ b/src/errors.h
@@ -3185,7 +3185,7 @@ EXTERN char e_separator_not_supported_str[]
 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
index 29e462380c959d4c1a091cbbabb4f2246d090ca7..78299f0454fe8382c2260e6617053f94015c869a 100644 (file)
--- 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
index c677ba1fe47e76e3f2716f72ecf8d86c5c8f2f4e..f9fdd2d66bdc38c9446e8ee5e9d3528dbd377b34 100644 (file)
--- 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
index 28a4a96b413e09e9325e1ad6b0391059eb9af67e..75940cce0a3056a22aa3ec36c42f79f3d470498d 100644 (file)
--- a/src/option.h
+++ b/src/option.h
@@ -637,7 +637,7 @@ EXTERN char_u       *p_guifontset;  // 'guifontset'
 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
index 776858804d03362bed5fbd7e8707ebb33a7a4d03..1a09e1c7fbcc0f03cf5fcd180bc6928632b0f5e8 100644 (file)
--- 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
index 8b000abbb43b05ee63891a71a568c008e2515764..457fccb1eb19c86b511e83a6b5b4e4b3753edf14 100644 (file)
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -2438,7 +2438,7 @@ did_set_guifontwide(optset_T *args UNUSED)
 }
 #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
index dbf1d3b3101561bcd9494996ce290cfdeddfacc3..2ff8d3400bda5097184de972071ce5e2ce95d067 100644 (file)
--- 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
index 59a940ba0905fe4489e0dc57a174dee15d44c31d..1405854d80d323743108f5be28de2ede024dd494 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    133,
 /**/
     132,
 /**/