From a1d709f137653c61981d71f784da8cadfe6ab72d Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Thu, 2 Mar 2023 22:03:51 +0000
Subject: bump version

---
 Version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Version b/Version
index d15b8b0..aaf18d2 100644
--- a/Version
+++ b/Version
@@ -1 +1 @@
-3.6.5
+3.7.5
-- 
cgit v1.2.3


From 1449ad03d479c53eddb93b3c6213474b80655316 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Thu, 2 Mar 2023 22:04:42 +0000
Subject: include my "gather" function

---
 recipes/Dakkar | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/Dakkar b/recipes/Dakkar
index 3052e9f..e0a43f6 100644
--- a/recipes/Dakkar
+++ b/recipes/Dakkar
@@ -1,6 +1,7 @@
 Include components/functions/Music
 Include components/functions/Screen-Menu
 Include components/functions/Numpad-multihead
+Include components/functions/Gather
 
 InfoStoreAdd DeskIconsSign " "
 LoadPreferences IconsType
-- 
cgit v1.2.3


From d3aaa81cf3bb10d1edbb4b8efa0538d0eac703a5 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Thu, 2 Mar 2023 22:05:01 +0000
Subject: make sure `FvwmCommandS` is started

apparently latest crystal+fvwm doesn't start it on its own?
---
 recipes/Dakkar | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes/Dakkar b/recipes/Dakkar
index e0a43f6..6b56d46 100644
--- a/recipes/Dakkar
+++ b/recipes/Dakkar
@@ -3,6 +3,8 @@ Include components/functions/Screen-Menu
 Include components/functions/Numpad-multihead
 Include components/functions/Gather
 
+Module FvwmCommandS
+
 InfoStoreAdd DeskIconsSign " "
 LoadPreferences IconsType
 LoadPreferences DefaultDesktopManager
-- 
cgit v1.2.3


From af29e909edc4faaec4f581c1f818ec7ddd1cfb91 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Fri, 19 May 2023 15:26:52 +0100
Subject: fix fvwm-screens

* use pids for `-r`, but still show names
* use `StartTerminal` instead of `A` because `A` doesn't seem to work
  with arguments??
* `AddToMenu` because the rest of crystal does that now
---
 scripts/fvwm-screen.pl | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/fvwm-screen.pl b/scripts/fvwm-screen.pl
index eea4a3c..d462b29 100755
--- a/scripts/fvwm-screen.pl
+++ b/scripts/fvwm-screen.pl
@@ -3,35 +3,35 @@ use strict;
 use warnings;
 
 sub sess_names {
-    map { m{^ \s* \d+ \. ([^.]+?) (?:\.\w+)? \s+}smx } @_;
+    map { m{^ \s* (\d+) \. (.+?) \s+}smx } @_;
 }
 
 # Get list of detached/attached screen sessions and hostname
 my @screen_out=qx(screen -list);
 
-my @detached_sessions=sess_names grep {m{\(Detached\)}} @screen_out;
-my @attached_sessions=sess_names grep {m{\(Attached\)}} @screen_out;
+my %detached_sessions=reverse sess_names grep {m{\(Detached\)}} @screen_out;
+my %attached_sessions=reverse sess_names grep {m{\(Attached\)}} @screen_out;
 
-print <<'EOL' if @detached_sessions;
-  + "Reattach first" A screen -d -RR
+print <<'EOL' if %detached_sessions;
+AddToMenu /Screens "Reattach first" StartTerminal screen -d -RR
 EOL
 
 print <<'EOL';
-  + "New Session" A screen
+AddToMenu /Screens "New Session" StartTerminal screen
 EOL
 
-print <<'EOL' if @detached_sessions;
-  + "" NoP
+print <<'EOL' if %detached_sessions;
+AddToMenu /Screens "" NoP
 EOL
 
-print <<"EOL" for @detached_sessions;
-  + "$_ (a)" A screen -r "$_"
+print <<"EOL" for sort keys %detached_sessions;
+AddToMenu /Screens "$_ (a)" StartTerminal screen -r "$detached_sessions{$_}"
 EOL
 
-print <<'EOL' if @attached_sessions;
-  + "" NoP
+print <<'EOL' if %attached_sessions;
+AddToMenu /Screens "" NoP
 EOL
 
-print <<"EOL" for @attached_sessions;
-  + "$_ (d)" A screen -d "$_"
+print <<"EOL" for sort keys %attached_sessions;
+AddToMenu /Screens "$_ (d)" StartTerminal screen -d "$attached_sessions{$_}"
 EOL
-- 
cgit v1.2.3