First completion level is working (LSP connected)

# Conflicts:
#	include/builtins.h
#	include/data.h
#	include/editor_op.h
#	include/file_io.h
#	include/input.h
#	include/row_op.h
#	install.sh
#	main.c
#	meson.build
#	src/builtins.c
#	src/editor_op.c
#	src/file_io.c
#	src/init.c
#	src/input.c
#	src/output.c
#	src/row_op.c

assets/beluga.txt

@@ -9,7 +9,7 @@
     #----------------------------------------------------------##
    #=--------------------------------------------------------------##
   +--------------------------+@#-%*-----------------------------------#*
-  +--------------------------%@@@@#-------------------------------------**                              BELUGA - VERSION 2.3
+  +--------------------------%@@@@#-------------------------------------**                              BELUGA - VERSION 2.4
   *-=-------------------------#@@*---------------------------------------=%
   %*#==--------------------------------------------------------------------+#                           ----- KEY-BINDS -----
   *%%=-=--------------------------------------------------------------------=#                          CTRL-x CTRL-c  leave

config/init.lisp

@@ -80,12 +80,15 @@
 (map-key "PAGE-DOWN" move-cursor-page-down "no-prefix")
 (map-key "f" editor-open-file "user")
 (map-key "TAB" editor-insert-tab "no-prefix")
-(map-key "CTRL-k" editor-del-row "no-prefix")
 (map-key "CTRL-s" buffer-find "no-prefix")
-(map-key "CTRL-r" editor-move-to-end-of-word "no-prefix")
+(map-key "CTRL-r" buffer-find-reverse "no-prefix")
 (map-key "ARROW-RIGHT" editor-switch-next-buffer "user")
 (map-key "\"" editor-split-screen-vertical "user")
 (map-key "o" editor-switch-next-pane "user")
 (map-key "*" editor-unify-panes "user")
-(map-key "t" editor-create-terminal "user")
-
+(map-key "CTRL-y" editor-paste "no-prefix")
+(map-key "CTRL-k" editor-cut-end-line "no-prefix")
+(map-key "a" editor-move-cursor-beg-buffer "user")
+(map-key "z" editor-move-cursor-end-buffer "user")
+(map-key "CTRL-h" editor-auto-complete "no-prefix")
+(map-key "C-x" lsp-complete "user")

include/buffer.h

@@ -13,7 +13,7 @@
  * @param filename Path to the file
  * @return Buffer ID on success, -1 on failure
  */
-int bufferCreate(const char *filename);
+int bufferCreate(const char *path, enum bufferStatus_e state);
 
 /**
  * @brief Switches to a specific buffer by ID
@@ -55,18 +55,15 @@ int bufferSave(void);
  */
 int bufferSaveAll(void);
 
-/**
- * @brief Creates a new terminal buffer
- * @return Buffer ID on success, -1 on failure
- */
-int bufferCreateTerminal(void);
+void bufferFind(struct buffer_t *buf);
+void bufferFindReverse(struct buffer_t* buf);
+void bufferInsertNewLine();
+void bufferInsertBytes(const char *src, int n);
+void bufferDelBytes();
+void bufferRowInsertBytes(struct buffer_t *buffer, row_t *row, int at, const char *src, int n);
+void bufferRowDelByte(struct buffer_t *buffer, row_t *row, int at, int n);
+void bufferInsertRow(struct buffer_t *buffer, int at, char *s, size_t len);
+void bufferFreeRow(row_t *row);
 
-/**
- * @brief Executes a command in the terminal buffer
- * @param buffer_id The terminal buffer ID
- * @param command The command to execute
- * @return 0 on success, -1 on failure
- */
-int bufferExecuteTerminalCommand(int buffer_id, const char *command);
 
 #endif

include/builtins.h

@@ -17,7 +17,6 @@ Lisp l_editorInsertNewLine(Lisp args, LispError* e, LispContext ctx);
 Lisp l_editorInserTab(Lisp args, LispError *e, LispContext ctx);
 Lisp deletePreviousChar(Lisp args, LispError *e, LispContext ctx);
 Lisp editorPrintC(Lisp args, LispError *e, LispContext ctx);
-Lisp editorDelRow_L(Lisp args, LispError *e, LispContext ctx);
 Lisp editorReadChar_L(Lisp args, LispError *e, LispContext ctx);
 
 // Editor
@@ -36,6 +35,7 @@ Lisp addPackage(Lisp args, LispError *e, LispContext ctx);
 
 Lisp editorSwitchNextBuffer(Lisp args, LispError *e, LispContext ctx);
 Lisp bufferFind_L(Lisp args, LispError *e, LispContext ctx);
+Lisp bufferFindReverse_L(Lisp args, LispError *e, LispContext ctx);
 
 
 // Pane
@@ -45,16 +45,18 @@ Lisp editorSwitchNextPane(Lisp args, LispError *e, LispContext ctx);
 Lisp editorUnifiedPanes(Lisp args, LispError *e, LispContext ctx);
 
 
+Lisp editorPaste(Lisp args, LispError *e, LispContext ctx);
+Lisp editorCutEndLine(Lisp args, LispError *e, LispContext ctx);
 
-
-
+Lisp editorMoveBegBuffer(Lisp args, LispError *e, LispContext ctx);
+Lisp editorMoveEndBuffer(Lisp args, LispError *e, LispContext ctx);
 
 // Other
 
+Lisp editorAutoComplete(Lisp args, LispError *e, LispContext ctx);
+// Lisp lspComplete(Lisp args, LispError *e, LispContext ctx);
+Lisp lspDefinition(Lisp args, LispError *e, LispContext ctx);
+
 void free_structs(void);
 
-// Terminal
-
-Lisp editorCreateTerminal(Lisp args, LispError *e, LispContext ctx);
-
 #endif

include/cJSON.h

@@ -0,0 +1,306 @@
+/*
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#ifndef cJSON__h
+#define cJSON__h
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
+#define __WINDOWS__
+#endif
+
+#ifdef __WINDOWS__
+
+/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention.  For windows you have 3 define options:
+
+CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
+CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
+CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
+
+For *nix builds that support visibility attribute, you can define similar behavior by
+
+setting default visibility to hidden by adding
+-fvisibility=hidden (for gcc)
+or
+-xldscope=hidden (for sun cc)
+to CFLAGS
+
+then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
+
+*/
+
+#define CJSON_CDECL __cdecl
+#define CJSON_STDCALL __stdcall
+
+/* export symbols by default, this is necessary for copy pasting the C and header file */
+#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_EXPORT_SYMBOLS
+#endif
+
+#if defined(CJSON_HIDE_SYMBOLS)
+#define CJSON_PUBLIC(type)   type CJSON_STDCALL
+#elif defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllexport) type CJSON_STDCALL
+#elif defined(CJSON_IMPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllimport) type CJSON_STDCALL
+#endif
+#else /* !__WINDOWS__ */
+#define CJSON_CDECL
+#define CJSON_STDCALL
+
+#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
+#define CJSON_PUBLIC(type)   __attribute__((visibility("default"))) type
+#else
+#define CJSON_PUBLIC(type) type
+#endif
+#endif
+
+/* project version */
+#define CJSON_VERSION_MAJOR 1
+#define CJSON_VERSION_MINOR 7
+#define CJSON_VERSION_PATCH 19
+
+#include <stddef.h>
+
+/* cJSON Types: */
+#define cJSON_Invalid (0)
+#define cJSON_False  (1 << 0)
+#define cJSON_True   (1 << 1)
+#define cJSON_NULL   (1 << 2)
+#define cJSON_Number (1 << 3)
+#define cJSON_String (1 << 4)
+#define cJSON_Array  (1 << 5)
+#define cJSON_Object (1 << 6)
+#define cJSON_Raw    (1 << 7) /* raw json */
+
+#define cJSON_IsReference 256
+#define cJSON_StringIsConst 512
+
+/* The cJSON structure: */
+typedef struct cJSON
+{
+    /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
+    struct cJSON *next;
+    struct cJSON *prev;
+    /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
+    struct cJSON *child;
+
+    /* The type of the item, as above. */
+    int type;
+
+    /* The item's string, if type==cJSON_String  and type == cJSON_Raw */
+    char *valuestring;
+    /* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
+    int valueint;
+    /* The item's number, if type==cJSON_Number */
+    double valuedouble;
+
+    /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
+    char *string;
+} cJSON;
+
+typedef struct cJSON_Hooks
+{
+      /* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */
+      void *(CJSON_CDECL *malloc_fn)(size_t sz);
+      void (CJSON_CDECL *free_fn)(void *ptr);
+} cJSON_Hooks;
+
+typedef int cJSON_bool;
+
+/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
+ * This is to prevent stack overflows. */
+#ifndef CJSON_NESTING_LIMIT
+#define CJSON_NESTING_LIMIT 1000
+#endif
+
+/* Limits the length of circular references can be before cJSON rejects to parse them.
+ * This is to prevent stack overflows. */
+#ifndef CJSON_CIRCULAR_LIMIT
+#define CJSON_CIRCULAR_LIMIT 10000
+#endif
+
+/* returns the version of cJSON as a string */
+CJSON_PUBLIC(const char*) cJSON_Version(void);
+
+/* Supply malloc, realloc and free functions to cJSON */
+CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
+
+/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */
+/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
+CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length);
+/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
+/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated);
+
+/* Render a cJSON entity to text for transfer/storage. */
+CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
+/* Render a cJSON entity to text for transfer/storage without any formatting. */
+CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
+/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
+CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
+/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
+/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
+CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
+/* Delete a cJSON entity and all subentities. */
+CJSON_PUBLIC(void) cJSON_Delete(cJSON *item);
+
+/* Returns the number of items in an array (or object). */
+CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
+/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */
+CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
+/* Get item "string" from object. Case insensitive. */
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
+/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
+CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
+
+/* Check item type and return its value */
+CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item);
+CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item);
+
+/* These functions check the type of an item */
+CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item);
+
+/* These calls create a cJSON item of the appropriate type. */
+CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean);
+CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num);
+CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string);
+/* raw json */
+CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void);
+
+/* Create a string where valuestring references a string so
+ * it will not be freed by cJSON_Delete */
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string);
+/* Create an object/array that only references it's elements so
+ * they will not be freed by cJSON_Delete */
+CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child);
+
+/* These utilities create an Array of count items.
+ * The parameter count cannot be greater than the number of elements in the number array, otherwise array access will be out of bounds.*/
+CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count);
+
+/* Append item to the specified array/object. */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
+/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object.
+ * WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before
+ * writing to `item->string` */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item);
+/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
+
+/* Remove/Detach items from Arrays/Objects. */
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
+
+/* Update array items. */
+CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
+
+/* Duplicate a cJSON item */
+CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
+/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
+ * need to be released. With recurse!=0, it will duplicate any children connected to the item.
+ * The item->next and ->prev pointers are always zero on return from Duplicate. */
+/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
+ * case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
+CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
+
+/* Minify a strings, remove blank characters(such as ' ', '\t', '\r', '\n') from strings.
+ * The input pointer json cannot point to a read-only address area, such as a string constant, 
+ * but should point to a readable and writable address area. */
+CJSON_PUBLIC(void) cJSON_Minify(char *json);
+
+/* Helper functions for creating and adding items to an object at the same time.
+ * They return the added item or NULL on failure. */
+CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean);
+CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number);
+CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string);
+CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw);
+CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name);
+
+/* When assigning an integer value, it needs to be propagated to valuedouble too. */
+#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number))
+/* helper for the cJSON_SetNumberValue macro */
+CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
+#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number))
+/* Change the valuestring of a cJSON_String object, only takes effect when type of object is cJSON_String */
+CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring);
+
+/* If the object is not a boolean type this does nothing and returns cJSON_Invalid else it returns the new type*/
+#define cJSON_SetBoolValue(object, boolValue) ( \
+    (object != NULL && ((object)->type & (cJSON_False|cJSON_True))) ? \
+    (object)->type=((object)->type &(~(cJSON_False|cJSON_True)))|((boolValue)?cJSON_True:cJSON_False) : \
+    cJSON_Invalid\
+)
+
+/* Macro for iterating over an array or object */
+#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
+
+/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
+CJSON_PUBLIC(void *) cJSON_malloc(size_t size);
+CJSON_PUBLIC(void) cJSON_free(void *object);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

include/completion.h

@@ -0,0 +1,29 @@
+//
+// Created by Giorgio on 25/05/2026.
+//
+
+#ifndef BELUGA_COMPLETION_H
+#define BELUGA_COMPLETION_H
+#include "data.h"
+
+
+
+void createContextBuffer(const int x, const int y, const char * text);
+
+int  lspStart(LspClient *lsp, const char *project_root);
+void lspShutdown(LspClient *lsp);
+
+// Document sync — call these from your buffer open/save/edit hooks
+void lspDidOpen(LspClient *lsp, struct buffer_t *buf);
+void lspDidChange(LspClient *lsp, struct buffer_t *buf);
+void lspDidClose(LspClient *lsp, struct buffer_t *buf);
+
+// Requests
+void lspRequestCompletion(LspClient *lsp, struct buffer_t *buf,
+                          int line, int col,
+                          int screen_x, int screen_y);
+void lspRequestHover(LspClient *lsp, struct buffer_t *buf, int line, int col);
+void lspRequestDefinition(LspClient *lsp, struct buffer_t *buf, int line, int col);
+
+
+#endif //BELUGA_COMPLETION_H

include/data.h

@@ -2,29 +2,33 @@
 #define DATA_H_
 
 #include <stdio.h>
+#include <termios.h>
 #include <time.h>
 
-#ifdef _WIN32
-#include "termiWin.h"
-#else
-#include <termios.h>
-#endif
+#include "define.h"
 
 #include "lisp.h"
 
+typedef struct lsp_client_t LspClient;
+
 /**
- * \struct erow
+ * \struct row_t
  * \brief Store one editor row
  * \param
  * */
 
-typedef struct frow {
+typedef struct row {
   int size;     /**< Size of the line */
-  int rsize;    /**< Size of the render line */
+  int cap;    /**< Size of the render line */
   char *chars;  /**< Characters of the line */
-  char *render; /**< The actual line we will print */
-} frow;
+} row_t;
 
+typedef struct context_buffer_t
+{
+  int editor_x, editor_y;
+  int width, height;
+  row_t *rows;
+} ContextBuffer;
 
 /**
  * @brief Split modes for screen layout
@@ -40,15 +44,12 @@ typedef enum {
  */
 typedef struct {
     int buffer_id;        // Which buffer this pane displays
-    int start_row;        // Starting row on screen
-    int start_col;        // Starting column on screen
     int height;           // Height of this pane
     int width;            // Width of this pane
+    int origin_x, origin_y;
     int cursor_x;         // Local cursor x in this pane
     int cursor_y;         // Local cursor y in this pane
-  int rx, ry; 
-    int row_offset;       // Scroll offset for rows
-    int col_offset;       // Scroll offset for columns
+    int x_offset, y_offset;
     int is_active;        // Is this pane currently active
 } EditorPane;
 
@@ -97,26 +98,100 @@ struct keyBind_t {
   Lisp command;
 };
 
+// In data.h — add these
+
+#include <pthread.h>
+
+#define LSP_MAX_PENDING 64
+
+typedef enum {
+  LSP_NOT_STARTED = 0,
+  LSP_INITIALIZING,
+  LSP_READY,
+  LSP_SHUTDOWN,
+} LspState;
+
+typedef struct {
+  int      id;
+  void   (*callback)(struct lsp_client_t *lsp, const char *json);
+} LspPending;
+
+typedef struct lsp_client_t {
+  // ── Process ───────────────────────────────────────────────────────────────
+  pid_t            pid;
+  int              write_fd;
+  int              read_fd;
+  int completion_just_arrived;
+  int completion_requested;
+
+
+
+  int               wake_pipe[2];   // [0] = read end (main loop), [1] = write end (reader thread)
+
+
+  // ── State ─────────────────────────────────────────────────────────────────
+  LspState         state;
+  int              next_id;
+
+  // ── Pending requests ──────────────────────────────────────────────────────
+  LspPending       pending[LSP_MAX_PENDING];
+  int              pending_count;
+
+  // ── Threading ─────────────────────────────────────────────────────────────
+  pthread_t        reader_thread;
+  pthread_mutex_t  lock;
+  pthread_cond_t   ready_cond;      // signaled when state → LSP_READY
+
+  // ── Completion context ────────────────────────────────────────────────────
+  int              completion_cursor_x;   // screen position when
+  int              completion_cursor_y;   // completion was requested
+} LspClient;
+
+typedef struct {
+  char label[128];     // display text  e.g. "printf"
+  char detail[64];     // type/sig hint e.g. "int (const char *, ...)"
+  int  kind;           // LSP CompletionItemKind (1=Text,2=Method,3=Function…)
+} CompletionItem;
+
+typedef struct {
+  CompletionItem items[COMPLETION_MAX_ITEMS];
+  int            count;
+  int            selected;   // currently highlighted row
+  int            visible;    // is the popup shown?
+  int            origin_x;   // screen col where popup appears
+  int            origin_y;   // screen row where popup appears
+} CompletionPopup;
+
+typedef enum { DIAG_ERROR = 1, DIAG_WARNING, DIAG_HINT } DiagSeverity;
+
+typedef struct {
+  int          buffer_id;
+  int          line;        // 0-based
+  int          col_start;   // 0-based
+  int          col_end;
+  DiagSeverity severity;
+  char         message[256];
+} Diagnostic;
+
+typedef struct {
+  Diagnostic entries[DIAG_MAX];
+  int        count;
+} DiagnosticList;
+
 enum buffer_type { FILE_BUFF, TERMINAL_BUFF };
 
 struct buffer_t {
   enum buffer_type type;
   int buffer_id;
-  int width, height;
-  int x, y; /**< Position in the buffer (cursor) */
-  frow *row;
+  int b_lsp_open;
+  int x, y; /**< Position in the file */
+  row_t *row;
   int numrows;
+  int b_has_changed;
   char *filename;
+  char *path;
   enum bufferStatus_e state;
   int dirty;             /**< Has this buffer been modified since last save */
-  int row_offset;        /**< Scroll offset for rows in this buffer */
-  int col_offset;        /**< Scroll offset for columns in this buffer */
-  
-  // Terminal-specific data
-  char *terminal_command; /**< Current command being executed */
-  int terminal_pid;       /**< Process ID of running terminal command */
-  char *terminal_output;  /**< Captured terminal output */
-  int terminal_output_size; /**< Size of terminal output */
 };
 
 /**
@@ -124,14 +199,23 @@ struct buffer_t {
  * \brief Containing our editor state.
  */
 struct editorConfig {
+  int cursor_x, cursor_y; /**< Cursor position */
   int screenrows;         /**< Terminal height*/
   int screencols;         /**< Terminal width*/
 
   ScreenLayout layout;
 
+  row_t *rows;        /**< Store all the rows printed */
+
+  ContextBuffer* context_buffers;
+
+  LspClient *lsp_client;
+  CompletionPopup  lsp_completion;
+  DiagnosticList   lsp_diagnostics;
+
   int dirty;
-  int prefix_state;
-  char status_msg[80];
+
+  char *status_msg;
   time_t status_msg_time;
   struct termios orig_termios; /**< Terminal communication interface */
 
@@ -150,6 +234,7 @@ struct editorConfig {
 
   struct prefix_t *prefix;
   int number_of_prefix;
+  int prefix_state;
 
   struct buffer_t buffers[64];
   int number_of_buffer;
@@ -169,4 +254,5 @@ struct abuf {
 
 extern struct editorConfig E;
 
+
 #endif

include/define.h

@@ -2,28 +2,48 @@
 #define DEFINE_H_
 
 #define CTRL_KEY(k) ((k) & 0x1f)
+#define ALT(k) ((k) | 0x200)  // set bit 9 to mark as Option combo
+
 
 #define ESCAPE '\x1b'
 #define CURSOR_TOP_LEFT "\x1b[H"
 #define HIDE_CURSOR "\x1b[?25l"
 #define SHOW_CURSOR "\x1b[?25h"
 #define ERASE_END_LINE "\x1b[K"
+#define TAB "\t"
+#define SPACE "\x20"
+#define APP_DEBUG
 
-enum editorKey {
-  BACKSPACE = 127,
-  ARROW_LEFT = 1000,
-  ARROW_RIGHT,
-  ARROW_UP,
-  ARROW_DOWN,
-  DEL_KEY,
-  BEG_LINE,
-  END_LINE,
-  PAGE_UP,
-  PAGE_DOWN,
-};
+#define COMPLETION_MAX_ITEMS  16
+#define COMPLETION_MAX_WIDTH  40
+#define COMPLETION_POPUP_H    8   // max visible rows
+#define DIAG_MAX 128
+
+#define GUTTER_WIDTH 2
+
+enum editorKey_e {
+    BACKSPACE = 127,
+    ARROW_LEFT = 1000,
+    ARROW_RIGHT,
+    ARROW_UP,
+    ARROW_DOWN,
+    DEL_KEY,
+    BEG_LINE,
+    END_LINE,
+    PAGE_UP,
+    PAGE_DOWN,
+  };
 
 #define ABUF_INIT {NULL, 0}
 
-#define BELUGA_VERSION "1.1"
+#define BELUGA_VERSION "2.4"
+
+#ifdef __APPLE__
+#define CLIPBOARD_COPY_CMD  "pbcopy"
+#define CLIPBOARD_PASTE_CMD "pbpaste"
+#else
+#define CLIPBOARD_COPY_CMD  "xclip -selection clipboard"
+#define CLIPBOARD_PASTE_CMD "xclip -selection clipboard -o"
+#endif
 
 #endif // DEFINE_H_

include/editor_op.h

@@ -2,12 +2,12 @@
 #define EDITOR_OP_H_
 
 #include "data.h"
-void bufferInsertChar(int c);
-
-void bufferInsertNewLine();
-
-void bufferDelChar();
 
 void editorSetStatusMessage(const char *fmt, ...);
+int editorRowCharCount(row_t *row, int x);
+int editorRowCxToByte(const row_t *row, int cursor_x);
+char *editorGetClipboard(void);
+void editorSetClipboard(const char *text, int len);
+
 
 #endif // EDITOR_OP_H_

include/file_io.h

@@ -2,21 +2,14 @@
 #define FILE_IO_H_
 
 #include "data.h"
-#include "row_op.h"
-#include "terminal.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
-char *bufferRowsToString(struct buffer_t *buf,int *buffer_len);
-
-
 void editorCloseFile(void);
 
 void editorOpen(struct buffer_t *buffer);
 
 void editorSave();
 
-void bufferFind(struct buffer_t *buf);
-
 #endif // FILE_IO_H_

include/init.h

@@ -1,10 +1,6 @@
 #ifndef INIT_H_
 #define INIT_H_
 
-#include "builtins.h"
-#include "data.h"
-#include "terminal.h"
-#include <stdio.h>
 
 /**
  * \fn void initEditor()

include/input.h

@@ -22,7 +22,7 @@
 
 char *editorPrompt(char *prompt, char * PlaceHolder, char bPathMode);
 
-char *key_to_string(int key);
+const char *fileCompletion(const char *path);
 
 int editorMoveCursor(int key);
 

include/lisp.h

@@ -1527,7 +1527,7 @@ typedef enum
     TOKEN_CHAR,
     TOKEN_BOOL,
     TOKEN_HASH_L_PAREN,
-} LispTokenType;
+} TokenType;
 
 /* for debug
 static const char* token_type_name[] = {
@@ -1541,7 +1541,7 @@ typedef struct
 
     const char* token_start;
     const char* token_end;
-    LispTokenType token;
+    TokenType token;
 } Lexer;
 
 static
@@ -2178,11 +2178,9 @@ Lisp lisp_read_path(const char *path, LispError* out_error, LispContext ctx)
 
     return l;
 #else
-    FILE* file = fopen(path, "r");
-    if (file) {
-      lisp_read_file(file, out_error, ctx);
-      fclose(file);
-    }
+    FILE* file = fopen(path);
+    lisp_read_file(file, out_error, ctx);
+    fclose(path);
 #endif
     return lisp_eof();
 }

include/lsp_ui.h

@@ -0,0 +1,35 @@
+//
+// Created by Giorgio on 27/05/2026.
+//
+
+#ifndef BELUGA_LSP_UI_H
+#define BELUGA_LSP_UI_H
+
+
+#include "data.h"
+#include "buffer.h"   // for abuf
+
+
+// ── Public API ────────────────────────────────────────────────────────────────
+
+// Call from editorRefreshScreen() — appends popup/underlines to abuf
+void lspUiDrawCompletion(struct abuf *ab, CompletionPopup *popup);
+void lspUiDrawDiagnostics(struct abuf *ab, DiagnosticList *diags,
+                          EditorPane *pane, struct buffer_t *buf);
+
+// Input handling — returns 1 if the key was consumed by the popup
+int  lspUiHandleKey(CompletionPopup *popup, int key);
+
+// Parse clangd JSON into our structs
+void lspParseCompletion(const char *json, CompletionPopup *popup,
+                        int screen_x, int screen_y);
+void lspParseDiagnostics(const char *json, DiagnosticList *diags, int buffer_id);
+
+void lspUiDrawGutter(struct abuf *ab, DiagnosticList *diags,
+                     int buf_id, int line);
+const char *lspUiDiagnosticAtCursor(DiagnosticList *diags,
+                                    int buffer_id, int cursor_line);
+
+
+#endif
+

include/output.h

@@ -9,8 +9,6 @@
  * \brief Draws left rows of the editor.
  */
 
-void editorDrawRows(struct abuf *ab);
-
 void editorRefreshScreen();
 
 void editorScroll();

include/row_op.h

@@ -8,22 +8,8 @@
 #include <time.h>
 #include <unistd.h>
 
-int bufferRowCxToRx(frow *row, int cursor_x);
 
-int bufferRowRxToCx(frow *row, int rx);
 
-void bufferUpdatfrow(frow *row);
 
-void bufferInsertRow(struct buffer_t *buffer, int at, char *s, size_t len);
-
-void bufferFrefrow(frow *row);
-
-void bufferDelRow(struct buffer_t *buffer, int at);
-
-void bufferRowInsertChar(struct buffer_t *buffer, frow *row, int at, int c);
-
-void bufferRowAppendString(struct buffer_t *buffer, frow *row, char *s, size_t len);
-
-void bufferRowDelchar(struct buffer_t *buffer, frow *row, int at);
 
 #endif // ROW_OP_H_

include/syntax_highlighter.h

@@ -1,7 +1,6 @@
 #ifndef SYNTAX_HIGHLIGHTER_H_
 #define SYNTAX_HIGHLIGHTER_H_
 
-#include "color.h"
 
 // Color codes that only affect foreground, preserving your background color
 #define COLOR_RESET         "\x1b[39m"            // Reset all (4 bytes)
@@ -9,16 +8,14 @@
 // Token types
 typedef enum {
   TOKEN_KEYWORD,
-  TOKEN_DATATYPE,
+  TOKEN_TYPE,
   TOKEN_STRING,
   TOKEN_COMMENT,
   TOKEN_NUMBER,
   TOKEN_OPERATOR,
   TOKEN_DEFAULT
-} SyntaxTokenType;
+} TokenType;
 
-const char *get_color(SyntaxTokenType type);
 char *highlight_line(const char * line, int *length);
 
 #endif
-

include/termiWin.h

@@ -1,217 +0,0 @@
-/* termiWin.h
-*
-* 	Copyright (C) 2017 Christian Visintin - christian.visintin1997@gmail.com
-*
-* 	This file is part of "termiWin: a termios porting for Windows"
-*
-*   termiWin is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   termiWin is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with termiWin.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-#pragma once
-
-#ifndef TERMIWIN_H_
-#define TERMIWIN_H_
-
-#define TERMIWIN_VERSION "1.2.0"
-#define TERMIWIN_MAJOR_VERSION 1
-#define TERMIWIN_MINOR_VERSION 2
-
-#ifdef _WIN32
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <winsock2.h>
-
-#ifdef _MSC_VER
-#pragma comment(lib, "Ws2_32.lib")
-#endif
-
-/*Redefining functions from winsock to termiWin. This is very important since winsock2 defines functions such as close as closesocket we have to redefine it*/
-
-#ifdef __MINGW32__
-#define TERMIWIN_DONOTREDEFINE
-#endif
-
-#ifndef TERMIWIN_DONOTREDEFINE
-#define read read_serial
-#define write serial_write
-#define open open_serial
-#define close close_serial
-#define select select_serial
-#endif
-
-#if !defined(SSIZE_MAX)
-// ssize_t
-#if SIZE_MAX == UINT_MAX
-typedef int ssize_t;        /* common 32 bit case */
-#define SSIZE_MAX  INT_MAX
-#elif SIZE_MAX == ULONG_MAX
-typedef long ssize_t;       /* linux 64 bits */
-#define SSIZE_MAX  LONG_MAX
-#elif SIZE_MAX == ULLONG_MAX
-typedef long long ssize_t;  /* windows 64 bits */
-#define SSIZE_MAX  LLONG_MAX
-#endif
-#endif
-
-//Serial options - Linux -> Windows
-
-/*setAttr flags - ~ in front of flags -> deny them*/
-
-//iFlag
-
-#define INPCK		0x00004000 	/*If this bit is set, input parity checking is enabled. If it is not set, no checking at all is done for parity errors on input; the characters are simply passed through to the application.*/
-#define IGNPAR	0x00001000	/*If this bit is set, any byte with a framing or parity error is ignored. This is only useful if INPCK is also set.*/
-#define PARMRK	0x00040000	/*If this bit is set, input bytes with parity or framing errors are marked when passed to the program. This bit is meaningful only when INPCK is set and IGNPAR is not set.*/
-#define ISTRIP	0x00008000	/*If this bit is set, valid input bytes are stripped to seven bits; otherwise, all eight bits are available for programs to read. */
-#define IGNBRK	0x00000400	/*If this bit is set, break conditions are ignored. */
-#define BRKINT	0x00000100	/*If this bit is set and IGNBRK is not set, a break condition clears the terminal input and output queues and raises a SIGINT signal for the foreground process group associated with the terminal. */
-#define IGNCR		0x00000800	/*If this bit is set, carriage return characters ('\r') are discarded on input. Discarding carriage return may be useful on terminals that send both carriage return and linefeed when you type the RET key. */
-#define ICRNL		0x00000200	/*If this bit is set and IGNCR is not set, carriage return characters ('\r') received as input are passed to the application as newline characters ('\n').*/
-#define INLCR		0x00002000	/*If this bit is set, newline characters ('\n') received as input are passed to the application as carriage return characters ('\r').*/
-#define IXOFF		0x00010000	/*If this bit is set, start/stop control on input is enabled. In other words, the computer sends STOP and START characters as necessary to prevent input from coming in faster than programs are reading it. The idea is that the actual terminal hardware that is generating the input data responds to a STOP character by suspending transmission, and to a START character by resuming transmission.*/
-#define IXON		0x00020000	/*If this bit is set, start/stop control on output is enabled. In other words, if the computer receives a STOP character, it suspends output until a START character is received. In this case, the STOP and START characters are never passed to the application program. If this bit is not set, then START and STOP can be read as ordinary characters.*/
-
-//lFlag
-
-#define ICANON	0x00001000	/*This bit, if set, enables canonical input processing mode. Otherwise, input is processed in noncanonical mode. */
-#define ECHO		0x00000100	/*If this bit is set, echoing of input characters back to the terminal is enabled.*/
-#define ECHOE		0x00000200	/*If this bit is set, echoing indicates erasure of input with the ERASE character by erasing the last character in the current line from the screen. Otherwise, the character erased is re-echoed to show what has happened (suitable for a printing terminal). */
-#define ECHOK		0x00000400	/*This bit enables special display of the KILL character by moving to a new line after echoing the KILL character normally. The behavior of ECHOKE (below) is nicer to look at.*/
-#define ECHONL	0x00000800	/*If this bit is set and the ICANON bit is also set, then the newline ('\n') character is echoed even if the ECHO bit is not set. */
-#define ISIG		0x00004000	/*This bit controls whether the INTR, QUIT, and SUSP characters are recognized. The functions associated with these characters are performed if and only if this bit is set. Being in canonical or noncanonical input mode has no effect on the interpretation of these characters. */
-#define IEXTEN	0x00002000	/*On BSD systems and GNU/Linux and GNU/Hurd systems, it enables the LNEXT and DISCARD characters.*/
-#define NOFLSH	0x00008000	/*Normally, the INTR, QUIT, and SUSP characters cause input and output queues for the terminal to be cleared. If this bit is set, the queues are not cleared. */
-#define TOSTOP	0x00010000	/*If this bit is set and the system supports job control, then SIGTTOU signals are generated by background processes that attempt to write to the terminal.*/
-
-//cFlag
-
-#define CSTOPB	0x00001000	/*If this bit is set, two stop bits are used. Otherwise, only one stop bit is used. */
-#define PARENB	0x00004000	/*If this bit is set, generation and detection of a parity bit are enabled*/
-#define PARODD	0x00008000	/*This bit is only useful if PARENB is set. If PARODD is set, odd parity is used, otherwise even parity is used. */
-#define CSIZE		0x00000c00	/*This is a mask for the number of bits per character. */
-#define CS5			0x00000000	/*This specifies five bits per byte. */
-#define CS6			0x00000400	/*This specifies six bits per byte. */
-#define CS7			0x00000800	/*This specifies seven bits per byte. */
-#define CS8			0x00000c00	/*This specifies eight bits per byte. */
-#define CLOCAL 	0x00000000 	/*Ignore modem control lines -> ignore data carrier detected - not implementable in windows*/
-#define CREAD 	0x00000000 /*Enable receiver - if is not set no character will be received*/
-
-//oFlag
-
-#define OPOST	0x00000100 	/*If this bit is set, output data is processed in some unspecified way so that it is displayed appropriately on the terminal device. This typically includes mapping newline characters ('\n') onto carriage return and linefeed pairs. */
-
-//cc
-
-#define VEOF 0
-#define VEOL 1
-#define VERASE 2
-#define VINTR 3
-#define VKILL 4
-#define VMIN 5 /*If set to 0, serial communication is NOT-BLOCKING, otherwise is BLOCKING*/
-#define VQUIT 6
-#define VSTART 7
-#define VSTOP 8
-#define VSUSP 9
-#define VTIME 10
-
-//END OF setAttr flags
-
-/*Controls*/
-#define TIOMBIC DTR_CONTROL_DISABLE
-#define TIOMBIS DTR_CONTROL_ENABLE
-#define CRTSCTS RTS_CONTROL_ENABLE
-
-/*Others*/
-#define NCCS 11
-
-//Baud speed
-#define B110 CBR_110
-#define B300 CBR_300
-#define B600 CBR_600
-#define B1200 CBR_2400
-#define B2400 CBR_2400
-#define B4800 CBR_4800
-#define B9600 CBR_9600
-#define B19200 CBR_19200
-#define B38400 CBR_38400
-#define B57600 CBR_57600
-#define B115200 CBR_115200
-
-/*Attributes optional_actions*/
-#define TCSANOW 0
-#define TCSADRAIN 1
-#define TCSAFLUSH 2
-
-/*TCFLUSH options*/
-#define TCIFLUSH 0
-#define TCOFLUSH 1
-#define TCIOFLUSH 2
-
-/*TCFLOW optons*/
-
-#define TCOOFF 0
-#define TCOON 1
-#define TCIOFF 2
-#define TCION 3
-
-//typdef
-typedef unsigned tcflag_t; /*This is an unsigned integer type used to represent the various bit masks for terminal flags.*/
-typedef unsigned cc_t; /*This is an unsigned integer type used to represent characters associated with various terminal control functions.*/
-typedef unsigned speed_t; /*used for terminal baud rates*/
-
-typedef struct termios
-{
-
-	tcflag_t c_iflag; /*input modes*/
-	tcflag_t c_oflag; /*output modes*/
-	tcflag_t c_cflag; /*control modes*/
-	tcflag_t c_lflag; /*local modes*/
-	cc_t c_cc[NCCS]; /*special character*/
-
-} termios;
-
-//Serial configuration functions
-
-int tcgetattr(int fd, struct termios *termios_p);
-int tcsetattr(int fd, int optional_actions, const struct termios *termios_p);
-int tcsendbreak(int fd, int duration);
-int tcdrain(int fd);
-int tcflush(int fd, int queue_selector);
-int tcflow(int fd, int action);
-void cfmakeraw(struct termios *termios_p);
-speed_t cfgetispeed(const struct termios *termios_p);
-speed_t cfgetospeed(const struct termios *termios_p);
-int cfsetispeed(struct termios *termios_p, speed_t speed);
-int cfsetospeed(struct termios *termios_p, speed_t speed);
-int cfsetspeed(struct termios * termios_p, speed_t speed);
-
-//Write/Read/Open/Close/Select Functions
-
-ssize_t read_serial(int fd, void* buffer, size_t count);
-ssize_t write_serial(int fd, const void* buffer, size_t count);
-int open_serial(const char* portname, int opt);
-int close_serial(int fd);
-int select_serial(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout);
-
-//get Handle out of the COM structure
-HANDLE getHandle();
-
-#endif
-
-#ifndef _WIN32
-#pragma message("-Warning: termiWin requires a Windows system!")
-#endif
-
-#endif

include/terminal.h

@@ -4,12 +4,11 @@
 
 /* includes */
 
-#include "data.h"
-#include "define.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-// #include <sys/ioctl.h>
+#include <sys/ioctl.h>
+#include <termios.h>
 #include <unistd.h>
 
 /**
@@ -30,4 +29,8 @@ int getCursorPosition(int *rows, int *cols);
 
 int getWindowSize(int *rows, int *cols);
 
+char *keyToString(int key);
+
+void appDebug(const char *fmt, ...);
+
 #endif

include/termios.h

@@ -1,32 +0,0 @@
-/* termios.h
-*
-* 	Copyright (C) 2017 Christian Visintin - christian.visintin1997@gmail.com
-*
-* 	This file is part of "termiWin: a termios porting for Windows"
-*
-*   termiWin is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   termiWin is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with termiWin.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-#pragma once
-
-#ifdef _WIN32
-
-#ifndef TERMIOS_H
-#define TERMIOS_H
-
-#include "termiWin.h"
-
-#endif // TERMIOS_H
-
-#endif // _WIN32

include/utf8.h

@@ -0,0 +1,16 @@
+//
+// Created by Giorgio on 01/05/2026.
+//
+
+#ifndef BELUGA_UTF8_H
+#define BELUGA_UTF8_H
+#include <stdint.h>
+
+uint32_t readUtf8Char(void);
+int utf8Encode(uint32_t cp, char *buf);
+int utf8Seqlen(unsigned char c);
+int codepointWidth(uint32_t codepoint);
+uint32_t utf8Decode(const char** s);
+
+
+#endif //BELUGA_UTF8_H

include/utils.h

@@ -0,0 +1,16 @@
+//
+// Created by Giorgio on 28/05/2026.
+//
+
+#ifndef BELUGA_UTILS_H
+#define BELUGA_UTILS_H
+#include <sys/_types/_size_t.h>
+
+extern int beluga_alloc_counter;
+
+
+void * bAlloc(size_t size);
+void * bRealloc(void * ptr, size_t size);
+void * bFree(void * ptr);
+
+#endif //BELUGA_UTILS_H

main.c

@@ -5,46 +5,69 @@
  * interactions. \version 0.1 \date 21 septembre 2024
  */
 
-#include "include/buffer.h"
-#include "include/split_screen.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #define _DEFAULT_SOURCE
 #define _BSD_SOURCE
 #define _GNU_SOURCE
 
+#include "include/utils.h"
+
+#include "include/buffer.h"
+#include "include/split_screen.h"
+#include <string.h>
+#include <unistd.h>
+
 #include "include/data.h"
-#include "include/file_io.h"
 #include "include/init.h"
 #include "include/input.h"
 #include "include/editor_op.h"
 #include "include/terminal.h"
+#include "include/completion.h"
+#include <signal.h>
+
+#include "include/utils.h"
 
 struct editorConfig E;
 
 int main(int argc, char *argv[]) {
 
-  char * splash_screen = (char *) calloc(256, sizeof(char));
+  char * splash_screen = bAlloc(sizeof(char) * 512);
+
+  signal(SIGPIPE, SIG_IGN);  // don't die on broken pipe, just get EPIPE from write()
 
   enableRawMode();
   initEditor();
   if (argc >= 2) {
     EditorPane *active = splitScreenGetActivePane();
-    active->buffer_id = bufferCreate(argv[1]);
+    active->buffer_id = bufferCreate(argv[1], READ_AND_WRITE);
+
+    char project_root[512];
+    realpath(argv[1], project_root);
+    char *slash = strrchr(project_root, '/');
+    if (slash) *slash = '\0';
+
+    appDebug("peoject root : %s\n", project_root);
+
+    lspStart(E.lsp_client, project_root);
+    struct buffer_t *buf = &E.buffers[active->buffer_id];
+    lspDidOpen(E.lsp_client, buf);
+
   } else {
     strcat(splash_screen, getenv("HOME"));
     strcat(splash_screen, "/.beluga/assets/beluga.txt");
-    fprintf(stderr, "%s\n", splash_screen);
+
+    appDebug("splash : %s\n", splash_screen);
     EditorPane *active = splitScreenGetActivePane();
-    active->buffer_id = bufferCreate(splash_screen);
+    active->buffer_id = bufferCreate(splash_screen, READ_ONLY);
+    struct buffer_t *buf = &E.buffers[active->buffer_id];
+    lspStart(E.lsp_client, splash_screen);
+    lspDidOpen(E.lsp_client, buf);
+
   }
-  //free(splash_screen);
+  free(splash_screen);
 
   editorSetStatusMessage("HELP: Ctrl-x Ctrl-s = save | Ctrl-x Ctrl-c = quit");
 
+  appDebug("allocation : %d\n", beluga_alloc_counter);
 
   while (1) {
     editorRefreshScreen();

meson.build

@@ -7,6 +7,7 @@ project('beluga', 'c',
 
 cc = meson.get_compiler('c')
 m = cc.find_library('m', required: false)
+thread_dep = dependency('threads')
 
 # Source files
 src_files = files(
@@ -22,16 +23,16 @@ src_files = files(
   'src/terminal.c',
   'src/builtins.c',
   'src/buffer.c',
-  'src/split_screen.c'
+  'src/split_screen.c',
+  'src/utf8.c',
+  'src/completion.c',
+  'src/lsp_ui.c',
+  'src/cJSON.c',
+  'src/utils.c'
 )
 
-# Add termiWin.c for Windows builds
-if host_machine.system() == 'windows'
-  src_files += files('src/termiWin.c')
-endif
-
 # Executable
 executable('beluga',
   src_files,
-  dependencies: [m]
+  dependencies: [m, thread_dep]
 )

src/append_buffer.c

@@ -1,9 +1,8 @@
 #include "../include/append_buffer.h"
-
-extern struct editorConfig E;
+#include "include/utils.h"
 
 void abAppend(struct abuf *ab, const char *s, int len) {
-  char *new = realloc(ab->b, ab->len + len);
+  char *new = bRealloc(ab->b, ab->len + len);
 
   if (new == NULL) {
     return;
@@ -13,4 +12,4 @@ void abAppend(struct abuf *ab, const char *s, int len) {
   ab->len += len;
 }
 
-void abFree(struct abuf *ab) { free(ab->b); }
+void abFree(struct abuf *ab) { bFree(ab->b); }

src/buffer.c

@@ -10,19 +10,26 @@
 #include "include/split_screen.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <libgen.h>
 #include <string.h>
+#include <sys/stat.h>
+
+#include "include/input.h"
+#include "include/utils.h"
 
-extern struct editorConfig E;
 
 /**
  * @brief Finds a buffer by filename
  * @param filename The filename to search for
  * @return Buffer ID if found, -1 if not found
  */
-static int bufferFindByFilename(const char *filename) {
-    for (int i = 0; i < E.number_of_buffer; i++) {
+static int bufferFindByFilename(const char* filename)
+{
+    for (int i = 0; i < E.number_of_buffer; i++)
+    {
         if (E.buffers[i].filename != NULL &&
-            strcmp(E.buffers[i].filename, filename) == 0) {
+            strcmp(E.buffers[i].filename, filename) == 0)
+        {
             return E.buffers[i].buffer_id;
         }
     }
@@ -34,9 +41,12 @@ static int bufferFindByFilename(const char *filename) {
  * @param buffer_id The buffer ID to find
  * @return Pointer to buffer, NULL if not found
  */
-struct buffer_t *bufferFindById(int buffer_id) {
-    for (int i = 0; i < E.number_of_buffer; i++) {
-        if (E.buffers[i].buffer_id == buffer_id) {
+struct buffer_t* bufferFindById(int buffer_id)
+{
+    for (int i = 0; i < E.number_of_buffer; i++)
+    {
+        if (E.buffers[i].buffer_id == buffer_id)
+        {
             return &E.buffers[i];
         }
     }
@@ -47,33 +57,35 @@ struct buffer_t *bufferFindById(int buffer_id) {
  * @brief Creates a new buffer for a file
  * @details Allocates buffer slot, loads file content, saves buffer metadata.
  * If file is already open, switches to existing buffer instead.
- * @param filename Path to the file
  * @return Buffer ID on success, -1 on failure
  */
-int bufferCreate(const char *filename) {
+int bufferCreate(const char* path, enum bufferStatus_e state)
+{
+    char *filename = basename((char *) path);
     // Check if file is already open
-    int existing_id = bufferFindByFilename(filename);
-    if (existing_id != -1) {
+    const int existing_id = bufferFindByFilename(path);
+    path = dirname((char *) path);
+    if (existing_id != -1)
+    {
         return bufferSwitch(existing_id);
     }
-    
     // Check if we have space for more buffers
-    if (E.number_of_buffer >= 64) {
+    if (E.number_of_buffer >= 64)
+    {
         editorSetStatusMessage("Error: maximum buffers reached (64)");
         return -1;
     }
 
     // Initialize new buffer
-    struct buffer_t *new_buf = &E.buffers[E.number_of_buffer];
+    struct buffer_t* new_buf = &E.buffers[E.number_of_buffer];
     new_buf->buffer_id = E.number_of_buffer;
     new_buf->filename = strdup(filename);
     new_buf->type = FILE_BUFF;
-    new_buf->state = READ_AND_WRITE;
+    new_buf->state = state;
     new_buf->x = 0;
     new_buf->y = 0;
-    new_buf->row_offset = 0;
-    new_buf->col_offset = 0;
-    new_buf->dirty = 0;  // New file starts clean
+    new_buf->dirty = 0; // New file starts clean
+    new_buf->path = strdup(path);
 
     // Load file content using existing editorOpen
     editorOpen(new_buf);
@@ -90,17 +102,19 @@ int bufferCreate(const char *filename) {
  * @param buffer_id The buffer ID to switch to
  * @return 0 on success, -1 on failure
  */
-int bufferSwitch(int buffer_id) {
-    struct buffer_t *target = bufferFindById(buffer_id);
-    if (target == NULL) {
-      E.layout.panes[E.layout.active_pane].buffer_id = buffer_id;
+int bufferSwitch(int buffer_id)
+{
+    struct buffer_t* target = bufferFindById(buffer_id);
+    if (target == NULL)
+    {
+        E.layout.panes[E.layout.active_pane].buffer_id = buffer_id;
         editorSetStatusMessage("Error: buffer not found");
         return -1;
     }
 
 
     editorSetStatusMessage("Switched to: %s (buffer %d)",
-                          target->filename, buffer_id);
+                           target->filename, buffer_id);
     return 0;
 }
 
@@ -112,44 +126,55 @@ int bufferSwitch(int buffer_id) {
  * @param buffer_id The buffer ID to close
  * @return 0 on success, -1 on failure
  */
-int bufferClose(int buffer_id) {
-    struct buffer_t *buf = bufferFindById(buffer_id);
-    if (buf == NULL) {
+int bufferClose(int buffer_id)
+{
+    struct buffer_t* buf = bufferFindById(buffer_id);
+    if (buf == NULL)
+    {
         editorSetStatusMessage("Error: buffer not found");
         return -1;
     }
 
-    EditorPane * active = splitScreenGetActivePane();
+    EditorPane* active = splitScreenGetActivePane();
 
     // If this is the current buffer, find next buffer to switch to
-    if (active->buffer_id == buffer_id) {
+    if (active->buffer_id == buffer_id)
+    {
         int next_id = -1;
 
         // Try to switch to next buffer
-        for (int i = 0; i < E.number_of_buffer; i++) {
-            if (E.buffers[i].buffer_id != buffer_id) {
+        for (int i = 0; i < E.number_of_buffer; i++)
+        {
+            if (E.buffers[i].buffer_id != buffer_id)
+            {
                 next_id = E.buffers[i].buffer_id;
                 break;
             }
         }
 
-        if (next_id != -1) {
+        if (next_id != -1)
+        {
             bufferSwitch(next_id);
-        } else {
+        }
+        else
+        {
             // No other buffers, clear editor
             editorCloseFile();
         }
     }
 
     // Free buffer resources
-    free(buf->filename);
+    bFree(buf->filename);
     buf->filename = NULL;
     buf->buffer_id = -1;
 
     // Remove from buffer list by shifting
-    for (int i = 0; i < E.number_of_buffer; i++) {
-        if (E.buffers[i].buffer_id == buffer_id) {
-            for (int j = i; j < E.number_of_buffer - 1; j++) {
+    for (int i = 0; i < E.number_of_buffer; i++)
+    {
+        if (E.buffers[i].buffer_id == buffer_id)
+        {
+            for (int j = i; j < E.number_of_buffer - 1; j++)
+            {
                 E.buffers[j] = E.buffers[j + 1];
             }
             E.number_of_buffer--;
@@ -165,8 +190,9 @@ int bufferClose(int buffer_id) {
  * @brief Gets the current active buffer
  * @return Pointer to current buffer_t, NULL if none
  */
-struct buffer_t *bufferGetCurrent(void) {
-  EditorPane * active = splitScreenGetActivePane();
+struct buffer_t* bufferGetCurrent(void)
+{
+    EditorPane* active = splitScreenGetActivePane();
     return bufferFindById(active->buffer_id);
 }
 
@@ -175,22 +201,25 @@ struct buffer_t *bufferGetCurrent(void) {
  * @details Prints buffer information to status message
  * @return Number of open buffers
  */
-int bufferListAll(void) {
-    if (E.number_of_buffer == 0) {
+int bufferListAll(void)
+{
+    if (E.number_of_buffer == 0)
+    {
         editorSetStatusMessage("No buffers open");
         return 0;
     }
 
     char buf[256] = "";
     int offset = 0;
-    EditorPane * active = splitScreenGetActivePane();
+    EditorPane* active = splitScreenGetActivePane();
 
-    for (int i = 0; i < E.number_of_buffer; i++) {
-        struct buffer_t *b = &E.buffers[i];
+    for (int i = 0; i < E.number_of_buffer; i++)
+    {
+        struct buffer_t* b = &E.buffers[i];
         char marker = (b->buffer_id == active->buffer_id) ? '*' : ' ';
         offset += snprintf(&buf[offset], sizeof(buf) - offset,
-                          "%c%d:%s ", marker, b->buffer_id, 
-                          b->filename ? b->filename : "[No Name]");
+                           "%c%d:%s ", marker, b->buffer_id,
+                           b->filename ? b->filename : "[No Name]");
     }
 
     editorSetStatusMessage("Buffers: %s", buf);
@@ -201,9 +230,11 @@ int bufferListAll(void) {
  * @brief Saves current buffer to disk
  * @return 0 on success, -1 on failure
  */
-int bufferSave(void) {
-    EditorPane * active = splitScreenGetActivePane();
-    if (active->buffer_id == -1) {
+int bufferSave(void)
+{
+    EditorPane* active = splitScreenGetActivePane();
+    if (active->buffer_id == -1)
+    {
         editorSetStatusMessage("Error: no buffer active");
         return -1;
     }
@@ -217,16 +248,22 @@ int bufferSave(void) {
  * @details Iterates through all buffers, saves each one
  * @return 0 on success, -1 on failure
  */
-int bufferSaveAll(void) {
+int bufferSaveAll(void)
+{
     int saved = 0;
     int failed = 0;
 
-    for (int i = 0; i < E.number_of_buffer; i++) {
-        if (bufferSwitch(E.buffers[i].buffer_id) == 0) {
-            if (E.dirty && bufferSave() == 0) {
+    for (int i = 0; i < E.number_of_buffer; i++)
+    {
+        if (bufferSwitch(E.buffers[i].buffer_id) == 0)
+        {
+            if (E.dirty && bufferSave() == 0)
+            {
                 saved++;
             }
-        } else {
+        }
+        else
+        {
             failed++;
         }
     }
@@ -236,101 +273,209 @@ int bufferSaveAll(void) {
 }
 
 /**
- * @brief Creates a new terminal buffer
- * @return Buffer ID on success, -1 on failure
+ * @brief Searches for a string in the document
+ * @details Prompts user for a search query, then searches forward from current
+ * cursor position. Updates cursor position to the first match found.
+ * @note Updates global editor state E (cursor position, row_offset)
+ * @note Search is case-sensitive and operates on rendered line content
+ * @note Searches begin from the line after current cursor position
+ * @see editorPrompt()
+ * @see editorRowRxToCx()
  */
-int bufferCreateTerminal(void) {
-    // Check if we have space for more buffers
-    if (E.number_of_buffer >= 64) {
-        editorSetStatusMessage("Error: maximum buffers reached (64)");
-        return -1;
+void bufferFind(struct buffer_t* buf)
+{
+    appDebug("searching\n");
+    char* query = editorPrompt("Search: %s (ESC to cancel)", "", 0);
+
+    if (query == NULL)
+        return;
+    int i;
+    for (i = buf->y+1; i < buf->numrows; i++)
+    {
+        row_t* row = &buf->row[i];
+        char* match = strstr(row->chars, query);
+        if (match)
+        {
+            buf->y = i;
+            break;
+        }
     }
+    bFree(query);
+}
 
-    // Initialize new terminal buffer
-    struct buffer_t *new_buf = &E.buffers[E.number_of_buffer];
-    new_buf->buffer_id = E.number_of_buffer;
-    new_buf->filename = strdup("[Terminal]");
-    new_buf->type = TERMINAL_BUFF;
-    new_buf->state = READ_AND_WRITE;
-    new_buf->x = 0;
-    new_buf->y = 0;
-    new_buf->row_offset = 0;
-    new_buf->col_offset = 0;
-    new_buf->dirty = 0;
-    new_buf->numrows = 0;
-    new_buf->row = NULL;
+void bufferFindReverse(struct buffer_t* buf)
+{
+    appDebug("searching\n");
+    char* query = editorPrompt("Reverse search: %s (ESC to cancel)", "", 0);
 
-    // Initialize terminal-specific data
-    new_buf->terminal_command = NULL;
-    new_buf->terminal_pid = -1;
-    new_buf->terminal_output = NULL;
-    new_buf->terminal_output_size = 0;
+    if (query == NULL)
+        return;
+    int i;
+    if (!buf->y)
+        return;
+    for (i = buf->y - 1; i >= 0; i--)
+    {
+        row_t* row = &buf->row[i];
+        char* match = strstr(row->chars, query);
+        if (match)
+        {
+            buf->y = i;
+            break;
+        }
+    }
+    bFree(query);
+}
 
-    // Initialize terminal-specific data
-    new_buf->terminal_command = NULL;
-    new_buf->terminal_pid = -1;
-    new_buf->terminal_output = NULL;
-    new_buf->terminal_output_size = 0;
+void bufferInsertRow(struct buffer_t *buffer, int at, char *s, size_t len) {
+  if (at < 0 || at > buffer->numrows)
+    return;
 
-    E.number_of_buffer++;
+  row_t *tmp = bRealloc(buffer->row, sizeof(row_t) * (buffer->numrows + 1));
+  if (!tmp)
+    return;
+  buffer->row = tmp;
 
-    editorSetStatusMessage("Created terminal buffer %d", new_buf->buffer_id);
-    return new_buf->buffer_id;
+  /* Shift existing rows to make room at 'at' — no at++ */
+  if (at < buffer->numrows) {
+    memmove(&buffer->row[at + 1], &buffer->row[at],
+            sizeof(row_t) * (buffer->numrows - at)); /* not -at+1 */
+  }
+
+  buffer->row[at].size  = (int) len;
+  buffer->row[at].cap   = (int) len + 1;
+  buffer->row[at].chars = bAlloc(len + 1);
+  if (!buffer->row[at].chars)
+    return;
+  memcpy(buffer->row[at].chars, s, len);
+  buffer->row[at].chars[len] = '\0'; /* always NUL-terminate */
+
+  buffer->numrows++;
+  buffer->dirty++;
+}
+
+void bufferFreeRow(row_t *row) { bFree(row->chars); }
+
+/**
+ * \fn editorRowInsertChar(erow *row, int at, int c)
+ * \param at Index of where we want to insert the char */
+
+void bufferRowInsertBytes(struct buffer_t *buffer, row_t *row, int at,
+                          const char *src, int n) {
+  if (buffer->state == READ_ONLY)
+    return;
+  if (row->size + n + 1 > row->cap) {
+    row->cap = (row->size + n + 1) * 2;
+    row->chars = bRealloc(row->chars, row->cap);
+  }
+  memmove(row->chars + at + n, row->chars + at, row->size - at);
+  memcpy(row->chars + at, src, n);
+  row->size += n;
+  row->chars = bRealloc(row->chars, row->size + 2);
+  ++buffer->dirty;
 }
 
 /**
- * @brief Executes a command in the terminal buffer
- * @param buffer_id The terminal buffer ID
- * @param command The command to execute
- * @return 0 on success, -1 on failure
- */
-int bufferExecuteTerminalCommand(int buffer_id, const char *command) {
-    struct buffer_t *buf = bufferFindById(buffer_id);
-    if (buf == NULL || buf->type != TERMINAL_BUFF) {
-        editorSetStatusMessage("Error: buffer is not a terminal buffer");
-        return -1;
-    }
-    
-    // Free any existing terminal data
-    if (buf->terminal_command) {
-        free(buf->terminal_command);
-    }
-    if (buf->terminal_output) {
-        free(buf->terminal_output);
-    }
-    
-    // Store the command
-    buf->terminal_command = strdup(command);
-    
-    // For now, we'll simulate terminal output
-    // In a real implementation, this would fork a process and capture output
-    char output[256];
-    snprintf(output, sizeof(output), "$ %s\n[Command executed: %s]\n", command, command);
-    
-    buf->terminal_output = strdup(output);
-    buf->terminal_output_size = strlen(output);
-    
-    // Update the buffer content to show terminal output
-    // Clear existing rows
-    for (int i = 0; i < buf->numrows; ++i) {
-        free(buf->row[i].chars);
-        free(buf->row[i].render);
-    }
-    free(buf->row);
-    buf->row = NULL;
-    buf->numrows = 0;
-    
-    // Add terminal output as rows
-    // Make a copy for parsing since strtok modifies the string
-    char *output_copy = strdup(buf->terminal_output);
-    char *line = strtok(output_copy, "\n");
-    while (line != NULL) {
-        bufferInsertRow(buf, buf->numrows, line, strlen(line));
-        line = strtok(NULL, "\n");
-    }
-    free(output_copy);
-    
-    buf->dirty = 1;
-    editorSetStatusMessage("Executed: %s", command);
-    return 0;
+ * \fn bufferRowDelChar(struct bufferConfig *E, frow *frow, int at)
+ * \brief Delete the a char at the chosen position on the given row
+ * \param at Index of the char to delete
+ * \param row Row on operation is made */
+void bufferRowDelByte(struct buffer_t *buffer, row_t *row, int at, int n) {
+    if (buffer->state == READ_ONLY)
+        return;
+    if (at < 0 || at >= row->size)
+        return;
+  memmove(row->chars + at, row->chars + at + n, row->size - at - n);
+  row->size -= n;
+  row->chars[row->size] = '\0';
+  buffer->x -= n;
+  ++buffer->dirty;
+}
+
+
+void bufferInsertBytes(const char* src, int n)
+{
+    appDebug("bufferInsertBytes \r\n");
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buf = bufferFindById(active->buffer_id);
+    if (buf->y == buf->numrows)
+    {
+        bufferInsertRow(buf, buf->numrows, "", 0);
+    }
+    bufferRowInsertBytes(buf, &buf->row[buf->y], buf->x, src, n);
+    buf->x += n;
+    buf->b_has_changed = 1;
+}
+
+void bufferDelBytes(void)
+{
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buf = bufferFindById(active->buffer_id);
+
+    /* Nothing to delete */
+    if (buf->numrows == 0) return;
+    if (buf->x == 0 && buf->y == 0) return;
+
+    /* Use row_offset, not col_offset, for row indexing */
+    row_t* r = &buf->row[buf->y];
+
+    if (buf->x > 0)
+    {
+        int byte_end = editorRowCxToByte(r, buf->x);
+        int byte_start = editorRowCxToByte(r, buf->x - 1);
+        int char_width = byte_end - byte_start; /* byte width of the character */
+
+        bufferRowDelByte(buf, r, byte_start, char_width);
+        E.dirty = 1;
+    }
+    else
+    {
+        /* Merge current row into the previous one */
+        row_t* prev = &buf->row[buf->y - 1];  // FIX: was buf->y (same as r)
+        int prev_char_count = editorRowCharCount(prev, prev->size);
+
+        bufferRowInsertBytes(buf, prev, prev->size, r->chars, r->size);
+        bFree(r->chars);
+        r->chars = NULL;
+
+        memmove(&buf->row[buf->y],
+                &buf->row[buf->y + 1],
+                sizeof(row_t) * (buf->numrows - buf->y - 1));
+        buf->numrows--;
+
+        active->cursor_x = prev_char_count;
+        buf->x = prev_char_count;
+        active->cursor_y--;
+        buf->y--;
+        E.dirty = 1;
+    }
+}
+
+void bufferInsertNewLine(void) {
+    appDebug("Inserting new line\n");
+    EditorPane *active = splitScreenGetActivePane();
+    struct buffer_t *buf = bufferFindById(active->buffer_id);
+
+    appDebug("buf x %d\n", buf->x);
+
+    if (buf->y >= buf->numrows) {
+        /* Cursor is past the last row: just append a blank line */
+        bufferInsertRow(buf, buf->numrows, "", 0);
+    } else {
+        row_t *row = &buf->row[buf->y];
+
+        /* Insert the tail (from cursor to end) as a new row below */
+        bufferInsertRow(buf, buf->y + 1, &row->chars[buf->x], row->size - buf->x);
+
+        /* Re-fetch: bRealloc inside bufferInsertRow may have moved the array */
+        row = &buf->row[buf->y];
+
+        /* Truncate the current row at the cursor */
+        row->size           = buf->x;
+        row->chars[row->size] = '\0';
+        /* Do NOT touch row->cap — the allocation is still valid */
+    }
+
+    buf->y++;
+    buf->x = 0;
+    appDebug("Insert new line done\n");
 }

src/builtins.c

@@ -2,23 +2,27 @@
  * @file builtins.c
  * @brief Built-in Lisp functions for editor operations
  * @details Provides Lisp bindings for core editor functionality including
- * cursor movement, file operations, keybinding management, and text manipulation
+ * cursor movement, file operations, keybinding management, and text
+ * manipulation
  */
 
 #include "../include/builtins.h"
+#include "../include/buffer.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/buffer.h"
+#include "../include/terminal.h"
 #include "../include/split_screen.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "include/completion.h"
+#include "include/utils.h"
+
 /**
  * @brief Finds a prefix configuration by name
  * @details Searches the prefix array for a prefix matching the given name.
@@ -27,14 +31,17 @@
  * @return Matching prefix_t structure, or E.prefix[0] if not found
  * @note Updates global editor state E
  */
-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];
+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];
+    return E.prefix[0];
 }
 
 /**
@@ -50,54 +57,43 @@ struct prefix_t find_prefix(const char prefix_name[64]) {
  * @return lisp_null()
  * @note Updates global editor state E (key_binds array)
  */
-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);
+Lisp mapKey(Lisp args, LispError* e, LispContext ctx)
+{
+    /*
+     * 3 arguments keybind command prefix
+     */
+    const char* key_sequence = lisp_string(lisp_car(args));
+    void* memory_temp;
+    args = lisp_cdr(args);
+    // second argument
+    const 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));
+    memory_temp = (void*)bRealloc(
+        E.key_binds, ++E.number_of_keybinds * sizeof(struct keyBind_t));
+    E.key_binds = (struct keyBind_t*)memory_temp;
+    if (!E.key_binds)
+        editorQuit(args, e, ctx);
+    E.key_binds[E.number_of_keybinds - 1].key_sequence =
+        (char*)bAlloc(50 * sizeof(char));
 
-  strncpy(E.key_binds[E.number_of_keybinds - 1].key_sequence, key_sequence, 50);
+    strncpy(E.key_binds[E.number_of_keybinds - 1].key_sequence, key_sequence, 50);
 
-  E.key_binds[E.number_of_keybinds - 1].command = func;
+    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);
+    // 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;
+    E.key_binds[E.number_of_keybinds - 1].prefix_id = prefix.prefix_id;
 
-  return lisp_null();
-}
-
-/**
- * @brief Lisp function to create a new terminal buffer
- * @details Creates a new terminal buffer and switches to it.
- * @param args Lisp arguments (ignored)
- * @param e Error pointer for Lisp error handling
- * @param ctx Lisp context
- * @return lisp_null()
- * @note Updates global editor state E
- */
-Lisp editorCreateTerminal(Lisp args, LispError *e, LispContext ctx) {
-  int buffer_id = bufferCreateTerminal();
-  if (buffer_id >= 0) {
-    bufferSwitch(buffer_id);
-  }
-  return lisp_null();
+    return lisp_null();
 }
 
 /**
  * @brief Lisp function to move cursor in a specified direction
- * @details Moves the editor cursor up, down, left, or right based on direction string.
+ * @details Moves the editor cursor up, down, left, or right based on direction
+ * string.
  * @param args Lisp list with one argument: direction string
  *        - "u": up, "d": down, "r": right, "l": left
  * @param e Error pointer for Lisp error handling
@@ -106,85 +102,94 @@ Lisp editorCreateTerminal(Lisp args, LispError *e, LispContext ctx) {
  * @note Updates global editor state E
  * @see editorMoveCursor()
  */
-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':
-    is_in = editorMoveCursor(ARROW_UP);
-    break;
-  case 'd':
-    is_in = editorMoveCursor(ARROW_DOWN);
-    break;
-  case 'r':
-    is_in = editorMoveCursor(ARROW_RIGHT);
-    break;
-  case 'l':
-    is_in = editorMoveCursor(ARROW_LEFT);
-    break;
-  }
-  fprintf(stderr, "move lisp %d\n", is_in);
-  return lisp_make_bool(is_in);
+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':
+        is_in = editorMoveCursor(ARROW_UP);
+        break;
+    case 'd':
+        is_in = editorMoveCursor(ARROW_DOWN);
+        break;
+    case 'r':
+        is_in = editorMoveCursor(ARROW_RIGHT);
+        break;
+    case 'l':
+        is_in = editorMoveCursor(ARROW_LEFT);
+        break;
+    default:
+        break;
+    }
+    appDebug("move lisp %d\n", is_in);
+    return lisp_make_bool(is_in);
 }
 
 /**
- * @brief Frees all dynamically allocated editor structures
+ * @brief bFrees all dynamically allocated editor structures
  * @details Releases memory for prefix table, keybinds, filename, and all rows.
  * Called during shutdown to prevent memory leaks.
  * @note Updates global editor state E
  */
-void free_structs(void) {
-  int i, j;
-  free(E.prefix);
-  for (i = 0; i < E.number_of_keybinds; ++i) {
-    free(E.key_binds[i].key_sequence);
-  }
-  free(E.key_binds);
-  // free layout
-  free(E.layout.panes);
-
-  // Free buffers
-  for (i = 0; i < E.number_of_buffer; ++i) {
-    free(E.buffers[i].filename);
-    for (j = 0; j < E.buffers[i].numrows; ++j) {
-      free(E.buffers[i].row[j].render);
-      free(E.buffers[i].row[j].chars);
+void bFree_structs(void)
+{
+    int i, j;
+    bFree(E.prefix);
+    for (i = 0; i < E.number_of_keybinds; ++i)
+    {
+        bFree(E.key_binds[i].key_sequence);
     }
-    free(E.buffers[i].row);
-  }
+    bFree(E.key_binds);
+    // bFree layout
+    bFree(E.layout.panes);
 
-  free(E.init_file_path);
-  fclose(E.fd_init_file);
+    // bFree buffers
+    for (i = 0; i < E.number_of_buffer; ++i)
+    {
+        bFree(E.buffers[i].filename);
+        for (j = 0; j < E.buffers[i].numrows; ++j)
+        {
+            bFree(E.buffers[i].row[j].chars);
+        }
+        bFree(E.buffers[i].row);
+    }
 
+    bFree(E.init_file_path);
+    fclose(E.fd_init_file);
 }
 
 /**
  * @brief Lisp function to quit the editor
- * @details Closes editor with unsaved changes protection. Prompts user to confirm
- * quit after multiple attempts if file is dirty. Cleans up resources and restores terminal.
+ * @details Closes editor with unsaved changes protection. Prompts user to
+ * confirm quit after multiple attempts if file is dirty. Cleans up resources
+ * and restores terminal.
  * @param args Lisp arguments (unused)
  * @param e Error pointer for Lisp error handling
  * @param ctx Lisp context
  * @return lisp_null() (never returns on successful exit)
  * @note Calls exit(0) to terminate program
  * @note Updates quit_times_buffer counter
- * @see free_structs()
+ * @see bFree_structs()
  */
-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 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();
+    }
+    bFree_structs();
+    write(STDOUT_FILENO, "\x1b[2J", 4);
+    write(STDOUT_FILENO, CURSOR_TOP_LEFT, 3);
+    disableRawMode();
+    lspShutdown(E.lsp_client);
+    lisp_shutdown(E.ctx);
+    appDebug("Rest alloc %d\n", beluga_alloc_counter);
+    exit(0);
 }
 
 /**
@@ -197,20 +202,24 @@ Lisp editorQuit(Lisp args, LispError *e, LispContext ctx) {
  * @see editorSave()
  */
 
-Lisp l_editorSplitScreenVertical(Lisp args, LispError *e, LispContext ctx) {
-  if (E.number_of_buffer >= 2) {
+Lisp l_editorSplitScreenVertical(Lisp args, LispError* e, LispContext ctx)
+{
+    if (E.number_of_buffer >= 2)
+    {
         splitScreenVertical(E.buffers[0].buffer_id, E.buffers[1].buffer_id);
-    } else {
+    }
+    else
+    {
         editorSetStatusMessage("Need at least 2 buffers open");
     }
-  return lisp_null();
+    return lisp_null();
 }
 
-Lisp l_editorSave(Lisp args, LispError *e, LispContext ctx) {
+Lisp l_editorSave(Lisp args, LispError* e, LispContext ctx)
+{
+    editorSave();
 
-  editorSave();
-
-  return lisp_null();
+    return lisp_null();
 }
 
 /**
@@ -222,11 +231,11 @@ Lisp l_editorSave(Lisp args, LispError *e, LispContext ctx) {
  * @return lisp_null()
  * @see editorInsertNewLine()
  */
-Lisp l_editorInsertNewLine(Lisp args, LispError *e, LispContext ctx) {
+Lisp l_editorInsertNewLine(Lisp args, LispError* e, LispContext ctx)
+{
+    bufferInsertNewLine();
 
-  bufferInsertNewLine();
-
-  return lisp_null();
+    return lisp_null();
 }
 
 /**
@@ -238,13 +247,14 @@ Lisp l_editorInsertNewLine(Lisp args, LispError *e, LispContext ctx) {
  * @return lisp_null()
  * @note Uses E.constantes.TAB_LENGTH for indentation width
  */
-Lisp l_editorInserTab(Lisp args, LispError *e, LispContext ctx) {
+Lisp l_editorInserTab(Lisp args, LispError* e, LispContext ctx)
+{
+    for (int i = 0; i < E.constantes.TAB_LENGTH; ++i)
+    {
+        bufferInsertBytes(" ", 1);
+    }
 
-  for (int i = 0; i<E.constantes.TAB_LENGTH; ++i) {
-    bufferInsertChar(' ');
-  }
-
-  return lisp_null();
+    return lisp_null();
 }
 
 /**
@@ -256,9 +266,12 @@ Lisp l_editorInserTab(Lisp args, LispError *e, LispContext ctx) {
  * @return lisp_null()
  * @note Updates global editor state E
  */
-Lisp moveCursorBeginLine(Lisp args, LispError *e, LispContext ctx) {
-  E.layout.panes[E.layout.active_pane].cursor_x = 0;
-  return lisp_null();
+Lisp moveCursorBeginLine(Lisp args, LispError* e, LispContext ctx)
+{
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buf = bufferFindById(active->buffer_id);
+    buf->x = 0;
+    return lisp_null();
 }
 
 /**
@@ -270,13 +283,12 @@ Lisp moveCursorBeginLine(Lisp args, LispError *e, LispContext ctx) {
  * @return lisp_null()
  * @note Updates global editor state E
  */
-Lisp moveCursorEndLine(Lisp args, LispError *e, LispContext ctx) {
-  EditorPane *active = splitScreenGetActivePane();
-  struct buffer_t *buf = bufferFindById(active->buffer_id);
-  if (active->cursor_y < buf->numrows) {
-    active->cursor_x = buf->row[active->cursor_y].size;
-  }
-  return lisp_null();
+Lisp moveCursorEndLine(Lisp args, LispError* e, LispContext ctx)
+{
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buf = bufferFindById(active->buffer_id);
+    buf->x = buf->row[buf->y].size;
+    return lisp_null();
 }
 
 /**
@@ -288,14 +300,16 @@ Lisp moveCursorEndLine(Lisp args, LispError *e, LispContext ctx) {
  * @return lisp_null()
  * @see editorDelChar()
  */
-Lisp deletePreviousChar(Lisp args, LispError *e, LispContext ctx) {
-  bufferDelChar();
-  return lisp_null();
+Lisp deletePreviousChar(Lisp args, LispError* e, LispContext ctx)
+{
+    bufferDelBytes();
+    return lisp_null();
 }
 
 /**
  * @brief Lisp function to move cursor up by one screen
- * @details Scrolls up one full screen height, moving cursor to top of visible area.
+ * @details Scrolls up one full screen height, moving cursor to top of visible
+ * area.
  * @param args Lisp arguments (unused)
  * @param e Error pointer for Lisp error handling
  * @param ctx Lisp context
@@ -303,19 +317,22 @@ Lisp deletePreviousChar(Lisp args, LispError *e, LispContext ctx) {
  * @note Updates global editor state E
  * @see editorMoveCursor()
  */
-Lisp editorMoveCursorPageUp(Lisp args, LispError *e, LispContext ctx) {
-  EditorPane *active = splitScreenGetActivePane();
-  active->cursor_y = active->row_offset;
-  int times = E.screenrows;
-  while (--times) {
-    editorMoveCursor(ARROW_UP);
-  }
-  return lisp_null();
+Lisp editorMoveCursorPageUp(Lisp args, LispError* e, LispContext ctx)
+{
+    EditorPane* active = splitScreenGetActivePane();
+    active->cursor_y = active->y_offset;
+    int times = E.screenrows;
+    while (--times)
+    {
+        editorMoveCursor(ARROW_UP);
+    }
+    return lisp_null();
 }
 
 /**
  * @brief Lisp function to move cursor down by one screen
- * @details Scrolls down one full screen height, moving cursor to bottom of visible area.
+ * @details Scrolls down one full screen height, moving cursor to bottom of
+ * visible area.
  * @param args Lisp arguments (unused)
  * @param e Error pointer for Lisp error handling
  * @param ctx Lisp context
@@ -323,19 +340,22 @@ Lisp editorMoveCursorPageUp(Lisp args, LispError *e, LispContext ctx) {
  * @note Updates global editor state E
  * @see editorMoveCursor()
  */
-Lisp editorMoveCursorPageDown(Lisp args, LispError *e, LispContext ctx) {
-  EditorPane *active = splitScreenGetActivePane();
-  struct buffer_t *buffer = bufferFindById(active->buffer_id);
-  active->cursor_y = active->row_offset + E.screenrows - 1;
-  if (active->cursor_y > buffer->numrows) {
-    active->cursor_y = buffer->numrows;
-  }
-  int times = E.screenrows;
-  while (--times) {
-    editorMoveCursor(ARROW_DOWN);
-  }
+Lisp editorMoveCursorPageDown(Lisp args, LispError* e, LispContext ctx)
+{
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buffer = bufferFindById(active->buffer_id);
+    active->cursor_y = active->y_offset + E.screenrows - 1;
+    if (active->cursor_y > buffer->numrows)
+    {
+        active->cursor_y = buffer->numrows;
+    }
+    int times = E.screenrows;
+    while (--times)
+    {
+        editorMoveCursor(ARROW_DOWN);
+    }
 
-  return lisp_null();
+    return lisp_null();
 }
 
 /**
@@ -349,32 +369,35 @@ Lisp editorMoveCursorPageDown(Lisp args, LispError *e, LispContext ctx) {
  * @see editorOpen()
  * @see editorPrompt()
  */
-Lisp editorOpenFile(Lisp args, LispError *e, LispContext ctx) {
-  char *filename = editorPrompt("Open : %s", getenv("PWD"), 1);
-  if (filename){
-    //    editorOpen(filename);
-    EditorPane *active = splitScreenGetActivePane();
-    active->buffer_id = bufferCreate(filename);
-  }
-  free(filename);
+Lisp editorOpenFile(Lisp args, LispError* e, LispContext ctx)
+{
+    char* filename = editorPrompt("Open : %s", getenv("PWD"), 1);
+    if (filename)
+    {
+        //    editorOpen(filename);
+        EditorPane* active = splitScreenGetActivePane();
+        active->buffer_id = bufferCreate(filename, READ_AND_WRITE);
+    }
+    bFree(filename);
 
-
-  return lisp_null();
+    return lisp_null();
 }
 
 /**
  * @brief Lisp function to insert a character
- * @details Extracts a character from Lisp string argument and inserts it at cursor.
+ * @details Extracts a character from Lisp string argument and inserts it at
+ * cursor.
  * @param args Lisp list with one string argument
  * @param e Error pointer for Lisp error handling
  * @param ctx Lisp context
  * @return lisp_null()
  * @note Uses first character of the string argument
  */
-Lisp editorPrintC(Lisp args, LispError *e, LispContext ctx) {
-  char c = lisp_string(lisp_car(args))[0];
-  bufferInsertChar(c);
-  return lisp_null();
+Lisp editorPrintC(Lisp args, LispError* e, LispContext ctx)
+{
+    const char* src = lisp_string(lisp_car(args));
+    bufferInsertBytes(src, (int) strlen(src));
+    return lisp_null();
 }
 
 /**
@@ -388,63 +411,52 @@ Lisp editorPrintC(Lisp args, LispError *e, LispContext ctx) {
  * @note Package files must be valid Lisp code
  * @note Package directory defaults to ~/.beluga/packages/
  */
-Lisp addPackage(Lisp args, LispError *e, LispContext ctx) {
-  const char *package_name = lisp_string(lisp_car(args));
-  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);
+Lisp addPackage(Lisp args, LispError* e, LispContext ctx)
+{
+    const char* package_name = lisp_string(lisp_car(args));
+    appDebug("%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");
+    appDebug("%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);
+    bFree(package_dir);
 
-  return lisp_null();
+    return lisp_null();
 }
 
-/**
- * @brief Lisp function to delete the current row
- * @details Removes the line at the current cursor position.
- * @param args Lisp arguments (unused)
- * @param e Error pointer for Lisp error handling
- * @param ctx Lisp context
- * @return lisp_null()
- * @note Updates global editor state E
- * @see editorDelRow()
- */
-Lisp editorDelRow_L(Lisp args, LispError *e, LispContext ctx) {
-  EditorPane *active = splitScreenGetActivePane();
-  struct buffer_t *buffer = bufferFindById(active->buffer_id);
-  bufferDelRow(buffer, active->cursor_y);
-  return lisp_null();
-}
-
-Lisp editorSwitchNextBuffer(Lisp args, LispError *e, LispContext ctx) {
-  fprintf(stderr, "switch buffer\n");
-  if (E.number_of_buffer > 0) {
-    EditorPane *active = splitScreenGetActivePane();
-    int next_idx = (active->buffer_id + 1) % E.number_of_buffer;
-    active->buffer_id = next_idx;
+Lisp editorSwitchNextBuffer(Lisp args, LispError* e, LispContext ctx)
+{
+    appDebug("switch buffer\n");
+    if (E.number_of_buffer > 0)
+    {
+        EditorPane* active = splitScreenGetActivePane();
+        int next_idx = (active->buffer_id + 1) % E.number_of_buffer;
+        active->buffer_id = next_idx;
     }
 
-  return lisp_null();
+    return lisp_null();
 }
 
-Lisp editorSwitchNextPane(Lisp args, LispError *e, LispContext ctx) {
-  splitScreenSwitchPane();
-  return lisp_null();
+Lisp editorSwitchNextPane(Lisp args, LispError* e, LispContext ctx)
+{
+    splitScreenSwitchPane();
+    return lisp_null();
 }
 
-Lisp editorUnifiedPanes(Lisp args, LispError *e, LispContext ctx) {
-  if (E.layout.num_panes - 1) {
-    splitScreenUnify();
-  }
-  return lisp_null();
+Lisp editorUnifiedPanes(Lisp args, LispError* e, LispContext ctx)
+{
+    if (E.layout.num_panes - 1)
+    {
+        splitScreenUnify();
+    }
+    return lisp_null();
 }
 
 /**
@@ -456,34 +468,56 @@ Lisp editorUnifiedPanes(Lisp args, LispError *e, LispContext ctx) {
  * @return lisp_null()
  * @see editorFind()
  */
-Lisp bufferFind_L(Lisp args, LispError *e, LispContext ctx) {
-  fprintf(stderr, "LispFind\n");
-  EditorPane *active = splitScreenGetActivePane();
-  struct buffer_t *buffer = bufferFindById(active->buffer_id);
-  bufferFind(buffer);
-  return lisp_null();
+Lisp bufferFind_L(Lisp args, LispError* e, LispContext ctx)
+{
+    appDebug("LispFind\n");
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buffer = bufferFindById(active->buffer_id);
+    bufferFind(buffer);
+    return lisp_null();
+}
+
+/**
+ * @brief Lisp function to search for text
+ * @details Wrapper around editorFind() for use in Lisp keybindings.
+ * @param args Lisp arguments (unused)
+ * @param e Error pointer for Lisp error handling
+ * @param ctx Lisp context
+ * @return lisp_null()
+ * @see editorFind()
+ */
+Lisp bufferFindReverse_L(Lisp args, LispError* e, LispContext ctx)
+{
+    appDebug("LispFind\n");
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buffer = bufferFindById(active->buffer_id);
+    bufferFindReverse(buffer);
+    return lisp_null();
 }
 
 /**
  * @brief Lisp function to read character at cursor
- * @details Returns the character at the current cursor position as a Lisp character.
- * Returns 'a' if at end of line.
+ * @details Returns the character at the current cursor position as a Lisp
+ * character. Returns 'a' if at end of line.
  * @param args Lisp arguments (unused)
  * @param e Error pointer for Lisp error handling
  * @param ctx Lisp context
  * @return Lisp character object representing the character at cursor
  */
-Lisp editorReadChar_L(Lisp args, LispError *e, LispContext ctx) {
-  Lisp returned_char;
-  EditorPane *active = splitScreenGetActivePane();
-  struct buffer_t *buffer = bufferFindById(active->buffer_id);
-  if (buffer->row[active->cursor_y].render[active->cursor_x] == 0) {
-    returned_char = lisp_make_char('a');
-  } else {
-    
-     returned_char = lisp_make_char(buffer->row[active->cursor_y].render[active->cursor_x]); 
-  }
-  return returned_char;
+Lisp editorReadChar_L(Lisp args, LispError* e, LispContext ctx)
+{
+    Lisp returned_char;
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buffer = bufferFindById(active->buffer_id);
+    if (buffer->row[buffer->y].chars[buffer->x] == 0)
+    {
+        returned_char = lisp_make_char('a');
+    }
+    else
+    {
+        returned_char = lisp_make_char(buffer->row[buffer->y].chars[buffer->x]);
+    }
+    return returned_char;
 }
 
 /**
@@ -497,17 +531,18 @@ Lisp editorReadChar_L(Lisp args, LispError *e, LispContext ctx) {
  * @note Updates global editor state E (prefix_state)
  * @see find_prefix()
  */
-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);
+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);
+    appDebug("%s set\n", prefix_name);
 
-  return lisp_null();
+    return lisp_null();
 }
 
 /**
@@ -520,11 +555,93 @@ Lisp editorSetPrefix(Lisp args, LispError *e, LispContext ctx) {
  * @return lisp_null()
  * @note Updates global editor state E (prefix array)
  */
-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();
+Lisp editorPrefix(Lisp args, LispError* e, LispContext ctx)
+{
+    void * memory_temp;
+    E.prefix = (struct prefix_t*)bRealloc(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();
+}
+
+Lisp editorPaste(Lisp args, LispError* e, LispContext ctx)
+{
+    const char* char_to_paste = editorGetClipboard();
+    appDebug("editor-paste, %s\n", char_to_paste);
+    bufferInsertBytes(char_to_paste, (int)strlen(char_to_paste));
+    return lisp_null();
+}
+
+Lisp editorCutEndLine(Lisp args, LispError* e, LispContext ctx)
+{
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buffer = bufferFindById(active->buffer_id);
+    int bytes_to_delete = editorRowCharCount(&buffer->row[buffer->y],
+                                             buffer->row[buffer->y].chars[buffer->row[buffer->y].size]) -
+        editorRowCharCount(&buffer->row[buffer->y], buffer->x);
+    editorSetClipboard(&buffer->row[buffer->y].chars[buffer->x], bytes_to_delete);
+    buffer->x = buffer->row[buffer->y].size;
+    while (bytes_to_delete--)
+    {
+        bufferDelBytes();
+    }
+    return lisp_null();
+}
+
+Lisp editorMoveBegBuffer(Lisp args, LispError* e, LispContext ctx)
+{
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buffer = bufferFindById(active->buffer_id);
+    buffer->x = 0;
+    buffer->y = 0;
+    return lisp_null();
+}
+
+Lisp editorMoveEndBuffer(Lisp args, LispError* e, LispContext ctx)
+{
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buffer = bufferFindById(active->buffer_id);
+    buffer->x = buffer->row[buffer->numrows - 1].size;
+    buffer->y = buffer->numrows - 1;
+    return lisp_null();
+}
+
+Lisp editorAutoComplete(Lisp args, LispError* e, LispContext ctx)
+{
+    // createContextBuffer(E.cursor_x - 2, E.cursor_y + 1, "hello");
+    appDebug("editor-auto-complete\n");
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buffer = bufferFindById(active->buffer_id);
+    E.lsp_completion.visible = 1;
+    lspRequestCompletion(
+        E.lsp_client,
+        buffer,
+        active->cursor_y + active->y_offset, // file line
+        active->cursor_x + active->x_offset, // file col
+        active->cursor_x + active->origin_x + GUTTER_WIDTH, // screen x
+        active->cursor_y + active->origin_y // screen y
+    );
+    return lisp_null();
+}
+
+Lisp lspDefinition(Lisp args, LispError* e, LispContext ctx)
+{
+    (void)args;
+    (void)e;
+    (void)ctx;
+    if (!E.lsp_client || E.lsp_client->state != LSP_READY)
+        return lisp_null();
+
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buf = bufferFindById(active->buffer_id);
+    if (!buf) return lisp_null();
+
+    lspRequestDefinition(
+        E.lsp_client, buf,
+        active->cursor_y + active->y_offset,
+        active->cursor_x + active->x_offset
+    );
+    return lisp_null();
 }

src/completion.c

@@ -0,0 +1,555 @@
+//
+// Created by Giorgio on 25/05/2026.
+//
+
+#include "../include/completion.h"
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/syslimits.h>
+
+#include "include/append_buffer.h"
+#include "include/cJSON.h"
+#include "include/data.h"
+#include "include/lsp_ui.h"
+#include "include/terminal.h"
+#include "include/utils.h"
+
+void createContextBuffer(const int x, const int y, const char* text)
+{
+    E.context_buffers = bAlloc(sizeof(ContextBuffer));
+    ContextBuffer* buffer = E.context_buffers;
+    buffer->editor_x = x;
+    buffer->editor_y = y;
+    buffer->height = 1;
+    buffer->rows = bAlloc(sizeof(struct row));
+    if (!buffer->rows) return;
+    buffer->rows[0].chars = strdup(text);
+    buffer->rows[0].size = strlen(text);
+    buffer->width = strlen(text);
+}
+
+static void lsp_send(int fd, const char* json)
+{
+    int body_len = strlen(json);
+    char header[1024];
+    int header_len = snprintf(header, sizeof(header),
+                              "Content-Length: %d\r\n\r\n", body_len);
+
+    // Write header + body atomically in two writes, no dprintf mixing
+    write(fd, header, header_len);
+    write(fd, json, body_len);
+
+    // Log to stderr for debugging
+    fprintf(stderr, "[LSP →] Content-Length: %d | %s\n", body_len, json);
+    fflush(stderr);
+}
+
+static int lsp_uri_to_buffer_id(const char* uri)
+{
+    const char *path = uri;
+    if (strncmp(uri, "file://", 7) == 0)
+        path = uri + 7;
+    // path is now "/absolute/path" — realpath output matches this directly
+
+    for (int i = 0; i < E.number_of_buffer; i++) {
+        if (E.buffers[i].filename == NULL) continue;
+        char abs[PATH_MAX];
+        realpath(E.buffers[i].filename, abs);
+        fprintf(stderr, "[URI MATCH] comparing '%s' vs '%s'\n", abs, path);
+        if (strcmp(abs, path) == 0)
+            return E.buffers[i].buffer_id;
+    }
+    return -1;
+}
+
+static char* lsp_recv(int fd)
+{
+    char header[1024];
+    int content_length = 0;
+
+    while (1)
+    {
+        int i = 0;
+        char c;
+        int n;
+        // Read until \n
+        while ((n = read(fd, &c, 1)) == 1 && c != '\n')
+            header[i++] = c;
+        if (n <= 0) return NULL;
+        header[i] = '\0';
+        // Strip \r explicitly
+        while (i > 0 && (header[i - 1] == '\r' || header[i - 1] == ' '))
+            header[--i] = '\0';
+        if (i == 0) break; // blank line = end of headers
+        if (strncmp(header, "Content-Length: ", 16) == 0)
+            content_length = atoi(header + 16);
+    }
+
+    if (content_length == 0) return NULL;
+
+    char* body = bAlloc(content_length + 1);
+    int total = 0;
+    while (total < content_length)
+    {
+        int n = read(fd, body + total, content_length - total);
+        if (n <= 0)
+        {
+            bFree(body);
+            return NULL;
+        }
+        total += n;
+    }
+    body[content_length] = '\0';
+    return body;
+}
+
+static void lsp_dispatch(LspClient* lsp, const char* json)
+{
+    if (!json) return;
+
+    cJSON* root = cJSON_Parse(json);
+    if (!root)
+    {
+        fprintf(stderr, "[LSP ←] Failed to parse JSON: %.120s\n", json);
+        return;
+    }
+
+    cJSON* method = cJSON_GetObjectItem(root, "method");
+    cJSON* id = cJSON_GetObjectItem(root, "id");
+    cJSON* result = cJSON_GetObjectItem(root, "result");
+    cJSON* error = cJSON_GetObjectItem(root, "error");
+
+    // ── Error response ────────────────────────────────────────────────────────
+    if (error)
+    {
+        cJSON* msg = cJSON_GetObjectItem(error, "message");
+        fprintf(stderr, "[LSP ←] ERROR: %s\n",
+                msg ? msg->valuestring : "(no message)");
+        cJSON_Delete(root);
+        return;
+    }
+
+    // ── Notification (no id, has method) ─────────────────────────────────────
+    if (method && !id)
+    {
+        const char* m = method->valuestring;
+        fprintf(stderr, "[LSP ←] NOTIF: %s\n", m);
+
+        if (strcmp(m, "textDocument/publishDiagnostics") == 0)
+        {
+            // Find which buffer this diagnostic belongs to
+            cJSON* params = cJSON_GetObjectItem(root, "params");
+            cJSON* uri = cJSON_GetObjectItem(params, "uri");
+            int buf_id = lsp_uri_to_buffer_id(
+                uri ? uri->valuestring : "");
+
+            fprintf(stderr, "[LSP ←] Diagnostics for buffer %d\n", buf_id);
+
+            pthread_mutex_lock(&lsp->lock);
+            lspParseDiagnostics(json, &E.lsp_diagnostics, buf_id);
+            pthread_mutex_unlock(&lsp->lock);
+            write(lsp->wake_pipe[1], "d", 1);
+        }
+
+        else if (strcmp(m, "window/logMessage") == 0)
+        {
+            cJSON* params = cJSON_GetObjectItem(root, "params");
+            cJSON* message = cJSON_GetObjectItem(params, "message");
+            fprintf(stderr, "[LSP ←] LOG: %s\n",
+                    message ? message->valuestring : "");
+        }
+        E.lsp_client->completion_just_arrived = 1;
+
+
+        cJSON_Delete(root);
+        return;
+    }
+
+    // ── Response (has id + result) ────────────────────────────────────────────
+    if (id && result)
+    {
+        int response_id = id->valueint;
+        fprintf(stderr, "[LSP ←] RESPONSE id=%d\n", response_id);
+
+        // initialize response → send initialized + mark ready
+        if (lsp->state == LSP_INITIALIZING)
+        {
+            fprintf(stderr, "[LSP ←] Initialize OK, sending initialized\n");
+            lsp_send(lsp->write_fd,
+                     "{\"jsonrpc\":\"2.0\",\"method\":\"initialized\",\"params\":{}}");
+
+            pthread_mutex_lock(&lsp->lock);
+            lsp->state = LSP_READY;
+            pthread_cond_signal(&lsp->ready_cond);
+            pthread_mutex_unlock(&lsp->lock);
+            E.lsp_client->completion_just_arrived = 1;
+
+            cJSON_Delete(root);
+            return;
+        }
+
+        // completion response → parse items and show popup
+        cJSON* items = cJSON_GetObjectItem(result, "items");
+        if (items && cJSON_IsArray(items))
+        {
+            int count = cJSON_GetArraySize(items);
+            fprintf(stderr, "[LSP ←] Completion: %d items\n", count);
+
+            // Print each item to stderr for debugging
+            cJSON* item;
+            int i = 0;
+            cJSON_ArrayForEach(item, items)
+            {
+                cJSON* label = cJSON_GetObjectItem(item, "label");
+                cJSON* detail = cJSON_GetObjectItem(item, "detail");
+                cJSON* kind = cJSON_GetObjectItem(item, "kind");
+                fprintf(stderr, "  [%d] kind=%-2d  %-40s  %s\n",
+                        i++,
+                        kind ? kind->valueint : 0,
+                        label ? label->valuestring : "(no label)",
+                        detail ? detail->valuestring : "");
+                if (i >= 10)
+                {
+                    fprintf(stderr, "  ... (%d more)\n", count - 10);
+                    break;
+                }
+            }
+
+            pthread_mutex_lock(&lsp->lock);
+            lspParseCompletion(json, &E.lsp_completion,
+                               lsp->completion_cursor_x,
+                               lsp->completion_cursor_y);
+            pthread_mutex_unlock(&lsp->lock);
+            E.lsp_client->completion_just_arrived = 1;
+
+            fprintf(stderr, "[POPUP] visible=%d count=%d origin=(%d,%d)\n",
+                    E.lsp_completion.visible,
+                    E.lsp_completion.count,
+                    E.lsp_completion.origin_x,
+                    E.lsp_completion.origin_y);
+            write(lsp->wake_pipe[1], "c", 1);
+
+            cJSON_Delete(root);
+            return;
+        }
+
+        // definition response → jump to location
+        cJSON* uri_item = cJSON_GetObjectItem(result, "uri");
+        if (uri_item)
+        {
+            cJSON* range = cJSON_GetObjectItem(result, "range");
+            cJSON* start = cJSON_GetObjectItem(range, "start");
+            int line = cJSON_GetObjectItem(start, "line")->valueint;
+            int col = cJSON_GetObjectItem(start, "character")->valueint;
+            fprintf(stderr, "[LSP ←] Definition: %s:%d:%d\n",
+                    uri_item->valuestring, line, col);
+            E.lsp_client->completion_just_arrived = 1;
+
+            // TODO: jump to that location
+            cJSON_Delete(root);
+            return;
+        }
+
+        fprintf(stderr, "[LSP ←] Unhandled response id=%d: %.80s\n",
+                response_id, json);
+    }
+
+    cJSON_Delete(root);
+}
+
+static void* lsp_reader(void* arg)
+{
+    LspClient* lsp = (LspClient*)arg;
+    while (lsp->state != LSP_SHUTDOWN)
+    {
+        char* msg = lsp_recv(lsp->read_fd);
+        if (!msg) break; // ← pipe closed or error, exit cleanly
+        lsp_dispatch(lsp, msg);
+        bFree(msg);
+    }
+    return NULL;
+}
+
+// ─── lifecycle ───────────────────────────────────────────────────────────────
+
+int lspStart(LspClient* lsp, const char* project_root)
+{
+    int to_clangd[2], from_clangd[2];
+    pipe(to_clangd);
+    pipe(from_clangd);
+
+    pipe(lsp->wake_pipe);
+
+    lsp->pid = fork();
+    if (lsp->pid == 0)
+    {
+        // Child: become clangd
+        dup2(to_clangd[0], STDIN_FILENO);
+        dup2(from_clangd[1], STDOUT_FILENO);
+        close(to_clangd[1]);
+        close(from_clangd[0]);
+        execlp("clangd", "clangd", "--log=error", "--completion-style=detailed", NULL);
+        _exit(1); // clangd not found
+    }
+
+    close(to_clangd[0]);
+    close(from_clangd[1]);
+    lsp->write_fd = to_clangd[1];
+    lsp->read_fd = from_clangd[0];
+    lsp->next_id = 1;
+    lsp->state = LSP_INITIALIZING;
+    pthread_mutex_init(&lsp->lock, NULL);
+
+    // Send initialize
+    char buf[1024];
+    snprintf(buf, sizeof(buf),
+             "{\"jsonrpc\":\"2.0\",\"id\":%d,\"method\":\"initialize\","
+             "\"params\":{\"processId\":%d,\"rootUri\":\"file://%s\","
+             "\"capabilities\":{"
+             "\"textDocument\":{"
+             "\"completion\":{\"completionItem\":{\"snippetSupport\":false}},"
+             "\"hover\":{},"
+             "\"definition\":{},"
+             "\"publishDiagnostics\":{}"
+             "}"
+             "}}}",
+             lsp->next_id++, getpid(), project_root);
+
+    pthread_mutex_init(&lsp->lock, NULL);
+    pthread_cond_init(&lsp->ready_cond, NULL);
+    pthread_create(&lsp->reader_thread, NULL, lsp_reader, lsp);
+
+
+    lsp_send(lsp->write_fd, buf);
+
+    pthread_mutex_lock(&lsp->lock);
+    while (lsp->state != LSP_READY)
+        pthread_cond_wait(&lsp->ready_cond, &lsp->lock);
+    pthread_mutex_unlock(&lsp->lock);
+    return 0;
+}
+
+// ─── document sync ───────────────────────────────────────────────────────────
+
+// Build the full buffer text into a bAlloc'd string
+static char* buffer_to_text(struct buffer_t* buf)
+{
+    int total = 0;
+    for (int i = 0; i < buf->numrows; i++)
+        total += buf->row[i].size + 1; // +1 for \n
+    char* text = bAlloc(total + 1);
+    char* p = text;
+    for (int i = 0; i < buf->numrows; i++)
+    {
+        memcpy(p, buf->row[i].chars, buf->row[i].size);
+        p += buf->row[i].size;
+        *p++ = '\n';
+    }
+    *p = '\0';
+    return text;
+}
+
+void lspDidOpen(LspClient* lsp, struct buffer_t* buf)
+{
+    if (lsp->state != LSP_READY || buf->b_lsp_open) return;
+
+    char abs[PATH_MAX];
+    realpath(buf->filename, abs);
+    char uri[PATH_MAX + 8];
+    snprintf(uri, sizeof(uri), "file://%s", abs);
+
+    const char* lang = "c";
+    if (strstr(buf->filename, ".cpp") || strstr(buf->filename, ".cc"))
+        lang = "cpp";
+
+    char* raw = buffer_to_text(buf);
+
+    // Let cJSON handle ALL escaping — don't touch the text yourself
+    cJSON* root = cJSON_CreateObject();
+    cJSON* params = cJSON_CreateObject();
+    cJSON* td = cJSON_CreateObject();
+
+    cJSON_AddStringToObject(root, "jsonrpc", "2.0");
+    cJSON_AddStringToObject(root, "method", "textDocument/didOpen");
+
+    cJSON_AddStringToObject(td, "uri", uri);
+    cJSON_AddStringToObject(td, "languageId", lang);
+    cJSON_AddNumberToObject(td, "version", 1);
+    cJSON_AddStringToObject(td, "text", raw); // cJSON escapes this
+
+    cJSON_AddItemToObject(params, "textDocument", td);
+    cJSON_AddItemToObject(root, "params", params);
+
+    char* msg = cJSON_PrintUnformatted(root);
+    lsp_send(lsp->write_fd, msg);
+
+    bFree(msg);
+    bFree(raw);
+    cJSON_Delete(root);
+    buf->b_lsp_open = 1;
+}
+
+void lspDidChange(LspClient* lsp, struct buffer_t* buf)
+{
+    if (lsp->state != LSP_READY || !buf->b_lsp_open) return;
+
+    char abs[PATH_MAX];
+    realpath(buf->filename, abs);
+    char uri[PATH_MAX + 8];
+    snprintf(uri, sizeof(uri), "file://%s", abs);
+
+    char* raw = buffer_to_text(buf);
+
+    cJSON* root = cJSON_CreateObject();
+    cJSON* params = cJSON_CreateObject();
+    cJSON* td = cJSON_CreateObject();
+    cJSON* changes = cJSON_CreateArray();
+    cJSON* change = cJSON_CreateObject();
+
+    cJSON_AddStringToObject(root, "jsonrpc", "2.0");
+    cJSON_AddStringToObject(root, "method", "textDocument/didChange");
+
+    cJSON_AddStringToObject(td, "uri", uri);
+    cJSON_AddNumberToObject(td, "version", buf->dirty);
+
+    cJSON_AddStringToObject(change, "text", raw); // full content sync
+    cJSON_AddItemToArray(changes, change);
+
+    cJSON_AddItemToObject(params, "textDocument", td);
+    cJSON_AddItemToObject(params, "contentChanges", changes);
+    cJSON_AddItemToObject(root, "params", params);
+
+    char* msg = cJSON_PrintUnformatted(root);
+    lsp_send(lsp->write_fd, msg);
+
+    bFree(msg);
+    bFree(raw);
+    cJSON_Delete(root);
+}
+
+void lspDidClose(LspClient* lsp, struct buffer_t* buf)
+{
+    char abs[PATH_MAX];
+    realpath(buf->filename, abs);
+    char uri[PATH_MAX + 8];
+    snprintf(uri, sizeof(uri), "file://%s", abs);
+
+    cJSON* root = cJSON_CreateObject();
+    cJSON* params = cJSON_CreateObject();
+    cJSON* td = cJSON_CreateObject();
+    cJSON_AddStringToObject(root, "jsonrpc", "2.0");
+    cJSON_AddStringToObject(root, "method", "textDocument/didClose");
+    cJSON_AddStringToObject(td, "uri", uri); // ← fixed
+    cJSON_AddItemToObject(params, "textDocument", td);
+    cJSON_AddItemToObject(root, "params", params);
+    char* msg = cJSON_PrintUnformatted(root);
+    lsp_send(lsp->write_fd, msg);
+    bFree(msg);
+    cJSON_Delete(root);
+    buf->b_lsp_open = 0;
+}
+
+// ─── requests ────────────────────────────────────────────────────────────────
+
+void lspRequestCompletion(LspClient* lsp, struct buffer_t* buf,
+                          int line, int col,
+                          int screen_x, int screen_y)
+{
+    if (lsp->state != LSP_READY) return;
+    lsp->completion_cursor_x = screen_x; // ← add
+    lsp->completion_cursor_y = screen_y;
+
+    appDebug("LSP REQUEST COMP");
+
+    char* msg;
+    char abs[PATH_MAX];
+    realpath(buf->filename, abs);
+    char uri[PATH_MAX + 8];
+    snprintf(uri, sizeof(uri), "file://%s", abs);
+
+    cJSON* req = cJSON_CreateObject();
+    cJSON* params = cJSON_CreateObject();
+    cJSON* td = cJSON_CreateObject();
+    cJSON* position = cJSON_CreateObject();
+
+    cJSON_AddStringToObject(req, "jsonrpc", "2.0");
+    cJSON_AddNumberToObject(req, "id", lsp->next_id++);
+    cJSON_AddStringToObject(req, "method", "textDocument/completion");
+
+    cJSON_AddStringToObject(td, "uri", uri);
+
+    cJSON_AddNumberToObject(position, "line", line);
+    cJSON_AddNumberToObject(position, "character", col);
+    cJSON_AddItemToObject(params, "position", position);
+
+    cJSON_AddItemToObject(params, "textDocument", td);
+    cJSON_AddItemToObject(req, "params", params);
+
+    msg = cJSON_PrintUnformatted(req);
+    lsp_send(lsp->write_fd, msg);
+    E.lsp_client->completion_requested = 1;
+    cJSON_Delete(req);
+    bFree(msg);
+}
+
+void lspRequestDefinition(LspClient* lsp, struct buffer_t* buf, int line, int col)
+{
+    if (lsp->state != LSP_READY) return;
+    char* msg;
+    asprintf(&msg,
+             "{\"jsonrpc\":\"2.0\",\"id\":%d,\"method\":\"textDocument/definition\","
+             "\"params\":{\"textDocument\":{\"uri\":\"file://%s\"},"
+             "\"position\":{\"line\":%d,\"character\":%d}}}",
+             lsp->next_id++, buf->filename, line, col);
+    lsp_send(lsp->write_fd, msg);
+    bFree(msg);
+}
+
+void lspShutdown(LspClient* lsp)
+{
+    if (!lsp || lsp->state == LSP_SHUTDOWN) return;
+
+    lsp->state = LSP_SHUTDOWN;
+
+    // 1. Send shutdown request (clangd expects this before exit)
+    cJSON* req = cJSON_CreateObject();
+    cJSON_AddStringToObject(req, "jsonrpc", "2.0");
+    cJSON_AddNumberToObject(req, "id", lsp->next_id++);
+    cJSON_AddStringToObject(req, "method", "shutdown");
+    cJSON_AddNullToObject(req, "params");
+    char* msg = cJSON_PrintUnformatted(req);
+    lsp_send(lsp->write_fd, msg);
+    bFree(msg);
+    cJSON_Delete(req);
+
+    // 2. Wait briefly for the shutdown response
+    // (don't block forever — clangd has 2s to reply)
+    struct timeval tv = {.tv_sec = 2, .tv_usec = 0};
+    fd_set fds;
+    FD_ZERO(&fds);
+    FD_SET(lsp->read_fd, &fds);
+    if (select(lsp->read_fd + 1, &fds, NULL, NULL, &tv) > 0)
+    {
+        char* resp = lsp_recv(lsp->read_fd);
+        bFree(resp);
+    }
+
+    // 3. Send exit notification
+    lsp_send(lsp->write_fd,
+             "{\"jsonrpc\":\"2.0\",\"method\":\"exit\",\"params\":null}");
+
+    // 4. Close pipes — this signals the reader thread to stop
+    close(lsp->write_fd);
+    close(lsp->read_fd);
+
+    // 5. Wait for reader thread to finish
+    pthread_join(lsp->reader_thread, NULL);
+    pthread_mutex_destroy(&lsp->lock);
+
+    // 6. Reap the clangd process
+    waitpid(lsp->pid, NULL, 0);
+
+    bFree(lsp);
+}

src/editor_op.c

@@ -1,10 +1,14 @@
+#include "../include/editor_op.h"
+
 #include <stdarg.h>
 
-#include "../include/editor_op.h"
 #include "../include/row_op.h"
-#include "include/buffer.h"
-#include "include/data.h"
-#include "include/split_screen.h"
+#include "../include/buffer.h"
+#include "../include/data.h"
+#include "../include/split_screen.h"
+#include "../include/terminal.h"
+#include "../include/utf8.h"
+#include "include/utils.h"
 
 
 extern struct editorConfig E;
@@ -19,64 +23,109 @@ extern struct editorConfig E;
  * @note Updates global editor state E (status_msg, status_msg_time)
  * @see editorDrawMessageBar()
  */
-void editorSetStatusMessage(const char *fmt, ...) {
-  va_list ap;
-  va_start(ap, fmt);
-  vsnprintf(E.status_msg, sizeof(E.status_msg), fmt, ap);
-  va_end(ap);
-  E.status_msg_time = time(NULL);
+void editorSetStatusMessage(const char* fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    vsnprintf(E.status_msg, E.screencols, fmt, ap);
+    va_end(ap);
+    E.status_msg_time = time(NULL);
 }
 
+/**
+ * @brief Moves the cursor based on arrow key input
+ * @details Updates cursor position (E.cursor_x, E.cursor_y) based on the given
+ * key direction. Handles line wrapping and boundary conditions. Prevents cursor
+ * from exceeding line lengths.
+ * @param key The arrow key code (ARROW_UP, ARROW_DOWN, ARROW_LEFT, ARROW_RIGHT)
+ * @return 1 if cursor movement was valid, 0 if cursor was constrained to line boundary
+ * @note Updates global editor state E
+ */
+int editorMoveCursor(int key) {
+    EditorPane *active = splitScreenGetActivePane();
+    struct buffer_t *buf = bufferFindById(active->buffer_id);
+    row_t *row = &buf->row[buf->y];
+    switch (key) {
+    case ARROW_RIGHT:
+        if (row && buf->x < row->size) {
+            int len = utf8Seqlen(row->chars[buf->x]);
+            buf->x += len;
+        } else if (row && buf->y < buf->numrows) {
+            buf->y++;
+            buf->x = 0;
+        }
+        break;
+    case ARROW_DOWN:
+        if (buf->y < buf->numrows) {
 
-void bufferInsertChar(int c) {
-  EditorPane *active = splitScreenGetActivePane();
-  struct buffer_t *buf = bufferFindById(active->buffer_id);
-    if (active->cursor_y == buf->numrows) {
-      bufferInsertRow(buf, buf->numrows, "", 0);
+            buf->y++;
+        }
+        break;
+    case ARROW_UP:
+        if (buf->y != 0) {
+            --buf->y;
+        }
+        break;
+    case ARROW_LEFT:
+        if (buf->x != 0) {
+            --buf->x;
+        } else if (buf->y > 0) {
+            --buf->y;
+            buf->x = buf->row[buf->y].size;
+        }
+        break;
     }
-    bufferRowInsertChar(buf, &buf->row[active->cursor_y], active->cursor_x, c);
-    active->cursor_x++;
+    return 1;
 }
 
-void bufferInsertNewLine() {
-  /*
-   * Add new line and place the cursor at the beginning of it
-   */
-  fprintf(stderr, "Inserting new line\n");
-    EditorPane *active = splitScreenGetActivePane();
-  struct buffer_t *buf = bufferFindById(active->buffer_id);
-  frow *row;
-  if (!active->cursor_x) {
-    bufferInsertRow(buf, active->cursor_y, "", 0);
-  } else {
-    row = &buf->row[active->cursor_y];
-    bufferInsertRow(buf, active->cursor_y + 1, &row->chars[active->cursor_x],
-                    row->size - active->cursor_x);
-    row = &buf->row[active->cursor_y];
-    row->size = active->cursor_x;
-    row->chars[row->size] = '\0';
-    bufferUpdatfrow(row);
-  }
-  ++active->cursor_y;
-  active->cursor_x = 0;
-  fprintf(stderr, "Insert new line done\n");
+char *editorGetClipboard(void) {
+    FILE *pipe = popen(CLIPBOARD_PASTE_CMD, "r");
+    if (!pipe) return NULL;
+
+    size_t cap = 4096;
+    size_t len = 0;
+    char *buf = bAlloc(cap);
+
+    int c;
+    while ((c = fgetc(pipe)) != EOF) {
+        if (len + 1 >= cap) {
+            cap *= 2;
+            buf = bRealloc(buf, cap);
+        }
+        buf[len++] = (char)c;
+    }
+    buf[len] = '\0';
+    pclose(pipe);
+    return buf; // caller must free
 }
 
-void bufferDelChar() {
-  frow *row;
-    EditorPane *active = splitScreenGetActivePane();
-  struct buffer_t *buf = bufferFindById(active->buffer_id);
-  if (active->cursor_y == buf->numrows || !(active->cursor_x || active->cursor_y)) {
-    return;
-  }
-  row = &buf->row[active->cursor_y];
-  if (active->cursor_x > 0) {
-    bufferRowDelchar(buf, row, active->cursor_x - 1);
-    --active->cursor_x;
-  } else {
-    active->cursor_x = buf->row[active->cursor_y - 1].size;
-    bufferRowAppendString(buf, &buf->row[active->cursor_y - 1], row->chars, row->size);
-    bufferDelRow(buf, active->cursor_y);
-    --active->cursor_y;
-  }
+void editorSetClipboard(const char *text, int len) {
+    FILE *pipe = popen(CLIPBOARD_COPY_CMD, "w");
+    if (!pipe) return;
+    fwrite(text, 1, len, pipe);
+    pclose(pipe);
+}
+
+int editorRowCxToByte(const row_t *row, int cursor_x) {
+    int i = 0, col = 0;
+    while (col < cursor_x && i < row->size) {
+        int sl = utf8Seqlen((unsigned char)row->chars[i]);
+        if (sl < 1)
+            sl = 1;
+        col++;
+        i += sl;
+    }
+    return i;
+}
+
+int editorRowCharCount(row_t *row, int x) {
+    int n = 0, i = 0;
+    while (i < x && i < row->size) {
+        int sl = utf8Seqlen((unsigned char)row->chars[i]);
+        if (sl < 1)
+            sl = 1;
+        n++;
+        i += sl;
+    }
+    return n;
 }

src/file_io.c

@@ -9,111 +9,22 @@
 #include "../include/file_io.h"
 #include "../include/editor_op.h"
 #include "../include/input.h"
-#include "include/buffer.h"
-#include "include/data.h"
-#include "include/split_screen.h"
+#include "../include/buffer.h"
+#include "../include/data.h"
+#include "../include/split_screen.h"
+#include "../include/row_op.h"
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <errno.h>
 
-// Windows compatibility for getline
-#ifdef _WIN32
-#include <io.h>
+#include "../include/utils.h"
 
-ssize_t getline(char **lineptr, size_t *n, FILE *stream) {
-    char *bufptr = NULL;
-    char *p = bufptr;
-    size_t size;
-    int c;
-
-    if (lineptr == NULL) {
-        return -1;
-    }
-    if (stream == NULL) {
-        return -1;
-    }
-    if (n == NULL) {
-        return -1;
-    }
-    bufptr = *lineptr;
-    size = *n;
-
-    c = fgetc(stream);
-    if (c == EOF) {
-        return -1;
-    }
-
-    if (bufptr == NULL) {
-        bufptr = malloc(128);
-        if (bufptr == NULL) {
-            return -1;
-        }
-        size = 128;
-    }
-    p = bufptr;
-    while(c != EOF) {
-        if ((p - bufptr) > (size - 1)) {
-            size = size + 128;
-            bufptr = realloc(bufptr, size);
-            if (bufptr == NULL) {
-                return -1;
-            }
-        }
-        *p++ = c;
-        if (c == '\n') {
-            break;
-        }
-        c = fgetc(stream);
-    }
-
-    *p++ = '\0';
-    *lineptr = bufptr;
-    *n = size;
-
-    return p - bufptr - 1;
-}
-#endif
-
-extern char *strdup(const char *);
-extern ssize_t getline(char **restrict lineptr, size_t *restrict n,
-                       FILE *restrict stream);
-extern int ftruncate(int fd, off_t length);
 extern struct editorConfig E;
 
-/**
- * @brief Converts all editor rows to a single string buffer
- * @details Concatenates all row content into a single allocated buffer with
- * newlines between rows. Useful for file saving and buffer operations.
- * @param buffer_len Pointer to integer where total buffer length will be stored
- * @return Pointer to dynamically allocated buffer containing all row data.
- *         Rows are separated by newline characters.
- * @note Caller is responsible for freeing the returned buffer
- */
-char *bufferRowsToString(struct buffer_t *buf, int *buffer_len) {
-  int tot_len = 0;
-  int j;
-  char *buffer;
-  char *p;
-
-  for (j = 0; j < buf->numrows; ++j) {
-    tot_len += buf->row[j].size + 1;
-  }
-  *buffer_len = tot_len;
-  buffer = malloc(tot_len);
-  p = buffer;
-  for (j = 0; j < buf->numrows; ++j) {
-    memcpy(p, buf->row[j].chars, buf->row[j].size);
-    p += buf->row[j].size;
-    *p = '\n';
-    p++;
-  }
-
-  return buffer;
-}
-
 /**
  * @brief Closes the current file and resets editor state
  * @details Clears all rows, resets cursor position, scroll offsets, and file
@@ -125,18 +36,16 @@ void editorCloseFile(void) {
   struct buffer_t *buf = bufferFindById(active->buffer_id);
   active->cursor_x = 0;
   active->cursor_y = 0;
-  active->rx = 0;
-  active->row_offset = 0;
-  active->col_offset = 0;
+  active->x_offset = 0;
+  active->y_offset = 0;
   for (int i = 0; i < buf->numrows; ++i) {
-    free(buf->row[i].chars);
-    free(buf->row[i].render);
+    bFree(buf->row[i].chars);
   }
   buf->numrows = 0;
-  free(buf->row);
+  bFree(buf->row);
   buf->row = NULL;
   buf->dirty = 0;
-  free(buf->filename);
+  bFree(buf->filename);
   buf->filename = NULL;
   E.status_msg[0] = '\0';
   E.status_msg_time = 0;
@@ -155,25 +64,34 @@ void editorCloseFile(void) {
  */
 void editorOpen(struct buffer_t* buffer) {
   FILE *fp;
+  char full_name[1024];
+  strcpy(full_name, buffer->path);
+  strcat(full_name, "/");
+  strcat(full_name, buffer->filename);
+  strcat(full_name, "\0");
+  appDebug("full name : %s", full_name);
 
-  fp = fopen(buffer->filename, "a+");
+  fp = fopen(full_name, "a+");
   if (!fp)
     die("fopen");
 
   char *line = NULL;
-  size_t line_cap = 0;
+  size_t line_cap;
   ssize_t line_len;
 
+  rewind(fp);
+
   while ((line_len = getline(&line, &line_cap, fp)) != -1) {
     while (line_len > 0 &&
            (line[line_len - 1] == '\n' || line[line_len - 1] == '\r')) {
       --line_len;
     }
+    appDebug("line %s\n", line);
     bufferInsertRow(buffer, buffer->numrows, line, line_len);
-    free(line);
+    bFree(line);
     line = NULL;
   }
-  free(line);
+  bFree(line);
   fclose(fp);
   E.dirty = 0;
 }
@@ -192,7 +110,6 @@ void editorSave() {
   EditorPane *active = splitScreenGetActivePane();
   struct buffer_t *buffer = bufferFindById(active->buffer_id);
   int len;
-  char *buf;
   int fd;
   if (buffer->filename == NULL) {
     buffer->filename = editorPrompt("Save as: %s (ESC to cancel)", "", 1);
@@ -201,51 +118,21 @@ void editorSave() {
       return;
     }
   }
-  buf = bufferRowsToString(buffer, &len);
   fd = open(buffer->filename, O_RDWR | O_CREAT, 0644);
   if (fd != -1) {
-    if (ftruncate(fd, len) != -1) {
-      if (write(fd, buf, len) == len) {
+    for (int i = 0; i < buffer->numrows; ++i)
+    {
+      len = strlen(buffer->row[i].chars);
+      if (write(fd, buffer->row[i].chars, len) != len) {
         close(fd);
-        free(buf);
-        E.dirty = 0;
-        editorSetStatusMessage("%d bytes written to disk", len);
+        editorSetStatusMessage("Can't save! I/O error: %s", strerror(errno));
+
         return;
       }
+      write(fd, "\n", 1);
     }
+    buffer->dirty = 0;
     close(fd);
   }
-  free(buf);
-  editorSetStatusMessage("Can't save! I/O error: %s", strerror(errno));
-}
-
-/**
- * @brief Searches for a string in the document
- * @details Prompts user for a search query, then searches forward from current
- * cursor position. Updates cursor position to the first match found.
- * @note Updates global editor state E (cursor position, row_offset)
- * @note Search is case-sensitive and operates on rendered line content
- * @note Searches begin from the line after current cursor position
- * @see editorPrompt()
- * @see editorRowRxToCx()
- */
-void bufferFind(struct buffer_t *buf) {
-  fprintf(stderr, "searching\n");
-  char *query = editorPrompt("Search: %s (ESC to cancel)", "", 0);
-  EditorPane *active = splitScreenGetActivePane();
-
-  if (query == NULL)
-    return;
-  int i;
-  for (i = active->cursor_y + 1; i < buf->numrows; i++) {
-    frow *row = &buf->row[i];
-    char *match = strstr(row->render, query);
-    if (match) {
-      active->cursor_y = i;
-      active->cursor_x = bufferRowRxToCx(row, match - row->render);
-      buf->row_offset = buf->numrows;
-      break;
-    }
-  }
-  free(query);
+  editorSetStatusMessage("File saved");
 }

src/init.c

@@ -3,7 +3,7 @@
 #include "../include/color.h"
 #include "../include/data.h"
 #include "../include/terminal.h"
-#include "include/split_screen.h"
+#include "../include/split_screen.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,12 +11,14 @@
 #define LISP_IMPLEMENTATION
 #include "../include/lisp.h"
 #include "../include/lisp_lib.h"
+#include "include/utils.h"
 
 struct editorConfig;
 
 void registerBuiltin(char *key_sequence, LispCFunc f) {
   lisp_env_define(E.ctx.p->env, lisp_make_symbol(key_sequence, E.ctx),
                   lisp_make_func(f), E.ctx);
+
 }
 
 void initBuiltins() {
@@ -34,8 +36,8 @@ void initBuiltins() {
   registerBuiltin("editor-open-file", editorOpenFile);
   registerBuiltin("editor-insert-char", editorPrintC);
   registerBuiltin("add-package", addPackage);
-  registerBuiltin("editor-del-row", editorDelRow_L);
   registerBuiltin("buffer-find", bufferFind_L);
+  registerBuiltin("buffer-find-reverse", bufferFindReverse_L);
   registerBuiltin("editor-read-char", editorReadChar_L);
   registerBuiltin("add-prefix", editorPrefix);
   registerBuiltin("editor-set-prefix", editorSetPrefix);
@@ -44,12 +46,19 @@ void initBuiltins() {
   registerBuiltin("editor-split-screen-vertical", l_editorSplitScreenVertical);
   registerBuiltin("editor-switch-next-pane", editorSwitchNextPane);
   registerBuiltin("editor-unify-panes", editorUnifiedPanes);
-  registerBuiltin("editor-create-terminal", editorCreateTerminal);
+  registerBuiltin("editor-paste", editorPaste);
+  registerBuiltin("editor-cut-end-line", editorCutEndLine);
+  registerBuiltin("editor-move-cursor-beg-buffer", editorMoveBegBuffer);
+  registerBuiltin("editor-move-cursor-end-buffer", editorMoveEndBuffer);
+  registerBuiltin("editor-auto-complete", editorAutoComplete);
+  // registerBuiltin("lsp-complete",    lspComplete);
+  registerBuiltin("lsp-definition",  lspDefinition);
 }
 
 void initConfig() {
 
   E.ctx = lisp_init();
+  E.ctx.p->err_port = fopen("log.err", "w");
   E.env = lisp_env(E.ctx);
   lisp_lib_load(E.ctx);
   // Init builtins lisp functions
@@ -63,7 +72,7 @@ void initConfig() {
   lisp_eval(E.ctx_data, &E.ctx_error, E.ctx);
 }
 
-void init_theme() {
+void initTheme() {
   E.constantes.THEME = (char *)lisp_string(
       lisp_eval(lisp_read("THEME", &E.ctx_error, E.ctx), &E.ctx_error, E.ctx));
   if (strcmp(E.constantes.THEME, "dark") == 0) {
@@ -90,23 +99,31 @@ void initEditor() {
   if (getWindowSize(&E.screenrows, &E.screencols) == -1) {
     die("getWindowSize");
   }
+  appDebug("%d %d\n", E.screenrows, E.screencols);
   E.screenrows -= 2;
 
 
   // Init graphics variables
   splitScreenInit();
   EditorPane *active = splitScreenGetActivePane();
+  E.cursor_x = 0;
+  E.cursor_y = 0;
+
   active->cursor_x = 0;
   active->cursor_y = 0;
-  active->rx = 0;
-  active->row_offset = 0;
-  active->col_offset = 0;
+  active->origin_x = 0;
+  active->origin_y = 0;
+  active->width = E.screencols;
+  active->height = E.screenrows;
+
   E.init_file_path = (char *)calloc(256, sizeof(char));
   strcat(E.init_file_path, getenv("HOME"));
   strcat(E.init_file_path, "/.beluga/config/init.lisp");
+  appDebug("%s\n", E.init_file_path);
   E.fd_init_file = fopen(E.init_file_path, "r");
 
   // Status bar
+  E.status_msg = (char *)calloc(E.screencols, sizeof(char));
   E.status_msg[0] = '\0';
   E.status_msg_time = 0;
 
@@ -114,14 +131,15 @@ void initEditor() {
   E.number_of_keybinds = 0;
   E.number_of_prefix = 0;
   // General prefix is 0 (no prefix)
-  E.prefix = (struct prefix_t *)malloc(sizeof(struct prefix_t));
+  E.prefix = (struct prefix_t *)bAlloc(sizeof(struct prefix_t));
   E.prefix[0].prefix_id = 0;
   strncpy(E.prefix[0].prefix_name, "no-prefix", 64);
   E.prefix_state = 0;
 
-  initConfig();
+  E.lsp_client = (LspClient*)bAlloc(sizeof(LspClient));
 
-  init_theme();
+  initConfig();
+  initTheme();
 
   // To modify
 

src/input.c

@@ -2,16 +2,25 @@
 #include "../include/define.h"
 #include "../include/editor_op.h"
 #include "../include/output.h"
+#include "include/data.h"
 #include "include/buffer.h"
 #include "include/data.h"
 #include "include/split_screen.h"
+#include "include/completion.h"
+#include "include/lsp_ui.h"
 #include <ctype.h>
+#include <sys/stat.h>
 #include <dirent.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <unistd.h>
+
+#include "include/terminal.h"
+#include "include/utf8.h"
+#include "include/utils.h"
 
 extern struct editorConfig E;
 
@@ -31,13 +40,13 @@ extern struct editorConfig E;
  *         - path ends with '/' (already a directory)
  *         - no matching entries found
  *         - directory cannot be opened
- * @note Caller is responsible for freeing the returned string
+ * @note Caller is responsible for bFreeing the returned string
  * @note Uses static buffer internally; may return stale pointers across calls
  */
-const char *file_completion(const char *path) {
+const char *fileCompletion(const char *path) {
   DIR *dir;
   struct dirent *entry;
-  char directory[128];
+  char directory[256];
   char predict[128];
   const char *last_slash;
   int predict_len = 0;
@@ -45,8 +54,8 @@ const char *file_completion(const char *path) {
 
   // path is a directory
   if (path[strlen(path) - 1] == '/') {
-    fprintf(stderr, "[FILE COMP] is dir\n");
-    strncpy(directory, path, 128);
+    appDebug("[FILE COMP] is dir\n");
+    strncpy(directory, path, 256);
   }
 
   // Find dir name
@@ -58,9 +67,9 @@ const char *file_completion(const char *path) {
     strncpy(predict, last_slash + 1, predict_len);
     directory[dir_len] = '\0';
     predict[predict_len] = '\0';
-    fprintf(stderr, "%s %s\n", directory, predict);
+    appDebug("%s %s\n", directory, predict);
   } else {
-    fprintf(stderr, "[FILE COMP] dir not found\n");
+    appDebug("[FILE COMP] dir not found\n");
     return strdup(path);
   }
 
@@ -70,7 +79,7 @@ const char *file_completion(const char *path) {
 
   while ((entry = readdir(dir)) != NULL) {
     if (strncmp(entry->d_name, predict, predict_len) == 0) {
-      static char full_path[512];
+      static char full_path[1024];
       snprintf(full_path, sizeof(full_path), "%s%s", directory, entry->d_name);
 
       struct stat st;
@@ -86,8 +95,8 @@ const char *file_completion(const char *path) {
   // Cleanup when no more entries
   closedir(dir);
   dir = NULL;
-  free(entry);
-  fprintf(stderr, "[FILE COMP] no entries\n");
+  bFree(entry);
+  appDebug("[FILE COMP] no entries\n");
   return strdup(path);
 }
 
@@ -102,12 +111,13 @@ const char *file_completion(const char *path) {
  * @return Pointer to the user-entered text (dynamically allocated), or NULL if:
  *         - User pressed ESC to cancel
  *         - Input buffer is empty when Enter is pressed
- * @note Caller is responsible for freeing the returned string
+ * @note Caller is responsible for bFreeing the returned string
  * @note Uses editorReadKey() for input and editorRefreshScreen() for display
  */
 char *editorPrompt(char *prompt, char *placeHolder, char bPathMode) {
-  size_t buf_size = 128;
-  char *buf = malloc(buf_size);
+  size_t buf_size = 256;
+  appDebug("[FILE COMP] %s %d\n", placeHolder, strlen(placeHolder));
+  char *buf = bAlloc(buf_size);
   size_t buf_len = 0;
   int c = 0;
   buf[0] = '\0';
@@ -124,7 +134,7 @@ char *editorPrompt(char *prompt, char *placeHolder, char bPathMode) {
       }
     } else if (c == ESCAPE) {
       editorSetStatusMessage("");
-      free(buf);
+      bFree(buf);
       return NULL;
     } else if (c == '\r') {
       if (buf_len != 0) {
@@ -132,29 +142,29 @@ char *editorPrompt(char *prompt, char *placeHolder, char bPathMode) {
         return buf;
       }
     } else if (bPathMode && c == '\t') {
-      char path[128];
+      char path[256];
       char *pwd;
       if (buf[0] != '/') {
         pwd = getenv("PWD");
-        fprintf(stderr, "%s\n", pwd);
+        appDebug("%s\n", pwd);
         memcpy(path, pwd, strlen(pwd));
         path[strlen(pwd)] = '/';
         strncat(path, buf, buf_len);
       } else {
         strcpy(path, buf);
       }
-      memset(buf, 0, 128);
+      memset(buf, 0, 256);
       buf_len = 0;
-      char * buf_complete = (char *) file_completion(path);
+      char * buf_complete = (char *) fileCompletion(path);
       strcpy(buf, buf_complete);
-      free(buf_complete);
+      bFree(buf_complete);
       buf_len = strlen(buf);
       buf[buf_len] = '\0';
 
-    } else if (!iscntrl(c) && c < 128) {
+    } else if (!iscntrl(c) && c < 256) {
       if (buf_len == buf_size - 1) {
         buf_size *= 2;
-        buf = realloc(buf, buf_size);
+        buf = bRealloc(buf, buf_size);
       }
       buf[buf_len++] = c;
       buf[buf_len] = '\0';
@@ -162,133 +172,7 @@ char *editorPrompt(char *prompt, char *placeHolder, char bPathMode) {
   }
 }
 
-/**
- * @brief Converts a key code to its string representation
- * @details Translates raw key codes (including special keys, control keys,
- * and regular characters) into human-readable string formats suitable for
- * display and keybinding configuration.
- * @param key The key code to convert
- * @return Pointer to static buffer containing the string representation.
- *         Examples: "ENTER", "ARROW-UP", "CTRL-a", "TAB", "DELETE", etc.
- * @note Returns pointer to static buffer; string is overwritten on next call
- * @note Non-printable characters are formatted as "KEY-<number>"
- */
-char *key_to_string(int key) {
-  static char key_str[32];
 
-  char tmp[10];
-  sprintf(tmp, "%d", key);
-
-  // First test enter key
-
-  if (key == '\r') {
-    strcpy(key_str, "ENTER");
-  } else if (key == '\t') {
-    strcpy(key_str, "TAB");
-  } else if (key >= 1 && key <= 26) { // CTRL keys
-    snprintf(key_str, sizeof(key_str), "CTRL-%c", 'a' + key - 1);
-  } else {
-    switch (key) {
-    case ARROW_UP:
-      strcpy(key_str, "ARROW-UP");
-      break;
-    case ARROW_DOWN:
-      strcpy(key_str, "ARROW-DOWN");
-      break;
-    case ARROW_LEFT:
-      strcpy(key_str, "ARROW-LEFT");
-      break;
-    case ARROW_RIGHT:
-      strcpy(key_str, "ARROW-RIGHT");
-      break;
-    case PAGE_UP:
-      strcpy(key_str, "PAGE-UP");
-      fprintf(stderr, "pagr up\n");
-      break;
-    case PAGE_DOWN:
-      strcpy(key_str, "PAGE-DOWN");
-      break;
-    case DEL_KEY:
-      strcpy(key_str, "DEL");
-
-      break;
-    case BACKSPACE:
-      strcpy(key_str, "BACKSPACE");
-      break;
-    case '\r':
-      strcpy(key_str, "ENTER");
-      break;
-    case '\x1b':
-      strcpy(key_str, "ESCAPE");
-      break;
-    case BEG_LINE:
-      strcpy(key_str, "HOME");
-      break;
-    case END_LINE:
-      strcpy(key_str, "END");
-      break;
-    default:
-      // For regular characters
-      if (isprint(key)) {
-        snprintf(key_str, sizeof(key_str), "%c", key);
-      } else {
-        snprintf(key_str, sizeof(key_str), "KEY-%d", key);
-      }
-    }
-  }
-  return key_str;
-}
-
-/**
- * @brief Moves the cursor based on arrow key input
- * @details Updates cursor position (E.cursor_x, E.cursor_y) based on the given
- * key direction. Handles line wrapping and boundary conditions. Prevents cursor
- * from exceeding line lengths.
- * @param key The arrow key code (ARROW_UP, ARROW_DOWN, ARROW_LEFT, ARROW_RIGHT)
- * @return 1 if cursor movement was valid, 0 if cursor was constrained to line boundary
- * @note Updates global editor state E
- */
-int editorMoveCursor(int key) {
-  EditorPane *active = splitScreenGetActivePane();
-  struct buffer_t *buf = bufferFindById(active->buffer_id);
-  frow *row = (active->cursor_y + active->row_offset >= buf->numrows) ? NULL : &buf->row[active->cursor_y + active->row_offset];
-  int row_len;
-  int x = active->cursor_x + active->col_offset;
-  int y = active->cursor_y + active->row_offset;
-  switch (key) {
-  case ARROW_RIGHT:
-    if (row && x < row->size) {
-        active->cursor_x++;
-
-    } else if (row && y == row->size) {
-      active->cursor_y++;
-      active->cursor_x = 0;
-    }
-    break;
-  case ARROW_DOWN:
-    if (y < buf->numrows) {
-
-      active->cursor_y++;
-    }
-    break;
-  case ARROW_UP:
-    if (y != 0) {
-      --active->cursor_y;
-    }
-    break;
-  case ARROW_LEFT:
-    if (x != 0) {
-      --active->cursor_x;
-    } else if (y > 0) {
-      --active->cursor_y;
-      active->cursor_x = buf->row[y].size;
-    }
-    break;
-  }
-    
-    
-  return 1;
-}
 
 /**
  * @brief Executes the command bound to a key sequence
@@ -302,7 +186,7 @@ int editorMoveCursor(int key) {
 int executeKeyBind(char *key_sequence) {
   int i;
   int previous_state = 0;
-  fprintf(stderr, "pressed %s\n", key_sequence);
+  appDebug("pressed %s\n", key_sequence);
   for (i = 0; i < E.number_of_keybinds; ++i) {
     if (!strcmp(key_sequence, E.key_binds[i].key_sequence)) {
       if (E.prefix_state != E.key_binds[i].prefix_id) {
@@ -320,55 +204,6 @@ int executeKeyBind(char *key_sequence) {
   return 0;
 }
 
-/**
- * @brief Handles terminal-specific key processing
- * @details Processes key presses for terminal buffers, handling command input
- * and execution.
- * @param c The key code
- * @return 1 if key was handled, 0 otherwise
- */
-int handleTerminalKeypress(int c) {
-  EditorPane *active = splitScreenGetActivePane();
-  struct buffer_t *buf = bufferFindById(active->buffer_id);
-  
-  if (buf == NULL || buf->type != TERMINAL_BUFF) {
-    return 0;
-  }
-  
-  // Handle terminal-specific keys
-  if (c == '\r') { // Enter key - execute command
-    if (buf->terminal_command && strlen(buf->terminal_command) > 0) {
-      bufferExecuteTerminalCommand(buf->buffer_id, buf->terminal_command);
-      return 1;
-    }
-  } else if (c == BACKSPACE || c == CTRL_KEY('h')) { // Backspace
-    if (buf->terminal_command && strlen(buf->terminal_command) > 0) {
-      buf->terminal_command[strlen(buf->terminal_command) - 1] = '\0';
-      return 1;
-    }
-  } else if (c == CTRL_KEY('c')) { // Ctrl+C - clear command
-    if (buf->terminal_command) {
-      free(buf->terminal_command);
-      buf->terminal_command = NULL;
-    }
-    return 1;
-  } else if (!iscntrl(c) && c < 128) { // Regular character input
-    if (buf->terminal_command == NULL) {
-      buf->terminal_command = malloc(2);
-      buf->terminal_command[0] = c;
-      buf->terminal_command[1] = '\0';
-    } else {
-      int len = strlen(buf->terminal_command);
-      buf->terminal_command = realloc(buf->terminal_command, len + 2);
-      buf->terminal_command[len] = c;
-      buf->terminal_command[len + 1] = '\0';
-    }
-    return 1;
-  }
-  
-  return 0;
-}
-
 /**
  * @brief Processes a single keypress from the user
  * @details Reads a key, checks if it matches any registered keybinding,
@@ -379,15 +214,59 @@ int handleTerminalKeypress(int c) {
  */
 void editorProcessKeypress() {
   int c = editorReadKey();
+  char key_sequence[8];
 
-  // First try terminal-specific handling
-  if (handleTerminalKeypress(c)) {
-    return;
+  if (E.lsp_client && E.lsp_completion.visible) {
+    if (c == ARROW_UP || c == CTRL_KEY('p')) {
+      if (E.lsp_completion.selected > 0)
+        E.lsp_completion.selected--;
+      return;  // consumed, redraw on next loop
+    }
+    if (c == ARROW_DOWN || c == CTRL_KEY('n')) {
+      if (E.lsp_completion.selected < E.lsp_completion.count - 1)
+        E.lsp_completion.selected++;
+      return;
+    }
+    if (c == '\r') {
+      CompletionItem *item = &E.lsp_completion.items[E.lsp_completion.selected];
+      EditorPane *active = splitScreenGetActivePane();
+      struct buffer_t *buf = bufferFindById(active->buffer_id);
+
+      // Find how many chars the user already typed by looking at the
+      // current word (chars before cursor on the same line)
+      int file_col = active->cursor_x + active->x_offset;
+      row_t *row = &buf->row[active->cursor_y + active->y_offset];
+
+      // Walk backwards from cursor to find start of current word
+      int word_start = file_col;
+      while (word_start > 0 &&
+             (isalnum((unsigned char)row->chars[word_start - 1]) ||
+              row->chars[word_start - 1] == '_'))
+        word_start--;
+
+      int already_typed = file_col - word_start;  // chars user already typed
+
+      // Insert only the suffix — what comes after what's already typed
+      const char *suffix = item->label + already_typed;
+      for (int i = 0; suffix[i]; i++)
+        bufferInsertBytes(&suffix[i], 1);
+
+      E.lsp_completion.visible = 0;
+      return;
+    }
+    if (c == ESCAPE) {
+      E.lsp_completion.visible = 0;
+      return;
+    }
+    // Any other key: dismiss popup and fall through to normal handling
+    E.lsp_completion.visible = 0;
   }
 
-  if (executeKeyBind(key_to_string(c))) {
+  if (executeKeyBind(keyToString(c))) {
     return;
   }
-  bufferInsertChar(c);
+  int seq_len = utf8Encode(c, key_sequence);
+  appDebug("key seq : %s\n", key_sequence);
+  bufferInsertBytes(key_sequence, seq_len);
   E.quit_times_buffer = E.constantes.QUIT_TIMES;
 }

src/lsp_ui.c

@@ -0,0 +1,324 @@
+//
+// Created by Giorgio on 27/05/2026.
+//
+
+#include "include/lsp_ui.h"
+#include "include/data.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+// We use cJSON — drop cJSON.c + cJSON.h into src/ and include/
+#include "include/cJSON.h"
+#include "include/append_buffer.h"
+
+// ─── ANSI helpers ─────────────────────────────────────────────────────────────
+
+// Move terminal cursor to absolute (col, row) — 1-based
+static void ab_move(struct abuf *ab, int row, int col) {
+    char esc[32];
+    int  n = snprintf(esc, sizeof(esc), "\x1b[%d;%dH", row, col);
+    abAppend(ab, esc, n);   // your existing abAppend
+}
+
+static void ab_sgr(struct abuf *ab, const char *codes) {
+    char esc[32];
+    int  n = snprintf(esc, sizeof(esc), "\x1b[%sm", codes);
+    abAppend(ab, esc, n);
+}
+
+#define AB_RESET(ab)      ab_sgr(ab, "0")
+#define AB_BOLD(ab)       ab_sgr(ab, "1")
+#define AB_DIM(ab)        ab_sgr(ab, "2")
+#define AB_FG(ab, c)      ab_sgr(ab, c)   // e.g. "32" = green
+#define AB_BG(ab, c)      ab_sgr(ab, c)   // e.g. "44" = blue bg
+
+// ─── Completion item kind → short tag ────────────────────────────────────────
+
+static const char *kind_tag(int k) {
+    switch (k) {
+        case  2: return "mth";  // Method
+        case  3: return "fn ";  // Function
+        case  4: return "ctr";  // Constructor
+        case  5: return "fld";  // Field
+        case  6: return "var";  // Variable
+        case  7: return "cls";  // Class
+        case  9: return "ifc";  // Interface
+        case 14: return "kwd";  // Keyword
+        default: return "   ";
+    }
+}
+
+static const char *kind_color(int k) {
+    switch (k) {
+        case  3: return "33";   // yellow  — functions
+        case  2: return "36";   // cyan    — methods
+        case  7: return "35";   // magenta — classes
+        case 14: return "34";   // blue    — keywords
+        case  5:
+        case  6: return "32";   // green   — fields/vars
+        default: return "37";   // white
+    }
+}
+
+// ─── Draw completion popup ───────────────────────────────────────────────────
+//
+//  ┌─────────────────────────────────────┐
+//  │ fn  printf          int (const …)  │  ← selected (bold, inverted)
+//  │ fn  fprintf                        │
+//  │ fn  sprintf                        │
+//  └─────────────────────────────────────┘
+//
+// Drawn using absolute cursor positioning — safe to call inside
+// editorRefreshScreen() before the final write().
+
+void lspUiDrawCompletion(struct abuf *ab, CompletionPopup *popup) {
+    fprintf(stderr, "[DRAW] visible=%d count=%d origin=(%d,%d)\n",
+            popup->visible, popup->count,
+            popup->origin_x, popup->origin_y);
+    if (!popup->visible || popup->count == 0) return;
+
+    int visible_count = popup->count < COMPLETION_POPUP_H
+                      ? popup->count : COMPLETION_POPUP_H;
+    int box_w = COMPLETION_MAX_WIDTH;
+
+    // Scroll window so selected item is always visible
+    int scroll = 0;
+    if (popup->selected >= COMPLETION_POPUP_H)
+        scroll = popup->selected - COMPLETION_POPUP_H + 1;
+    // ── top border ────────────────────────────────────────────────────────────
+    ab_move(ab, popup->origin_y, popup->origin_x);
+    ab_sgr(ab, "0;37;40");          // white on black
+    abAppend(ab, "┌", 3);           // UTF-8 box chars (3 bytes each)
+    for (int i = 0; i < box_w - 2; i++) abAppend(ab, "─", 3);
+    abAppend(ab, "┐", 3);
+
+    // ── rows ──────────────────────────────────────────────────────────────────
+    for (int i = 0; i < visible_count; i++) {
+        int idx = i + scroll;
+        CompletionItem *it = &popup->items[idx];
+        int is_sel = (idx == popup->selected);
+
+        ab_move(ab, popup->origin_y + 1 + i, popup->origin_x);
+
+        if (is_sel) ab_sgr(ab, "7");        // reverse video (highlight)
+        else        ab_sgr(ab, "0;37;40");
+
+        abAppend(ab, "│ ", 2);
+
+        // kind tag in color
+        if (!is_sel) ab_sgr(ab, kind_color(it->kind));
+        abAppend(ab, kind_tag(it->kind), 3);
+        abAppend(ab, " ", 1);
+        if (!is_sel) AB_RESET(ab);
+        if (!is_sel) ab_sgr(ab, "37;40");
+
+        // label — left column, fixed width 20
+        char label_col[21];
+        snprintf(label_col, sizeof(label_col), "%-20s", it->label);
+        if (is_sel) AB_BOLD(ab);
+        abAppend(ab, label_col, 20);
+        if (is_sel) ab_sgr(ab, "22"); // bold off
+
+        abAppend(ab, " ", 1);
+
+        // detail — right column, dimmed
+        if (!is_sel) AB_DIM(ab);
+        char detail_col[14];
+        snprintf(detail_col, sizeof(detail_col), "%-13s", it->detail);
+        abAppend(ab, detail_col, 13);
+
+        AB_RESET(ab);
+        if (is_sel) ab_sgr(ab, "7");
+        else        ab_sgr(ab, "37;40");
+        abAppend(ab, " │", 2);
+        AB_RESET(ab);
+    }
+
+    // ── scroll indicator on right border if needed ────────────────────────────
+    if (popup->count > COMPLETION_POPUP_H) {
+        int bar_row = popup->origin_y + 1 +
+                      (popup->selected * (COMPLETION_POPUP_H - 1))
+                      / (popup->count - 1);
+        ab_move(ab, bar_row, popup->origin_x + box_w - 1);
+        ab_sgr(ab, "0;37;40");
+        abAppend(ab, "█", 3);
+        AB_RESET(ab);
+    }
+
+    // ── bottom border ─────────────────────────────────────────────────────────
+    ab_move(ab, popup->origin_y + 1 + visible_count, popup->origin_x);
+    ab_sgr(ab, "0;37;40");
+    abAppend(ab, "└", 3);
+    for (int i = 0; i < box_w - 2; i++) abAppend(ab, "─", 3);
+    abAppend(ab, "┘", 3);
+    AB_RESET(ab);
+}
+
+// ─── Handle popup keys ────────────────────────────────────────────────────────
+// Returns 1 if key was consumed, 0 if editor should handle it normally.
+
+int lspUiHandleKey(CompletionPopup *popup, int key) {
+    if (!popup->visible) return 0;
+
+    switch (key) {
+        case '\x1b':                // ESC — dismiss
+            popup->visible = 0;
+            return 1;
+
+        case '\r':                  // Enter — accept
+            // Caller should insert popup->items[popup->selected].label
+            popup->visible = 0;
+            return 1;
+
+        // Arrow up / Ctrl-p
+        case 'A' + 0x80:
+        case 0x10:
+            if (popup->selected > 0) popup->selected--;
+            return 1;
+
+        // Arrow down / Ctrl-n
+        case 'B' + 0x80:
+        case 0x0e:
+            if (popup->selected < popup->count - 1) popup->selected++;
+            return 1;
+
+        default:
+            // Any printable key: dismiss popup, let editor handle it
+            popup->visible = 0;
+            return 0;
+    }
+}
+
+static DiagSeverity diag_worst_on_line(DiagnosticList *diags,
+                                       int buffer_id, int line) {
+    DiagSeverity worst = 0;
+    for (int i = 0; i < diags->count; i++) {
+        Diagnostic *d = &diags->entries[i];
+        if (d->buffer_id == buffer_id && d->line == line) {
+            if (d->severity > worst) worst = d->severity;  // ERROR > WARN > HINT
+        }
+    }
+    return worst;
+}
+
+// Call this once per screen row, right before you draw the row text.
+// ab     : your append buffer
+// diags  : &E.lsp_diagnostics
+// buf_id : active buffer id
+// line   : file line number (0-based) for this screen row
+void lspUiDrawGutter(struct abuf *ab, DiagnosticList *diags,
+                     int buf_id, int line) {
+    DiagSeverity s = diag_worst_on_line(diags, buf_id, line);
+    switch (s) {
+        case DIAG_ERROR:
+            ab_sgr(ab, "1;31");         // bold red
+            abAppend(ab, "●", 3);
+            break;
+        case DIAG_WARNING:
+            ab_sgr(ab, "1;33");         // bold yellow
+            abAppend(ab, "◆", 3);
+            break;
+        case DIAG_HINT:
+            ab_sgr(ab, "2;37");         // dim white
+            abAppend(ab, "·", 1);
+            break;
+        default:
+            abAppend(ab, " ", 1);       // no diagnostic
+            break;
+    }
+    AB_RESET(ab);
+    abAppend(ab, " ", 1);  // gutter padding
+}
+
+// Returns the diagnostic message for the line the cursor is on, or NULL.
+const char *lspUiDiagnosticAtCursor(DiagnosticList *diags,
+                                    int buffer_id, int cursor_line) {
+    for (int i = 0; i < diags->count; i++) {
+        Diagnostic *d = &diags->entries[i];
+        if (d->buffer_id == buffer_id && d->line == cursor_line)
+            return d->message;
+    }
+    return NULL;
+}
+
+// ─── Parse clangd JSON → our structs ─────────────────────────────────────────
+
+void lspParseCompletion(const char *json, CompletionPopup *popup,
+                        int screen_x, int screen_y) {
+    popup->count    = 0;
+    popup->selected = 0;
+    popup->origin_x = screen_x;
+    popup->origin_y = screen_y + 1;  // one row below cursor
+
+    cJSON *root  = cJSON_Parse(json);
+    if (!root) return;
+    cJSON *result = cJSON_GetObjectItem(root, "result");
+    if (!result) { cJSON_Delete(root); return; }
+
+    // result can be a list or {isIncomplete, items:[…]}
+    cJSON *items = cJSON_IsArray(result)
+                 ? result
+                 : cJSON_GetObjectItem(result, "items");
+    if (!items) { cJSON_Delete(root); return; }
+
+    cJSON *item;
+    cJSON_ArrayForEach(item, items) {
+        if (popup->count >= COMPLETION_MAX_ITEMS) break;
+        CompletionItem *ci = &popup->items[popup->count++];
+
+        cJSON *label  = cJSON_GetObjectItem(item, "label");
+        cJSON *detail = cJSON_GetObjectItem(item, "detail");
+        cJSON *kind   = cJSON_GetObjectItem(item, "kind");
+
+        const char *raw_label = label ? label->valuestring : "";
+        if (raw_label[0] == ' ') raw_label++;
+
+        strncpy(ci->label,  raw_label,                          127);
+        strncpy(ci->detail, detail ? detail->valuestring : "",   63);
+        ci->kind = kind ? kind->valueint : 0;
+    }
+
+    popup->visible = (popup->count > 0);
+    cJSON_Delete(root);
+}
+
+void lspParseDiagnostics(const char *json, DiagnosticList *diags,
+                         int buffer_id) {
+    cJSON *root = cJSON_Parse(json);
+    if (!root) return;
+
+    cJSON *params = cJSON_GetObjectItem(root, "params");
+    if (!params) { cJSON_Delete(root); return; }
+    cJSON *diag_arr = cJSON_GetObjectItem(params, "diagnostics");
+    if (!diag_arr) { cJSON_Delete(root); return; }
+
+    // Remove old entries for this buffer
+    int w = 0;
+    for (int i = 0; i < diags->count; i++)
+        if (diags->entries[i].buffer_id != buffer_id)
+            diags->entries[w++] = diags->entries[i];
+    diags->count = w;
+
+    cJSON *d;
+    cJSON_ArrayForEach(d, diag_arr) {
+        if (diags->count >= DIAG_MAX) break;
+        Diagnostic *diag = &diags->entries[diags->count++];
+        diag->buffer_id = buffer_id;
+
+        cJSON *range    = cJSON_GetObjectItem(d, "range");
+        cJSON *start    = cJSON_GetObjectItem(range, "start");
+        cJSON *end_pos  = cJSON_GetObjectItem(range, "end");
+        cJSON *sev      = cJSON_GetObjectItem(d, "severity");
+        cJSON *msg      = cJSON_GetObjectItem(d, "message");
+
+        diag->line      = cJSON_GetObjectItem(start, "line")->valueint;
+        diag->col_start = cJSON_GetObjectItem(start, "character")->valueint;
+        diag->col_end   = cJSON_GetObjectItem(end_pos, "character")->valueint;
+        diag->severity  = sev ? (DiagSeverity)sev->valueint : DIAG_ERROR;
+
+        strncpy(diag->message, msg ? msg->valuestring : "", 255);
+    }
+
+    cJSON_Delete(root);
+}

src/output.c

@@ -8,171 +8,150 @@
 #include "../include/output.h"
 #include "../include/append_buffer.h"
 #include "../include/buffer.h"
+#include "../include/editor_op.h"
 #include "../include/data.h"
 #include "../include/define.h"
 #include "../include/row_op.h"
 #include "../include/split_screen.h"
 #include "../include/syntax_highlighter.h"
+#include "../include/terminal.h"
+#include "../include/lsp_ui.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
+#include "include/completion.h"
+#include "include/utils.h"
+
 extern struct editorConfig E;
 
 /**
  * @brief Renders a single pane with its buffer content
  */
-static void editorDrawPane(struct abuf *ab, EditorPane *pane) {
-  if (pane == NULL || pane->buffer_id < 0)
-    return;
-
-  struct buffer_t *buf = bufferFindById(pane->buffer_id);
-  if (buf == NULL)
-    return;
-
-  // Draw content for this pane
-  for (int y = 0; y < pane->height; y++) {
-    int file_row = y + pane->row_offset;
-
-    // Position cursor at start of pane row
+static void editorDrawPane(struct abuf* ab, EditorPane* pane)
+{
+    int file_row;
     char pos_buf[32];
-    int pos_len = snprintf(pos_buf, sizeof(pos_buf), "\x1b[%d;%dH",
-                           pane->start_row + y + 1, pane->start_col + 1);
-    abAppend(ab, pos_buf, pos_len);
+    int pos_len;
+    int byte_len_to_print;
+    int bytes_to_print;
+    char* highlighted;
 
-    // Apply background color (6 bytes for RGB format)
-    abAppend(ab, E.theme.BACKGROUND_COLOR, strlen(E.theme.BACKGROUND_COLOR));
+    if (pane == NULL || pane->buffer_id < 0)
+        return;
 
-    int chars_printed = 0;
+    const struct buffer_t* buf = bufferFindById(pane->buffer_id);
+    if (buf == NULL)
+        return;
 
-    if (file_row >= buf->numrows) {
-      // Empty line - show tilde
-      if (buf->numrows == 0 && y == pane->height / 3) {
-        char welcome[80];
-        int welcome_len;
+    // Draw all pane
+    for (int y = 0; y < pane->height; y++)
+    {
+        file_row = y + pane->y_offset;
 
-        // Different welcome message for terminal buffers
-        if (buf->type == TERMINAL_BUFF) {
-          welcome_len = snprintf(welcome, sizeof(welcome), "Terminal %d", pane->buffer_id);
-        } else {
-          welcome_len = snprintf(welcome, sizeof(welcome), "Buffer %d", pane->buffer_id);
-        }
+        // Set cursor at start of pane row
+        pos_len = snprintf(pos_buf, sizeof(pos_buf), "\x1b[%d;%dH",
+                           pane->origin_y + y + 1, pane->origin_x + 1);
+        abAppend(ab, pos_buf, pos_len);
 
-        if (welcome_len > pane->width)
-          welcome_len = pane->width;
+        // Apply background color (6 bytes for RGB format)
+        abAppend(ab, E.theme.BACKGROUND_COLOR, (int)strlen(E.theme.BACKGROUND_COLOR));
 
-        int padding = (pane->width - welcome_len) / 2;
-        if (padding) {
-          abAppend(ab, "~", 1);
-          chars_printed++;
-          padding--;
-        }
-        while (padding-- && chars_printed < pane->width) {
-          abAppend(ab, " ", 1);
-          chars_printed++;
-        }
-        abAppend(ab, welcome, welcome_len);
-        chars_printed += welcome_len;
-      } else {
-        abAppend(ab, "~", 1);
-        chars_printed++;
-      }
-    } else {
-      // Render line with syntax highlighting, constrain to pane width
-      int start_offset = pane->col_offset;
-      int visible_len = buf->row[file_row].rsize - start_offset;
-      if (visible_len < 0)
-        visible_len = 0;
-      if (visible_len > pane->width)
-        visible_len = pane->width;
 
-      if (buf->type == TERMINAL_BUFF) {
-        // Terminal buffer - show prompt for input line
-        if (file_row == buf->numrows - 1) {
-          char prompt[16];
-          int prompt_len = snprintf(prompt, sizeof(prompt), "$ ");
-          abAppend(ab, prompt, prompt_len);
-          chars_printed += prompt_len;
+        // pane line is out of buffer
+        if (file_row >= buf->numrows)
+        {
+            // Empty line - show tilde
 
-          // Show the command being typed (if any)
-          if (buf->terminal_command != NULL) {
-            int cmd_len = strlen(buf->terminal_command);
-            if (cmd_len > pane->width - prompt_len) {
-              cmd_len = pane->width - prompt_len;
+            abAppend(ab, "~", 1);
+            for (int i = 0;
+                 i < pane->width - 1;
+                 ++i)
+            {
+                abAppend(ab, " ", 1);
             }
-            abAppend(ab, buf->terminal_command, cmd_len);
-            chars_printed += cmd_len;
-          }
-        } else {
-          // Show terminal output
-          abAppend(ab, &buf->row[file_row].render[start_offset], visible_len);
-          chars_printed = visible_len;
         }
-      } else if (buf->filename && strlen(buf->filename) > 0 && buf->filename[strlen(buf->filename) - 1] == 'c') {
-        int byte_len_to_print;
+        else
+        {
+            lspUiDrawGutter(ab, &E.lsp_diagnostics, pane->buffer_id, file_row);
 
-        char *highlighted = highlight_line(
-            &buf->row[file_row].render[start_offset], &byte_len_to_print);
+            if (buf->filename[strlen(buf->filename) - 1] == 'c' || buf->filename[strlen(buf->filename) - 1] == 'h')
+            {
+                // Render line with syntax highlighting, constrain to pane width
+                highlighted = highlight_line(
+                    &buf->row[file_row].chars[pane->x_offset], &byte_len_to_print);
 
-        // Print only up to pane width
-
-        abAppend(ab, highlighted, byte_len_to_print);
-        free(highlighted);
-      } else {
-        abAppend(ab, &buf->row[file_row].render[start_offset], buf->row[file_row].rsize);
-      }
-
-      chars_printed = visible_len;
+                // Print only up to pane width
+                abAppend(ab, highlighted, byte_len_to_print);
+                bFree(highlighted);
+            }
+            else
+            {
+                // Render basic line
+                bytes_to_print =
+                    buf->row[file_row].size - pane->x_offset < pane->width
+                        ? buf->row[file_row].size - pane->x_offset
+                        : pane->width;
+                abAppend(ab, &buf->row[file_row].chars[pane->x_offset], bytes_to_print);
+            }
+            // Fill remaining space with background color to pane width
+            for (int i = 0;
+                 i < pane->width - editorRowCharCount(&buf->row[file_row], pane->width) + pane->x_offset;
+                 ++i)
+            {
+                abAppend(ab, " ", 1);
+            }
+        }
     }
-
-    // Fill remaining space with background color to pane width
-    abAppend(ab, E.theme.BACKGROUND_COLOR, strlen(E.theme.BACKGROUND_COLOR));
-    while (chars_printed < pane->width) {
-      abAppend(ab, " ", 1);
-      chars_printed++;
-    }
-
-    // Restore background color at end of line
-  }
 }
 
 /**
  * @brief Renders all panes based on current split configuration
  */
-static void editorDrawAllPanes(struct abuf *ab) {
-  ScreenLayout *layout = splitScreenGetLayout();
+static void editorDrawAllPanes(struct abuf* ab)
+{
+    const ScreenLayout* layout = splitScreenGetLayout();
 
-  if (layout->num_panes == 1) {
-    // Single pane fullscreen
-    editorDrawPane(ab, &layout->panes[0]);
-  } else if (layout->num_panes == 2) {
-    // Draw both panes
-    for (int i = 0; i < 2; i++) {
-      editorDrawPane(ab, &layout->panes[i]);
-
-      // Draw pane border/divider if not the last pane
-      if (layout->mode == SPLIT_VERTICAL && i == 0) {
-        // Draw vertical divider
-        int divider_col = layout->panes[0].width;
-        for (int y = 0; y < layout->panes[0].height; y++) {
-          char pos_buf[32];
-          snprintf(pos_buf, sizeof(pos_buf), "\x1b[%d;%dH", y + 1, divider_col);
-          abAppend(ab, pos_buf, strlen(pos_buf));
-          abAppend(ab, "\x1b[1m|\x1b[0m", 9); // Bold pipe divider
-        }
-      } else if (layout->mode == SPLIT_HORIZONTAL && i == 0) {
-        // Draw horizontal divider
-        int divider_row = layout->panes[0].height;
-        char pos_buf[32];
-        snprintf(pos_buf, sizeof(pos_buf), "\x1b[%d;%dH", divider_row + 1, 1);
-        abAppend(ab, pos_buf, strlen(pos_buf));
-        for (int x = 0; x < E.screencols; x++) {
-          abAppend(ab, "\x1b[1m-\x1b[0m", 9); // Bold dash divider
-        }
-      }
+    if (layout->num_panes == 1)
+    {
+        // Single pane fullscreen
+        editorDrawPane(ab, &layout->panes[0]);
+    }
+    else if (layout->num_panes == 2)
+    {
+        // Draw both panes
+        for (int i = 0; i < 2; i++)
+        {
+            editorDrawPane(ab, &layout->panes[i]);
+
+            // Draw pane border/divider if not the last pane
+            if (layout->mode == SPLIT_VERTICAL && i == 0)
+            {
+                // Draw vertical divider
+                int divider_col = layout->panes[0].width;
+                for (int y = 0; y < layout->panes[0].height; y++)
+                {
+                    char pos_buf[32];
+                    snprintf(pos_buf, sizeof(pos_buf), "\x1b[%d;%dH", y + 1, divider_col);
+                    abAppend(ab, pos_buf, (int)strlen(pos_buf));
+                    abAppend(ab, "\x1b[1m|\x1b[0m", 9); // Bold pipe divider
+                }
+            }
+            else if (layout->mode == SPLIT_HORIZONTAL && i == 0)
+            {
+                // Draw horizontal divider
+                int divider_row = layout->panes[0].height;
+                char pos_buf[32];
+                snprintf(pos_buf, sizeof(pos_buf), "\x1b[%d;%dH", divider_row + 1, 1);
+                abAppend(ab, pos_buf, (int)strlen(pos_buf));
+                for (int x = 0; x < E.screencols; x++)
+                {
+                    abAppend(ab, "\x1b[1m-\x1b[0m", 9); // Bold dash divider
+                }
+            }
+        }
     }
-  }
 }
 
 /**
@@ -182,35 +161,91 @@ static void editorDrawAllPanes(struct abuf *ab) {
  * @note Updates global editor state E
  * @see editorRowCxToRx()
  */
-void editorScroll() {
-  EditorPane *active = splitScreenGetActivePane();
-  struct buffer_t *buf = bufferFindById(active->buffer_id);
-  active->rx = active->cursor_x;
+void editorScroll()
+{
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buf = bufferFindById(active->buffer_id);
+    int rel_x, rel_y;
 
-  fprintf(stderr, "%d %d / %d %d\n", active->cursor_x, active->col_offset,
-          active->cursor_y, active->row_offset);
+    // compute relative coordinates
+    rel_x = editorRowCharCount(&buf->row[buf->y], buf->x);
+    appDebug("counting %d\n", rel_x);
+    rel_y = buf->y;
 
-  if (active->cursor_x < 0) {
-    active->cursor_x = 0;
-    active->col_offset = active->col_offset == 0 ? 0 : --active->col_offset;
-  }
+    appDebug("%d %d / %d %d\n", active->cursor_x, active->x_offset,
+             active->cursor_y, active->y_offset);
 
-  if (active->cursor_y < 0) {
-    active->cursor_y = 0;
-    active->row_offset = active->row_offset == 0 ? 0 : --active->row_offset;
-  }
+    while (rel_x != active->cursor_x + active->x_offset ||
+        rel_y != active->cursor_y + active->y_offset)
+    {
+        if (rel_x < active->cursor_x + active->x_offset)
+        {
+            // LEFT
+            if (active->cursor_x == 0 && active->x_offset)
+            {
+                active->x_offset--;
+            }
+            else
+            {
+                active->cursor_x--;
+            }
+        }
+        else
+        {
+            // RIGHT
+            if (rel_x > active->cursor_x + active->x_offset)
+            {
+                if (active->cursor_x == active->width - 1)
+                {
+                    active->x_offset++;
+                }
+                else
+                {
+                    active->cursor_x++;
+                }
+            }
+        }
 
-  if (active->cursor_x == active->width) {
+        if (rel_y < active->cursor_y + active->y_offset)
+        {
+            if (active->cursor_y == 0 && active->y_offset)
+            {
+                active->y_offset--;
+            }
+            else
+            {
+                active->cursor_y--;
+            }
+        }
 
-    active->cursor_x--;
-    active->col_offset++;
-  }
+        if (rel_y > active->cursor_y + active->y_offset)
+        {
+            if (active->cursor_y == active->height - 1)
+            {
+                active->y_offset++;
+            }
+            else
+            {
+                active->cursor_y++;
+            }
+        }
+    }
+}
 
-  if (active->cursor_y == active->height) {
+char* basename(char* path)
+{
+    int len = (int)strlen(path);
 
-    active->cursor_y--;
-    active->row_offset++;
-  }
+
+    for (int i = len - 1; i > 0; i--)
+    {
+        if (path[i] == '/')
+        {
+            path = path + i + 1;
+            break;
+        }
+    }
+    return path;
 }
 
 /**
@@ -221,55 +256,63 @@ void editorScroll() {
  * @param ab Pointer to append buffer structure for accumulating output
  * @note Uses ANSI escape codes for color inversion
  */
-void editorDrawStatusBar(struct abuf *ab) {
-  int len, render_len;
-  char status[80], render_status[80];
-  EditorPane *active = splitScreenGetActivePane();
-  struct buffer_t *buf = bufferFindById(active->buffer_id);
+void editorDrawStatusBar(struct abuf* ab)
+{
+    // TO MODIFY
+    int len, render_len;
+    char status[E.screencols], render_status[E.screencols * 4];
+    EditorPane* active = splitScreenGetActivePane();
+    struct buffer_t* buf = bufferFindById(active->buffer_id);
 
-  abAppend(ab, "\x1b[7m", 4); // inverting colors
+    abAppend(ab, "\x1b[7m", 4); // inverting colors
 
-  const char *mode_str = "";
-  ScreenLayout *layout = splitScreenGetLayout();
-  if (layout->mode == SPLIT_VERTICAL)
-    mode_str = " [V-SPLIT]";
-  else if (layout->mode == SPLIT_HORIZONTAL)
-    mode_str = " [H-SPLIT]";
+    const char* mode_str = "";
+    ScreenLayout* layout = splitScreenGetLayout();
+    if (layout->mode == SPLIT_VERTICAL)
+        mode_str = " [V-SPLIT]";
+    else if (layout->mode == SPLIT_HORIZONTAL)
+        mode_str = " [H-SPLIT]";
 
-  // Build buffer status showing all buffers with dirty indicators
-  char buf_status[200] = "";
-  int offset = 0;
-  for (int i = 0; i < E.number_of_buffer; i++) {
-    struct buffer_t *b = &E.buffers[i];
-    char marker = (b->buffer_id == active->buffer_id) ? '>' : ' ';
-    char dirty_marker = b->dirty ? '*' : ' ';
-    offset += snprintf(&buf_status[offset], sizeof(buf_status) - offset,
-                       "%c%d:%s%c ", marker, b->buffer_id,
-                       b->filename ? b->filename : "[No Name]", dirty_marker);
-  }
-
-  len = snprintf(status, sizeof(status), "%s%s", buf_status, mode_str);
-
-  render_len = snprintf(render_status, sizeof(render_status), "%d/%d",
-                        active->cursor_y + 1, buf->numrows);
-
-  if (len > E.screencols) {
-    len = E.screencols;
-  }
-
-  abAppend(ab, status, len);
-  while (len < E.screencols) {
-    if (E.screencols - len == render_len) {
-      abAppend(ab, render_status, render_len);
-      break;
-    } else {
-      abAppend(ab, " ", 1);
-      ++len;
+    // Build buffer status showing all buffers with dirty indicators
+    char buf_status[1024] = "";
+    int offset = 0;
+    for (int i = 0; i < E.number_of_buffer; i++)
+    {
+        struct buffer_t* b = &E.buffers[i];
+        char marker = (b->buffer_id == active->buffer_id) ? '>' : ' ';
+        char dirty_marker = b->dirty ? '*' : ' ';
+        offset += snprintf(&buf_status[offset], sizeof(buf_status) - offset,
+                           "%c%d:%s%c ", marker, b->buffer_id,
+                           b->filename ? basename(b->filename) : "[No Name]", dirty_marker);
     }
-  }
 
-  abAppend(ab, "\x1b[m", 3); // normal text mode
-  abAppend(ab, "\r\n", 2);
+    len = snprintf(status, sizeof(status), "%s%s", buf_status, mode_str);
+
+    render_len = snprintf(render_status, sizeof(render_status), "%d/%d",
+                          active->cursor_y + 1, buf->numrows);
+
+    if (len > E.screencols)
+    {
+        len = E.screencols;
+    }
+
+    abAppend(ab, status, len);
+    while (len < E.screencols)
+    {
+        if (E.screencols - len == render_len + 1)
+        {
+            abAppend(ab, render_status, render_len);
+            break;
+        }
+        else
+        {
+            abAppend(ab, " ", 1);
+            ++len;
+        }
+    }
+
+    abAppend(ab, "\x1b[m", 3); // normal text mode
+    abAppend(ab, "\r\n", 2);
 }
 
 /**
@@ -279,15 +322,48 @@ void editorDrawStatusBar(struct abuf *ab) {
  * @param ab Pointer to append buffer structure for accumulating output
  * @note Messages are set by editorSetStatusMessage()
  */
-void editorDrawMessageBar(struct abuf *ab) {
-  int msg_len = strlen(E.status_msg);
-  abAppend(ab, ERASE_END_LINE, 3);
-  if (msg_len > E.screencols) {
-    msg_len = E.screencols;
-  }
-  if (msg_len && time(NULL) - E.status_msg_time < 5) {
-    abAppend(ab, E.status_msg, msg_len);
-  }
+void editorDrawMessageBar(struct abuf* ab)
+{
+    int msg_len = (int)strlen(E.status_msg);
+    abAppend(ab, ERASE_END_LINE, 3);
+    if (msg_len > E.screencols)
+    {
+        msg_len = E.screencols;
+    }
+    if (msg_len && time(NULL) - E.status_msg_time < 5)
+    {
+        abAppend(ab, E.status_msg, msg_len);
+    }
+}
+
+void editorDrawContextBuffer(struct abuf* ab)
+{
+    int pos_len;
+    char pos_buf[1024];
+    int i, j;
+
+    if (!E.context_buffers)
+        return;
+
+    appDebug("Printing context");
+
+    for (i = 0; i < E.context_buffers->height; ++i)
+    {
+        if (E.context_buffers->editor_y + i + 1 > 0)
+        {
+            pos_len = snprintf(pos_buf, sizeof(pos_buf), "\x1b[%d;%dH",
+                               E.context_buffers->editor_y + i + 1, E.context_buffers->editor_x - 2);
+            abAppend(ab, pos_buf, pos_len);
+
+            // Apply background color (6 bytes for RGB format)
+            abAppend(ab, E.theme.BACKGROUND_COLOR, (int)strlen(E.theme.BACKGROUND_COLOR));
+            abAppend(ab, "|", 1);
+            abAppend(ab, E.context_buffers->rows->chars, E.context_buffers->rows->size);
+            abAppend(ab, "|", 1);
+        }
+    }
+    bFree(E.context_buffers);
+    E.context_buffers = NULL;
 }
 
 /**
@@ -301,33 +377,64 @@ void editorDrawMessageBar(struct abuf *ab) {
  * @see editorDrawMessageBar()
  */
 
-void editorRefreshScreen() {
-  struct abuf ab = ABUF_INIT;
-  char buf[32];
+void editorRefreshScreen()
+{
+    struct abuf ab = ABUF_INIT;
+    char buf[32];
 
-  abAppend(&ab, HIDE_CURSOR, 6);
-  abAppend(&ab, CURSOR_TOP_LEFT, 3);
-  abAppend(&ab, E.theme.BACKGROUND_COLOR,
-           strlen(E.theme.BACKGROUND_COLOR)); // RGB background is 12 bytes
+    abAppend(&ab, HIDE_CURSOR, 6);
+    abAppend(&ab, CURSOR_TOP_LEFT, 3);
+    abAppend(&ab, E.theme.BACKGROUND_COLOR,
+             (int)strlen(E.theme.BACKGROUND_COLOR));
 
-  // Draw all panes
-  editorScroll();
-  editorDrawAllPanes(&ab);
+    editorScroll();
+    editorDrawAllPanes(&ab);
+    editorDrawStatusBar(&ab);
+    editorDrawMessageBar(&ab);
 
-  // Draw status bar and message bar
-  editorDrawStatusBar(&ab);
-  editorDrawMessageBar(&ab);
+    EditorPane    *active = splitScreenGetActivePane();
+    struct buffer_t *buffer = bufferFindById(active->buffer_id);
 
-  // Position cursor in active pane
-  EditorPane *active = splitScreenGetActivePane();
-  if (active != NULL) {
+    // ── LSP: sync buffer changes to clangd ────────────────────────────────────
+    if (buffer->b_has_changed) {
+        if (E.lsp_client && E.lsp_client->state == LSP_READY) {
+            lspDidChange(E.lsp_client, buffer);
+
+            E.lsp_client->completion_just_arrived = 0;  // consume the flag
+        }
+        buffer->b_has_changed = 0;
+    }
+
+    // ── LSP: draw completion popup every frame while visible ──────────────────
+    fprintf(stderr, "[REFRESH] lsp_completion.visible=%d\n",
+        E.lsp_completion.visible);
+    while (E.lsp_client->completion_requested && !E.lsp_client->completion_just_arrived)
+        ;
+    // reset flags
+    E.lsp_client->completion_just_arrived = 0;
+    E.lsp_client->completion_requested = 0;
+
+    if (E.lsp_client && E.lsp_client->state == LSP_READY)
+    {
+        lspUiDrawCompletion(&ab, &E.lsp_completion);
+        appDebug("ready\n");
+    }
+
+    // ── LSP: diagnostic for current line in status bar ────────────────────────
+    const char *diag = lspUiDiagnosticAtCursor(
+        &E.lsp_diagnostics,
+        active->buffer_id,
+        active->cursor_y + active->y_offset);
+    if (diag)
+        editorSetStatusMessage("● %s", diag);
+
+    // ── Position cursor (account for gutter width) ────────────────────────────
     snprintf(buf, sizeof(buf), "\x1b[%d;%dH",
-             active->cursor_y + active->start_row + 1,
-             active->cursor_x + active->start_col + 1);
-    abAppend(&ab, buf, strlen(buf));
-  }
+             active->cursor_y + active->origin_y + 1,
+             active->cursor_x + active->origin_x + 1 + GUTTER_WIDTH);
+    abAppend(&ab, buf, (int)strlen(buf));
 
-  abAppend(&ab, SHOW_CURSOR, 6);
-  write(STDOUT_FILENO, ab.b, ab.len);
-  abFree(&ab);
+    abAppend(&ab, SHOW_CURSOR, 6);
+    write(STDOUT_FILENO, ab.b, ab.len);
+    abFree(&ab);
 }

src/row_op.c

@@ -1,4 +1,6 @@
 #include "../include/row_op.h"
+#include "../include/data.h"
+#include "../include/utf8.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -6,147 +8,5 @@
 
 extern struct editorConfig E;
 
-int bufferRowCxToRx(frow *row, int cursor_x) {
-  int render_x = 0;
-  int i;
-  for (i = 0; i < cursor_x; ++i) {
-    if (row->chars[i] == '\t') {
-      render_x += (E.constantes.TAB_LENGTH - 1) - (render_x % E.constantes.TAB_LENGTH);
-    }
-    render_x++;
-  }
-  return render_x;
-}
 
-int bufferRowRxToCx(frow *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 bufferUpdatfrow(frow *row)
- * \brief Copy content of \p row in \p row->render.
- *  */
-
-void bufferUpdatfrow(frow *row) {
-  int i, i_render;
-  int tabs = 0;
-
-  // counting number of tabs
-
-  for (i = 0; i < row->size; ++i) {
-    tabs +=
-        (row->chars[i] == '\t'); /**< increment tabs of 1 if chars[i] is one. */
-  }
-
-  free(row->render);
-  row->render = malloc(row->size + tabs * (E.constantes.TAB_LENGTH - 1) +
-                       1); /**< Tabs needs E.constantes.TAB_LENGTH chars so E.constantes.TAB_LENGTH - 1
-                              more than the first already counted. */
-
-  // end of counting
-  i_render = 0;
-  for (i = 0; i < row->size; ++i) {
-    if (row->chars[i] == '\t') {
-      row->render[i_render++] = ' ';
-      while (i_render % E.constantes.TAB_LENGTH) {
-        row->render[i_render++] =
-            ' '; /**< Addind the right amount of spaces for tabs */
-      }
-    } else {
-      row->render[i_render++] = row->chars[i];
-    }
-  }
-  row->render[i_render] = '\0'; // Don't forget the end of string character.
-  row->rsize = i_render;
-}
-
-void bufferInsertRow(struct buffer_t *buffer, int at, char *s, size_t len) {
-  
-  if (at < 0 || at > buffer->numrows) {
-    
-    return;
-  }
-  frow *tmp = (frow *)realloc(buffer->row, sizeof(frow) * (buffer->numrows + 1));
-  if (!tmp) {
-    return;
-  }
-  buffer->row = tmp;
-  memmove(&buffer->row[at + 1], &buffer->row[at], sizeof(frow) * (buffer->numrows - at));
-
-  buffer->row[at].size = len;
-  buffer->row[at].chars = malloc(len + 1);
-  memcpy(buffer->row[at].chars, s, len);
-  buffer->row[at].chars[len] = '\0';
-
-  buffer->row[at].rsize = 0;
-  buffer->row[at].render = NULL;
-  bufferUpdatfrow(&buffer->row[at]);
-
-  ++buffer->numrows;
-  ++buffer->dirty;
-}
-
-void bufferFrefrow(frow *row) {
-  free(row->render);
-  free(row->chars);
-}
-
-void bufferDelRow(struct buffer_t *buffer, int at) {
-  if (at < 0 || at >= buffer->numrows) {
-    return;
-  }
-  bufferFrefrow(&buffer->row[at]);
-  memmove(&buffer->row[at], &buffer->row[at + 1], sizeof(frow) * (buffer->numrows - at - 1));
-  --buffer->numrows;
-  ++buffer->dirty;
-}
-
-/**
- * \fn bufferRowInsertChar(frow *row, int at, int c)
- * \param at Index of where we want to insert the char */
-
-void bufferRowInsertChar(struct buffer_t *buffer, frow *row, int at, int c) {
-  if (buffer->state == READ_ONLY)
-    return;
-  if (at < 0 || at > row->size) {
-    at = row->size;
-  }
-  row->chars = realloc(row->chars, row->size + 2);
-  memmove(&row->chars[at + 1], &row->chars[at], row->size - at + 1);
-  ++row->size;
-  row->chars[at] = c;
-  bufferUpdatfrow(row);
-  ++buffer->dirty;
-}
-
-void bufferRowAppendString(struct buffer_t *buffer, frow *row, char *s, size_t len) {
-  row->chars = realloc(row->chars, row->size + len + 1);
-  memcpy(&row->chars[row->size], s, len);
-  row->size += len;
-  row->chars[row->size] = '\0';
-  bufferUpdatfrow(row);
-  ++buffer->dirty;
-}
-
-/**
- * \fn bufferRowDelChar(struct bufferConfig *E, frow *frow, int at)
- * \brief Delete the a char at the chosen position on the given row
- * \param at Index of the char to delete
- * \param row Row on operation is made */
-void bufferRowDelchar(struct buffer_t *buffer, frow *row, int at) {
-  if (at < 0 || at >= row->size) {
-    return;
-  }
-  memmove(&row->chars[at], &row->chars[at + 1], row->size - at);
-  --row->size;
-  bufferUpdatfrow(row);
-  ++buffer->dirty;
-}

src/split_screen.c

@@ -9,6 +9,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "include/utils.h"
+
 extern struct editorConfig E;
 
 /**
@@ -19,18 +21,18 @@ void splitScreenInit(void) {
     E.layout.num_panes = 1;
     E.layout.active_pane = 0;
 
-    E.layout.panes = malloc(sizeof(EditorPane) * 2);
+    E.layout.panes = bAlloc(sizeof(EditorPane) * 2);
 
     // Initialize single fullscreen pane
     E.layout.panes[0].buffer_id = -1; // No buffer for now
-    E.layout.panes[0].start_row = 0;
-    E.layout.panes[0].start_col = 0;
+    E.layout.panes[0].origin_y = 0;
+    E.layout.panes[0].origin_x = 0;
     E.layout.panes[0].height = E.screenrows - 2;  // Leave room for status bar
     E.layout.panes[0].width = E.screencols;
     E.layout.panes[0].cursor_x = 0;
     E.layout.panes[0].cursor_y = 0;
-    E.layout.panes[0].row_offset = 0;
-    E.layout.panes[0].col_offset = 0;
+    E.layout.panes[0].y_offset = 0;
+    E.layout.panes[0].x_offset = 0;
     E.layout.panes[0].is_active = 1;
 }
 
@@ -48,37 +50,37 @@ int splitScreenVertical(int buffer_id_left, int buffer_id_right) {
         return -1;
     }
 
-    // Reallocate panes array
-    E.layout.panes = realloc(E.layout.panes, sizeof(EditorPane) * 2);
+    // bReallocate panes array
+    E.layout.panes = bRealloc(E.layout.panes, sizeof(EditorPane) * 2);
     E.layout.mode = SPLIT_VERTICAL;
     E.layout.num_panes = 2;
     E.layout.active_pane = 0;
 
     int half_width = E.screencols / 2;
-    int pane_height = E.screenrows - 2;  // Leave room for status bar
+    int pane_height = E.screenrows;  // Leave room for status bar
 
     // Left pane
     E.layout.panes[0].buffer_id = buffer_id_left;
-    E.layout.panes[0].start_row = 0;
-    E.layout.panes[0].start_col = 0;
+    E.layout.panes[0].origin_y = 0;
+    E.layout.panes[0].origin_x = 0;
     E.layout.panes[0].height = pane_height;
     E.layout.panes[0].width = half_width;
     E.layout.panes[0].cursor_x = 0;
     E.layout.panes[0].cursor_y = 0;
-    E.layout.panes[0].row_offset = 0;
-    E.layout.panes[0].col_offset = 0;
+    E.layout.panes[0].y_offset = 0;
+    E.layout.panes[0].x_offset = 0;
     E.layout.panes[0].is_active = 1;
 
     // Right pane
     E.layout.panes[1].buffer_id = buffer_id_right;
-    E.layout.panes[1].start_row = 0;
-    E.layout.panes[1].start_col = half_width;
+    E.layout.panes[1].origin_y = 0;
+    E.layout.panes[1].origin_x = half_width;
     E.layout.panes[1].height = pane_height;
     E.layout.panes[1].width = E.screencols - half_width;
     E.layout.panes[1].cursor_x = 0;
     E.layout.panes[1].cursor_y = 0;
-    E.layout.panes[1].row_offset = 0;
-    E.layout.panes[1].col_offset = 0;
+    E.layout.panes[1].y_offset = 0;
+    E.layout.panes[1].x_offset = 0;
     E.layout.panes[1].is_active = 0;
 
     editorSetStatusMessage("Vertical split: %d | %d", buffer_id_left, buffer_id_right);
@@ -99,8 +101,8 @@ int splitScreenHorizontal(int buffer_id_top, int buffer_id_bottom) {
         return -1;
     }
 
-    // Reallocate panes array
-    E.layout.panes = realloc(E.layout.panes, sizeof(EditorPane) * 2);
+    // bReallocate panes array
+    E.layout.panes = bRealloc(E.layout.panes, sizeof(EditorPane) * 2);
     E.layout.mode = SPLIT_HORIZONTAL;
     E.layout.num_panes = 2;
     E.layout.active_pane = 0;
@@ -109,26 +111,26 @@ int splitScreenHorizontal(int buffer_id_top, int buffer_id_bottom) {
 
     // Top pane
     E.layout.panes[0].buffer_id = buffer_id_top;
-    E.layout.panes[0].start_row = 0;
-    E.layout.panes[0].start_col = 0;
+    E.layout.panes[0].origin_y = 0;
+    E.layout.panes[0].origin_x = 0;
     E.layout.panes[0].height = half_height;
     E.layout.panes[0].width = E.screencols;
     E.layout.panes[0].cursor_x = 0;
     E.layout.panes[0].cursor_y = 0;
-    E.layout.panes[0].row_offset = 0;
-    E.layout.panes[0].col_offset = 0;
+    E.layout.panes[0].y_offset = 0;
+    E.layout.panes[0].x_offset = 0;
     E.layout.panes[0].is_active = 1;
 
     // Bottom pane
     E.layout.panes[1].buffer_id = buffer_id_bottom;
-    E.layout.panes[1].start_row = half_height;
-    E.layout.panes[1].start_col = 0;
+    E.layout.panes[1].origin_y = half_height;
+    E.layout.panes[1].origin_x = 0;
     E.layout.panes[1].height = E.screenrows - 2 - half_height;
     E.layout.panes[1].width = E.screencols;
     E.layout.panes[1].cursor_x = 0;
     E.layout.panes[1].cursor_y = 0;
-    E.layout.panes[1].row_offset = 0;
-    E.layout.panes[1].col_offset = 0;
+    E.layout.panes[1].x_offset = 0;
+    E.layout.panes[1].y_offset = 0;
     E.layout.panes[1].is_active = 0;
 
     editorSetStatusMessage("Horizontal split: %d / %d", buffer_id_top, buffer_id_bottom);
@@ -143,9 +145,9 @@ void splitScreenUnify(void) {
     E.layout.num_panes = 1;
     E.layout.active_pane = 0;
 
-    E.layout.panes[0].start_row = 0;
-    E.layout.panes[0].start_col = 0;
-    E.layout.panes[0].height = E.screenrows - 2;
+    E.layout.panes[0].origin_x = 0;
+    E.layout.panes[0].origin_y = 0;
+    E.layout.panes[0].height = E.screenrows;
     E.layout.panes[0].width = E.screencols;
     E.layout.panes[0].is_active = 1;
 
@@ -192,8 +194,8 @@ int splitScreenSetPaneBuffer(int buffer_id) {
     active->buffer_id = buffer_id;
     active->cursor_x = 0;
     active->cursor_y = 0;
-    active->row_offset = 0;
-    active->col_offset = 0;
+    active->origin_x = 0;
+    active->origin_y = 0;
 
     editorSetStatusMessage("Pane %d now showing buffer %d",
                           E.layout.active_pane, buffer_id);

src/syntax_highlighter.c

@@ -1,14 +1,17 @@
 #include "../include/syntax_highlighter.h"
 #include "../include/data.h"
+#include "../include/utf8.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "include/utils.h"
+
 extern struct editorConfig E;
 
 const char *c_keywords[] = {
     "if",     "else",     "while",    "for",     "do",       "switch",
-    "case",   "break",    "#include", "#define", "continue", "return",
+    "case",   "break",    "#include", "#define", "#if", "#endif", "#ifndef", "continue", "return",
     "goto",   "struct",   "union",    "enum",    "typedef",  "static",
     "extern", "const",    "volatile", "sizeof",  "auto",     "register",
     "inline", "restrict", NULL};
@@ -18,10 +21,52 @@ const char *c_types[] = {"int",    "char", "float", "double",
                          "void",   "long", "short", "unsigned",
                          "signed", "bool", NULL};
 
+// Returns the byte length of the UTF-8 character starting at s.
+// Never returns 0 for a non-NUL byte, so callers won't infinite-loop.
+static int utf8_char_len(const char *s)
+{
+    unsigned char c = (unsigned char)*s;
+    if (c == 0)              return 0;
+    if (c < 0x80)            return 1;
+    if ((c & 0xE0) == 0xC0)  return 2;
+    if ((c & 0xF0) == 0xE0)  return 3;
+    if ((c & 0xF8) == 0xF0)  return 4;
+    return 1; // continuation byte or invalid — advance 1 to avoid infinite loop
+}
+
+// Copy one full UTF-8 character from src+i into dst+pos, advance both indices.
+static void copy_utf8_char(char *dst, int *dst_pos, const char *src, int *src_pos)
+{
+    int len = utf8_char_len(&src[*src_pos]);
+    for (int b = 0; b < len; b++)
+        dst[(*dst_pos)++] = src[(*src_pos)++];
+}
+
 // Check if character is alphanumeric or underscore
-int is_word_char(char c) {
-  return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
-         (c >= '0' && c <= '9') || c == '_' || c == '#';
+int is_word_char(const char *s)
+{
+    uint32_t cp = utf8Decode(&s);
+
+    if ((cp >= 'a' && cp <= 'z') || (cp >= 'A' && cp <= 'Z') ||
+        (cp >= '0' && cp <= '9') || cp == '_' || cp == '#')
+        return 1;
+
+    if (cp == 0xFFFD) return 0;
+
+    if (cp >= 0x00C0 && cp <= 0x017F) return 1;
+    if (cp >= 0x0370 && cp <= 0x03FF) return 1;
+    if (cp >= 0x0400 && cp <= 0x04FF) return 1;
+    if (cp >= 0x0600 && cp <= 0x06FF) return 1;
+    if (cp >= 0x05D0 && cp <= 0x05EA) return 1;
+    if (cp >= 0x0900 && cp <= 0x097F) return 1;
+    if (cp >= 0x4E00 && cp <= 0x9FFF) return 1;
+    if ((cp >= 0x3040 && cp <= 0x309F) ||
+        (cp >= 0x30A0 && cp <= 0x30FF)) return 1;
+    if (cp >= 0xAC00 && cp <= 0xD7A3) return 1;
+    if ((cp >= 0x0660 && cp <= 0x0669) ||
+        (cp >= 0x06F0 && cp <= 0x06F9)) return 1;
+
+    return 0;
 }
 
 // Check if string is a keyword
@@ -43,11 +88,11 @@ int is_type(const char *word) {
 }
 
 // Get color code for token type
-const char *get_color(SyntaxTokenType type) {
+const char *get_color(TokenType type) {
   switch (type) {
   case TOKEN_KEYWORD:
     return E.theme.COLOR_KEYWORD;
-  case TOKEN_DATATYPE:
+  case TOKEN_TYPE:
     return E.theme.COLOR_TYPE;
   case TOKEN_STRING:
     return E.theme.COLOR_STRING;
@@ -65,26 +110,29 @@ int comment_section = 0;
 // Highlight a line of C code and return the highlighted string
 // Returns a newly allocated string that must be freed by the caller
 char *highlight_line(const char *line, int *length) {
-  char *result = malloc(1024); // Allocate space for result
+  // Each byte can expand to at most (color_prefix + 4 bytes + color_reset).
+  // Allocate generously based on line length to avoid overflow.
+  int line_len = strlen(line);
+  int buf_size = line_len * 32 + 256;
+  char *result = bAlloc(buf_size);
   int result_pos = 0;
   int i = 0;
 
   while (line[i] != '\0' && line[i] != '\n') {
-    // Skip whitespace
+    // Skip whitespace — copy full UTF-8 char (whitespace is always ASCII,
+    // but using copy_utf8_char keeps the pattern consistent)
     if (line[i] == ' ' || line[i] == '\t') {
-      result[result_pos++] = line[i++];
+      copy_utf8_char(result, &result_pos, line, &i);
       continue;
     }
 
     if (comment_section) {
       result_pos += sprintf(&result[result_pos], "%s", E.theme.COLOR_COMMENT);
       while (line[i] != '\0' && line[i] != '\n') {
-        
-    if (line[i] == '*' && line[i + 1] == '/') {
-      comment_section = 0;
-    }
-
-        result[result_pos++] = line[i++];
+        if (line[i] == '*' && line[i + 1] == '/') {
+          comment_section = 0;
+        }
+        copy_utf8_char(result, &result_pos, line, &i);
       }
       result_pos += sprintf(&result[result_pos], "%s", COLOR_RESET);
       continue;
@@ -94,14 +142,14 @@ char *highlight_line(const char *line, int *length) {
     if (line[i] == '/' && line[i + 1] == '/') {
       result_pos += sprintf(&result[result_pos], "%s", E.theme.COLOR_COMMENT);
       while (line[i] != '\0' && line[i] != '\n') {
-        result[result_pos++] = line[i++];
+        copy_utf8_char(result, &result_pos, line, &i);
       }
       result_pos += sprintf(&result[result_pos], "%s", COLOR_RESET);
       continue;
     }
 
     // Handle block comments
-    if ((line[i] == '/' && line[i + 1] == '*')) {
+    if (line[i] == '/' && line[i + 1] == '*') {
       comment_section = 1;
       result_pos += sprintf(&result[result_pos], "%s", E.theme.COLOR_COMMENT);
       result[result_pos++] = line[i++];
@@ -110,9 +158,10 @@ char *highlight_line(const char *line, int *length) {
         if (line[i] == '*' && line[i + 1] == '/') {
           result[result_pos++] = line[i++];
           result[result_pos++] = line[i++];
+          comment_section = 0;
           break;
         }
-        result[result_pos++] = line[i++];
+        copy_utf8_char(result, &result_pos, line, &i);
       }
       result_pos += sprintf(&result[result_pos], "%s", COLOR_RESET);
       continue;
@@ -125,9 +174,9 @@ char *highlight_line(const char *line, int *length) {
       while (line[i] != '\0' && line[i] != '"') {
         if (line[i] == '\\') {
           result[result_pos++] = line[i++];
-          result[result_pos++] = line[i++];
+          copy_utf8_char(result, &result_pos, line, &i);
         } else {
-          result[result_pos++] = line[i++];
+          copy_utf8_char(result, &result_pos, line, &i);
         }
       }
       if (line[i] == '"')
@@ -143,9 +192,9 @@ char *highlight_line(const char *line, int *length) {
       while (line[i] != '\0' && line[i] != '\'') {
         if (line[i] == '\\') {
           result[result_pos++] = line[i++];
-          result[result_pos++] = line[i++];
+          copy_utf8_char(result, &result_pos, line, &i);
         } else {
-          result[result_pos++] = line[i++];
+          copy_utf8_char(result, &result_pos, line, &i);
         }
       }
       if (line[i] == '\'')
@@ -157,37 +206,41 @@ char *highlight_line(const char *line, int *length) {
     // Handle numbers
     if (line[i] >= '0' && line[i] <= '9') {
       result_pos += sprintf(&result[result_pos], "%s", E.theme.COLOR_NUMBER);
-      while (is_word_char(line[i]) || line[i] == '.') {
-        result[result_pos++] = line[i++];
+      while (is_word_char(&line[i]) || line[i] == '.') {
+        copy_utf8_char(result, &result_pos, line, &i);
       }
       result_pos += sprintf(&result[result_pos], "%s", COLOR_RESET);
       continue;
     }
 
     // Handle identifiers and keywords
-    if (is_word_char(line[i])) {
+    if (is_word_char(&line[i])) {
       int start = i;
-      while (is_word_char(line[i]))
-        i++;
+      // Advance by full UTF-8 character widths, not single bytes
+      while (line[i] != '\0' && is_word_char(&line[i]))
+        i += utf8_char_len(&line[i]);
 
       char word[256];
-      strncpy(word, &line[start], i - start);
-      word[i - start] = '\0';
+      int word_len = i - start;
+      if (word_len >= (int)sizeof(word))
+        word_len = (int)sizeof(word) - 1;
+      strncpy(word, &line[start], word_len);
+      word[word_len] = '\0';
 
-      SyntaxTokenType type = TOKEN_DEFAULT;
+      TokenType type = TOKEN_DEFAULT;
       if (is_keyword(word))
         type = TOKEN_KEYWORD;
       else if (is_type(word))
-        type = TOKEN_DATATYPE;
+        type = TOKEN_TYPE;
 
       result_pos += sprintf(&result[result_pos], "%s%s%s", get_color(type),
                             word, COLOR_RESET);
       continue;
     }
 
-    // Handle operators and other characters
+    // Handle operators and other characters (including non-ASCII multi-byte)
     result_pos += sprintf(&result[result_pos], "%s", E.theme.COLOR_DEFAULT);
-    result[result_pos++] = line[i++];
+    copy_utf8_char(result, &result_pos, line, &i);
     result_pos += sprintf(&result[result_pos], "%s", COLOR_RESET);
   }
 

src/termiWin.c

@@ -1,556 +0,0 @@
-/* termiWin.c
-*
-*   Copyright (C) 2017 Christian Visintin - christian.visintin1997@gmail.com
-*
-*   This file is part of "termiWin: a termios porting for Windows"
-*
-*   termiWin is free software: you can redistribute it and/or modify
-*   it under the terms of the GNU General Public License as published by
-*   the Free Software Foundation, either version 3 of the License, or
-*   (at your option) any later version.
-*
-*   termiWin is distributed in the hope that it will be useful,
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*   GNU General Public License for more details.
-*
-*   You should have received a copy of the GNU General Public License
-*   along with termiWin.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-#include "../include/termiWin.h"
-
-#ifdef _WIN32
-
-#ifdef __cplusplus > 201711L
-  #define TERMIWIN_MAYBE_UNUSED [[maybe_unused]]
-#else
-  #ifdef __GNUC__
-    #define TERMIWIN_MAYBE_UNUSED __attribute__((unused))
-  #else
-    #define TERMIWIN_MAYBE_UNUSED
-  #endif
-#endif
-
-#include <fcntl.h>
-#include <stdlib.h>
-
-typedef struct COM {
-  HANDLE hComm;
-  int fd; //Actually it's completely useless
-  char port[128];
-} COM;
-
-DCB SerialParams = { 0 }; //Initializing DCB structure
-struct COM com;
-COMMTIMEOUTS timeouts = { 0 }; //Initializing COMMTIMEOUTS structure
-
-//LOCAL functions
-
-//nbyte 0->7
-
-int getByte(tcflag_t flag, int nbyte, int nibble) {
-
-  int byte;
-  if (nibble == 1)
-    byte = (flag >> (8 * (nbyte)) & 0x0f);
-  else
-    byte = (flag >> (8 * (nbyte)) & 0xf0);
-  return byte;
-}
-
-//INPUT FUNCTIONS
-
-enum{
-  i_IXOFF = 0x01,
-  i_IXON = 0x02,
-  i_IXOFF_IXON = 0x03,
-  i_PARMRK = 0x04,
-  i_PARMRK_IXOFF = 0x05,
-  i_PARMRK_IXON = 0x06,
-  i_PARMRK_IXON_IXOFF = 0x07
-};
-
-int getIXOptions(tcflag_t flag) {
-  int byte = getByte(flag, 1, 1);
-
-  return byte;
-}
-
-//LOCALOPT FUNCTIONS
-
-enum{
-  l_NOECHO = 0x00,
-  l_ECHO = 0x01,
-  l_ECHO_ECHOE = 0x03,
-  l_ECHO_ECHOK = 0x05,
-  l_ECHO_ECHONL = 0x09,
-  l_ECHO_ECHOE_ECHOK = 0x07,
-  l_ECHO_ECHOE_ECHONL = 0x0b,
-  l_ECHO_ECHOE_ECHOK_ECHONL = 0x0f,
-  l_ECHO_ECHOK_ECHONL = 0x0d,
-  l_ECHOE = 0x02,
-  l_ECHOE_ECHOK = 0x06,
-  l_ECHOE_ECHONL = 0x0a,
-  l_ECHOE_ECHOK_ECHONL = 0x0e,
-  l_ECHOK = 0x04,
-  l_ECHOK_ECHONL = 0x0c,
-  l_ECHONL = 0x08
-};
-
-int getEchoOptions(tcflag_t flag) {
-  int byte = getByte(flag, 1, 1);
-  return byte;
-}
-
-enum{
-  l_ICANON = 0x10,
-  l_ICANON_ISIG = 0x50,
-  l_ICANON_IEXTEN = 0x30,
-  l_ICANON_NOFLSH = 0x90,
-  l_ICANON_ISIG_IEXTEN = 0x70,
-  l_ICANON_ISIG_NOFLSH = 0xd0,
-  l_ICANON_IEXTEN_NOFLSH = 0xb0,
-  l_ICANON_ISIG_IEXTEN_NOFLSH = 0xf0,
-  l_ISIG = 0x40,
-  l_ISIG_IEXTEN = 0x60,
-  l_ISIG_NOFLSH = 0xc0,
-  l_ISIG_IEXTEN_NOFLSH = 0xe0,
-  l_IEXTEN = 0x20,
-  l_IEXTEN_NOFLSH = 0xa0,
-  l_NOFLSH = 0x80,
-};
-
-int getLocalOptions(tcflag_t flag) {
-  int byte = getByte(flag, 1, 0);
-  return byte;
-}
-
-enum{
-  l_TOSTOP = 0x01
-};
-
-int getToStop(tcflag_t flag) {
-  int byte = getByte(flag, 1, 1);
-  return byte;
-}
-
-//CONTROLOPT FUNCTIONS
-
-int getCharSet(tcflag_t flag) {
-
-  //FLAG IS MADE UP OF 8 BYTES, A FLAG IS MADE UP OF A NIBBLE -> 4 BITS, WE NEED TO EXTRACT THE SECOND NIBBLE (1st) FROM THE FIFTH BYTE (6th).
-  int byte = getByte(flag, 1, 1);
-
-  switch (byte) {
-
-  case 0X0:
-    return CS5;
-    break;
-
-  case 0X4:
-    return CS6;
-    break;
-
-  case 0X8:
-    return CS7;
-    break;
-
-  case 0Xc:
-    return CS8;
-    break;
-
-  default:
-    return CS8;
-    break;
-  }
-}
-
-enum{
-  c_ALL_ENABLED = 0xd0,
-  c_PAREVEN_CSTOPB = 0x50,
-  c_PAREVEN_NOCSTOPB = 0x40,
-  c_PARODD_NOCSTOPB = 0xc0,
-  c_NOPARENB_CSTOPB = 0x10,
-  c_ALL_DISABLED = 0x00,
-};
-
-int getControlOptions(tcflag_t flag) {
-  int byte = getByte(flag, 1, 0);
-  return byte;
-}
-
-//LIBFUNCTIONS
-
-int tcgetattr(int fd, struct termios* TERMIWIN_MAYBE_UNUSED termios_p) {
-
-  if (fd != com.fd) return -1;
-  int TERMIWIN_MAYBE_UNUSED ret = 0;
-
-  ret = GetCommState(com.hComm, &SerialParams);
-
-  return 0;
-}
-
-int tcsetattr(int fd, int TERMIWIN_MAYBE_UNUSED optional_actions, const struct termios* termios_p) {
-
-  if (fd != com.fd) return -1;
-  int ret = 0;
-
-  //Store flags into local variables
-  tcflag_t iflag = termios_p->c_iflag;
-  tcflag_t lflag = termios_p->c_lflag;
-  tcflag_t cflag = termios_p->c_cflag;
-  tcflag_t TERMIWIN_MAYBE_UNUSED oflag = termios_p->c_oflag;
-
-  //iflag
-
-  int IX = getIXOptions(iflag);
-
-  if ((IX == i_IXOFF_IXON) || (IX == i_PARMRK_IXON_IXOFF)) {
-
-    SerialParams.fOutX = TRUE;
-    SerialParams.fInX = TRUE;
-    SerialParams.fTXContinueOnXoff = TRUE;
-  }
-
-  //lflag
-  int TERMIWIN_MAYBE_UNUSED EchoOpt = getEchoOptions(lflag);
-  int TERMIWIN_MAYBE_UNUSED l_opt = getLocalOptions(lflag);
-  int TERMIWIN_MAYBE_UNUSED tostop = getToStop(lflag);
-
-  //Missing parameters...
-
-  //cflags
-
-  int CharSet = getCharSet(cflag);
-  int c_opt = getControlOptions(cflag);
-
-  switch (CharSet) {
-
-  case CS5:
-    SerialParams.ByteSize = 5;
-    break;
-
-  case CS6:
-    SerialParams.ByteSize = 6;
-    break;
-
-  case CS7:
-    SerialParams.ByteSize = 7;
-    break;
-
-  case CS8:
-    SerialParams.ByteSize = 8;
-    break;
-  }
-
-  switch (c_opt) {
-
-  case c_ALL_ENABLED:
-    SerialParams.Parity = ODDPARITY;
-    SerialParams.StopBits = TWOSTOPBITS;
-    break;
-
-  case c_ALL_DISABLED:
-    SerialParams.Parity = NOPARITY;
-    SerialParams.StopBits = ONESTOPBIT;
-    break;
-
-  case c_PAREVEN_CSTOPB:
-    SerialParams.Parity = EVENPARITY;
-    SerialParams.StopBits = TWOSTOPBITS;
-    break;
-
-  case c_PAREVEN_NOCSTOPB:
-    SerialParams.Parity = EVENPARITY;
-    SerialParams.StopBits = ONESTOPBIT;
-    break;
-
-  case c_PARODD_NOCSTOPB:
-    SerialParams.Parity = ODDPARITY;
-    SerialParams.StopBits = ONESTOPBIT;
-    break;
-
-  case c_NOPARENB_CSTOPB:
-    SerialParams.Parity = NOPARITY;
-    SerialParams.StopBits = TWOSTOPBITS;
-    break;
-  }
-
-  //aflags
-
-  /*
-  int OP;
-  if(oflag == OPOST)
-  else ...
-  */
-  //Missing parameters...
-
-  //special characters
-
-  if (termios_p->c_cc[VEOF] != 0) SerialParams.EofChar = (char)termios_p->c_cc[VEOF];
-  if (termios_p->c_cc[VINTR] != 0) SerialParams.EvtChar = (char)termios_p->c_cc[VINTR];
-
-  if (termios_p->c_cc[VMIN] == 1) { //Blocking
-
-    timeouts.ReadIntervalTimeout = 0;         // in milliseconds
-    timeouts.ReadTotalTimeoutConstant = 0;    // in milliseconds
-    timeouts.ReadTotalTimeoutMultiplier = 0;  // in milliseconds
-    timeouts.WriteTotalTimeoutConstant = 0;   // in milliseconds
-    timeouts.WriteTotalTimeoutMultiplier = 0; // in milliseconds
-
-  } else { //Non blocking
-
-    timeouts.ReadIntervalTimeout = termios_p->c_cc[VTIME] * 100;         // in milliseconds
-    timeouts.ReadTotalTimeoutConstant = termios_p->c_cc[VTIME] * 100;    // in milliseconds
-    timeouts.ReadTotalTimeoutMultiplier = termios_p->c_cc[VTIME] * 100;  // in milliseconds
-    timeouts.WriteTotalTimeoutConstant = termios_p->c_cc[VTIME] * 100;   // in milliseconds
-    timeouts.WriteTotalTimeoutMultiplier = termios_p->c_cc[VTIME] * 100; // in milliseconds
-  }
-
-  SetCommTimeouts(com.hComm, &timeouts);
-
-  //EOF
-
-  ret = SetCommState(com.hComm, &SerialParams);
-  if (ret != 0)
-    return 0;
-  else
-    return -1;
-}
-
-int tcsendbreak(int fd, int TERMIWIN_MAYBE_UNUSED duration) {
-
-  if (fd != com.fd) return -1;
-
-  int ret = 0;
-  ret = TransmitCommChar(com.hComm, '\x00');
-  if (ret != 0)
-    return 0;
-  else
-    return -1;
-}
-
-int tcdrain(int fd) {
-
-  if (fd != com.fd) return -1;
-  return FlushFileBuffers(com.hComm);
-}
-
-int tcflush(int fd, int queue_selector) {
-
-  if (fd != com.fd) return -1;
-  int rc = 0;
-
-  switch (queue_selector) {
-
-  case TCIFLUSH:
-    rc = PurgeComm(com.hComm, PURGE_RXCLEAR);
-    break;
-
-  case TCOFLUSH:
-    rc = PurgeComm(com.hComm, PURGE_TXCLEAR);
-    break;
-
-  case TCIOFLUSH:
-    rc = PurgeComm(com.hComm, PURGE_RXCLEAR);
-    rc *= PurgeComm(com.hComm, PURGE_TXCLEAR);
-    break;
-
-  default:
-    rc = 0;
-    break;
-  }
-
-  if (rc != 0)
-    return 0;
-  else
-    return -1;
-}
-
-int tcflow(int fd, int action) {
-
-  if (fd != com.fd) return -1;
-  int rc = 0;
-
-  switch (action) {
-
-  case TCOOFF:
-    rc = PurgeComm(com.hComm, PURGE_TXABORT);
-    break;
-
-  case TCOON:
-    rc = ClearCommBreak(com.hComm);
-    break;
-
-  case TCIOFF:
-    rc = PurgeComm(com.hComm, PURGE_RXABORT);
-    break;
-
-  case TCION:
-    rc = ClearCommBreak(com.hComm);
-    break;
-
-  default:
-    rc = 0;
-    break;
-  }
-
-  if (rc != 0)
-    return 0;
-  else
-    return -1;
-}
-
-void cfmakeraw(struct termios* TERMIWIN_MAYBE_UNUSED termios_p) {
-
-  SerialParams.ByteSize = 8;
-  SerialParams.StopBits = ONESTOPBIT;
-  SerialParams.Parity = NOPARITY;
-}
-
-speed_t cfgetispeed(const struct termios* TERMIWIN_MAYBE_UNUSED termios_p) {
-
-  return SerialParams.BaudRate;
-}
-
-speed_t cfgetospeed(const struct termios* TERMIWIN_MAYBE_UNUSED termios_p) {
-
-  return SerialParams.BaudRate;
-}
-
-int cfsetispeed(struct termios* TERMIWIN_MAYBE_UNUSED termios_p, speed_t speed) {
-
-  SerialParams.BaudRate = speed;
-  return 0;
-}
-
-int cfsetospeed(struct termios* TERMIWIN_MAYBE_UNUSED termios_p, speed_t speed) {
-
-  SerialParams.BaudRate = speed;
-  return 0;
-}
-
-int cfsetspeed(struct termios* TERMIWIN_MAYBE_UNUSED termios_p, speed_t speed) {
-
-  SerialParams.BaudRate = speed;
-  return 0;
-}
-
-ssize_t read_serial(int fd, void* buffer, size_t count) {
-
-  if (fd != com.fd) return -1;
-  int rc = 0;
-  int ret;
-
-  ret = ReadFile(com.hComm, buffer, count, &rc, NULL);
-
-  if (ret == 0)
-    return -1;
-  else
-    return rc;
-}
-
-ssize_t write_serial(int fd, const void* buffer, size_t count) {
-
-  if (fd != com.fd) return -1;
-  int rc = 0;
-  int ret;
-
-  ret = WriteFile(com.hComm, buffer, count, &rc, NULL);
-
-  if (ret == 0)
-    return -1;
-  else
-    return rc;
-}
-
-int open_serial(const char* portname, int opt) {
-
-  if (strlen(portname) < 4) return -1;
-
-  // Set to zero
-  memset(com.port, 0x00, 128);
-
-  //COMxx
-  size_t portSize = 0;
-  if (strlen(portname) > 4) {
-    portSize = sizeof(char) * strlen("\\\\.\\COM10") + 1;
-#ifdef _MSC_VER
-    strncat_s(com.port, portSize, "\\\\.\\", strlen("\\\\.\\"));
-#else
-    strncat(com.port, "\\\\.\\", strlen("\\\\.\\"));
-#endif
-  }
-  //COMx
-  else {
-    portSize = sizeof(char) * 5;
-  }
-
-#ifdef _MSC_VER
-  strncat_s(com.port, portSize, portname, 4);
-#else
-  strncat(com.port, portname, 4);
-#endif
-  com.port[portSize] = 0x00;
-
-  switch (opt) {
-
-  case O_RDWR:
-    com.hComm = CreateFile(com.port, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
-    break;
-
-  case O_RDONLY:
-    com.hComm = CreateFile(com.port, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
-    break;
-
-  case O_WRONLY:
-    com.hComm = CreateFile(com.port, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
-    break;
-  }
-
-  if (com.hComm == INVALID_HANDLE_VALUE) {
-    return -1;
-  }
-  com.fd = atoi(portname + 3); // COMx and COMxx
-  SerialParams.DCBlength = sizeof(SerialParams);
-  return com.fd;
-}
-
-int close_serial(int TERMIWIN_MAYBE_UNUSED fd) {
-
-  int ret = CloseHandle(com.hComm);
-  if (ret != 0)
-    return 0;
-  else
-    return -1;
-}
-
-int select_serial(int TERMIWIN_MAYBE_UNUSED nfds, fd_set* readfds, fd_set* TERMIWIN_MAYBE_UNUSED writefds, fd_set* TERMIWIN_MAYBE_UNUSED exceptfds, struct timeval* TERMIWIN_MAYBE_UNUSED timeout) {
-
-  SetCommMask(com.hComm, EV_RXCHAR);
-  DWORD dwEventMask;
-  if (WaitCommEvent(com.hComm, &dwEventMask, NULL) == 0) {
-    return -1; // Return -1 if failed
-  }
-  if (dwEventMask == EV_RXCHAR) {
-    return com.fd;
-  } else {
-    if (readfds) {
-      // Clear file descriptor if event is not RXCHAR
-      FD_CLR(com.fd, readfds);
-    }
-  }
-  // NOTE: write event not detectable!
-  // NOTE: no timeout
-  return 0; // No data
-}
-
-//Returns hComm from the COM structure
-HANDLE getHandle() {
-  return com.hComm;
-}
-
-#endif

src/terminal.c

@@ -1,11 +1,16 @@
 #include "../include/terminal.h"
+
+#include <ctype.h>
+
 #include "../include/data.h"
+#include "../include/define.h"
 
+#include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
-#ifdef _WIN32
-#include <windows.h>
-#endif
+#include "include/utf8.h"
 
 void die(const char *s) {
   write(STDOUT_FILENO, "\x1b[2J", 4);
@@ -39,26 +44,88 @@ void enableRawMode() {
   }
 }
 
-int editorReadKey() {
-  int nread;
-  char c;
-  char seq[3];
-  while ((nread = read(STDIN_FILENO, &c, 1)) != 1) {
-    if (nread == -1 && errno != EAGAIN) {
-      die("read");
+#include <ctype.h> /* isprint */
+
+char *keyToString(int key) {
+  static char key_str[32];
+
+  if (key == '\r') {
+    strcpy(key_str, "ENTER");
+  } else if (key == 0x09) {
+    strcpy(key_str, "TAB");
+  } else if (key >= 1 && key <= 26) {
+    snprintf(key_str, sizeof(key_str), "CTRL-%c", 'a' + key - 1);
+  } else {
+    switch (key) {
+    case ARROW_UP:
+      strcpy(key_str, "ARROW-UP");
+      break;
+    case ARROW_DOWN:
+      strcpy(key_str, "ARROW-DOWN");
+      break;
+    case ARROW_LEFT:
+      strcpy(key_str, "ARROW-LEFT");
+      break;
+    case ARROW_RIGHT:
+      strcpy(key_str, "ARROW-RIGHT");
+      break;
+    case PAGE_UP:
+      strcpy(key_str, "PAGE-UP");
+      break;
+    case PAGE_DOWN:
+      strcpy(key_str, "PAGE-DOWN");
+      break;
+    case DEL_KEY:
+      strcpy(key_str, "DEL");
+      break;
+    case BACKSPACE:
+      strcpy(key_str, "BACKSPACE");
+      break;
+    case BEG_LINE:
+      strcpy(key_str, "HOME");
+      break;
+    case END_LINE:
+      strcpy(key_str, "END");
+      break;
+    case '\x1b':
+      strcpy(key_str, "ESCAPE");
+      break;
+    default:
+      if (key > 127) {
+        /* UTF-8 code point — re-encode into the buffer */
+        char buf[5] = {0};
+        int n = utf8Encode((uint32_t)key, buf);
+        snprintf(key_str, sizeof(key_str), "%.*s", n, buf);
+      } else if (isprint(key)) {
+        snprintf(key_str, sizeof(key_str), "%c", key);
+      } else {
+        snprintf(key_str, sizeof(key_str), "KEY-%d", key);
+      }
     }
   }
+  return key_str;
+}
+
+int editorReadKey() {
+  char c;
+  /* read first byte — may be start of UTF-8 or escape */
+  while (read(STDIN_FILENO, &c, 1) != 1)
+    ;
+  appDebug("f : %hhu %ld\r\n", c, 0x200);
 
   if (c == '\x1b') {
-    if (read(STDIN_FILENO, &seq[0], 1) != 1 ||
-        read(STDIN_FILENO, &seq[1], 1) != 1) {
+    char seq[6];
+    /* try to read escape sequence */
+    if (read(STDIN_FILENO, &seq[0], 1) != 1)
       return '\x1b';
-    }
+    if (read(STDIN_FILENO, &seq[1], 1) != 1)
+      return '\x1b';
+    appDebug("f2 : %s\r\n", seq);
+
     if (seq[0] == '[') {
       if (seq[1] >= '0' && seq[1] <= '9') {
-        if (read(STDIN_FILENO, &seq[2], 1) != 1) {
+        if (read(STDIN_FILENO, &seq[2], 1) != 1)
           return '\x1b';
-        }
         if (seq[2] == '~') {
           switch (seq[1]) {
           case '1':
@@ -78,7 +145,6 @@ int editorReadKey() {
           }
         }
       } else {
-
         switch (seq[1]) {
         case 'A':
           return ARROW_UP;
@@ -94,18 +160,26 @@ int editorReadKey() {
           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;
   }
+
+  /* multi-byte UTF-8: read remaining bytes */
+  int seqlen = utf8Seqlen((unsigned char)c);
+  if (seqlen > 1) {
+    /* pack into a pseudo-codepoint just to pass bytes through;
+       we handle encoding/decoding at the row level */
+    char buf[4] = {c, 0, 0, 0};
+    for (int i = 1; i < seqlen; i++)
+      if (read(STDIN_FILENO, &buf[i], 1) != 1)
+        break;
+    /* decode and return as uint32, but we need int — use high range */
+    const char *p = buf;
+    uint32_t cp = utf8Decode(&p);
+    return (int)cp; /* caller re-encodes when inserting */
+  }
+
+  return (unsigned char)c;
 }
 
 int getCursorPosition(int *rows, int *cols) {
@@ -138,15 +212,6 @@ int getCursorPosition(int *rows, int *cols) {
 }
 
 int getWindowSize(int *rows, int *cols) {
-#ifdef _WIN32
-  // Windows implementation
-  CONSOLE_SCREEN_BUFFER_INFO csbi;
-  GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi);
-  *cols = csbi.srWindow.Right - csbi.srWindow.Left + 1;
-  *rows = csbi.srWindow.Bottom - csbi.srWindow.Top + 1;
-  return 0;
-#else
-  // Unix implementation
   struct winsize ws;
 
   if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) {
@@ -159,5 +224,15 @@ int getWindowSize(int *rows, int *cols) {
     *rows = ws.ws_row;
     return 0;
   }
+}
+
+void appDebug(const char *fmt, ...) {
+#ifdef APP_DEBUG
+  va_list ap;
+  char message[256];
+  va_start(ap, fmt);
+  vsnprintf(message, 256, fmt, ap);
+  va_end(ap);
+  fprintf(stderr, "%s\n", message);
 #endif
 }

src/utf8.c

@@ -0,0 +1,147 @@
+/**
+ * @file utf8.c
+ */
+
+#include "../include/utf8.h"
+
+#include <stdint.h>
+#include <unistd.h>
+
+
+uint32_t readUtf8Char(void)
+{
+    unsigned char buf[4];
+
+    read(STDIN_FILENO, &buf[0], 1);
+
+    int extra;
+    uint32_t cp;
+
+    if (buf[0] < 0x80)
+    {
+        cp = buf[0];
+        extra = 0;
+    }
+    else if (buf[0] < 0xC0) { return 0xFFFD; } // stray continuation
+    else if (buf[0] < 0xE0)
+    {
+        cp = buf[0] & 0x1F;
+        extra = 1;
+    }
+    else if (buf[0] < 0xF0)
+    {
+        cp = buf[0] & 0x0F;
+        extra = 2;
+    }
+    else
+    {
+        cp = buf[0] & 0x07;
+        extra = 3;
+    }
+
+    if (extra > 0)
+    {
+        read(STDIN_FILENO, &buf[1], extra); // read remaining bytes at once
+        for (int i = 0; i < extra; i++)
+            cp = (cp << 6) | (buf[1 + i] & 0x3F);
+    }
+
+    return cp;
+}
+
+uint32_t utf8Decode(const char** s)
+{
+    unsigned char c = (unsigned char)**s;
+    uint32_t cp;
+    int extra;
+    if (c < 0x80)
+    {
+        cp = c;
+        extra = 0;
+    }
+    else if (c < 0xC0)
+    {
+        (*s)++;
+        return 0xFFFD;
+    }
+    else if (c < 0xE0)
+    {
+        cp = c & 0x1F;
+        extra = 1;
+    }
+    else if (c < 0xF0)
+    {
+        cp = c & 0x0F;
+        extra = 2;
+    }
+    else
+    {
+        cp = c & 0x07;
+        extra = 3;
+    }
+    (*s)++;
+    while (extra--)
+    {
+        c = (unsigned char)**s;
+        if ((c & 0xC0) != 0x80) return 0xFFFD;
+        cp = (cp << 6) | (c & 0x3F);
+        (*s)++;
+    }
+    return cp;
+}
+
+// buf must have at least 4 bytes; returns bytes written
+int utf8Encode(uint32_t cp, char* buf)
+{
+    if (cp < 0x80)
+    {
+        buf[0] = cp;
+        return 1;
+    }
+    if (cp < 0x800)
+    {
+        buf[0] = 0xC0 | (cp >> 6);
+        buf[1] = 0x80 | (cp & 0x3F);
+        return 2;
+    }
+    if (cp < 0x10000)
+    {
+        buf[0] = 0xE0 | (cp >> 12);
+        buf[1] = 0x80 | ((cp >> 6) & 0x3F);
+        buf[2] = 0x80 | (cp & 0x3F);
+        return 3;
+    }
+    buf[0] = 0xF0 | (cp >> 18);
+    buf[1] = 0x80 | ((cp >> 12) & 0x3F);
+    buf[2] = 0x80 | ((cp >> 6) & 0x3F);
+    buf[3] = 0x80 | (cp & 0x3F);
+    return 4;
+}
+
+int utf8Seqlen(unsigned char c)
+{
+    if (c < 0x80) return 1;
+    if (c < 0xC0) return 0; /* continuation — shouldn't be leading */
+    if (c < 0xE0) return 2;
+    if (c < 0xF0) return 3;
+    return 4;
+}
+
+/**
+ * @param codepoint utf8 codepoint of a char
+ * @return length of the codepoint
+ */
+int codepointWidth(uint32_t codepoint)
+{
+    if (codepoint < 0x20 || codepoint == 0x7F) return 0;
+    /* rough double-width ranges */
+    if ((codepoint >= 0x1100 && codepoint <= 0x115F) ||
+        (codepoint >= 0x2E80 && codepoint <= 0x303E) ||
+        (codepoint >= 0x3041 && codepoint <= 0x33BF) ||
+        (codepoint >= 0xAC00 && codepoint <= 0xD7AF) ||
+        (codepoint >= 0xF900 && codepoint <= 0xFAFF) ||
+        (codepoint >= 0xFF01 && codepoint <= 0xFF60) ||
+        (codepoint >= 0x1F300 && codepoint <= 0x1FAFF))
+        return 2;
+    return 1;
+}

src/utils.c

@@ -0,0 +1,38 @@
+//
+// Created by Giorgio on 28/05/2026.
+//
+
+#include "../include/utils.h"
+
+#include <stdlib.h>
+
+
+int beluga_alloc_counter = 0;
+
+void * bAlloc(size_t size)
+{
+    void * result = malloc(size);
+    if (!result)
+        return NULL;
+    beluga_alloc_counter++;
+    return result;
+}
+
+void * bRealloc(void * ptr, size_t size)
+{
+    void * result = realloc(ptr, size);
+    if (!result)
+        return NULL;
+    beluga_alloc_counter++;
+    return result;
+}
+
+void * bFree(void * ptr)
+{
+    if (ptr)
+    {
+        free(ptr);
+        beluga_alloc_counter--;
+    }
+    return NULL;
+}

test/main.c

@@ -0,0 +1,3 @@
+int main() {
+	printf("hello");
+}