Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Conner Clere (78f1bcb3adc0d3f93193d166ee207a471966856b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Conner Clere <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Conner Clere (78f1bcb3adc0d3f93193d166ee207a471966856b)
  • Date: Thu, 30 Mar 2023 01:14:48 +0000

GIT changes to master grimoire by Conner Clere <xenanthropy AT sourcemage.org>:

wm-addons/waybar/CONFIGURE | 3 ++-
wm-addons/waybar/FINAL | 12 ++++++++++++
wm-addons/waybar/HISTORY | 4 ++++
wm-addons/waybar/PRE_BUILD | 6 +++++-
4 files changed, 23 insertions(+), 2 deletions(-)

New commits:
commit 78f1bcb3adc0d3f93193d166ee207a471966856b
Author: Conner Clere <xenanthropy AT sourcemage.org>
Commit: Conner Clere <xenanthropy AT sourcemage.org>

waybar: add hyprland workspace support

diff --git a/wm-addons/waybar/CONFIGURE b/wm-addons/waybar/CONFIGURE
index 80745f9..b2db2a2 100755
--- a/wm-addons/waybar/CONFIGURE
+++ b/wm-addons/waybar/CONFIGURE
@@ -1,3 +1,4 @@
. "${GRIMOIRE}/MESON_CONFIGURE" &&
config_query_option WAYBAR_OPTS "Build tests?" n "tests=enabled"
"tests=disabled" &&
-config_query_option WAYBAR_OPTS "Enable experimental features?" n
"experimental=true" "experimental=false"
+config_query_option WAYBAR_OPTS "Enable experimental features?" n
"experimental=true" "experimental=false" &&
+config_query HYPR_WORKSPACES "Patch in support for hyprland workspaces?" n
diff --git a/wm-addons/waybar/FINAL b/wm-addons/waybar/FINAL
new file mode 100755
index 0000000..2d611a2
--- /dev/null
+++ b/wm-addons/waybar/FINAL
@@ -0,0 +1,12 @@
+if [[ $HYPR_WORKSPACES == "y" ]]; then
+ message "\n" \
+ "-----------------------------------\n" \
+ "${PROBLEM_COLOR}ATTENTION!\n" \
+ "${MESSAGE_COLOR}\n" \
+ "Hyprland workspace support has been patched in. In order to make
it work,\n" \
+ "edit your waybar config (~/.config/waybar/config) and replace all
instances\n" \
+ "of 'sway/workspaces' with 'wlr/workspaces'\n" \
+ "this can be accomplished by running (from your ~/.config/waybar/
directory):\n" \
+ "${YELLOW}sed -i \"s#sway/workspaces#wlr/workspaces#g\"
config${DEFAULT_COLOR}\n" \
+ "-----------------------------------\n"
+fi
diff --git a/wm-addons/waybar/HISTORY b/wm-addons/waybar/HISTORY
index 85d9aad..3b256e9 100644
--- a/wm-addons/waybar/HISTORY
+++ b/wm-addons/waybar/HISTORY
@@ -1,3 +1,7 @@
+2023-03-24 Conner Clere <xenanthropy AT sourcemage.org>
+ * CONFIGURE, PRE_BUILD: add edit for hyprland workspace support
+ * FINAL: added, explain edits needed to make hyprland workspaces work
+
2023-03-12 Conner Clere <xenanthropy AT sourcemage.org>
* DEPENDS: add missing chrono-date dep (spell just added)
* PRE_BUILD: added, apply patches
diff --git a/wm-addons/waybar/PRE_BUILD b/wm-addons/waybar/PRE_BUILD
index 0cab101..d8c2e0d 100755
--- a/wm-addons/waybar/PRE_BUILD
+++ b/wm-addons/waybar/PRE_BUILD
@@ -1,3 +1,7 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
-apply_patch_dir patches
+apply_patch_dir patches &&
+
+if [[ $HYPR_WORKSPACES == "y" ]]; then
+ sed -i 's/zext_workspace_handle_v1_activate(workspace_handle_);/const
std::string command = "hyprctl dispatch workspace " +
name_;\n\tsystem(command.c_str());/g' src/modules/wlr/workspace_manager.cpp
+fi



  • [SM-Commit] GIT changes to master grimoire by Conner Clere (78f1bcb3adc0d3f93193d166ee207a471966856b), Conner Clere, 03/29/2023

Archive powered by MHonArc 2.6.24.

Top of Page