Updated hyprsolusctl

Upgrade does not clean unless told to. Added call to Updating module components...
git submodule foreach \
	'git pull origin $(git rev-parse --abbrev-ref HEAD)'
Entering 'Hyprland'
Updating 6ae89940..af83c825
Fast-forward
 .github/workflows/ci.yaml                          |   2 +-
 .github/workflows/man-update.yaml                  |   4 +-
 .github/workflows/nix-update-inputs.yml            |   4 +-
 .github/workflows/release.yaml                     |   2 +-
 .github/workflows/security-checks.yml              |   2 +-
 .github/workflows/stale.yml                        |   2 +-
 CMakeLists.txt                                     |  16 +-
 Makefile                                           |   7 +-
 README.md                                          |   2 +-
 VERSION                                            |   2 +-
 docs/ISSUE_GUIDELINES.md                           |   2 +-
 example/hyprland-session.service                   |  14 -
 example/hyprland-systemd.desktop                   |   5 -
 example/hyprland.conf                              |  54 +++-
 example/hyprland.desktop                           |   4 +-
 flake.lock                                         |  42 +--
 hyprctl/Strings.hpp                                |   2 +
 hyprctl/main.cpp                                   |  37 +--
 hyprpm/CMakeLists.txt                              |   2 +-
 hyprpm/src/core/DataState.cpp                      |   6 +-
 hyprpm/src/core/PluginManager.cpp                  | 289 +++++++++----------
 hyprpm/src/core/PluginManager.hpp                  |   3 +-
 hyprpm/src/helpers/StringUtils.hpp                 |  32 +++
 hyprpm/src/main.cpp                                |  44 +--
 hyprpm/src/progress/CProgressBar.cpp               |  16 +-
 hyprpm/src/progress/CProgressBar.hpp               |   2 +-
 meson.build                                        |  13 +-
 meson_options.txt                                  |   1 +
 nix/default.nix                                    |   6 +-
 nix/overlays.nix                                   |  10 +-
 src/Compositor.cpp                                 | 300 +++++++++++---------
 src/Compositor.hpp                                 |  42 +--
 src/config/ConfigDescriptions.hpp                  |  92 ++++--
 src/config/ConfigManager.cpp                       | 116 +++++---
 src/config/ConfigManager.hpp                       |   8 +-
 src/config/defaultConfig.hpp                       |  54 +++-
 src/debug/HyprCtl.cpp                              | 262 +++++++++--------
 src/debug/HyprCtl.hpp                              |   1 +
 src/debug/HyprDebugOverlay.cpp                     |  18 +-
 src/debug/HyprDebugOverlay.hpp                     |  24 +-
 src/debug/HyprNotificationOverlay.cpp              |   8 +-
 src/debug/HyprNotificationOverlay.hpp              |   8 +-
 src/debug/Log.cpp                                  |   4 +-
 src/desktop/DesktopTypes.hpp                       |   6 +
 src/desktop/LayerSurface.cpp                       |  55 ++--
 src/desktop/LayerSurface.hpp                       |   5 +-
 src/desktop/Popup.cpp                              |  16 +-
 src/desktop/Popup.hpp                              |   2 +-
 src/desktop/Window.cpp                             |  78 +++---
 src/desktop/Window.hpp                             |  25 +-
 src/desktop/Workspace.cpp                          |  30 +-
 src/desktop/Workspace.hpp                          |  11 +-
 src/devices/IHID.hpp                               |   2 +-
 src/devices/IKeyboard.hpp                          |   1 -
 src/devices/IPointer.hpp                           |   1 -
 src/devices/ITouch.hpp                             |   1 -
 src/devices/Tablet.cpp                             |   2 +-
 src/devices/Tablet.hpp                             |   8 +-
 src/devices/VirtualPointer.cpp                     |   2 +-
 src/events/Events.hpp                              |   8 -
 src/events/Monitors.cpp                            | 105 -------
 src/events/Windows.cpp                             | 143 ++++++----
 src/helpers/MiscFunctions.cpp                      |  33 ++-
 src/helpers/MiscFunctions.hpp                      |   1 +
 src/helpers/Monitor.cpp                            | 213 +++++++++-----
 src/helpers/Monitor.hpp                            |  11 +-
 src/helpers/Timer.cpp                              |   5 +-
 src/helpers/Timer.hpp                              |   2 +-
 src/helpers/WLClasses.hpp                          |  20 +-
 src/hyprerror/HyprError.cpp                        |   4 +-
 src/layout/DwindleLayout.cpp                       |  68 ++---
 src/layout/IHyprLayout.cpp                         | 271 ++++++++++++++----
 src/layout/IHyprLayout.hpp                         |  18 +-
 src/layout/MasterLayout.cpp                        | 103 +++----
 src/macros.hpp                                     |   2 +
 src/main.cpp                                       |  81 ++----
 src/managers/AnimationManager.cpp                  |  12 +-
 src/managers/CursorManager.cpp                     |   2 +-
 src/managers/KeybindManager.cpp                    | 200 ++++++++++---
 src/managers/KeybindManager.hpp                    |   8 +-
 src/managers/PointerManager.cpp                    | 312 +++++++++++----------
 src/managers/PointerManager.hpp                    |  31 +-
 src/managers/ProtocolManager.cpp                   |   7 +-
 src/managers/ProtocolManager.hpp                   |   2 +-
 src/managers/SeatManager.hpp                       |   3 +
 src/managers/SessionLockManager.cpp                |   6 +-
 src/managers/TokenManager.cpp                      |   4 +-
 src/managers/XCursorManager.cpp                    |  16 +-
 src/managers/XCursorManager.hpp                    |  24 +-
 src/managers/XWaylandManager.cpp                   | 116 ++++----
 src/managers/eventLoop/EventLoopManager.cpp        |   2 +-
 src/managers/input/InputManager.cpp                | 148 +++++-----
 src/managers/input/InputManager.hpp                |   3 +-
 src/managers/input/InputMethodPopup.cpp            |   8 +-
 src/managers/input/Swipe.cpp                       |  13 +-
 src/managers/input/Tablets.cpp                     |  10 +-
 src/managers/input/Touch.cpp                       |   7 +-
 src/protocols/CTMControl.cpp                       |   2 +-
 src/protocols/CTMControl.hpp                       |   2 +-
 src/protocols/DRMLease.cpp                         |  34 ++-
 src/protocols/DRMLease.hpp                         |  13 +-
 src/protocols/DRMSyncobj.cpp                       |   8 +
 src/protocols/DataDeviceWlr.cpp                    |   4 +-
 src/protocols/ForeignToplevel.cpp                  |  29 +-
 src/protocols/ForeignToplevel.hpp                  |   1 +
 src/protocols/ForeignToplevelWlr.cpp               |  34 ++-
 src/protocols/ForeignToplevelWlr.hpp               |   3 +-
 src/protocols/GammaControl.cpp                     |  15 +-
 src/protocols/GammaControl.hpp                     |  10 +-
 src/protocols/LayerShell.cpp                       |   6 +-
 src/protocols/LayerShell.hpp                       |   2 +-
 src/protocols/LinuxDMABUF.cpp                      |  26 +-
 src/protocols/LinuxDMABUF.hpp                      |  12 +-
 src/protocols/OutputManagement.cpp                 |  24 +-
 src/protocols/OutputManagement.hpp                 |  26 +-
 src/protocols/OutputPower.cpp                      |   6 +-
 src/protocols/OutputPower.hpp                      |   4 +-
 src/protocols/PresentationTime.cpp                 |   8 +-
 src/protocols/PresentationTime.hpp                 |   6 +-
 src/protocols/PrimarySelection.cpp                 |   2 +-
 src/protocols/Screencopy.cpp                       |  20 +-
 src/protocols/Screencopy.hpp                       |   6 +-
 src/protocols/SecurityContext.cpp                  |  12 +-
 src/protocols/SecurityContext.hpp                  |  12 +-
 src/protocols/SessionLock.cpp                      |   8 +-
 src/protocols/SessionLock.hpp                      |   6 +-
 src/protocols/ToplevelExport.cpp                   |  12 +-
 src/protocols/ToplevelExport.hpp                   |   2 +-
 src/protocols/VirtualPointer.cpp                   |   4 +-
 src/protocols/VirtualPointer.hpp                   |  12 +-
 src/protocols/XDGOutput.cpp                        |   2 +-
 src/protocols/XDGOutput.hpp                        |   4 +-
 src/protocols/core/Compositor.cpp                  |  47 +++-
 src/protocols/core/Compositor.hpp                  |  14 +-
 src/protocols/core/DataDevice.cpp                  |   2 +-
 src/protocols/core/DataDevice.hpp                  |   2 +-
 src/protocols/core/Output.cpp                      |  25 +-
 src/protocols/core/Output.hpp                      |   8 +-
 src/protocols/core/Seat.cpp                        |  24 +-
 src/protocols/core/Seat.hpp                        |   4 +
 src/render/Framebuffer.cpp                         |  40 ++-
 src/render/Framebuffer.hpp                         |  12 +-
 src/render/OpenGL.cpp                              | 264 ++++++++++-------
 src/render/OpenGL.hpp                              |  58 ++--
 src/render/Renderer.cpp                            | 266 +++++++++---------
 src/render/Renderer.hpp                            |  62 ++--
 src/render/Texture.cpp                             |  21 +-
 src/render/Texture.hpp                             |  34 ++-
 src/render/decorations/CHyprBorderDecoration.cpp   |   4 +-
 src/render/decorations/CHyprBorderDecoration.hpp   |   2 +-
 .../decorations/CHyprDropShadowDecoration.cpp      |  40 ++-
 .../decorations/CHyprDropShadowDecoration.hpp      |   4 +-
 src/render/decorations/CHyprGroupBarDecoration.cpp |  22 +-
 src/render/decorations/CHyprGroupBarDecoration.hpp |   2 +-
 src/render/decorations/DecorationPositioner.cpp    |  47 ++--
 src/render/decorations/IHyprWindowDecoration.hpp   |   2 +-
 src/render/shaders/Border.hpp                      |  10 +-
 src/render/shaders/SharedValues.hpp                |   3 +
 src/render/shaders/Textures.hpp                    |  15 +-
 src/xwayland/Server.cpp                            |  25 +-
 src/xwayland/XWM.cpp                               |  10 +
 systemd/hyprland-uwsm.desktop                      |   6 +
 systemd/meson.build                                |   7 +
 163 files changed, 3070 insertions(+), 2220 deletions(-)
 delete mode 100644 example/hyprland-session.service
 delete mode 100644 example/hyprland-systemd.desktop
 create mode 100644 hyprpm/src/helpers/StringUtils.hpp
 delete mode 100644 src/events/Monitors.cpp
 create mode 100644 src/render/shaders/SharedValues.hpp
 create mode 100644 systemd/hyprland-uwsm.desktop
 create mode 100644 systemd/meson.build
Entering 'aquamarine'
Updating 65dd97b..b31a6a4
Fast-forward
 CMakeLists.txt                             |   2 +-
 VERSION                                    |   2 +-
 include/aquamarine/allocator/Allocator.hpp |   1 +
 include/aquamarine/allocator/DRMDumb.hpp   |  68 ++++++++++++
 include/aquamarine/backend/Backend.hpp     |  25 ++---
 include/aquamarine/backend/DRM.hpp         |  48 +++++----
 include/aquamarine/backend/Headless.hpp    |  30 +++---
 include/aquamarine/backend/Wayland.hpp     |  29 +++---
 include/aquamarine/output/Output.hpp       |   6 +-
 nix/default.nix                            |  95 +++++++++--------
 src/allocator/DRMDumb.cpp                  | 159 +++++++++++++++++++++++++++++
 src/backend/Headless.cpp                   |   4 +
 src/backend/Wayland.cpp                    |   4 +
 src/backend/drm/DRM.cpp                    |  68 ++++++++----
 src/output/Output.cpp                      |   5 +-
 15 files changed, 413 insertions(+), 133 deletions(-)
 create mode 100644 include/aquamarine/allocator/DRMDumb.hpp
 create mode 100644 src/allocator/DRMDumb.cpp
Entering 'hyprcursor'
Updating 70fb494..0264e69
Fast-forward
 libhyprcursor/meta.cpp | 76 ++++++++++++++++++++++++++++----------------------
 1 file changed, 42 insertions(+), 34 deletions(-)
Entering 'hyprlang'
Already up to date.
Entering 'hyprlock'
Updating eb63207..b9cf515
Fast-forward
 CMakeLists.txt                              |   3 +-
 README.md                                   |   3 +-
 VERSION                                     |   2 +-
 flake.lock                                  |  18 +-
 nix/default.nix                             |   4 +
 nix/overlays.nix                            |  14 ++
 src/config/ConfigDataValues.hpp             | 116 +++++++++++++
 src/config/ConfigManager.cpp                | 164 ++++++++++++++++--
 src/core/Fingerprint.cpp                    | 243 ++++++++++++++++++++++++++
 src/core/Fingerprint.hpp                    |  50 ++++++
 src/core/LockSurface.cpp                    |   2 +-
 src/core/LockSurface.hpp                    |   2 +-
 src/core/Output.hpp                         |   2 +-
 src/core/hyprlock.cpp                       |  72 ++++++--
 src/core/hyprlock.hpp                       |  13 +-
 src/helpers/Box.cpp                         | 101 -----------
 src/helpers/Box.hpp                         |  68 --------
 src/helpers/Color.cpp                       |   4 +-
 src/helpers/Color.hpp                       |   5 +-
 src/helpers/Log.hpp                         |   3 +-
 src/helpers/Math.cpp                        |  23 +++
 src/helpers/Math.hpp                        |  12 ++
 src/helpers/MiscFunctions.cpp               |  82 +++++++++
 src/helpers/MiscFunctions.hpp               |   3 +
 src/helpers/Vector2D.cpp                    |  57 -------
 src/helpers/Vector2D.hpp                    | 159 -----------------
 src/renderer/Framebuffer.cpp                |   2 +-
 src/renderer/Framebuffer.hpp                |   2 +-
 src/renderer/Renderer.cpp                   |  97 +++++++----
 src/renderer/Renderer.hpp                   |  14 +-
 src/renderer/Shaders.hpp                    | 135 ++++++++++++++-
 src/renderer/Texture.hpp                    |   2 +-
 src/renderer/widgets/Background.cpp         |   8 +-
 src/renderer/widgets/Background.hpp         |   2 +-
 src/renderer/widgets/IWidget.cpp            |  87 ++++++----
 src/renderer/widgets/IWidget.hpp            |   2 +-
 src/renderer/widgets/Image.cpp              |  39 +++--
 src/renderer/widgets/Image.hpp              |   5 +-
 src/renderer/widgets/Label.cpp              |  43 +++--
 src/renderer/widgets/Label.hpp              |   2 +-
 src/renderer/widgets/PasswordInputField.cpp | 253 +++++++++++++++++-----------
 src/renderer/widgets/PasswordInputField.hpp |  58 ++++---
 src/renderer/widgets/Shadowable.cpp         |   3 +-
 src/renderer/widgets/Shadowable.hpp         |   1 +
 src/renderer/widgets/Shape.cpp              |  38 +++--
 src/renderer/widgets/Shape.hpp              |  34 ++--
 46 files changed, 1334 insertions(+), 718 deletions(-)
 create mode 100644 src/config/ConfigDataValues.hpp
 create mode 100644 src/core/Fingerprint.cpp
 create mode 100644 src/core/Fingerprint.hpp
 delete mode 100644 src/helpers/Box.cpp
 delete mode 100644 src/helpers/Box.hpp
 create mode 100644 src/helpers/Math.cpp
 create mode 100644 src/helpers/Math.hpp
 delete mode 100644 src/helpers/Vector2D.cpp
 delete mode 100644 src/helpers/Vector2D.hpp
Entering 'hyprpaper'
Updating 1c18ad6..3f8cc92
Fast-forward
 CMakeLists.txt               |  5 +++++
 README.md                    |  4 ++--
 src/Hyprpaper.cpp            | 11 +++++++++--
 src/Hyprpaper.hpp            |  1 +
 src/config/ConfigManager.cpp | 16 ++++++++++++++--
 src/main.cpp                 |  2 +-
 systemd/hyprpaper.service.in | 16 ++++++++++++++++
 7 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 systemd/hyprpaper.service.in
Entering 'hyprutils'
Updating 3f52934..e911361
Fast-forward
 CMakeLists.txt                   |   8 ++
 VERSION                          |   2 +-
 include/hyprutils/os/Process.hpp |  32 ++++++
 nix/default.nix                  |  55 ++++++----
 src/os/Process.cpp               | 223 +++++++++++++++++++++++++++++++++++++++
 tests/os.cpp                     |  19 ++++
 6 files changed, 317 insertions(+), 22 deletions(-)
 create mode 100644 include/hyprutils/os/Process.hpp
 create mode 100644 src/os/Process.cpp
 create mode 100644 tests/os.cpp
Entering 'hyprwayland-scanner'
Already up to date.
Entering 'wl-clipboard'
Already up to date.
# In case these libraries haven't been pulled yet, ignore the exit code
cd tomlplusplus && git pull origin $(git rev-parse --abbrev-ref HEAD)
cd libxcb-errors && git pull origin $(git rev-parse --abbrev-ref HEAD)
Please note that if tomlplusplus or libxcb-errors throw an error 	for not being found, this is defined behaviour since these libraries 	are cloned into the project later. You can safely ignore this.
cd Hyprland && git fetch origin --tags && git checkout $(git tag --list | sort -V | tail -n1) && git pull origin $(git rev-parse --abbrev-ref HEAD)
M	subprojects/hyprland-protocols
Updating a425fbeb..af83c825
Fast-forward
 CMakeLists.txt                      |  21 ++--
 Makefile                            |   3 +
 example/hyprland.conf               |   9 +-
 flake.lock                          |  30 +++---
 hyprpm/CMakeLists.txt               |   2 +-
 hyprpm/src/core/PluginManager.cpp   |  19 ++--
 meson.build                         |  10 +-
 meson_options.txt                   |   1 +
 nix/default.nix                     |   2 +-
 src/Compositor.cpp                  |   4 +-
 src/config/ConfigDescriptions.hpp   |  16 ++-
 src/config/ConfigManager.cpp        |  35 ++++---
 src/config/defaultConfig.hpp        |   9 +-
 src/debug/HyprCtl.cpp               |  88 +++++++++++++---
 src/devices/Tablet.hpp              |   3 +-
 src/devices/VirtualPointer.cpp      |   2 +-
 src/events/Windows.cpp              |   2 +-
 src/helpers/MiscFunctions.cpp       |  20 ++--
 src/managers/KeybindManager.cpp     |  52 +++++++++-
 src/managers/KeybindManager.hpp     |   5 +-
 src/managers/PointerManager.cpp     | 198 ++++++++++++++++++++----------------
 src/managers/ProtocolManager.cpp    |   1 +
 src/managers/XCursorManager.cpp     |   8 +-
 src/managers/XCursorManager.hpp     |  24 ++---
 src/managers/input/InputManager.cpp |   3 +
 src/protocols/core/Compositor.cpp   |  26 +++--
 src/protocols/core/Compositor.hpp   |   2 +-
 src/render/Renderer.cpp             |  15 +--
 src/render/Texture.cpp              |  21 +++-
 src/render/Texture.hpp              |  34 ++++---
 systemd/hyprland-session.service.in |  16 ---
 systemd/hyprland-systemd.desktop    |   7 --
 systemd/hyprland-uwsm.desktop       |   6 ++
 systemd/meson.build                 |  24 ++---
 34 files changed, 434 insertions(+), 284 deletions(-)
 delete mode 100644 systemd/hyprland-session.service.in
 delete mode 100644 systemd/hyprland-systemd.desktop
 create mode 100644 systemd/hyprland-uwsm.desktop to pull the latest changes.
This commit is contained in:
Ethan Smith-Coss 2024-11-17 14:04:34 +00:00
parent 503d0686a6
commit 5c1b6e779c
Signed by: TheOnePath
GPG Key ID: 1D351CCC6D01F32B

View File

@ -115,9 +115,11 @@ upgrade () {
do
case $1 in
--ensure-integrity) shift ; eopkg_check=0 ;;
--clean-all) shift ; clean_all=0 ;;
*) echo "Ignoring argument $1" ;;
esac
done
clean_all=${clean_all:-1}
echo "Upgrading Hyprland and components with hyprsolus."
eopkg_check=${eopkg_check:-1}
@ -148,7 +150,9 @@ upgrade () {
fi
cd "$HYPRSOLUS_PATH"
make clean && make
[[ $clean_all -eq 0 ]] && make clean
make update && make
exit_code=$?
if [[ $exit_code -ne 0 ]]
then
@ -163,7 +167,7 @@ case $1 in
update) shift ; update "$@" ;;
upgrade) shift ; upgrade "$@" ;;
info) shift ; info "$@" ;;
version) echo "hyprsolus v0.1.0" ;;
version) echo "hyprsolus v0.1.1" ;;
*) exit 1 ;;
esac
exit 0