fix: now clone-able

This commit is contained in:
Kaley, Fischer 2023-12-28 18:47:15 +01:00
parent 8311e65056
commit 8296f94fdd
5 changed files with 25 additions and 120 deletions

View file

@ -23,78 +23,39 @@
#include <filesystem>
#include <stdarg.h>
const std::string USAGE = R"#(usage: hyprctl [flags] [<command> [args]]
hyprctl --batch {<command 1> [args] ; <command 2> [args] ; ...}
const std::string USAGE = R"#(usage: hyprctl [(opt)flags] [command] [(opt)args]
commands:
LISTING COMMANDS:
monitors
monitors: List outputs
workspaces
workspaces: List all workspaces
activeworkspace
activeworkspace: Get currently active workspace
workspacerules
clients: List clients (e.g. windows)
clients
activewindow: Get currently active window
activewindow
layers: List layers
layers
animations: List animations and bezier curves in use
devices
devices: List devices
activeworkspace
binds
binds: List registered binds
dispatch
instances: List running Hyprland instances
keyword
layouts: List layouts
version
globalshortcuts: List global shortcuts
kill
version: Print hyprland version
splash
CONFIGURATION COMMANDS:
hyprpaper
keyword <keyword> [args]: Execute a keyword
reload
getoption <option>: Get value of <option>
setcursor
reload: Reload configurations
getoption
PLUGIN:
clients
cursorpos
plugin list: List loaded plugins
switchxkblayout
plugin load <path>: Load plugin from <path>
seterror
plugin unload <path>: Unload plugin at <path>
setprop
THEMING:
plugin
hyprpaper <keywords> Issue hyprpaper keywords using IPC
notify
splash: Prints the current random splash
devices
dispatch
getoption
globalshortcuts
cursorpos: Get the current cursor position in global layout coordinates
hyprpaper
instances
setcursor <theme> <size>: Set cursor theme and size, (except for GTK)
keyword
kill
layers
layouts
ADDITIONAL COMMANDS:
dispatch <name> [args]: Run a dispatcher
monitors
notify
plugin
reload
setcursor
seterror
setprop
splash
switchxkblayout
version
workspacerules
workspaces
flags:
kill: Enter kill mode, where you can kill an app by clicking on it,
use ESCAPE to quit kill mode
switchxkblayout <args>: Sets the xkb layout index for a keyboard, see wiki for details
setprop <window> <prop>: Set window property, see wiki for details
seterror <color> <msg>: Display <msg> as a error message, will reset upon reloading config
seterror disable: Clear error message
notify <icon> <time_ms> <color> <message>:
Sends a notification using the built-in Hyprland notification system.
output <args>: Add and remove fake outputs to specified backend, see wiki for details.
FLAGS:
-j -> output in JSON
--help -> display this help
--batch -> execute a batch of commands, separated by ';'
--instance (-i) -> use a specific instance. Can be either signature or index in hyprctl instances (0, 1, etc)
)#";

View file

@ -34,10 +34,6 @@ int main(int argc, char** argv) {
setenv("_JAVA_AWT_WM_NONREPARENTING", "1", 1);
setenv("MOZ_ENABLE_WAYLAND", "1", 1);
setenv("XDG_CURRENT_DESKTOP", "Hyprland", 1);
setenv("XDG_SESSION_TYPE", "wayland", 1);
setenv("QT_QPA_PLATFORM", "wayland", 1);
setenv("SDL_VIDEODRIVER", "wayland", 1);
setenv("OZONE_PLATFORM", "wayland", 1);
// parse some args
std::string configPath;

View file

@ -1,45 +0,0 @@
diff --git a/include/meson.build b/include/meson.build
index e669800..687786b 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -1,4 +1,5 @@
-subdir('wlr')
+run_command('ln', '-sf', join_paths(meson.project_source_root(), 'include', 'wlr'), join_paths(meson.project_source_root(), 'include', 'wlroots'), check: true)
+subdir('wlroots')
exclude_files = ['meson.build', 'config.h.in', 'version.h.in']
if not features.get('drm-backend')
@@ -24,8 +25,8 @@ if not features.get('session')
exclude_files += 'backend/session.h'
endif
-install_subdir('wlr',
- install_dir: get_option('includedir'),
+install_subdir('wlroots',
+ install_dir: join_paths(get_option('includedir'), 'hyprland'),
exclude_files: exclude_files,
)
diff --git a/include/wlr/meson.build b/include/wlr/meson.build
index f7ca413..0a86d54 100644
--- a/include/wlr/meson.build
+++ b/include/wlr/meson.build
@@ -22,4 +22,4 @@ ver_h = configure_file(
configuration: version_data,
)
-install_headers(conf_h, ver_h, subdir: 'wlr')
+install_headers(conf_h, ver_h, subdir: join_paths('hyprland', 'wlroots'))
diff --git a/meson.build b/meson.build
index 29b103a..0b6e5a4 100644
--- a/meson.build
+++ b/meson.build
@@ -15,7 +15,7 @@ project(
# necessary for bugfix releases. Increasing soversion is required because
# wlroots never guarantees ABI stability -- only API stability is guaranteed
# between minor releases.
-soversion = 13
+soversion = 13032
little_endian = target_machine.endian() == 'little'
big_endian = target_machine.endian() == 'big'

@ -1 +1 @@
Subproject commit 431ec576c7308e87146b29070a846bfded018446
Subproject commit 153291f4c58eb2735e6337b50d7aa6e6accac099

View file

@ -1,7 +0,0 @@
[wrap-git]
directory = wlroots
url = https://gitlab.freedesktop.org/wlroots/wlroots.git
revision = 5d639394f3e83b01596dcd166a44a9a1a2583350
depth = 1
diff_files = wlroots-meson-build.patch