Remove and compress some dead code in CYDisplayOutput.

[cycript.git] / Display.cpp

diff --git a/Display.cpp b/Display.cpp
index 5e45c458a16f91c574ce77954024039304ab8323..555bd6d490336fa9dd978b95c429b33b0d78d473 100644 (file)
--- a/Display.cpp
+++ b/Display.cpp
@@ -72,9 +72,6 @@ CYCursor CYDisplayOutput(int (*put)(int), int width, const char *data, ssize_t o
 
             case CYIgnoreStart:
                 CYDisplayOutput_(put, data);
 
             case CYIgnoreStart:
                 CYDisplayOutput_(put, data);

-                ++offset;
-            break;
-

             case CYIgnoreEnd:
                 ++offset;
             break;
             case CYIgnoreEnd:
                 ++offset;
             break;


@@ -90,19 +87,25 @@ CYCursor CYDisplayOutput(int (*put)(int), int width, const char *data, ssize_t o
 
         }
     }
 
         }
     }

+}

 
 

-    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) {
 }
 
 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;
 }
 
     current_ = target;
 }