1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32.c: restrict cursor move

Browse Source 
* win32/win32.c (constat_apply): restrict cursor move in visible
  screen only.  [ruby-core:81883] [Bug #13707]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59256 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-07-03 23:42:12 +00:00
parent 66245e1b2b
commit da373e5394
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
win32/win32.c
View File

@ -6710,8 +6710,8 @@ constat_apply(HANDLE handle, struct constat *s, WCHAR w)
csbi.dwCursorPosition.X = 0; csbi.dwCursorPosition.X = 0;
case L'A': case L'A':
csbi.dwCursorPosition.Y -= arg1; csbi.dwCursorPosition.Y -= arg1;
if (csbi.dwCursorPosition.Y < 0) if (csbi.dwCursorPosition.Y < csbi.srWindow.Top)
csbi.dwCursorPosition.Y = 0; csbi.dwCursorPosition.Y = csbi.srWindow.Top;
SetConsoleCursorPosition(handle, csbi.dwCursorPosition); SetConsoleCursorPosition(handle, csbi.dwCursorPosition);
break; break;
case L'E': case L'E':
@ -6719,29 +6719,35 @@ constat_apply(HANDLE handle, struct constat *s, WCHAR w)
case L'B': case L'B':
case L'e': case L'e':
csbi.dwCursorPosition.Y += arg1; csbi.dwCursorPosition.Y += arg1;
if (csbi.dwCursorPosition.Y >= csbi.dwSize.Y) if (csbi.dwCursorPosition.Y > csbi.srWindow.Bottom)
csbi.dwCursorPosition.Y = csbi.dwSize.Y; csbi.dwCursorPosition.Y = csbi.srWindow.Bottom;
SetConsoleCursorPosition(handle, csbi.dwCursorPosition); SetConsoleCursorPosition(handle, csbi.dwCursorPosition);
break; break;
case L'C': case L'C':
csbi.dwCursorPosition.X += arg1; csbi.dwCursorPosition.X += arg1;
if (csbi.dwCursorPosition.X >= csbi.dwSize.X) if (csbi.dwCursorPosition.X >= csbi.srWindow.Right)
csbi.dwCursorPosition.X = csbi.dwSize.X; csbi.dwCursorPosition.X = csbi.srWindow.Right;
SetConsoleCursorPosition(handle, csbi.dwCursorPosition); SetConsoleCursorPosition(handle, csbi.dwCursorPosition);
break; break;
case L'D': case L'D':
csbi.dwCursorPosition.X -= arg1; csbi.dwCursorPosition.X -= arg1;
if (csbi.dwCursorPosition.X < 0) if (csbi.dwCursorPosition.X < csbi.srWindow.Left)
csbi.dwCursorPosition.X = 0; csbi.dwCursorPosition.X = csbi.srWindow.Left;
SetConsoleCursorPosition(handle, csbi.dwCursorPosition); SetConsoleCursorPosition(handle, csbi.dwCursorPosition);
break; break;
case L'G': case L'G':
case L'`': case L'`':
csbi.dwCursorPosition.X = (arg1 > csbi.dwSize.X ? csbi.dwSize.X : arg1) - 1; arg1 += csbi.srWindow.Left;
if (arg1 > csbi.srWindow.Right)
arg1 = csbi.srWindow.Right;
csbi.dwCursorPosition.X = arg1;
SetConsoleCursorPosition(handle, csbi.dwCursorPosition); SetConsoleCursorPosition(handle, csbi.dwCursorPosition);
break; break;
case L'd': case L'd':
csbi.dwCursorPosition.Y = (arg1 > csbi.dwSize.Y ? csbi.dwSize.Y : arg1) - 1; arg1 += csbi.srWindow.Top;
if (arg1 > csbi.srWindow.Bottom)
arg1 = csbi.srWindow.Bottom;
csbi.dwCursorPosition.Y = arg1;
SetConsoleCursorPosition(handle, csbi.dwCursorPosition); SetConsoleCursorPosition(handle, csbi.dwCursorPosition);
break; break;
case L'H': case L'H':