patch 8.1.0933: When using VTP scroll region isn't used properly

Problem:    When using VTP scroll region isn't used properly.
Solution:   Make better use of the scroll region. (Nobuhiro Takasaki,
            closes #3974)

diff --git a/src/os_win32.c b/src/os_win32.c
index 816c3a59cf91decd528f3fd341c7121a2e283561..3627532cacb1176c6aaac51614a9a2f5a525a68a 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -171,6 +171,9 @@ static int g_fForceExit = FALSE;    /* set when forcefully exiting */
 static void scroll(unsigned cLines);
 static void set_scroll_region(unsigned left, unsigned top,
                              unsigned right, unsigned bottom);
+static void set_scroll_region_tb(unsigned top, unsigned bottom);
+static void set_scroll_region_lr(unsigned left, unsigned right);
+static void insert_lines(unsigned cLines);
 static void delete_lines(unsigned cLines);
 static void gotoxy(unsigned x, unsigned y);
 static void standout(void);
@@ -5392,7 +5395,7 @@ create_pipe_pair(HANDLE handles[2])
 
     if (handles[0] == INVALID_HANDLE_VALUE)
     {
-        CloseHandle(handles[1]);
+       CloseHandle(handles[1]);
        return FALSE;
     }
 
@@ -5976,9 +5979,30 @@ set_scroll_region(
     g_srScrollRegion.Top =    top;
     g_srScrollRegion.Right =  right;
     g_srScrollRegion.Bottom = bottom;
+}
 
-    if (USE_VTP)
-       vtp_printf("\033[%d;%dr", top + 1, bottom + 1);
+    static void
+set_scroll_region_tb(
+    unsigned top,
+    unsigned bottom)
+{
+    if (top >= bottom || bottom > (unsigned)Rows - 1)
+       return;
+
+    g_srScrollRegion.Top = top;
+    g_srScrollRegion.Bottom = bottom;
+}
+
+    static void
+set_scroll_region_lr(
+    unsigned left,
+    unsigned right)
+{
+    if (left >= right || right > (unsigned)Columns - 1)
+       return;
+
+    g_srScrollRegion.Left = left;
+    g_srScrollRegion.Right = right;
 }
 
 
@@ -5988,47 +6012,49 @@ set_scroll_region(
     static void
 insert_lines(unsigned cLines)
 {
-    SMALL_RECT     source;
+    SMALL_RECT     source, clip;
     COORD          dest;
     CHAR_INFO      fill;
 
-    dest.X = 0;
+    dest.X = g_srScrollRegion.Left;
     dest.Y = g_coord.Y + cLines;
 
-    source.Left   = 0;
+    source.Left   = g_srScrollRegion.Left;
     source.Top   = g_coord.Y;
     source.Right  = g_srScrollRegion.Right;
     source.Bottom = g_srScrollRegion.Bottom - cLines;
 
-    if (!USE_VTP)
+    clip.Left   = g_srScrollRegion.Left;
+    clip.Top    = g_coord.Y;
+    clip.Right  = g_srScrollRegion.Right;
+    clip.Bottom = g_srScrollRegion.Bottom;
+
     {
        fill.Char.AsciiChar = ' ';
-       fill.Attributes = g_attrCurrent;
+       fill.Attributes = g_attrDefault;
 
-       ScrollConsoleScreenBuffer(g_hConOut, &source, NULL, dest, &fill);
-    }
-    else
-    {
        set_console_color_rgb();
 
-       gotoxy(1, source.Top + 1);
-       vtp_printf("\033[%dT", cLines);
+       ScrollConsoleScreenBuffer(g_hConOut, &source, &clip, dest, &fill);
     }
-
-    /* Here we have to deal with a win32 console flake: If the scroll
-     * region looks like abc and we scroll c to a and fill with d we get
-     * cbd... if we scroll block c one line at a time to a, we get cdd...
-     * vim expects cdd consistently... So we have to deal with that
-     * here... (this also occurs scrolling the same way in the other
-     * direction).  */
+    // Here we have to deal with a win32 console flake: If the scroll
+    // region looks like abc and we scroll c to a and fill with d we get
+    // cbd... if we scroll block c one line at a time to a, we get cdd...
+    // vim expects cdd consistently... So we have to deal with that
+    // here... (this also occurs scrolling the same way in the other
+    // direction).
 
     if (source.Bottom < dest.Y)
     {
        COORD coord;
+       int   i;
 
-       coord.X = 0;
-       coord.Y = source.Bottom;
-       clear_chars(coord, Columns * (dest.Y - source.Bottom));
+       coord.X = source.Left;
+       for (i = clip.Top; i < dest.Y; ++i)
+       {
+           coord.Y = i;
+           clear_chars(coord, source.Right - source.Left + 1);
+       }
     }
 }
 
@@ -6039,50 +6065,48 @@ insert_lines(unsigned cLines)
     static void
 delete_lines(unsigned cLines)
 {
-    SMALL_RECT     source;
+    SMALL_RECT     source, clip;
     COORD          dest;
     CHAR_INFO      fill;
     int                    nb;
 
-    dest.X = 0;
+    dest.X = g_srScrollRegion.Left;
     dest.Y = g_coord.Y;
 
-    source.Left   = 0;
+    source.Left   = g_srScrollRegion.Left;
     source.Top   = g_coord.Y + cLines;
     source.Right  = g_srScrollRegion.Right;
     source.Bottom = g_srScrollRegion.Bottom;
 
-    if (!USE_VTP)
+    clip.Left   = g_srScrollRegion.Left;
+    clip.Top    = g_coord.Y;
+    clip.Right  = g_srScrollRegion.Right;
+    clip.Bottom = g_srScrollRegion.Bottom;
+
     {
        fill.Char.AsciiChar = ' ';
-       fill.Attributes = g_attrCurrent;
+       fill.Attributes = g_attrDefault;
 
-       ScrollConsoleScreenBuffer(g_hConOut, &source, NULL, dest, &fill);
-    }
-    else
-    {
        set_console_color_rgb();
 
-       gotoxy(1, source.Top + 1);
-       vtp_printf("\033[%dS", cLines);
+       ScrollConsoleScreenBuffer(g_hConOut, &source, &clip, dest, &fill);
     }
-
-    /* Here we have to deal with a win32 console flake: If the scroll
-     * region looks like abc and we scroll c to a and fill with d we get
-     * cbd... if we scroll block c one line at a time to a, we get cdd...
-     * vim expects cdd consistently... So we have to deal with that
-     * here... (this also occurs scrolling the same way in the other
-     * direction).  */
+    // Here we have to deal with a win32 console flake; See insert_lines()
+    // above.
 
     nb = dest.Y + (source.Bottom - source.Top) + 1;
 
     if (nb < source.Top)
     {
        COORD coord;
+       int   i;
 
-       coord.X = 0;
-       coord.Y = nb;
-       clear_chars(coord, Columns * (source.Top - nb));
+       coord.X = source.Left;
+       for (i = nb; i < clip.Bottom; ++i)
+       {
+           coord.Y = i;
+           clear_chars(coord, source.Right - source.Left + 1);
+       }
     }
 }
 
@@ -6508,6 +6532,14 @@ mch_write(
                {
                    set_scroll_region(0, arg1 - 1, Columns - 1, arg2 - 1);
                }
+               else if (argc == 2 && *p == 'R')
+               {
+                   set_scroll_region_tb(arg1, arg2);
+               }
+               else if (argc == 2 && *p == 'V')
+               {
+                   set_scroll_region_lr(arg1, arg2);
+               }
                else if (argc == 1 && *p == 'A')
                {
                    gotoxy(g_coord.X + 1,

diff --git a/src/term.c b/src/term.c
index be33fb92d5d4832c447ae8cb282ccbd583aad67f..9eebd28cb11f3c7b21b895b9af22c7c4a1652c8d 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -540,63 +540,65 @@ static struct builtin_term builtin_termcaps[] =
  * are also translated in os_win32.c.
  */
     {(int)KS_NAME,     "win32"},
-    {(int)KS_CE,       "\033|K"},      /* clear to end of line */
-    {(int)KS_AL,       "\033|L"},      /* add new blank line */
+    {(int)KS_CE,       "\033|K"},      // clear to end of line
+    {(int)KS_AL,       "\033|L"},      // add new blank line
 #  ifdef TERMINFO
-    {(int)KS_CAL,      "\033|%p1%dL"}, /* add number of new blank lines */
+    {(int)KS_CAL,      "\033|%p1%dL"}, // add number of new blank lines
 #  else
-    {(int)KS_CAL,      "\033|%dL"},    /* add number of new blank lines */
+    {(int)KS_CAL,      "\033|%dL"},    // add number of new blank lines
 #  endif
-    {(int)KS_DL,       "\033|M"},      /* delete line */
+    {(int)KS_DL,       "\033|M"},      // delete line
 #  ifdef TERMINFO
-    {(int)KS_CDL,      "\033|%p1%dM"}, /* delete number of lines */
+    {(int)KS_CDL,      "\033|%p1%dM"}, // delete number of lines
+    {(int)KS_CSV,      "\033|%p1%d;%p2%dV"},
 #  else
-    {(int)KS_CDL,      "\033|%dM"},    /* delete number of lines */
+    {(int)KS_CDL,      "\033|%dM"},    // delete number of lines
+    {(int)KS_CSV,      "\033|%d;%dV"},
 #  endif
-    {(int)KS_CL,       "\033|J"},      /* clear screen */
-    {(int)KS_CD,       "\033|j"},      /* clear to end of display */
-    {(int)KS_VI,       "\033|v"},      /* cursor invisible */
-    {(int)KS_VE,       "\033|V"},      /* cursor visible */
-
-    {(int)KS_ME,       "\033|0m"},     /* normal */
-    {(int)KS_MR,       "\033|112m"},   /* reverse: black on lightgray */
-    {(int)KS_MD,       "\033|15m"},    /* bold: white on black */
+    {(int)KS_CL,       "\033|J"},      // clear screen
+    {(int)KS_CD,       "\033|j"},      // clear to end of display
+    {(int)KS_VI,       "\033|v"},      // cursor invisible
+    {(int)KS_VE,       "\033|V"},      // cursor visible
+
+    {(int)KS_ME,       "\033|0m"},     // normal
+    {(int)KS_MR,       "\033|112m"},   // reverse: black on lightgray
+    {(int)KS_MD,       "\033|15m"},    // bold: white on black
 #if 1
-    {(int)KS_SO,       "\033|31m"},    /* standout: white on blue */
-    {(int)KS_SE,       "\033|0m"},     /* standout end */
+    {(int)KS_SO,       "\033|31m"},    // standout: white on blue
+    {(int)KS_SE,       "\033|0m"},     // standout end
 #else
-    {(int)KS_SO,       "\033|F"},      /* standout: high intensity */
-    {(int)KS_SE,       "\033|f"},      /* standout end */
-#endif
-    {(int)KS_CZH,      "\033|225m"},   /* italic: blue text on yellow */
-    {(int)KS_CZR,      "\033|0m"},     /* italic end */
-    {(int)KS_US,       "\033|67m"},    /* underscore: cyan text on red */
-    {(int)KS_UE,       "\033|0m"},     /* underscore end */
-    {(int)KS_CCO,      "16"},          /* allow 16 colors */
+    {(int)KS_SO,       "\033|F"},      // standout: high intensity
+    {(int)KS_SE,       "\033|f"},      // standout end
+#endif
+    {(int)KS_CZH,      "\033|225m"},   // italic: blue text on yellow
+    {(int)KS_CZR,      "\033|0m"},     // italic end
+    {(int)KS_US,       "\033|67m"},    // underscore: cyan text on red
+    {(int)KS_UE,       "\033|0m"},     // underscore end
+    {(int)KS_CCO,      "16"},          // allow 16 colors
 #  ifdef TERMINFO
-    {(int)KS_CAB,      "\033|%p1%db"}, /* set background color */
-    {(int)KS_CAF,      "\033|%p1%df"}, /* set foreground color */
+    {(int)KS_CAB,      "\033|%p1%db"}, // set background color
+    {(int)KS_CAF,      "\033|%p1%df"}, // set foreground color
 #  else
-    {(int)KS_CAB,      "\033|%db"},    /* set background color */
-    {(int)KS_CAF,      "\033|%df"},    /* set foreground color */
+    {(int)KS_CAB,      "\033|%db"},    // set background color
+    {(int)KS_CAF,      "\033|%df"},    // set foreground color
 #  endif
 
-    {(int)KS_MS,       "y"},           /* save to move cur in reverse mode */
+    {(int)KS_MS,       "y"},           // save to move cur in reverse mode
     {(int)KS_UT,       "y"},
     {(int)KS_XN,       "y"},
     {(int)KS_LE,       "\b"},
 #  ifdef TERMINFO
-    {(int)KS_CM,       "\033|%i%p1%d;%p2%dH"},/* cursor motion */
+    {(int)KS_CM,       "\033|%i%p1%d;%p2%dH"}, // cursor motion
 #  else
-    {(int)KS_CM,       "\033|%i%d;%dH"},/* cursor motion */
+    {(int)KS_CM,       "\033|%i%d;%dH"}, // cursor motion
 #  endif
-    {(int)KS_VB,       "\033|B"},      /* visual bell */
-    {(int)KS_TI,       "\033|S"},      /* put terminal in termcap mode */
-    {(int)KS_TE,       "\033|E"},      /* out of termcap mode */
+    {(int)KS_VB,       "\033|B"},      // visual bell
+    {(int)KS_TI,       "\033|S"},      // put terminal in termcap mode
+    {(int)KS_TE,       "\033|E"},      // out of termcap mode
 #  ifdef TERMINFO
-    {(int)KS_CS,       "\033|%i%p1%d;%p2%dr"},/* scroll region */
+    {(int)KS_CS,       "\033|%i%p1%d;%p2%dr"}, // scroll region
 #  else
-    {(int)KS_CS,       "\033|%i%d;%dr"},/* scroll region */
+    {(int)KS_CS,       "\033|%i%d;%dr"}, // scroll region
 #  endif
 #  ifdef FEAT_TERMGUICOLORS
     {(int)KS_8F,       "\033|38;2;%lu;%lu;%lum"},
@@ -6778,9 +6780,13 @@ static struct ks_tbl_s ks_tbl[] =
 #  ifdef TERMINFO
     {(int)KS_CAB, "\033|%p1%db", "\033|%p14%dm"}, // set background color
     {(int)KS_CAF, "\033|%p1%df", "\033|%p13%dm"}, // set foreground color
+    {(int)KS_CS,  "\033|%p1%d;%p2%dR", "\033|%p1%d;%p2%dR"},
+    {(int)KS_CSV, "\033|%p1%d;%p2%dV", "\033|%p1%d;%p2%dV"},
 #  else
     {(int)KS_CAB, "\033|%db", "\033|4%dm"}, // set background color
     {(int)KS_CAF, "\033|%df", "\033|3%dm"}, // set foreground color
+    {(int)KS_CS,  "\033|%d;%dR", "\033|%d;%dR"},
+    {(int)KS_CSV, "\033|%d;%dV", "\033|%d;%dV"},
 #  endif
     {(int)KS_CCO, "256", "256"},           // colors
     {(int)KS_NAME}                         // terminator

diff --git a/src/version.c b/src/version.c
index aa73ebd87832b51c4afda6c7ad4e7b5185cf58c1..21b9217878e6e0afece3db4f93bfe8c9ae4f101b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -779,6 +779,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    933,
 /**/
     932,
 /**/