From 06b4385e5c26577b738cccb9fda8b668375f7b53 Mon Sep 17 00:00:00 2001 From: TomasM Date: Wed, 8 Nov 2017 18:43:22 -0500 Subject: [PATCH] fixups for startup notify --- .../debian/modules/03-desktop/rootcopy/root/.fluxbox/menu | 8 ++++---- Slax/debian/modules/03-desktop/rootcopy/usr/bin/fblogout | 6 ++---- .../modules/03-desktop/rootcopy/usr/bin/fbstartupnotify | 4 +--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/menu b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/menu index 5b3e556..6777255 100644 --- a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/menu +++ b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/menu @@ -1,9 +1,9 @@ [begin] (Desktop menu) - [exec] (Terminal) { xterm -ls } - [exec] (Web browser) { chromium } - [exec] (Text editor) { leafpad } - [exec] (Calculator) { qalculate } + [exec] (Terminal) { fbstartupnotify && xterm -ls } + [exec] (Web browser) { fbstartupnotify && chromium } + [exec] (Text editor) { fbstartupnotify && leafpad } + [exec] (Calculator) { fbstartupnotify && qalculate } [separator] [workspaces] (Workspaces) [exec] (Exit) { fblogout } diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fblogout b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fblogout index d4e0722..09b666a 100755 --- a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fblogout +++ b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fblogout @@ -9,11 +9,9 @@ exec xlunch --input /etc/xlunch/logout.dsv --noprompt \ SND=/usr/share/sounds/shutdown.wav - # blackout desktop - feh --bg-scale /usr/share/icons/locolor/16x16/apps/black.png - - # play logout song if [ "$LINE" != "" -a -r $SND ]; then + feh --bg-scale /usr/share/icons/locolor/16x16/apps/black.png + xsetroot -xcf /usr/share/icons/breeze_cursors/cursors/watch 37 aplay $SND & sleep 1 fi diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbstartupnotify b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbstartupnotify index 18a79ec..509f199 100755 --- a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbstartupnotify +++ b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbstartupnotify @@ -6,13 +6,11 @@ SIZE=20 # Set cursor to wait. As soon as new window is detected, change cursor back xsetroot -xcf $CURSORSDIR/left_ptr_watch $SIZE export WINDOWS="$(wmctrl -l)" -xsetroot -cursor_name left_ptr_watch ( - until diff -u <(echo "$WINDOWS") <(wmctrl -l) | egrep -q "^[+]"; do + until diff <(echo "$WINDOWS") <(wmctrl -l) | egrep -q "^[>]"; do sleep 0.1 done - set_cursor_normal xsetroot -xcf $CURSORSDIR/left_ptr $SIZE ) &