From f46ab5cf14b9d8098df77e0f2effdaa09aeda5cf Mon Sep 17 00:00:00 2001 From: willifan Date: Tue, 2 Apr 2024 23:35:00 +0200 Subject: [PATCH] refactor from 4 space tabs to 2 --- eww.yuck | 2 - scripts/clients/src/main.cpp | 119 ++++++++++++++++++----------------- scripts/clients/src/test | Bin 24632 -> 0 bytes 3 files changed, 60 insertions(+), 61 deletions(-) delete mode 100755 scripts/clients/src/test diff --git a/eww.yuck b/eww.yuck index 64e0535..140afe6 100644 --- a/eww.yuck +++ b/eww.yuck @@ -5,8 +5,6 @@ ;; left -;; Test - (defwidget time [] (eventbox :onclick `` diff --git a/scripts/clients/src/main.cpp b/scripts/clients/src/main.cpp index 19eff21..c319be1 100644 --- a/scripts/clients/src/main.cpp +++ b/scripts/clients/src/main.cpp @@ -22,32 +22,31 @@ std::map iconMap; std::map monitorMap; const std::map specialWorkspaceMap = { - {"special:super", 0}, - {"special:ctrl", 1}, + {"special:super", 0}, + {"special:ctrl", 1}, {"special:alt", 2}, {"special:gr", 3} }; /*json workspacesOutput = json::parse(R"( - { - "normal": [ - { - "activeOn": str - "icon": str - "id": int - "occupied": int - } - ], - "special": [ - { - "activeOn": str - "icon": str - "id": str - "occupied": int - } - ] - } +[ +"normal": +{ + "activeOn": str + "icon": str + "id": int + "occupied": int +}, +"special": +{ + "activeOn": str + "icon": str + "id": str + "occupied": int +} +] + )");*/ @@ -97,6 +96,8 @@ void generateIconMap() initClass = "aguiienagi"; } + //TODO unjank + std::string cmd ="cd /home/willifan/.config/eww/scripts/ && ./test.sh "; std::string test = std::string("cd /home/willifan/.config/eww/scripts/ && ./test.sh ") + initClass + " " + pid; @@ -149,7 +150,7 @@ json getWorkspace(json workspaceInput) return workspaceOutput; } - +//TODO fix special workspaces void getAllWorkspaces() { json workspacesInput = json::parse(command("hyprctl workspaces -j")); @@ -179,7 +180,7 @@ void getAllWorkspaces() } - +//TODO optimize whatever void handle(std::string message) @@ -236,47 +237,47 @@ int main(int argc, char const *argv[]) // Create a socket - int sockfd = socket(AF_UNIX, SOCK_STREAM, 0); - if (sockfd == -1) { - std::cerr << "Error: Failed to create socket\n"; - return 1; - } + int sockfd = socket(AF_UNIX, SOCK_STREAM, 0); + if (sockfd == -1) { + std::cerr << "Error: Failed to create socket\n"; + return 1; + } - // Define the address of the IPC socket - struct sockaddr_un addr; - addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, socketPath.c_str(), sizeof(addr.sun_path) - 1); + // Define the address of the IPC socket + struct sockaddr_un addr; + addr.sun_family = AF_UNIX; + strncpy(addr.sun_path, socketPath.c_str(), sizeof(addr.sun_path) - 1); - // Connect to the IPC socket - if (connect(sockfd, (struct sockaddr*)&addr, sizeof(addr)) == -1) { - std::cerr << "Error: Failed to connect to IPC socket\n"; - close(sockfd); - return 1; - } - - // Receive and print messages from the IPC socket - char buffer[1024]; - ssize_t bytes_received; - while ((bytes_received = recv(sockfd, buffer, sizeof(buffer), 0)) > 0) { - - std::string message = std::string(buffer, bytes_received); - - std::istringstream iss(message); - std::string messageLine; - - while(std::getline(iss, messageLine)){ - handle(messageLine); - } - - } - if (bytes_received == -1) { - std::cerr << "Error: Failed to receive message\n"; - } - - // Close the socket + // Connect to the IPC socket + if (connect(sockfd, (struct sockaddr*)&addr, sizeof(addr)) == -1) { + std::cerr << "Error: Failed to connect to IPC socket\n"; close(sockfd); + return 1; + } - return 0; + // Receive and print messages from the IPC socket + char buffer[1024]; + ssize_t bytes_received; + while ((bytes_received = recv(sockfd, buffer, sizeof(buffer), 0)) > 0) { + + std::string message = std::string(buffer, bytes_received); + + std::istringstream iss(message); + std::string messageLine; + + while(std::getline(iss, messageLine)){ + handle(messageLine); + } + + } + if (bytes_received == -1) { + std::cerr << "Error: Failed to receive message\n"; + } + + // Close the socket + close(sockfd); + + return 0; } \ No newline at end of file diff --git a/scripts/clients/src/test b/scripts/clients/src/test deleted file mode 100755 index c0f021f2a42725ade3d84d305818ed0f012aaab7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24632 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 B+tC03