text edit: changes line processing.

src/utils/d_array.c

@@ -13,10 +13,8 @@ void u_d_arr_ptr_init(d_array_ptr_t *arr, int32_t init_capacity) {
   memset(arr->arr, 0, sizeof(void *) * init_capacity);
 }
 
-/* TODO: check out the correctness */
 void u_d_array_append(d_array_ptr_t *arr, void *el_ptr, size_t el_len) {
-  void *el = malloc(el_len);
-  u_d_arr_ptr_add(arr, el, arr->length);
+  u_d_arr_ptr_add(arr, el_ptr, arr->length);
 }
 
 void u_d_arr_ptr_add(d_array_ptr_t *arr, void *ptr, int32_t idx) {

src/windows/text_edit.c

@@ -27,12 +27,12 @@ static void w_te_cb(w_cb_args_t *args) {
   app_t *app = args->app;
   int32_t key = *((int32_t *)args->data);
   w_te_ui_t *fui = app->query_args->main_ui->ui;
-  w_te_ui_line_t *line = NULL;
+  w_te_ui_line_t *new_line = NULL;
 
   switch (key) {
   case KEY_BACKSPACE:
   case KEY_DL:
-    fui->line[fui->line_len--] = 0;
+    fui->current_line->text[fui->current_line->len--] = 0;
     break;
   case KEY_UP:
     fui->cur_shift_pos.y--;
@@ -43,17 +43,18 @@ static void w_te_cb(w_cb_args_t *args) {
     fui->cur_shift_pos.y++;
     break;
   case '\n':
-    line = malloc(sizeof (w_te_ui_line_t));
-    line->text = malloc(sizeof (wchar_t ) * (fui->line_len + 1));
-    wcscpy(line->text, fui->line);
-    line->capacity = line->len = fui->line_len;
-    u_d_array_append(&(fui->lines_arr), fui->line, fui->line_len);
-    fui->line[0] = 0;
-    fui->line_len = 0;
+    new_line = malloc(sizeof(w_te_ui_line_t));
+    new_line->text = malloc(sizeof(wchar_t) * INBUFSIZE);
+    new_line->capacity = new_line->len = INBUFSIZE;
+    new_line->text[0] = 0;
+    new_line->len = 0;
+
+    u_d_array_append(&(fui->lines_arr), new_line, sizeof(w_te_ui_line_t));
+    fui->current_line = new_line;
     break;
   default:
-    fui->line[fui->line_len++] = key;
-    fui->line[fui->line_len] = 0;
+    fui->current_line->text[fui->current_line->len++] = key;
+    fui->current_line->text[fui->current_line->len] = 0;
   }
 }
 
@@ -126,6 +127,11 @@ w_te_ui_t *w_te_init_win(app_t *app) {
   wcsncpy(app->top_text, top_text, top_text_len);
   app->top_text[top_text_len] = 0;
   u_d_arr_ptr_init(&(fui->lines_arr), INBUFSIZE);
+  fui->current_line = malloc(sizeof(w_te_ui_line_t));
+  fui->current_line->text = malloc(INBUFSIZE * sizeof(wchar_t));
+  fui->current_line->len = 0;
+  fui->current_line->capacity = INBUFSIZE;
+  u_d_array_append(&(fui->lines_arr), fui->current_line, sizeof(w_te_ui_line_t));
   return fui;
 }
 
@@ -133,7 +139,6 @@ void w_te_reset(w_te_ui_t *fui) {
   fui->line[0] = 0;
   fui->cur_shift_pos.x = 0;
   fui->cur_shift_pos.y = 0;
-  fui->line_len = 0;
 }
 
 void w_te_reset_app(void *app) {
@@ -160,40 +165,20 @@ void w_te_draw(w_te_ui_t *fui) {
     mvwprintw(win, p_y + i, p_x, "%*s", fui->w.sz.x, "");
   }
 
-  int len_rest = fui->line_len;
-
   wchar_t *cur_ptr = fui->line;
   wchar_t *nl_ptr = wcschr(cur_ptr, '\n');
-  // if (nl_ptr == NULL) {
-  //   mvwaddnwstr(win, p_y, p_x, cur_ptr, fui->line_len);
-  //   p_x += fui->line_len;
-  // } else {
-  //   while (true) {
-  //     mvwaddnwstr(win, p_y++, p_x, cur_ptr, nl_ptr - cur_ptr);
-  //     cur_ptr = nl_ptr + 1;
-  //     nl_ptr = wcschr(cur_ptr, '\n');
-  //     if (nl_ptr == NULL) {
-  //       int tlen = wcslen(cur_ptr);
-  //       mvwaddnwstr(win, p_y, p_x, cur_ptr, tlen);
-  //       p_x += tlen;
-  //       break;
-  //     }
-  //   }
-  // }
   w_te_ui_line_t *line_arr_el = NULL;
-  for (int i = 0; i < fui->lines_arr.length; i++) {
-    line_arr_el = (w_te_ui_line_t *) fui->lines_arr.arr[i];
-    mvwaddnwstr(win, p_y++, p_x, line_arr_el->text, line_arr_el->len);
-  }
 
-  mvwaddnwstr(win, p_y, p_x, fui->line, fui->line_len);
+  if (fui->lines_arr.length > 0) {
+    for (int i = 0; i < fui->lines_arr.length; i++) {
+      line_arr_el = (w_te_ui_line_t *)fui->lines_arr.arr[i];
+      mvwaddnwstr(win, p_y++, p_x, line_arr_el->text, line_arr_el->len);
+    }
+  }
 
   fui->cur_abs_pos.y = p_y;
   fui->cur_abs_pos.x = p_x;
 
-  wmove(win, fui->cur_abs_pos.y + fui->cur_shift_pos.y,
-        fui->cur_abs_pos.x + fui->cur_shift_pos.x);
-
   p_x = 1;
 
   wattroff(win, A_BOLD);

src/windows/text_edit.h

@@ -12,11 +12,17 @@
 #include <wchar.h>
 #include <widget_core.h>
 
+typedef struct {
+  int len;
+  wchar_t *text; /* TODO: make dynamic */
+  int capacity;
+} w_te_ui_line_t;
+
+
 typedef struct {
   w_t w;
   WINDOW *win;
   wchar_t line[INBUFSIZE * 10];
-  int line_len;
   int line_cur_pos;
   struct {
     int x;
@@ -27,15 +33,10 @@ typedef struct {
     int y;
   } cur_abs_pos;
   p_file_t *file_ptr;
+  w_te_ui_line_t *current_line;
   d_array_ptr_t lines_arr;
 } w_te_ui_t;
 
-typedef struct {
-  int len;
-  wchar_t *text; /* TODO: make dynamic */
-  int capacity;
-} w_te_ui_line_t;
-
 void w_te_draw(w_te_ui_t *fl_ui);
 void w_te_destroy(w_te_ui_t **fui);
 void w_te_reset(w_te_ui_t *fl_ui);