screen size

diff --git a/main2.c b/main2.c
index 72a84d3001ad2ae3db023e1a567aeffb86484a2c..12f99d4f5daaf8d5ae6e27fd43c78822158ab214 100644 (file)
--- a/main2.c
+++ b/main2.c
@@ -90,6 +90,17 @@ void vt100CursorHome() { vt100Escape("[H"); }
 void vt100CursorPos(int v, int h) { vt100Escape("[%d;%dH", v, h); }
 void vt100SaveCursor() { vt100Escape("7"); }
 void vt100RestoreCursor() { vt100Escape("8"); }
+void vt100GetScreenSize(int * v, int * h) {
+    *v = *h = 0;
+    vt100CursorPos(1000000, 1000000);
+    printf("\033[6n");
+    getch(); getch();
+    int c;
+    while ((c = getch()) != ';')
+        *v = (10*(*v)+(c-'0'));
+    while ((c = getch()) != 'R')
+        *h = (10*(*h)+(c-'0'));
+}
 
 
 // JSON
@@ -250,19 +261,37 @@ JSONNodePrint(JSONNode * node) {
 
 // Input
 
-JSONNode * g_Node;
+JSONNode * g_DrawNode = NULL;
+const char * g_DrawStr = "";
 
 void
-Draw(JSONNode * node, const char * str) {
+Draw(void) {
     vt100ClearScreen();
     vt100CursorHome();
     
-    printf("> %s\n\n", str);
+    if (g_DrawNode != NULL)
+        JSONNodePrint(g_DrawNode);
 
-    if (node != NULL)
-        JSONNodePrint(node);
+    int v, h;
+    vt100GetScreenSize(&v, &h);
+    vt100CursorPos(v, 0);
+    printf("> %s", g_DrawStr);
 
-    vt100CursorPos(0, strlen(str) + 3);
+    vt100CursorPos(v, strlen(g_DrawStr) + 3);
+}
+
+int
+GetChar() {
+    Draw();
+    int c = getch();
+    return c;
+}
+
+int
+PeekChar() {
+    int c = GetChar();
+    ungetch(c);
+    return c;
 }
 
 int
@@ -271,21 +300,21 @@ GetInt() {
     int intStrLen = 0;
     int result = 0;
     int c;
-    while ((c = getch()), (c != '\r') && (c != '\n')) {
+    g_DrawStr = intStr;
+    while ((c = GetChar()), (c != '\r') && (c != '\n')) {
         if ((c == 8 || c == 127) && intStrLen > 0) {
             intStrLen--;
             intStr[intStrLen] = '\0';
             result /= 10;
-            Draw(g_Node, intStr);
         }
         else if (intStrLen < 16 - 1 && (c >= '0' && c <= '9')) {
             intStr[intStrLen++] = c;
             intStr[intStrLen] = '\0';
             result *= 10;
             result += c - '0';
-            Draw(g_Node, intStr);
         }
     }
+    g_DrawStr = "";
     return result;
 }
 
@@ -294,29 +323,29 @@ GetStr() {
     char * str = NEWARR(char, 16);
     int strLen = 0;
     int c;
-    while ((c = getch()), (c != '\r') && (c != '\n')) {
+    g_DrawStr = str;
+    while ((c = GetChar()), (c != '\r') && (c != '\n')) {
         if ((c == 8 || c == 127) && strLen > 0) {
             strLen--;
             str[strLen] = '\0';
-            Draw(g_Node, str);
         }
         else if (strLen < 16 - 1) {
             str[strLen++] = c;
             str[strLen] = '\0';
-            Draw(g_Node, str);
         }
     }
+    g_DrawStr = "";
     return str;
 }
 
 JSONNode *
 GetNode(JSONNode * parent) {
-    int c = getch();
+    int c = GetChar();
 
     JSONNode * result = JSONNodeNewNul();
     
     if (parent == NULL)
-        g_Node = result;
+        g_DrawNode = result;
 
     if (parent != NULL && result != NULL)
         JSONNodePush(parent, result);
@@ -324,87 +353,51 @@ GetNode(JSONNode * parent) {
     switch (c) {
     case 'i': {
         result->kind = JSONNodeKind_Int;
-        Draw(g_Node, "");
         result->data = (size_t)GetInt();
-        Draw(g_Node, "");
         break;
     }
     case 's': {
         result->kind = JSONNodeKind_Str;
-        Draw(g_Node, "");
         result->data = (size_t)GetStr();
-        Draw(g_Node, "");
         break;
     }
     case 'o': {
         result->kind = JSONNodeKind_Obj;
-        Draw(g_Node, "");
-        while ((c = peekch()), (c != '\r') && (c != '\n')) {
-            Draw(g_Node, "");
-
+        while ((c = PeekChar()), (c != '\r') && (c != '\n')) {
             JSONNodePush(result, JSONNodeNewStr(GetStr()));
-            Draw(g_Node, "");
 
             JSONNodePush(result, GetNode(result));
-            Draw(g_Node, "");
         }
-        getch();
+        GetChar();
         break;
     }
     case 'a': {
         result->kind = JSONNodeKind_Arr;
-        Draw(g_Node, "");
-        while ((c = peekch()), (c != '\r') && (c != '\n')) {
-            Draw(g_Node, "");
-
+        while ((c = PeekChar()), (c != '\r') && (c != '\n')) {
             JSONNodePush(result, GetNode(result));
-            Draw(g_Node, "");
         }
-        getch();
+        GetChar();
         break;
     }
     case 8:
     case 127:
         JSONNodePop(parent);
-        Draw(g_Node, "");
         result = GetNode(parent);
         break;
     case 't':
         result->kind = JSONNodeKind_Int;
-        result->data = (size_t)getch();
+        result->data = (size_t)GetChar();
         break;
     }
 
     return result;
 }
 
-JSONNode *
-TestNode() {
-    JSONNode * n = JSONNodeNewObj();
-    JSONNode * k1 = JSONNodeNewStr("key 1");
-    JSONNode * v1 = JSONNodeNewObj();
-    JSONNode * k11 = JSONNodeNewStr("key 11");
-    JSONNode * v11 = JSONNodeNewStr("val 11");
-    JSONNode * k12 = JSONNodeNewStr("key 12");
-    JSONNode * v12 = JSONNodeNewStr("val 12");
-    JSONNode * k2 = JSONNodeNewStr("key 2");
-    JSONNode * v2 = JSONNodeNewStr("val 2");
-
-    JSONNodePush(n, k1);
-    JSONNodePush(n, v1);
-    JSONNodePush(n, k2);
-    JSONNodePush(n, v2);
-
-    JSONNodePush(v1, k11);
-    JSONNodePush(v1, v11);
-    JSONNodePush(v1, k12);
-    JSONNodePush(v1, v12);
-
-    return n;
-}
+
+
 
 int main() {
-    Draw(NULL, "");
+    Draw();
 
     JSONNode * n = GetNode(NULL);
     //JSONNode * n = TestNode();