Fix issue in 64-bit choose() reported by heardrwt.

[cycript.git] / Display.cpp

diff --git a/Display.cpp b/Display.cpp
index d76ac1f745c294cdead81b485c36f101a734aeb2..bd646bbd2f856294f3c1b4e7d626440750e5471c 100644 (file)
--- a/Display.cpp
+++ b/Display.cpp
@@ -28,6 +28,8 @@
 #include <readline/readline.h>
 #endif
 
+#if RL_READLINE_VERSION >= 0x0600
+
 #include <sys/ioctl.h>
 
 #include "Highlight.hpp"
@@ -36,6 +38,11 @@
 
 typedef std::complex<int> CYCursor;
 
+extern "C" int rl_display_fixed;
+extern "C" int _rl_vis_botlin;
+extern "C" int _rl_last_c_pos;
+extern "C" int _rl_last_v_pos;
+
 CYCursor current_;
 int width_;
 size_t point_;
@@ -109,12 +116,11 @@ void CYDisplayMove(CYCursor target) {
     current_ = target;
 }
 
-void CYDisplayStart(int meta) {
-    rl_prep_terminal(meta);
-    current_ = CYCursor();
-}
-
 void CYDisplayUpdate() {
+    rl_display_fixed = 1;
+    rl_redisplay();
+    current_ = CYCursor(_rl_last_v_pos, _rl_last_c_pos);
+
 #if RL_READLINE_VERSION >= 0x0600
     const char *prompt(rl_display_prompt);
 #else
@@ -137,6 +143,8 @@ void CYDisplayUpdate() {
     CYDisplayOutput(putchar, width, prompt);
     CYCursor target(CYDisplayOutput(putchar, width, stream.str().c_str(), rl_point));
 
+    _rl_vis_botlin = current_.real();
+
     if (current_.imag() == 0)
         CYDisplayOutput(putchar, width, " ");
     putp(clr_eos);
@@ -144,10 +152,11 @@ void CYDisplayUpdate() {
     CYDisplayMove(target);
     fflush(stdout);
 
+    _rl_last_v_pos = current_.real();
+    _rl_last_c_pos = current_.imag();
+
     width_ = width;
     point_ = rl_point;
 }
 
-void CYDisplayFinish() {
-    rl_deprep_terminal();
-}
+#endif