Merge branch 'main' of https://github.com/Tetrapak0/NexusShell

Author: Tetrapak0

.github/workflows/cmake-single-platform.yml

@@ -0,0 +1,34 @@
+# This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you need cross-platform coverage.
+# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml
+name: CMake on Linux x86_64
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Configure Packages
+      run: |
+           sudo apt update -y
+           sudo apt upgrade -y
+           sudo apt install gcc build-essential cmake libfreetype-dev
+    - name: Configure CMake
+      run: |
+           cd Client 
+           cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=MinSizeRel
+    - name: Build
+      run: cmake --build ${{github.workspace}}/build --config MinSizeRel
+
+    - name: Upload a Build Artifact
+      uses: actions/[email protected]
+      with:
+        name: NexusShell
+        path: ./build/NexusShell
+        if-no-files-found: error

README.md

@@ -17,7 +17,6 @@
 ## Help Wanted:
 #### Any contributions implementing following features will most likely be approved
 ### Top Priority:
-- Github Actions and artifact uploading -- The Linux build works on Arch Linux, but not on Ubuntu
 - Code stability, reliability, efficiency, rigidity and robustness
 - include SDL for aarch64
 ### High Priority:
@@ -40,14 +39,17 @@ The client only supports Linux.
 ##### 1.1 Install git if not installed:
 - Arch & based: `sudo pacman -Syu git`
 - Debian & based: `sudo apt update && sudo apt install git`
+- Fedora: `sudo dnf upgrade --refresh && sudo dnf install git`
 ##### 1.2 Clone
 `git clone https://github.com/Tetrapak0/NexusShell`
 #### 2. Install FreeType
 - Arch & based: `sudo pacman -Syu freetype2`
 - Debian & based: `sudo apt update && sudo apt install libfreetype-dev`
+- Fedora: `sudo dnf upgrade --refresh && sudo dnf install freetype-dev`
 #### 3. Install CMake
 - Arch & based: `sudo pacman -Syu cmake`
 - Debian & based: `sudo apt update && sudo apt install cmake`
+- Fedora: `sudo dnf upgrade --refresh && sudo dnf install cmake`
 #### 4. Configure CMake
 ##### 4.1 Build directory
 ```console
@@ -59,6 +61,7 @@ mkdir build
 ###### 4.2.1 Install gcc for aarch64
 - Arch & based: `sudo pacman -Syu aarch64-linux-gnu-gcc`
 - Debian & based: `sudo apt update && sudo apt install gcc-aarch64-linux-gnu`
+- Fedora: `gcc-aarch64-linux-gnu`
 ###### 4.2.2 Configure CMake for cross-compilation
 ```console
 cmake .. -DCMAKE_BUILD_TYPE=Release -DCROSS_COMPILE

Server/Server.vcxproj

@@ -207,6 +207,7 @@
     <ClInclude Include="include\Config.h" />
     <ClInclude Include="include\GUI.h" />
     <ClInclude Include="include\Header.h" />
+    <ClInclude Include="include\Server.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>

Server/Server.vcxproj.filters

@@ -203,6 +203,9 @@
     <ClInclude Include="include\Config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\Server.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\icon.png">

Server/include/Config.h

@@ -40,6 +40,11 @@ class profile {
 
 class id {
 public:
+	bool reconfigure  = false;
+	bool has_commsock = false;
+	bool has_confsock = false;
+	int belongs_to_comm_thread_no;
+	int belongs_to_conf_thread_no;
 	string ID;
 	vector<profile> profiles;
 	id(string in_ID);
@@ -50,8 +55,6 @@ extern vector<id> ids;
 
 using json = nlohmann::ordered_json;
 
-extern bool send_config;
-
 extern void clear_button(int profile, int page, int button);
 extern void configure_id(id* id);
-extern void write_config(vector<string> args, int arg_size);
+extern void write_config(vector<string> args, size_t arg_size);

Server/include/Header.h

@@ -15,8 +15,6 @@
 #include <Windows.h>
 #include <WinUser.h>
 #include <shellapi.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
 
 #include "../../json.hpp"
 
@@ -38,14 +36,3 @@ extern bool button_cleared;
 
 extern int selected_id;
 extern int connected_devices;
-
-extern int server_init();
-
-extern int setup_sock(int& iResult, 
-					  WSADATA& wsaData,
-		   			  SOCKET& ListenSocket,
-					  SOCKET& ClientSocket,
-					  struct addrinfo hints,
-					  struct addrinfo* result);
-
-extern void parse_message(string message);

Server/include/Server.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include "Config.h"
+
+using std::string;
+using std::vector;
+
+struct sockinfo {
+	WSADATA wsaData;
+	int iResult = 1;
+	int iSendResult = 1;
+	SOCKET ClientSocket = INVALID_SOCKET;
+	SOCKET ListenSocket = INVALID_SOCKET;
+	struct addrinfo hints;
+	struct addrinfo* result = NULL;
+};
+
+extern int server_init();
+
+extern int setup_sock(int& iResult,
+					  WSADATA& wsaData,
+					  SOCKET& ListenSocket,
+					  SOCKET& ClientSocket,
+					  struct addrinfo hints,
+					  struct addrinfo* result,
+					  int socktype);
+extern int accept_socket(sockinfo& sock, char* idbuf, char* sock_id, bool& is_valid);
+
+extern sockinfo sock_init(int type);
+
+extern bool is_id(string message);
+
+extern void parse_message(string message);
+extern void comm_comm(sockinfo commsock);
+extern void conf_comm(sockinfo confsock);
+extern void reconfigure(id& id, sockinfo& sockinfo);
+extern void begin_accept_cycle(sockinfo& commsock, sockinfo& confsock);

Server/src/Config.cpp

@@ -1,6 +1,12 @@
 #include "../include/Header.h"
 #include "../include/Config.h"
 
+bool button_cleared = false;
+
+id::id(string in_ID) : ID(in_ID) {}
+bool id::operator==(const id& other) const { return ID == other.ID; }
+vector<id> ids;
+
 void read_config(json& config, id* ID) {
 	if (config[config.begin().key()].contains("profiles")) {
 		ID->profiles.clear();
@@ -12,6 +18,8 @@ void read_config(json& config, id* ID) {
 				button button1;
 				profile1.buttons.push_back(button1);
 			}
+			ID->profiles.push_back(profile1);
+			return;
 		}
 		for (int i = 0; i < profile_count; i++) {
 			profile profile1;
@@ -21,11 +29,13 @@ void read_config(json& config, id* ID) {
 			if (profile_store.contains("pages")) {
 				int page_count = 0;
 				for (auto& page : profile_store["pages"]) if (page.is_object()) page_count++;
-				if (page_count == 0)
+				if (page_count == 0) {
 					for (int a = 0; i < profile1.columns * profile1.rows; i++) {
 						button button1;
 						profile1.buttons.push_back(button1);
 					}
+					continue;
+				}
 				for (int j = 0; j < page_count; j++) {
 					json page_store = profile_store["pages"][to_string(j)];
 					if (page_store.contains("buttons")) {
@@ -81,7 +91,7 @@ void configure_id(id* id) {
 				read_config(config, id);
 				reader.close();
 				cerr << "configured\n";
-				send_config = true;
+				id->reconfigure = true;
 				return;
 			} catch (...) {
 				cerr << "invalid config!\nclearing...\n";
@@ -90,7 +100,7 @@ void configure_id(id* id) {
 				ofstream writer(nxsh_config);
 				writer << empty_config.dump(4);
 				writer.close();
-				send_config = true;
+				id->reconfigure = true;
 			}
 		}
 		reader.close();
@@ -106,7 +116,7 @@ void configure_id(id* id) {
 	ofstream writer(nxsh_config);
 	writer << empty_config.dump(4);
 	writer.close();
-	send_config = true;
+	id->reconfigure = true;
 }
 
 void clear_button(int profile, int page, int button) {
@@ -129,10 +139,10 @@ void clear_button(int profile, int page, int button) {
 	writer.close();
 	read_config(to_remove, &ids[selected_id]);
 	button_cleared = true;
-	send_config = true;
+	ids[selected_id].reconfigure = true;
 }
 
-void write_config(vector<string> args, int arg_size) {
+void write_config(vector<string> args, size_t arg_size) {
 	string nxsh_config(getenv("USERPROFILE"));
 	nxsh_config += "\\AppData\\Roaming\\NexusShell";
 	if (!exists(nxsh_config)) create_directory(nxsh_config);

Server/src/GUI.cpp

@@ -143,11 +143,7 @@ ImGuiStyle& set_style(/*style parameters*/) {
 }
 
 int tray_init() {
-#ifdef _WIN32
-	Tray::Tray tray("NexusShell", "..\\..\\icon.ico");
-#else 
-	Tray::Tray tray("NexusShell", "../../icon.ico");
-#endif
+	Tray::Tray tray("NexusShell", "icon.ico");
 	tray.addEntry(Tray::Button("Show Window\0", [&] { ShowWindow(FindWindow(NULL, L"NexusShell"), SW_NORMAL);
 													  SetFocus(FindWindow(NULL, L"NexusShell")); }));
 	tray.addEntry(Tray::Separator());
@@ -253,7 +249,7 @@ void draw_properties(int index) {
 			write_config(to_write, to_write.size());
 			to_write = { CURRENT_ID.ID, "profiles", to_string(0), "pages", to_string(CURRENT_ID.profiles[0].current_page), "buttons", to_string(properties_to_draw), "action", CURRENT_ID_AND_BUTTON.action };
 			write_config(to_write, to_write.size());
-			send_config = true;
+			ids[selected_id].reconfigure = true;
 		}
 		ImGui::EndDisabled();
 		ImGui::SameLine();