ui: file list (not finished)

TODO.md

@@ -1,5 +1,6 @@
 TODO:
 - [x] More universal Makefile
+- [ ] Draw only when something changes in UI
 - [ ] Check and fix registration and login
 - [x] UI: destroy child elements everywhere
 - [x] use parent widgets pointers to count the margins correctly

src/deps.mk

@@ -8,17 +8,21 @@ file_processor.o: src/file_processor.c src/client.h src/main.h \
  src/types.h src/query.h src/ui/app.h src/ui/../common.h \
  src/ui/widget/dialogue.h src/ui/widget/../widget.h \
  src/ui/widget/../../main.h src/ui/widget/../../common.h \
- src/ui/widget/button.h src/ui/widget/../../main.h src/ui/widget/group.h
+ src/ui/widget/button.h src/ui/widget/../../main.h src/ui/widget/group.h \
+ src/ui/widget/file_list.h
 main.o: src/main.c src/connection.h src/main.h src/types.h src/ui/app.h \
  src/ui/../common.h src/ui/widget/dialogue.h src/ui/widget/../widget.h \
  src/ui/widget/../../main.h src/ui/widget/../../common.h \
  src/ui/widget/button.h src/ui/widget/../../main.h src/ui/widget/group.h \
- src/query.h src/ui/widget.h src/ui/widget/dialogue.h
+ src/query.h src/ui/widget.h src/ui/widget/dialogue.h \
+ src/ui/widget/file_list.h
 query.o: src/query.c src/client.h src/main.h src/types.h src/connection.h \
  src/ui/app.h src/ui/../common.h src/ui/widget/dialogue.h \
  src/ui/widget/../widget.h src/ui/widget/../../main.h \
  src/ui/widget/../../common.h src/ui/widget/button.h \
  src/ui/widget/../../main.h src/ui/widget/group.h src/file_processor.h \
  src/server.h
-server.o: src/server.c src/client.h src/main.h src/types.h src/ui.h
+server.o: src/server.c src/client.h src/main.h src/types.h src/ui.h \
+ src/ui/widget/file_list.h src/ui/widget/../widget.h \
+ src/ui/widget/../../main.h
 ui.o: src/ui.c

src/file_processor.c

@@ -1,6 +1,7 @@
 #include "client.h"
 #include "main.h"
 #include "query.h"
+#include "ui/widget/file_list.h"
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <netinet/in.h>
@@ -36,6 +37,7 @@ void file_list(file_args_t *f_args, query_args_t *q_args) {
                                         &query))) {
     if (!strcmp("list_end\n", query)) {
       q_args->state = S_FILE_SELECT;
+      draw_file_list(q_args->file_list_ui, &(f_args->l_start));
       idx = 1;
       break;
     }
@@ -43,8 +45,6 @@ void file_list(file_args_t *f_args, query_args_t *q_args) {
     qbuf_used += strlen(qbuf);
     if (strchr(qbuf, '\n') == NULL) continue;
     fl_add(&(f_args->l_current), &(f_args->l_start), qbuf);
-    printf("[%d] [%s | %s]\n%s\n", idx++, f_args->l_current->name,
-           f_args->l_current->owner, f_args->l_current->description);
     free(query);
     query = NULL;
     qbuf_used = 0;
@@ -53,7 +53,7 @@ void file_list(file_args_t *f_args, query_args_t *q_args) {
 
   while ((qlen = query_extract_from_buf(q_args->buf, &(q_args->buf_used),
                                         &query))) {
-    write(STDOUT_FILENO, query, strlen(query));
+    // write(STDOUT_FILENO, query, strlen(query));
   }
 }
 

src/main.c

@@ -15,6 +15,7 @@
 #include "ui/app.h"
 #include "ui/widget.h"
 #include "ui/widget/dialogue.h"
+#include "ui/widget/file_list.h"
 
 uint32_t m_id = 0;
 
@@ -41,6 +42,7 @@ int main(int argc, char **argv) {
   init_query_args(q_args, app->params);
   q_args->buf = malloc(INBUFSIZE);
   app->query_args = q_args;
+  q_args->file_list_ui = init_file_list(&(app->left_win));
 
   /* init client to connect to the server */
   app->params->sd = init_client();

src/main.h

@@ -84,6 +84,7 @@ typedef struct query_args {
     uint64_t capacity;
     uint64_t size;
   } server_message;
+  void *file_list_ui; /* TODO: find solution to insert actual type without recursion */
 } query_args_t;
 
 #endif

src/server.c

@@ -1,6 +1,7 @@
 #include "client.h"
 #include "main.h"
 #include "ui.h"
+#include "ui/widget/file_list.h"
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <netinet/in.h>
@@ -37,8 +38,14 @@ int process_server_command(char *line, int l_len, query_args_t *q_args) {
 
   /* LOGIN */
   if (!strncmp(line, "login>", ws_pos)) {
+    if (q_args->server_message.size > 0) {
       PRINT_SRV_MESSAGE(q_args);
+    }
+    if (q_args->params->uname != NULL && q_args->params->pass != NULL) {
+      write(params->sd, q_args->params->uname, strlen(q_args->params->uname));
+    } else {
       q_args->state = S_ASK_LOGIN_TYPE;
+    }
     return 0;
   }
 
@@ -65,9 +72,8 @@ int process_server_command(char *line, int l_len, query_args_t *q_args) {
   /* REGISTER CONFIRMATION */
   if (q_args->state == WAIT_REGISTER_CONFIRMATION) {
     if (!strcmp(line, "ok")) {
-      printf("Welcome, %s\n", q_args->params->uname);
+      write(q_args->sd, "file list", sizeof("file list"));
-      print_prompt(q_args->params);
+      q_args->state = S_FILE_LIST;
-      q_args->state = WAIT_CLIENT;
       return 0;
     } else {
       write(STDOUT_FILENO, line, strlen(line));
@@ -83,9 +89,8 @@ int process_server_command(char *line, int l_len, query_args_t *q_args) {
 
   /* WELCOME MES */
   if (!strncmp(line, "Welcome, ", ws_pos)) {
-    printf("%s\n", line);
+    write(q_args->sd, "file list", sizeof("file list"));
-    print_prompt(q_args->params);
+    q_args->state = S_FILE_LIST;
-    q_args->state = WAIT_CLIENT;
     return 0;
   }
 

src/ui/app.c

@@ -3,6 +3,7 @@
 #include "modals/login_credentials.h"
 #include "modals/login_option.h"
 #include "modals/server_message.h"
+#include "widget/file_list.h"
 // #include "modals/server_message.h"
 // #include "action.h"
 #include <ncurses.h>
@@ -111,14 +112,6 @@ void print_bars(app_t *app) {
   wattroff(app->win, A_REVERSE);
 }
 
-void draw_file_list(app_t *app) {
-  WINDOW *win = app->left_win;
-  int sz_y, sz_x;
-  getmaxyx(win, sz_y, sz_x);
-
-  
-}
-
 void app_refresh(app_t *app) {
   draw_borders(app);
 

src/ui/widget.h

@@ -45,7 +45,7 @@ typedef struct widget_t {
   } cur;
   WINDOW *const *parent_win;
   struct widget_t *w_parent;
-  enum rsize rsize;
+  // enum rsize rsize;
   void (*callback)(callback_args_t *args);
 } widget_t;
 

src/ui/widget/file_list.c

@@ -0,0 +1,31 @@
+#include "file_list.h"
+#include <ncurses.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
+file_list_t *init_file_list(WINDOW **win) {
+  file_list_t *fl_ui = malloc(sizeof(file_list_t));
+  init_widget(&(fl_ui->w), NULL, win,"");
+  return fl_ui;
+}
+
+void draw_file_list(file_list_t *fl_ui, fl_item_t **fl_start) {
+  int32_t sz_y, sz_x;
+  int32_t p_y, p_x;
+  getmaxyx(*(fl_ui->w.parent_win), sz_y, sz_x);
+  p_y = 1;
+  p_x = 1;
+  fl_item_t *el = *fl_start;
+
+  do {
+    p_x = 1;
+    mvwprintw(*(fl_ui->w.parent_win), p_y, p_x, "%s%n", el->name, &p_x);
+    for (uint i = 1; p_x < sz_x; i++) {
+        mvwprintw(*(fl_ui->w.parent_win), p_y, ++p_x, " ");
+    }
+    p_y++;
+  } while ((el = el->next) != NULL && p_y < sz_y);
+
+}

src/ui/widget/file_list.h

@@ -0,0 +1,14 @@
+#ifndef FILE_LIST_H
+#define FILE_LIST_H
+#include "../widget.h"
+#include <stdint.h>
+typedef struct {
+    widget_t w;
+    fl_item_t *current;
+    fl_item_t *start;
+    int32_t current_idx;
+} file_list_t;
+
+void draw_file_list(file_list_t *fl_ui, fl_item_t **fl_start);
+file_list_t *init_file_list(WINDOW **win);
+#endif