Add prefix feature

2026-01-09 14:54:07 +01:00
parent 410f382592
commit 815114923d
10 changed files with 491 additions and 373 deletions
@@ -1,87 +1,127 @@
 #include "../include/builtins.h"
-#include "../include/define.h"
-#include "../include/input.h"
-#include "../include/file_io.h"
-#include "../include/editor_op.h"
-#include "../include/row_op.h"
 #include "../include/data.h"
+#include "../include/define.h"
+#include "../include/editor_op.h"
+#include "../include/file_io.h"
+#include "../include/input.h"
+#include "../include/row_op.h"
+#include "include/output.h"

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+struct prefix_t find_prefix(const char prefix_name[64]) {
+  int i = E.number_of_prefix + 1;
+  while (i--) {
+    if (!strcmp(prefix_name, E.prefix[i].prefix_name)) {
+      return E.prefix[i];
+    }
+  }
+  return E.prefix[0];
+}
+
 Lisp mapKey(Lisp args, LispError *e, LispContext ctx) {
+  /*
+   * 3 arguments keybind command prefix
+   */
  const char *key_sequence = lisp_string(lisp_car(args));
  args = lisp_cdr(args);
  // second argument
  Lisp func = lisp_car(args);

-  E.key_binds =
-      (struct keyBind_t *)realloc(E.key_binds, ++E.number_of_keybinds * sizeof(struct keyBind_t));
-  E.key_binds[E.number_of_keybinds - 1].key_sequence = (char *) malloc(50 * sizeof(char));
+  E.key_binds = (struct keyBind_t *)realloc(
+      E.key_binds, ++E.number_of_keybinds * sizeof(struct keyBind_t));
+  E.key_binds[E.number_of_keybinds - 1].key_sequence =
+      (char *)malloc(50 * sizeof(char));

  strncpy(E.key_binds[E.number_of_keybinds - 1].key_sequence, key_sequence, 50);

  E.key_binds[E.number_of_keybinds - 1].command = func;

+  // Third argument
+  args = lisp_cdr(args);
+  const char *prefix_name = lisp_string(lisp_car(args));
+  struct prefix_t prefix = find_prefix(prefix_name);
+
+  E.key_binds[E.number_of_keybinds - 1].prefix_id = prefix.prefix_id;
+  
  return lisp_null();
 }

 Lisp moveCursor(Lisp args, LispError *e, LispContext ctx) {
  const char *direction = lisp_string(lisp_car(args));
+  int is_in = 0;
  switch (direction[0]) {
  case 'u':
-    editorMoveCursor(ARROW_UP);
+    is_in = editorMoveCursor(ARROW_UP);
    break;
  case 'd':
-    editorMoveCursor(ARROW_DOWN);
+    is_in = editorMoveCursor(ARROW_DOWN);
    break;
  case 'r':
-    editorMoveCursor(ARROW_RIGHT);
+    is_in = editorMoveCursor(ARROW_RIGHT);
    break;
  case 'l':
-    editorMoveCursor(ARROW_LEFT);
+    is_in = editorMoveCursor(ARROW_LEFT);
    break;
  }
-
-
-  return lisp_null();
+  fprintf(stderr, "move lisp %d\n", is_in);
+  return lisp_make_bool(is_in);
 }

-Lisp editorQuit(Lisp args, LispError* e, LispContext ctx) {
+void free_structs(void) {
+  int i;
+  free(E.prefix);
+  for (i = 0; i < E.number_of_keybinds; ++i) {
+    free(E.key_binds[i].key_sequence);
+  }
+  free(E.key_binds);
+  free(E.filename);
+  free(E.row->chars);
+  free(E.row->render);
+  free(E.row);
+  
+}
+
+Lisp editorQuit(Lisp args, LispError *e, LispContext ctx) {
  if (E.dirty && E.quit_times_buffer > 0) {
    editorSetStatusMessage("WARNING! Changes hasn't been saved. Press Ctrl-Q "
                           "another time to quit.");
    --E.quit_times_buffer;
    return lisp_null();
  }
+  free_structs();
  write(STDOUT_FILENO, "\x1b[2J", 4);
  write(STDOUT_FILENO, CURSOR_TOP_LEFT, 3);
  disableRawMode();
+  lisp_shutdown(E.ctx);
  exit(0);

  return lisp_null();
-
-  
 }

-
-Lisp l_editorSave(Lisp args, LispError* e, LispContext ctx) {
+Lisp l_editorSave(Lisp args, LispError *e, LispContext ctx) {

  editorSave();
-  
-  return lisp_null();

-  
+  return lisp_null();
 }

-Lisp l_editorInsertNewLine(Lisp args, LispError* e, LispContext ctx) {
+Lisp l_editorInsertNewLine(Lisp args, LispError *e, LispContext ctx) {

  editorInsertNewLine();
-  
-  return lisp_null();

-  
+  return lisp_null();
+}
+
+Lisp l_editorInserTab(Lisp args, LispError *e, LispContext ctx) {
+
+  for (int i = 0; i<E.constantes.TAB_LENGTH; ++i) {
+    editorInsertChar(' ');
+  }
+
+  return lisp_null();
 }

 Lisp moveCursorBeginLine(Lisp args, LispError *e, LispContext ctx) {
@@ -89,20 +129,19 @@ Lisp moveCursorBeginLine(Lisp args, LispError *e, LispContext ctx) {
  return lisp_null();
 }

-Lisp moveCursorEndLine(Lisp args, LispError* e, LispContext ctx) {
+Lisp moveCursorEndLine(Lisp args, LispError *e, LispContext ctx) {
  if (E.cursor_y < E.numrows) {
    E.cursor_x = E.row[E.cursor_y].size;
  }
  return lisp_null();
 }

-
-Lisp deletePreviousChar(Lisp args, LispError* e, LispContext ctx) {
+Lisp deletePreviousChar(Lisp args, LispError *e, LispContext ctx) {
  editorDelChar();
  return lisp_null();
 }

-Lisp editorMoveCursorPageUp(Lisp args, LispError* e, LispContext ctx) {
+Lisp editorMoveCursorPageUp(Lisp args, LispError *e, LispContext ctx) {
  E.cursor_y = E.row_offset;
  int times = E.screenrows;
  while (--times) {
@@ -111,7 +150,7 @@ Lisp editorMoveCursorPageUp(Lisp args, LispError* e, LispContext ctx) {
  return lisp_null();
 }

-Lisp editorMoveCursorPageDown(Lisp args, LispError* e, LispContext ctx) {
+Lisp editorMoveCursorPageDown(Lisp args, LispError *e, LispContext ctx) {
  E.cursor_y = E.row_offset + E.screenrows - 1;
  if (E.cursor_y > E.numrows) {
    E.cursor_y = E.numrows;
@@ -126,13 +165,15 @@ Lisp editorMoveCursorPageDown(Lisp args, LispError* e, LispContext ctx) {

 Lisp editorOpenFile(Lisp args, LispError *e, LispContext ctx) {
  char *filename = editorPrompt("Open : %s", getenv("PWD"), 1);
-  if (filename)
+  if (filename){
    editorOpen(filename);
+  }
+  free(filename);
+  

  return lisp_null();
 }

-
 Lisp editorPrintC(Lisp args, LispError *e, LispContext ctx) {
  char c = lisp_string(lisp_car(args))[0];
  editorInsertChar(c);
@@ -141,20 +182,21 @@ Lisp editorPrintC(Lisp args, LispError *e, LispContext ctx) {

 Lisp addPackage(Lisp args, LispError *e, LispContext ctx) {
  const char *package_name = lisp_string(lisp_car(args));
-  char *package_dir = (char *) calloc(256, sizeof(char));
+  fprintf(stderr, "%s\n", package_name);
+  char *package_dir = (char *)calloc(256, sizeof(char));
  FILE *fd_package = NULL;
  strcat(package_dir, getenv("HOME"));
  strcat(package_dir, "/.beluga/packages/");
  strcat(package_dir, package_name);
  strcat(package_dir, "/init.lisp");
+  fprintf(stderr, "%s\n", package_dir);
  fd_package = fopen(package_dir, "r");
  lisp_eval(lisp_read_file(fd_package, &E.ctx_error, E.ctx), &E.ctx_error,
            E.ctx);
  fclose(fd_package);
  free(package_dir);
-  
+
  return lisp_null();
-  
 }

 Lisp editorDelRow_L(Lisp args, LispError *e, LispContext ctx) {
@@ -163,12 +205,39 @@ Lisp editorDelRow_L(Lisp args, LispError *e, LispContext ctx) {
 }

 Lisp editorFind_L(Lisp args, LispError *e, LispContext ctx) {
-	editorFind();
-	return lisp_null();
+  editorFind();
+  return lisp_null();
 }

 Lisp editorReadChar_L(Lisp args, LispError *e, LispContext ctx) {
-	fprintf(stderr, "char read : %c\n", E.row[E.cursor_y].render[E.cursor_x]);
-	return lisp_make_char(E.row[E.cursor_y].render[E.cursor_x]);
+  Lisp returned_char;
+  if (E.row[E.cursor_y].render[E.cursor_x] == 0) {
+    returned_char = lisp_make_char('a');
+  } else {
+    
+     returned_char = lisp_make_char(E.row[E.cursor_y].render[E.cursor_x]); 
+  }
+  return returned_char;
 }

+Lisp editorSetPrefix(Lisp args, LispError *e, LispContext ctx) {
+  /*
+   * Set the prefix state of editor to the prefix in argument
+   */
+  const char *prefix_name = lisp_string(lisp_car(args));
+  struct prefix_t prefix = find_prefix(prefix_name);
+  E.prefix_state = prefix.prefix_id;
+  editorSetStatusMessage("prefix %s", prefix.prefix_name);
+  fprintf(stderr, "%s set\n", prefix_name);
+
+  return lisp_null();
+}
+
+Lisp editorPrefix(Lisp args, LispError *e, LispContext ctx) {
+  E.prefix = (struct prefix_t *)realloc(E.prefix, (++(E.number_of_prefix) + 1) *
+                                                      sizeof(struct prefix_t));
+  E.prefix[E.number_of_prefix].prefix_id = E.number_of_prefix;
+  strncpy(E.prefix[E.number_of_prefix].prefix_name, lisp_string(lisp_car(args)),
+          64);
+  return lisp_null();
+}