Add search 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,8 @@ 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);
+
 #endif

include/file_io.h

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

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>
@@ -155,3 +156,13 @@ 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();
+}

src/file_io.c

@@ -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)");
+  if (query == NULL) return;
+  int i;
+  for (i = 0; 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,8 @@ 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);
 }
 
 void initEditor() {

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.