From ceacd1306ffed4fd67c0912b3241cb7573eb3ab9 Mon Sep 17 00:00:00 2001
From: night0721 <night@night0721.xyz>
Date: Tue, 24 Sep 2024 13:53:53 +0100
Subject: [PATCH] Rename folders

---
 src/{client => zen}/db.c           |  0
 src/{client => zen}/user.c         |  0
 src/{client/ui.c => zen/zen.c}     | 20 ++++++--------------
 src/{client/client.c => zen/zmd.c} |  8 +++-----
 4 files changed, 9 insertions(+), 19 deletions(-)
 rename src/{client => zen}/db.c (100%)
 rename src/{client => zen}/user.c (100%)
 rename src/{client/ui.c => zen/zen.c} (98%)
 rename src/{client/client.c => zen/zmd.c} (98%)

diff --git a/src/client/db.c b/src/zen/db.c
similarity index 100%
rename from src/client/db.c
rename to src/zen/db.c
diff --git a/src/client/user.c b/src/zen/user.c
similarity index 100%
rename from src/client/user.c
rename to src/zen/user.c
diff --git a/src/client/ui.c b/src/zen/zen.c
similarity index 98%
rename from src/client/ui.c
rename to src/zen/zen.c
index a4fabf0..449d6be 100644
--- a/src/client/ui.c
+++ b/src/zen/zen.c
@@ -48,7 +48,7 @@ void ncurses_init()
 {
     /* check if it is interactive shell */
     if (!isatty(STDIN_FILENO)) {
-        error(1, "No tty detected. zsm requires an interactive shell to run");
+        error(1, "No tty detected. zen requires an interactive shell to run");
     }
 
     /* initialize screen, don't print special chars,
@@ -562,13 +562,13 @@ void ncurses_deinit()
 /*
  * Main loop of user interface
  */
-void ui(int fd)
+int main(int argc, char **argv)
 {
 	signal(SIGPIPE, signal_handler);
     signal(SIGABRT, signal_handler);
 	signal(SIGINT, signal_handler);
 	signal(SIGTERM, signal_handler);
-	sockfd = fd;
+	connect_server();
     ncurses_init();
     windows_init();
     users = arraylist_init(LINES);
@@ -579,27 +579,18 @@ void ui(int fd)
 	refresh();
     int ch;
     while (1) {
-		/*
-        if (COLS < 80 || LINES < 24) {
-            endwin();
-            error(1, "Terminal size needs to be at least 80x24");
-        }
-		*/
 		if (current_window == CHAT_WINDOW) {
 			wclear(textbox);
 			mvwprintw(textbox, 0, 0, "> %s", content);
 			wrefresh(textbox);
 			wmove(textbox, 0, curs_pos + 2);
+			/* Set cursor to visible */
 			curs_set(2);
 		} else {
 			curs_set(0);
 		}
 		ch = getch();
 		switch (ch) {
-			case CTRLD:
-				ncurses_deinit();
-				break;
-
 			/* go up by k or up arrow */
             case UP:
 				if (current_window == USERS_WINDOW) {
@@ -645,5 +636,6 @@ void ui(int fd)
 
 		}
     }
-	return;
+	ncurses_deinit();
+	return 0;
 }
diff --git a/src/client/client.c b/src/zen/zmd.c
similarity index 98%
rename from src/client/client.c
rename to src/zen/zmd.c
index 457f581..df9761c 100644
--- a/src/client/client.c
+++ b/src/zen/zmd.c
@@ -7,8 +7,6 @@
 #include "client/db.h"
 #include "server/server.h"
 
-int sockfd;
-
 /*
  * Authenticate with server by signing a challenge
  */
@@ -132,7 +130,7 @@ int main()
         error(1, "Error initializing libnotify");
     }
 
-	sockfd = socket(AF_INET, SOCK_STREAM, 0);
+	int sockfd = socket(AF_INET, SOCK_STREAM, 0);
     if (sockfd < 0) {
         error(1, "Error on opening socket");
     }
@@ -149,8 +147,8 @@ int main()
     memcpy(&server_addr.sin_addr.s_addr, server->h_addr, server->h_length);
 
 /*  free(server); Can't be freed seems */
-    if (connect(sockfd, (struct sockaddr *) &server_addr, sizeof(server_addr)
-				) < 0) {
+    if (connect(sockfd, (struct sockaddr *) &server_addr, sizeof(server_addr))
+			< 0) {
 		error(1, "Error on connect");
 		close(sockfd);
 		return 0;