[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[942] fvwm/components/functions

[<dom...@us...>]

Revision: 942
          http://sourceforge.net/p/fvwm-crystal/code/942
Author:   dominique_libre
Date:     2019-11-17 11:02:13 +0000 (Sun, 17 Nov 2019)
Log Message:
-----------
dynamic screen lid suspend menu

Modified Paths:
--------------
    ChangeLog
    fvwm/components/functions/Exit

Modified: ChangeLog
===================================================================
--- ChangeLog	2019-11-17 10:58:37 UTC (rev 941)
+++ ChangeLog	2019-11-17 11:02:13 UTC (rev 942)
@@ -2,6 +2,7 @@
 
 dimanche 17 novembre 2019
   fvwm/components/functions/Fullscreen: put back Window-Rearrange function
+  fvwm/components/functions/Exit: screen lid suspend menu test for pref and is dynamic
 
 samedi 16 movembre 2019
   FAQ: Added uam configuration with ext formatted partitions.

Modified: fvwm/components/functions/Exit
===================================================================
--- fvwm/components/functions/Exit	2019-11-17 10:58:37 UTC (rev 941)
+++ fvwm/components/functions/Exit	2019-11-17 11:02:13 UTC (rev 942)
@@ -3,9 +3,10 @@
 # Modified by Dominique Michel <dom...@so...> for use with
 # session managers as gnome-session
 
+# ps -C ... truncate the command name (see man 5 proc); use pgrep -f ...
 DestroyFunc KillAutoHibernate
 AddToFunc KillAutoHibernate
-+ I Piperead 'for i in `ps -C AutoHibernate -o pid=` ; do kill $i $[infostore.SILENT]; done'
++ I Piperead 'for i in `pgrep -f AutoHibernate` ; do kill $i $[infostore.SILENT]; done'
 
 DestroyFunc EndAutoHibernate
 AddToFunc EndAutoHibernate
@@ -41,17 +42,41 @@
 DestroyFunc AutoHibernate-generator
 AddToFunc AutoHibernate-generator
 + I DestroyMenu recreate /AutoHibernate
-+ I Piperead "if ps -C AutoHibernate -o pid= 1>2 2>/dev/null; \
++ I Piperead "if test `pkill -0 AutoHibernate`; \
 	then echo Test \\\(x /usr/sbin/pm-hibernate\\\) AddToMenu /AutoHibernate \\'$[gt.Stop]\\' EndAutoHibernate; \
 		echo Test \\\(x /usr/bin/systemctl\\\) AddToMenu /AutoHibernate \\'$[gt.Stop]\\' EndAutoHibernate; \
 	else echo Test \\\(x /usr/sbin/pm-hibernate\\\) AddToMenu /AutoHibernate \\'$[gt.Start when battery is as low as]\\' Popup /AutoHibernatePMValue; \
 		echo Test \\\(x /usr/bin/systemctl\\\) AddToMenu /AutoHibernate \\'$[gt.Start when battery is as low as]\\' Popup /AutoHibernateSysValue; \
-	fi
+	fi"
 
 DestroyMenu /AutoHibernate
 AddToMenu /AutoHibernate
 + DynamicPopupAction Function AutoHibernate-generator
 
+DestroyFunc ScreenLidSuspend
+AddToFunc ScreenLidSuspend
++ I Exec exec $[FVWM_SYSTEMDIR]/scripts/ScreenLidSuspend
++ I SavePreferences ScreenLidSuspend "Exec exec $[FVWM_SYSTEMDIR]/scripts/ScreenLidSuspend"
+
+DestroyFunc NoScreenLidSuspend
+AddToFunc NoScreenLidSuspend
++ I Piperead 'pkill ScreenLidSuspen'
++ I SavePreferences ScreenLidSuspend Nop
+
+DestroyFunc ScreenLidSuspend-generator
+AddToFunc ScreenLidSuspend-generator
++ I DestroyMenu recreate /ScreenLidSuspend
++ I Piperead "if test `pgrep ScreenLidSuspen`; \
+	then echo Test \\\(x /usr/sbin/pm-hibernate\\\) AddToMenu /ScreenLidSuspend \\'$[gt.No resume hybride with screen lid]\\' NoScreenLidSuspend; \
+		echo Test \\\(x /usr/bin/systemctl\\\) AddToMenu /ScreenLidSuspend \\'$[gt.No resume hybride with screen lid]\\' NoScreenLidSuspend; \
+	else echo Test \\\(x /usr/sbin/pm-hibernate\\\) AddToMenu /ScreenLidSuspend \\'$[gt.Resume hybride with screen lid]\\' ScreenLidSuspend; \
+		echo Test \\\(x /usr/bin/systemctl\\\) AddToMenu /ScreenLidSuspend \\'$[gt.Resume hybride with screen lid]\\' ScreenLidSuspend; \
+	fi"
+
+DestroyMenu /ScreenLidSuspend
+AddToMenu /ScreenLidSuspend
++ DynamicPopupAction Function ScreenLidSuspend-generator
+
 DestroyMenu /Exit
 AddToMenu /Exit 
 + '%22x22/fvwm-crystal/view-refresh.png%$[gt.Restart]' Restart
@@ -61,7 +86,7 @@
 Test (x /usr/sbin/pm-hibernate) + '' Nop
 Test (x /usr/sbin/pm-hibernate) + '%22x22/fvwm-crystal/gdm.png%$[gt.Automatic suspend to disk]' Popup /AutoHibernate
 Test (x /usr/bin/systemctl) + '%22x22/fvwm-crystal/gdm.png%$[gt.Automatic suspend to disk]' Popup /AutoHibernate
-Test (x /usr/sbin/pm-suspend-hybrid) + '%22x22/fvwm-crystal/gdm.png%$[gt.Resume hybride with screen lid]' Exec exec $[FVWM_SYSTEMDIR]/scripts/ScreenLidSuspend
+Test (x /usr/sbin/pm-suspend-hybrid) + '%22x22/fvwm-crystal/gdm.png%$[gt.Resume hybride with screen lid]' Popup /ScreenLidSuspend
 Test (x /usr/sbin/pm-suspend) + '' Nop
 Test (x /usr/sbin/pm-suspend) + '%22x22/fvwm-crystal/gdm.png%$[gt.Resume to RAM]' S pm-suspend
 Test (x /usr/sbin/pm-suspend-hybrid) + '%22x22/fvwm-crystal/gdm.png%$[gt.Resume hybride]' S pm-suspend-hybrid

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.