Remove AX_CHECK_GNU_MAKE as we no longer use gmake.

[cycript.git] / Display.cpp

diff --git a/Display.cpp b/Display.cpp
index 56cbb5eddccb179752813e17cb2a6ad9928fe268..d76ac1f745c294cdead81b485c36f101a734aeb2 100644 (file)
--- a/Display.cpp
+++ b/Display.cpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2012  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)
 */
 
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */
 /*
- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
  *
- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
@@ -40,14 +40,6 @@ CYCursor current_;
 int width_;
 size_t point_;
 
-const char *CYDisplayPrompt() {
-#if RL_READLINE_VERSION >= 0x0600
-    return rl_display_prompt;
-#else
-    return rl_prompt;
-#endif
-}
-
 unsigned CYDisplayWidth() {
     struct winsize info;
     if (ioctl(1, TIOCGWINSZ, &info) != -1)
@@ -80,36 +72,40 @@ CYCursor CYDisplayOutput(int (*put)(int), int width, const char *data, ssize_t o
 
             case CYIgnoreStart:
                 CYDisplayOutput_(put, data);
-                ++offset;
-            break;
-
             case CYIgnoreEnd:
                 ++offset;
             break;
 
             default:
-                if (put != NULL)
-                    put(next);
-
                 current_ += CYCursor(0, 1);
                 if (current_.imag() == width)
+            case '\n':
                     current_ = CYCursor(current_.real() + 1, 0);
+                if (put != NULL)
+                    put(next);
             break;
+
         }
     }
+}
 
-    return point;
+void CYDisplayMove_(char *negative, char *positive, int offset) {
+    if (offset < 0)
+        putp(tparm(negative, -offset));
+    else if (offset > 0)
+        putp(tparm(positive, offset));
 }
 
 void CYDisplayMove(CYCursor target) {
-    int offset(target.real() - current_.real());
+    CYCursor offset(target - current_);
 
-    if (offset < 0)
-        putp(tparm(parm_up_cursor, -offset));
-    else if (offset > 0)
-        putp(tparm(parm_down_cursor, offset));
+    CYDisplayMove_(parm_up_cursor, parm_down_cursor, offset.real());
+
+    if (char *parm = tparm(column_address, target.imag()))
+        putp(parm);
+    else
+        CYDisplayMove_(parm_left_cursor, parm_right_cursor, offset.imag());
 
-    putp(tparm(column_address, target.imag()));
     current_ = target;
 }
 
@@ -119,6 +115,12 @@ void CYDisplayStart(int meta) {
 }
 
 void CYDisplayUpdate() {
+#if RL_READLINE_VERSION >= 0x0600
+    const char *prompt(rl_display_prompt);
+#else
+    const char *prompt(rl_prompt);
+#endif
+
     std::ostringstream stream;
     CYLexerHighlight(rl_line_buffer, rl_end, stream, true);
     std::string string(stream.str());
@@ -127,20 +129,19 @@ void CYDisplayUpdate() {
     int width(CYDisplayWidth());
     if (width_ != width) {
         current_ = CYCursor();
-        CYDisplayOutput(NULL, width, CYDisplayPrompt());
-        CYDisplayOutput(NULL, width, buffer, point_);
+        CYDisplayOutput(NULL, width, prompt);
+        current_ = CYDisplayOutput(NULL, width, buffer, point_);
     }
 
     CYDisplayMove(CYCursor());
-    CYDisplayOutput(putchar, width, CYDisplayPrompt());
-
+    CYDisplayOutput(putchar, width, prompt);
     CYCursor target(CYDisplayOutput(putchar, width, stream.str().c_str(), rl_point));
-    if (target.imag() == 0)
-        putp(cursor_down);
 
+    if (current_.imag() == 0)
+        CYDisplayOutput(putchar, width, " ");
     putp(clr_eos);
-    CYDisplayMove(target);
 
+    CYDisplayMove(target);
     fflush(stdout);
 
     width_ = width;