From f27143165f1f3c2e47aaa65c4da24875e1639ceb Mon Sep 17 00:00:00 2001 From: Joursoir Date: Sat, 12 Dec 2020 12:44:08 +0000 Subject: some changes in work spec-symbols; clui: refactor; --- src/client/clui/Client.cpp | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'src/client/clui/Client.cpp') diff --git a/src/client/clui/Client.cpp b/src/client/clui/Client.cpp index 9b697b6..fa89710 100644 --- a/src/client/clui/Client.cpp +++ b/src/client/clui/Client.cpp @@ -1,17 +1,11 @@ #include +#include "../dimensions_client.hpp" #include "Client.hpp" #include "clui.hpp" -#define CHAT_HEIGHT 20 -#define CHAT_WIDTH 59 -#define PLAYERS_WIDTH 20 -#define PLAYERS_HEIGHT 12 -#define TIPS_WIDTH 20 -#define TIPS_HEIGHT 8 -#define INPUT_HEIGHT 4 -#define INPUT_WIDTH 80 - +const int input_lines = 2; +const int input_columns = 78; const int key_enter = 10; const int key_escape = 27; const int key_backspace = 127; @@ -19,10 +13,11 @@ const int key_backspace = 127; Client::Client(const char* ip, int port) : ClientBase(ip, port), in_buf_used(0), exit_flag(false) { - chat = new WindowChat(CHAT_HEIGHT, CHAT_WIDTH, 0, 0, 0); - players = new WindowPlayers(PLAYERS_HEIGHT, PLAYERS_WIDTH, 0, 60, 0); - tips = new WindowTips(TIPS_HEIGHT, TIPS_WIDTH, PLAYERS_HEIGHT, 60, 0); - input = new WindowInput(INPUT_HEIGHT, INPUT_WIDTH, 20, 0, 0); + // y+2 and x+2 for outlines + chat = new WindowChat(CHAT_LINES+2, CHAT_COLUMNS+2, 0, 0, 0); + players = new WindowPlayers(PLAYERS_LINES+2, PLAYERS_COLUMNS+2, 0, CHAT_COLUMNS+2+1, 0); + tips = new WindowTips(TIPS_LINES+2, TIPS_COLUMNS+2, PLAYERS_LINES+2, CHAT_COLUMNS+2+1, 0); + input = new WindowInput(input_lines+2, input_columns+2, CHAT_LINES+2, 0, 0); } Client::~Client() -- cgit v1.2.3-18-g5258