change node editing (wip)#

[iftint] / main2.c

diff --git a/main2.c b/main2.c
index 5864bc81c264cb87cd8e6b1f8d3b0df73db4fcd8..d8f25817bcb6f465a31b4991175ed9dee97d4e4a 100644 (file)
--- a/main2.c
+++ b/main2.c
@@ -14,11 +14,13 @@
 #define NEWARR(TYPE, NUM) ((TYPE *)calloc(NUM, sizeof(TYPE)))
 
 
 #define NEWARR(TYPE, NUM) ((TYPE *)calloc(NUM, sizeof(TYPE)))
 
 

-// getch()
+// getch

 
 #ifdef _WIN32
 
 #ifdef _WIN32

+#include <windows.h>

 #include <conio.h>
 #else
 #include <conio.h>
 #else

+#include <sys/ioctl.h>

 #include <termios.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <termios.h>
 #include <unistd.h>
 #include <stdio.h>


@@ -30,21 +32,7 @@ int getch(void)
     int ch;
     tcgetattr( STDIN_FILENO, &oldattr );
     newattr = oldattr;
     int ch;
     tcgetattr( STDIN_FILENO, &oldattr );
     newattr = oldattr;

-    newattr.c_lflag &= ~( ICANON | ECHO );
-    tcsetattr( STDIN_FILENO, TCSANOW, &newattr );
-    ch = getchar();
-    tcsetattr( STDIN_FILENO, TCSANOW, &oldattr );
-    return ch;
-}
-
-/* reads from keypress, echoes */
-int getche(void)
-{
-    struct termios oldattr, newattr;
-    int ch;
-    tcgetattr( STDIN_FILENO, &oldattr );
-    newattr = oldattr;
-    newattr.c_lflag &= ~( ICANON );
+    newattr.c_lflag &= ~( ICANON | ECHO ); // no ECHO for echo(?)

     tcsetattr( STDIN_FILENO, TCSANOW, &newattr );
     ch = getchar();
     tcsetattr( STDIN_FILENO, TCSANOW, &oldattr );
     tcsetattr( STDIN_FILENO, TCSANOW, &newattr );
     ch = getchar();
     tcsetattr( STDIN_FILENO, TCSANOW, &oldattr );


@@ -90,6 +78,29 @@ void vt100CursorHome() { vt100Escape("[H"); }
 void vt100CursorPos(int v, int h) { vt100Escape("[%d;%dH", v, h); }
 void vt100SaveCursor() { vt100Escape("7"); }
 void vt100RestoreCursor() { vt100Escape("8"); }
 void vt100CursorPos(int v, int h) { vt100Escape("[%d;%dH", v, h); }
 void vt100SaveCursor() { vt100Escape("7"); }
 void vt100RestoreCursor() { vt100Escape("8"); }

+void vt100GetCursor(int * v, int * h) {
+    *v = *h = 0;
+    printf("\033[6n");
+    getch(); getch();
+    int c;
+    while ((c = getch()) != ';')
+       *v = (10*(*v)+(c-'0'));
+    while ((c = getch()) != 'R')
+       *h = (10*(*h)+(c-'0'));
+}
+void vt100GetScreenSize(int * v, int * h) {
+#ifdef _WIN32
+    CONSOLE_SCREEN_BUFFER_INFO csbi;
+    GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi);
+    *h = csbi.srWindow.Right - csbi.srWindow.Left + 1;
+    *v = csbi.srWindow.Bottom - csbi.srWindow.Top + 1;
+#else
+    struct winsize w;
+    ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
+    *h = w.ws_row;
+    *v = w.ws_col;
+#endif
+}

 
 
 // JSON
 
 
 // JSON


@@ -100,6 +111,7 @@ typedef enum {
     JSONNodeKind_Str,
     JSONNodeKind_Obj,
     JSONNodeKind_Arr,
     JSONNodeKind_Str,
     JSONNodeKind_Obj,
     JSONNodeKind_Arr,

+    JSONNodeKind_COUNT

 } JSONNodeKind;
 
 struct JSONNode;
 } JSONNodeKind;
 
 struct JSONNode;


@@ -187,15 +199,18 @@ Indent(int indent) {
         printf("  ");
 }
 
         printf("  ");
 }
 

+static int currV = 0;
+static int currH = 0;
+

 void
 void

-JSONNodePrint(JSONNode * node) {
+JSONNodePrint(JSONNode * node, JSONNode * currNode) {

     if (node == NULL)
         return;
     
     static int indent;
     if (node->parent == NULL)
         indent = 0;
     if (node == NULL)
         return;
     
     static int indent;
     if (node->parent == NULL)
         indent = 0;

-    
+

     switch (node->kind) {
     case JSONNodeKind_Nul: {
         printf("null");
     switch (node->kind) {
     case JSONNodeKind_Nul: {
         printf("null");


@@ -220,7 +235,7 @@ JSONNodePrint(JSONNode * node) {
             JSONNode * value = ptr->next;
             Indent(indent);
             printf("\"%s\": ", key);
             JSONNode * value = ptr->next;
             Indent(indent);
             printf("\"%s\": ", key);

-            JSONNodePrint(value);
+            JSONNodePrint(value, currNode);

             if (ptr->next != NULL)
                 ptr = ptr->next->next;
             else
             if (ptr->next != NULL)
                 ptr = ptr->next->next;
             else


@@ -237,7 +252,7 @@ JSONNodePrint(JSONNode * node) {
         JSONNode * ptr = node->children;
         while (ptr != NULL) {
             JSONNode * value = ptr;
         JSONNode * ptr = node->children;
         while (ptr != NULL) {
             JSONNode * value = ptr;

-            JSONNodePrint(value);
+            JSONNodePrint(value, currNode);

             ptr = ptr->next;
             printf("%s", (ptr == NULL ? "" : ", "));
         }
             ptr = ptr->next;
             printf("%s", (ptr == NULL ? "" : ", "));
         }


@@ -245,78 +260,103 @@ JSONNodePrint(JSONNode * node) {
         break;
     }
     }
         break;
     }
     }

+
+    if (currNode == node) {
+       int currOffsets[JSONNodeKind_COUNT];
+       currOffsets[JSONNodeKind_Nul] = 0;
+       currOffsets[JSONNodeKind_Int] = 0;
+       currOffsets[JSONNodeKind_Str] = 1;
+       currOffsets[JSONNodeKind_Obj] = 1;
+       currOffsets[JSONNodeKind_Arr] = 2;
+        vt100GetCursor(&currV, &currH);
+       currH -= currOffsets[node->kind];
+    }

 }
 
 
 // Input
 
 }
 
 
 // Input
 

-JSONNode * g_Node;
+JSONNode * g_DrawNode = NULL;
+JSONNode * g_CurrNode = NULL;

 
 void
 
 void

-Draw(JSONNode * node, const char * str) {
+Draw(void) {

     vt100ClearScreen();
     vt100CursorHome();
     
     vt100ClearScreen();
     vt100CursorHome();
     

-    printf("> %s\n\n", str);
-
-    if (node != NULL)
-        JSONNodePrint(node);
+    if (g_DrawNode != NULL) {
+        JSONNodePrint(g_DrawNode, g_CurrNode);
+       vt100CursorPos(currV, currH);
+    }
+}

 
 

-    vt100CursorPos(0, strlen(str) + 3);
+int
+GetChar() {
+    Draw();
+    int c = getch();
+    return c;

 }
 
 int
 }
 
 int

-GetInt() {
-    static char intStr[16];
+PeekChar() {
+    Draw();
+    int c = peekch();
+    return c;
+}
+
+void
+GetInt(JSONNode * node) {
+    char intStr[16] = "";

     int intStrLen = 0;
     int intStrLen = 0;

-    int result = 0;
+    
+    size_t * i = &node->data;
+    

     int c;
     int c;

-    while ((c = getch()), (c != '\r') && (c != '\n')) {
-        if (c == 8 && intStrLen > 0) {
+    while ((c = GetChar()), (c != '\r') && (c != '\n')) {
+        if ((c == 8 || c == 127) && intStrLen > 0) {

             intStrLen--;
             intStr[intStrLen] = '\0';
             intStrLen--;
             intStr[intStrLen] = '\0';

-            result /= 10;
-            Draw(g_Node, intStr);
+            *i /= 10;

         }
         else if (intStrLen < 16 - 1 && (c >= '0' && c <= '9')) {
             intStr[intStrLen++] = c;
             intStr[intStrLen] = '\0';
         }
         else if (intStrLen < 16 - 1 && (c >= '0' && c <= '9')) {
             intStr[intStrLen++] = c;
             intStr[intStrLen] = '\0';

-            result *= 10;
-            result += c - '0';
-            Draw(g_Node, intStr);
+            *i *= 10;
+            *i += c - '0';

         }
     }
         }
     }

-    return result;

 }
 
 }
 

-char *
-GetStr() {
-    char * str = NEWARR(char, 16);
+void
+GetStr(JSONNode * node) {
+    node->data = (size_t)NEWARR(char, 16);

     int strLen = 0;
     int strLen = 0;

+
+    char * str = (char *)node->data;
+    

     int c;
     int c;

-    while ((c = getch()), (c != '\r') && (c != '\n')) {
-        if (c == 8 && strLen > 0) {
+    while ((c = GetChar()), (c != '\r') && (c != '\n')) {
+        if ((c == 8 || c == 127) && strLen > 0) {

             strLen--;
             str[strLen] = '\0';
             strLen--;
             str[strLen] = '\0';

-            Draw(g_Node, str);

         }
         else if (strLen < 16 - 1) {
         }
         else if (strLen < 16 - 1) {

-            str[strLen++] = c;
+            str[strLen] = c;
+           strLen++;

             str[strLen] = '\0';
             str[strLen] = '\0';

-            Draw(g_Node, str);

         }
     }
         }
     }

-    return str;

 }
 
 }
 

-JSONNode *
-GetNode(JSONNode * parent) {
-    int c = getch();
+void
+GetNode(JSONNode * parent, JSONNode * node) {
+    int c = GetChar();
+
+    JSONNode * result = node;
+    g_CurrNode = node;

 
 

-    JSONNode * result = JSONNodeNewNul();
-    

     if (parent == NULL)
     if (parent == NULL)

-        g_Node = result;
+        g_DrawNode = result;

 
     if (parent != NULL && result != NULL)
         JSONNodePush(parent, result);
 
     if (parent != NULL && result != NULL)
         JSONNodePush(parent, result);


@@ -324,97 +364,75 @@ GetNode(JSONNode * parent) {
     switch (c) {
     case 'i': {
         result->kind = JSONNodeKind_Int;
     switch (c) {
     case 'i': {
         result->kind = JSONNodeKind_Int;

-        Draw(g_Node, "");
-        result->data = (size_t)GetInt();
-        Draw(g_Node, "");
+       GetInt(result);

         break;
     }
     case 's': {
         result->kind = JSONNodeKind_Str;
         break;
     }
     case 's': {
         result->kind = JSONNodeKind_Str;

-        Draw(g_Node, "");
-        result->data = (size_t)GetStr();
-        Draw(g_Node, "");
+       GetStr(result);

         break;
     }
     case 'o': {
         result->kind = JSONNodeKind_Obj;
         break;
     }
     case 'o': {
         result->kind = JSONNodeKind_Obj;

-        Draw(g_Node, "");
-        while ((c = peekch()), (c != '\r') && (c != '\n')) {
-            Draw(g_Node, "");
-
-            JSONNodePush(result, JSONNodeNewStr(GetStr()));
-            Draw(g_Node, "");
-
-            JSONNodePush(result, GetNode(result));
-            Draw(g_Node, "");
+        while ((c = PeekChar()), (c != '\r') && (c != '\n')) {
+           JSONNode * newNode;
+           
+           newNode = JSONNodeNewStr("");
+           g_CurrNode = newNode;
+            JSONNodePush(result, newNode);
+           GetStr(newNode);
+
+           newNode = JSONNodeNewNul();
+            JSONNodePush(result, newNode);
+           GetNode(result, newNode);

         }
         }

-        getch();
+       g_CurrNode = result;
+        GetChar();

         break;
     }
     case 'a': {
         result->kind = JSONNodeKind_Arr;
         break;
     }
     case 'a': {
         result->kind = JSONNodeKind_Arr;

-        Draw(g_Node, "");
-        while ((c = peekch()), (c != '\r') && (c != '\n')) {
-            Draw(g_Node, "");
-
-            JSONNodePush(result, GetNode(result));
-            Draw(g_Node, "");
+        while ((c = PeekChar()), (c != '\r') && (c != '\n')) {
+           JSONNode * newNode = JSONNodeNewNul();
+           g_CurrNode = newNode;
+            JSONNodePush(result, newNode);
+           GetNode(result, newNode);

         }
         }

-        getch();
+       g_CurrNode = result;
+        GetChar();

         break;
     }
         break;
     }

+    /*

     case 8:
     case 8:

-    //case 127:
+    case 127:

         JSONNodePop(parent);
         JSONNodePop(parent);

-        Draw(g_Node, "");
-        result = GetNode(parent);
+       JSONNode * newNode = JSONNodeNewNul();
+        GetNode(parent, newNode);

         break;
         break;

+    */

     case 't':
         result->kind = JSONNodeKind_Int;
     case 't':
         result->kind = JSONNodeKind_Int;

-        result->data = (size_t)getch();
+        result->data = (size_t)GetChar();

         break;
     }
         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() {
 
 int main() {

-    Draw(NULL, "");
+    Draw();

 
 

-    JSONNode * n = GetNode(NULL);
+    JSONNode * n = JSONNodeNewNul();
+    GetNode(NULL, n);

     //JSONNode * n = TestNode();
 
     vt100ClearScreen();
     vt100CursorHome();
     //JSONNode * n = TestNode();
 
     vt100ClearScreen();
     vt100CursorHome();

-    JSONNodePrint(n);
+    JSONNodePrint(n, NULL);

     printf("\n");
 
     // JSONFree(n);
 
     return 0;
     printf("\n");
 
     // JSONFree(n);
 
     return 0;

-}
\ No newline at end of file
+}