Patch path complete and read char lisp function

config/init.lisp

@@ -16,7 +16,7 @@
 ;; KEY MAPPING
 
 (map-key "CTRL-q" editor-quit)
-(map-key "CTRL-s" editor-save)
+(map-key "CTRL-d" editor-save)
 (map-key "ARROW-UP" '(move-cursor "up"))
 (map-key "ARROW-DOWN" '(move-cursor "down"))
 (map-key "ARROW-RIGHT" '(move-cursor "right"))
@@ -29,6 +29,6 @@
 (map-key "PAGE-UP" move-cursor-page-up)
 (map-key "PAGE-DOWN" move-cursor-page-down)
 (map-key "CTRL-o" editor-open-file)
-
-
+(map-key "CTRL-k" editor-del-row)
+(map-key "CTRL-s" editor-find)
 

include/builtins.h

@@ -31,4 +31,10 @@ Lisp editorPrintC(Lisp args, LispError *e, LispContext ctx);
 
 Lisp addPackage(Lisp args, LispError *e, LispContext ctx);
 
+Lisp editorDelRow_L(Lisp args, LispError *e, LispContext ctx);
+
+Lisp editorFind_L(Lisp args, LispError *e, LispContext ctx);
+
+Lisp editorReadChar_L(Lisp args, LispError *e, LispContext ctx);
+
 #endif

include/file_io.h

@@ -17,4 +17,6 @@ void editorOpen(char *filename);
 
 void editorSave();
 
+void editorFind();
+
 #endif // FILE_IO_H_

include/input.h

@@ -20,7 +20,7 @@
 // END \x1b[4~ || <esc>[8~ || <esc>[F  || <esc>OF
 // DELETE \x1b[3~
 
-char *editorPrompt(char *prompt);
+char *editorPrompt(char *prompt, char * PlaceHolder, char bPathMode);
 
 char *key_to_string(int key);
 

include/row_op.h

@@ -10,6 +10,8 @@
 
 int editorRowCxToRx(erow *row, int cursor_x);
 
+int editorRowRxToCx(erow *row, int rx);
+
 void editorUpdateRow(erow *row);
 
 void editorInsertRow(int at, char *s, size_t len);

src/builtins.c

@@ -3,6 +3,7 @@
 #include "../include/input.h"
 #include "../include/file_io.h"
 #include "../include/editor_op.h"
+#include "../include/row_op.h"
 #include "../include/data.h"
 
 #include <stdio.h>
@@ -124,7 +125,7 @@ Lisp editorMoveCursorPageDown(Lisp args, LispError* e, LispContext ctx) {
 }
 
 Lisp editorOpenFile(Lisp args, LispError *e, LispContext ctx) {
-  char *filename = editorPrompt("Path : %s");
+  char *filename = editorPrompt("Open : %s", getenv("PWD"), 1);
   if (filename)
     editorOpen(filename);
 
@@ -155,3 +156,19 @@ Lisp addPackage(Lisp args, LispError *e, LispContext ctx) {
   return lisp_null();
   
 }
+
+Lisp editorDelRow_L(Lisp args, LispError *e, LispContext ctx) {
+  editorDelRow(E.cursor_y);
+  return lisp_null();
+}
+
+Lisp editorFind_L(Lisp args, LispError *e, LispContext ctx) {
+	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]);
+}
+

src/file_io.c

@@ -87,7 +87,7 @@ void editorSave() {
     char *buf;
     int fd;
     if (E.filename == NULL) {
-        E.filename = editorPrompt("Save as: %s (ESC to cancel)");
+        E.filename = editorPrompt("Save as: %s (ESC to cancel)", "", 1);
         if (E.filename == NULL) {
             editorSetStatusMessage("Save aborted");
             return;
@@ -110,3 +110,21 @@ void editorSave() {
     free(buf);
     editorSetStatusMessage("Can't save! I/O error: %s", strerror(errno));
 }
+
+void editorFind() {
+  char *query = editorPrompt("Search: %s (ESC to cancel)", "", 0);
+  if (query == NULL) return;
+  int i;
+  for (i = E.cursor_y + 1; i < E.numrows; i++) {
+    erow *row = &E.row[i];
+    char *match = strstr(row->render, query);
+    if (match) {
+      E.cursor_y = i;
+      E.cursor_x = editorRowRxToCx(row, match - row->render);
+      E.row_offset = E.numrows;
+      break;
+    }
+  }
+  free(query);
+}
+

src/init.c

@@ -32,6 +32,9 @@ void initBuiltins() {
   registerBuiltin("EDITOR-OPEN-FILE", editorOpenFile);
   registerBuiltin("EDITOR-INSERT-CHAR", editorPrintC);
   registerBuiltin("ADD-PACKAGE", addPackage);
+  registerBuiltin("EDITOR-DEL-ROW", editorDelRow_L);
+	registerBuiltin("EDITOR-FIND", editorFind_L);
+	registerBuiltin("EDITOR-READ-CHAR", editorReadChar_L);
 }
 
 void initEditor() {

src/input.c

@@ -3,6 +3,8 @@
 #include "../include/output.h"
 #include "../include/define.h"
 #include <ctype.h>
+#include <sys/stat.h>
+#include <dirent.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,19 +13,72 @@
 
 extern struct editorConfig E;
 
+char * file_completion(const char *path) {
+	DIR * dir;
+	struct dirent *entry;
+	char directory[128];
+	char predict[128];
+	int predict_len = 0;
+
+  if (path[strlen(path) - 1] == '/') {
+    return path;
+  }
+
+	// Find dir name
+	char * last_slash = strrchr(path, '/');
+	if (last_slash) {
+		size_t dir_len = last_slash - path + 1; // length of dir_path
+		strncpy(directory, path, dir_len);
+		predict_len = strlen(path) - dir_len - 1;
+		strncpy(predict, last_slash + 1, predict_len);
+		directory[dir_len] = '\0';
+		predict[predict_len] = '\0';
+		fprintf(stderr, "%s %s\n", directory, predict);
+	} else {
+		return NULL;
+	}
+
+
+  dir = opendir(directory);
+  if (!dir)
+  	return NULL;
+	
+	while ((entry = readdir(dir)) != NULL) {
+        if (strncmp(entry->d_name, predict, predict_len) == 0) {
+            static char full_path[128];
+            snprintf(full_path, sizeof(full_path), "%s%s", directory, entry->d_name);
+
+            struct stat st;
+            if (stat(full_path, &st) == 0 && S_ISDIR(st.st_mode)) {
+                strcat(full_path, "/"); // add slash for directories
+            }
+
+            return strdup(full_path);
+        }
+    }
+
+    // Cleanup when no more entries
+    closedir(dir);
+    dir = NULL;
+    return NULL;
+
+}
+
 /**
- * \fn char * editorPrompt(struct editorConfig *E, char *prompt)
+ * \fn char * editorPrompt(struct editorConfig *E, char *prompt, char bPathMode)
  * \brief Return user input in a prompt when enter is hit. */
 
-char *editorPrompt(char *prompt) {
+char *editorPrompt(char *prompt, char * placeHolder, char bPathMode) {
   size_t buf_size = 128;
   char *buf = malloc(buf_size);
   size_t buf_len = 0;
   int c = 0;
   buf[0] = '\0';
+	strcpy(buf, placeHolder);
+	buf_len = strlen(placeHolder);
 
   while (1) {
-    editorSetStatusMessage(prompt, buf);
+		editorSetStatusMessage(prompt, buf);
     editorRefreshScreen();
     c = editorReadKey();
     if (c == DEL_KEY || c == CTRL_KEY('h') || c == BACKSPACE) {
@@ -39,6 +94,24 @@ char *editorPrompt(char *prompt) {
         editorSetStatusMessage("");
         return buf;
       }
+    } else if (bPathMode && c == '\t') {
+			char path[128];
+		  char * pwd;
+			if (buf[0] != '/') {
+				pwd = getenv("PWD");
+			  fprintf(stderr, "%s\n", pwd);
+			  memcpy(path, pwd, strlen(pwd));
+				path[strlen(pwd)] = '/';
+				strncat(path, buf, buf_len);
+			} else {
+				strcpy(path, buf);
+			}
+			memset(buf, 0, 128);
+			buf_len = 0;
+		  strcpy(buf, file_completion(path));
+			buf_len = strlen(buf);
+			buf[buf_len] = '\0';
+		  
     } else if (!iscntrl(c) && c < 128) {
       if (buf_len == buf_size - 1) {
         buf_size *= 2;

src/row_op.c

@@ -18,6 +18,18 @@ int editorRowCxToRx(erow *row, int cursor_x) {
   return render_x;
 }
 
+int editorRowRxToCx(erow *row, int rx) {
+  int cur_rx = 0;
+  int cx;
+  for (cx = 0; cx < row->size; cx++) {
+    if (row->chars[cx] == '\t')
+      cur_rx += (E.constantes.TAB_LENGTH - 1) - (cur_rx % E.constantes.TAB_LENGTH);
+    cur_rx++;
+    if (cur_rx > rx) return cx;
+  }
+  return cx;
+}
+
 /**
  * \fn editorUpdateRow(erow *row)
  * \brief Copy content of \p row in \p row->render.