meson bulid changes

meson.build

@@ -33,7 +33,7 @@ if cc.get_id() == 'clang'
 endif
 
 # Include directory
-inc_dir = include_directories('include', 'lisp-interpreter/dist')
+inc_dir = include_directories('include')
 
 # Source files
 src_files = files(
@@ -49,7 +49,7 @@ src_files = files(
 )
 
 # Executable
-executable('editor',
+executable('beluga',
   src_files,
   include_directories : inc_dir,
   install : true,

src/init.c

@@ -1,7 +1,6 @@
 #include "../include/init.h"
-#include "data.h"
+#include "../include/data.h"
 #include <stdio.h>
-#include <stdlib.h>
 
 extern struct editorConfig;
 
@@ -21,4 +20,10 @@ void initEditor() {
     die("getWindowSize");
   }
   E.screenrows -= 2;
+
+  // E.fd_init_file = fopen("../config/init.el", "r");
+
+  // E.ctx = lisp_init();
+  // E.ctx_data = lisp_read_file(E.fd_init_file, &E.ctx_error, E.ctx);
+  // lisp_printf(stderr, E.ctx_data);
 }

src/terminal.c

@@ -1,146 +1,148 @@
 #include "../include/terminal.h"
-#include "data.h"
+#include "../include/data.h"
+
+#include <stdio.h>
 
 void die(const char *s) {
-  write(STDOUT_FILENO, "\x1b[2J", 4);
-  write(STDOUT_FILENO, CURSOR_TOP_LEFT, 3);
-  perror(s);
-  exit(1);
+    write(STDOUT_FILENO, "\x1b[2J", 4);
+    write(STDOUT_FILENO, CURSOR_TOP_LEFT, 3);
+    perror(s);
+    exit(1);
 }
 
 void disableRawMode() {
-  if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &E.orig_termios) == -1) {
-    die("tcsetattr");
-  }
+    if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &E.orig_termios) == -1) {
+        die("tcsetattr");
+    }
 }
 
 void enableRawMode() {
-  if (tcgetattr(STDIN_FILENO, &E.orig_termios) == -1) {
-    die("tcgetattr");
-  }
+    if (tcgetattr(STDIN_FILENO, &E.orig_termios) == -1) {
+        die("tcgetattr");
+    }
 
-  struct termios raw = E.orig_termios;
-  raw.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON);
-  raw.c_oflag &= ~(OPOST);
-  raw.c_cflag |= (CS8);
-  raw.c_lflag &= ~(ECHO | ICANON | ISIG | IEXTEN);
-  raw.c_cc[VMIN] = 0;
-  raw.c_cc[VTIME] = 1;
+    struct termios raw = E.orig_termios;
+    raw.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON);
+    raw.c_oflag &= ~(OPOST);
+    raw.c_cflag |= (CS8);
+    raw.c_lflag &= ~(ECHO | ICANON | ISIG | IEXTEN);
+    raw.c_cc[VMIN] = 0;
+    raw.c_cc[VTIME] = 1;
 
-  if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw) == -1) {
-    die("tcgetattr");
-  }
+    if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw) == -1) {
+        die("tcgetattr");
+    }
 }
 
 int editorReadKey() {
-  int nread;
-  char c;
-  char seq[3];
-  while ((nread = read(STDIN_FILENO, &c, 1)) != 1) {
-    if (nread == -1 && errno != EAGAIN) {
-      die("read");
+    int nread;
+    char c;
+    char seq[3];
+    while ((nread = read(STDIN_FILENO, &c, 1)) != 1) {
+        if (nread == -1 && errno != EAGAIN) {
+            die("read");
+        }
     }
-  }
 
-  if (c == '\x1b') {
-    if (read(STDIN_FILENO, &seq[0], 1) != 1 ||
-        read(STDIN_FILENO, &seq[1], 1) != 1) {
-      return '\x1b';
-    }
-    if (seq[0] == '[') {
-      if (seq[1] >= '0' && seq[1] <= '9') {
-        if (read(STDIN_FILENO, &seq[2], 1) != 1) {
-          return '\x1b';
+    if (c == '\x1b') {
+        if (read(STDIN_FILENO, &seq[0], 1) != 1 ||
+            read(STDIN_FILENO, &seq[1], 1) != 1) {
+            return '\x1b';
         }
-        if (seq[2] == '~') {
-          switch (seq[1]) {
-          case '1':
-            return BEG_LINE;
-          case '3':
-            return DEL_KEY;
-          case '4':
-            return END_LINE;
-          case '5':
-            return PAGE_UP;
-          case '6':
-            return PAGE_DOWN;
-          case '7':
-            return BEG_LINE;
-          case '8':
-            return END_LINE;
-          }
-        }
-      } else {
+        if (seq[0] == '[') {
+            if (seq[1] >= '0' && seq[1] <= '9') {
+                if (read(STDIN_FILENO, &seq[2], 1) != 1) {
+                    return '\x1b';
+                }
+                if (seq[2] == '~') {
+                    switch (seq[1]) {
+                    case '1':
+                        return BEG_LINE;
+                    case '3':
+                        return DEL_KEY;
+                    case '4':
+                        return END_LINE;
+                    case '5':
+                        return PAGE_UP;
+                    case '6':
+                        return PAGE_DOWN;
+                    case '7':
+                        return BEG_LINE;
+                    case '8':
+                        return END_LINE;
+                    }
+                }
+            } else {
 
-        switch (seq[1]) {
-        case 'A':
-          return ARROW_UP;
-        case 'B':
-          return ARROW_DOWN;
-        case 'C':
-          return ARROW_RIGHT;
-        case 'D':
-          return ARROW_LEFT;
-        case 'H':
-          return BEG_LINE;
-        case 'F':
-          return END_LINE;
+                switch (seq[1]) {
+                case 'A':
+                    return ARROW_UP;
+                case 'B':
+                    return ARROW_DOWN;
+                case 'C':
+                    return ARROW_RIGHT;
+                case 'D':
+                    return ARROW_LEFT;
+                case 'H':
+                    return BEG_LINE;
+                case 'F':
+                    return END_LINE;
+                }
+            }
+        } else if (seq[0] == 'O') {
+            switch (seq[1]) {
+            case 'H':
+                return BEG_LINE;
+            case 'F':
+                return END_LINE;
+            }
         }
-      }
-    } else if (seq[0] == 'O') {
-      switch (seq[1]) {
-      case 'H':
-        return BEG_LINE;
-      case 'F':
-        return END_LINE;
-      }
+        return '\x1b';
+    } else {
+        return c;
     }
-    return '\x1b';
-  } else {
-    return c;
-  }
 }
 
 int getCursorPosition(int *rows, int *cols) {
-  char buf[32];
-  unsigned int i = 0;
+    char buf[32];
+    unsigned int i = 0;
 
-  if (write(STDOUT_FILENO, "\x1b[6n", 4) != 4) {
-    return -1;
-  }
-
-  while (i < sizeof(buf) - 1) {
-    if (read(STDIN_FILENO, &buf[i], 1) != 1) {
-      break;
+    if (write(STDOUT_FILENO, "\x1b[6n", 4) != 4) {
+        return -1;
     }
-    if (buf[i] == 'R') {
-      break;
+
+    while (i < sizeof(buf) - 1) {
+        if (read(STDIN_FILENO, &buf[i], 1) != 1) {
+            break;
+        }
+        if (buf[i] == 'R') {
+            break;
+        }
+        ++i;
     }
-    ++i;
-  }
-  buf[i] = '\0';
+    buf[i] = '\0';
 
-  if (buf[0] != '\x1b' || buf[1] != '[') {
-    return -1;
-  }
-  if (sscanf(&buf[2], "%d;%d", rows, cols) != 2) {
-    return -1;
-  }
+    if (buf[0] != '\x1b' || buf[1] != '[') {
+        return -1;
+    }
+    if (sscanf(&buf[2], "%d;%d", rows, cols) != 2) {
+        return -1;
+    }
 
-  return 0;
+    return 0;
 }
 
 int getWindowSize(int *rows, int *cols) {
-  struct winsize ws;
+    struct winsize ws;
 
-  if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) {
-    if (write(STDOUT_FILENO, "\x1b[999C\x1b[999B", 12) != 12) {
-      return -1;
+    if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) {
+        if (write(STDOUT_FILENO, "\x1b[999C\x1b[999B", 12) != 12) {
+            return -1;
+        }
+        return getCursorPosition(rows, cols);
+    } else {
+        *cols = ws.ws_col;
+        *rows = ws.ws_row;
+        return 0;
     }
-    return getCursorPosition(rows, cols);
-  } else {
-    *cols = ws.ws_col;
-    *rows = ws.ws_row;
-    return 0;
-  }
 }