Fix windows console bug

peterix · peterix · commit d825356878ee · 2012-04-17T23:23:45.000+02:00
Line input cursor was going crazy when input reached right side of the screen
diff --git a/library/Console-windows.cpp b/library/Console-windows.cpp
@@ -223,12 +223,13 @@ namespace DFHack
             size_t plen = prompt.size();
             const char * buf = raw_buffer.c_str();
             size_t len = raw_buffer.size();
+            int cooked_cursor = raw_cursor;
 
-            while ((plen + raw_cursor) >= cols)
+            while ((plen + cooked_cursor) >= cols)
             {
                 buf++;
                 len--;
-                raw_cursor--;
+                cooked_cursor--;
             }
             while (plen + len > cols)
             {
@@ -247,7 +248,7 @@ namespace DFHack
                 output(tmp, inf.dwSize.X - (plen + len), len + plen, inf.dwCursorPosition.Y);
                 free(tmp);
             }
-            inf.dwCursorPosition.X = (SHORT)(raw_cursor + plen);
+            inf.dwCursorPosition.X = (SHORT)(cooked_cursor + plen);
             SetConsoleCursorPosition(console_out, inf.dwCursorPosition);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -223,12 +223,13 @@ namespace DFHack`
`223`	`223`	`size_t plen = prompt.size();`
`224`	`224`	`const char * buf = raw_buffer.c_str();`
`225`	`225`	`size_t len = raw_buffer.size();`
	`226`	`+ int cooked_cursor = raw_cursor;`
`226`	`227`
`227`		`- while ((plen + raw_cursor) >= cols)`
	`228`	`+ while ((plen + cooked_cursor) >= cols)`
`228`	`229`	`{`
`229`	`230`	`buf++;`
`230`	`231`	`len--;`
`231`		`- raw_cursor--;`
	`232`	`+ cooked_cursor--;`
`232`	`233`	`}`
`233`	`234`	`while (plen + len > cols)`
`234`	`235`	`{`
`@@ -247,7 +248,7 @@ namespace DFHack`
`247`	`248`	`output(tmp, inf.dwSize.X - (plen + len), len + plen, inf.dwCursorPosition.Y);`
`248`	`249`	`free(tmp);`
`249`	`250`	`}`
`250`		`- inf.dwCursorPosition.X = (SHORT)(raw_cursor + plen);`
	`251`	`+ inf.dwCursorPosition.X = (SHORT)(cooked_cursor + plen);`
`251`	`252`	`SetConsoleCursorPosition(console_out, inf.dwCursorPosition);`
`252`	`253`	`}`
`253`	`254`