From 32636aac4cd2c602c0a2f28a8be7afd796902605 Mon Sep 17 00:00:00 2001 From: Kaley Fischer Date: Fri, 24 Nov 2023 13:33:42 +0100 Subject: [PATCH] pull: Added a lot of fixes from pull requests --- hyprctl/main.cpp | 74 ++++++++++++++++------------- src/Compositor.cpp | 26 +++++++--- src/Compositor.hpp | 1 + src/config/ConfigManager.cpp | 1 + src/debug/HyprCtl.cpp | 10 +--- src/main.cpp | 3 +- src/managers/KeybindManager.cpp | 10 +--- src/managers/XWaylandManager.cpp | 4 ++ src/managers/input/InputManager.cpp | 13 ++++- src/render/Renderer.cpp | 2 +- 10 files changed, 85 insertions(+), 59 deletions(-) diff --git a/hyprctl/main.cpp b/hyprctl/main.cpp index 74127d5b..d3eadb13 100644 --- a/hyprctl/main.cpp +++ b/hyprctl/main.cpp @@ -23,39 +23,49 @@ #include #include -const std::string USAGE = R"#(usage: hyprctl [(opt)flags] [command] [(opt)args] - -commands: - monitors - workspaces - activeworkspace - workspacerules - clients - activewindow - layers - devices - binds - dispatch - keyword - version - kill - splash - hyprpaper - reload - setcursor - getoption - cursorpos - switchxkblayout - seterror - setprop - plugin - notify - globalshortcuts - instances - layouts - -flags: +const std::string USAGE = R"#(usage: hyprctl [flags] [ [args]] + hyprctl --batch { [args] ; [args] ; ...} +LISTING COMMANDS: + monitors: List outputs + workspaces: List all workspaces + activeworkspace: Get currently active workspace + clients: List clients (e.g. windows) + activewindow: Get currently active window + layers: List layers + animations: List animations and bezier curves in use + devices: List devices + binds: List registered binds + instances: List running Hyprland instances + layouts: List layouts + globalshortcuts: List global shortcuts + version: Print hyprland version +CONFIGURATION COMMANDS: + keyword [args]: Execute a keyword + getoption