[CTRL] + 'p' for Twm Screenshot. Twm Screen-saver menu.

4 files changed, 39 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fdd09f4beafa..52389d1f4943 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xdm-xfreq
 	pkgdesc = A customized XDM for XFreq
-	pkgver = 0.9
+	pkgver = 0.10
 	pkgrel = 1
 	url = http://github.com/cyring/xdm-xfreq
 	install = xdm-xfreq.install
diff --git a/PKGBUILD b/PKGBUILD
index 8915dec2ad1a..e233a3e6648d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: CyrIng <xfreq[at]cyring[dot]fr>
 # Contributor: CyrIng <xfreq[at]cyring[dot]fr>
 pkgname=xdm-xfreq
-pkgver=0.9
+pkgver=0.10
 pkgrel=1
 pkgdesc="A customized XDM for XFreq"
 arch=(any)
diff --git a/twm-xfreq.rc b/twm-xfreq.rc
index d697bd821b04..48589a6cfda4 100644
--- a/twm-xfreq.rc
+++ b/twm-xfreq.rc
@@ -104,6 +104,7 @@ Button1 = c	: frame		: f.function "raise-and-resize"
 #
 "F1" =		: all		: f.function "run-app"
 "r" = c		: all		: f.function "run-app"
+"p" = c		: all		: f.exec "scrot /tmp/%Y%m%d-%H%M%S-\$wx\$h.png"
 
 #
 # Menus
@@ -140,6 +141,40 @@ menu "sysops"
 ""		f.nop
 }
 
+menu "screensaver"
+{
+""		f.nop
+"   Default"	f.exec "xset s default"
+" 5 minutes"	f.exec "xset s 300 300"
+" 7 minutes"	f.exec "xset s 420 420"
+"10 minutes"	f.exec "xset s 600 600"
+"12 minutes"	f.exec "xset s 720 720"
+"15 minutes"	f.exec "xset s 900 900"
+"20 minutes"	f.exec "xset s 1500 1500"
+""		f.nop
+}
+
+menu "screenoff"
+{
+""		f.nop
+"   Disable"	f.exec "xset dpms 0 0 0"
+" 5 minutes"	f.exec "xset dpms 300 300 300"
+" 7 minutes"	f.exec "xset dpms 420 420 420"
+"10 minutes"	f.exec "xset dpms 600 600 600"
+"12 minutes"	f.exec "xset dpms 720 720 720"
+"15 minutes"	f.exec "xset dpms 900 900 900"
+"20 minutes"	f.exec "xset dpms 1500 1500 1500"
+""		f.nop
+}
+
+menu "settings"
+{
+""		f.nop
+"Screen Saver"	f.menu "screensaver"
+"Screen Off"	f.menu "screenoff"
+""		f.nop
+}
+
 menu "twmops"
 {
 ""		f.nop
@@ -154,6 +189,7 @@ menu "leftops"
 ""		f.nop
 "Window"	f.menu "winops"
 "System"	f.menu "sysops"
+"Settings"	f.menu "settings"
 "Manager"	f.menu "twmops"
 ""		f.nop
 }
diff --git a/xdm-xfreq.rc b/xdm-xfreq.rc
index cbeab6292d6d..dae5ddab43fc 100755
--- a/xdm-xfreq.rc
+++ b/xdm-xfreq.rc
@@ -32,7 +32,7 @@ XDM_XFREQ_BUTTONS_PWROFF="-buttons PowerOff?:11,Cancel?:12 -default Cancel? -tim
 XDM_XFREQ_BUTTONS_HALT="-buttons Halt?:11,Cancel?:12 -default Cancel? -timeout 6"
 XDM_XFREQ_BUTTONS_REBOOT="-buttons Reboot?:11,Cancel?:12 -default Cancel? -timeout 6"
 XDM_XFREQ_BUTTONS_RESCUE="-buttons Rescue?:11,Cancel?:12 -default Cancel? -timeout 6"
-XDM_XFREQ_BUTTONS_SUBMENU="-buttons \<\<:99,Screenshot:11,ScreenSaver5=min:20,ScreenSaver=7min:21,ScreenSaver=10min:22,ScreenSaver=12min:23,ScreenSaver=15min:24,ScreenSaver=20min:25"
+XDM_XFREQ_BUTTONS_SUBMENU="-buttons \<\<:99,Screenshot:11,ScreenSaver=5min:20,ScreenSaver=7min:21,ScreenSaver=10min:22,ScreenSaver=12min:23,ScreenSaver=15min:24,ScreenSaver=20min:25"
 
 # Screenshot
 XDM_XFREQ_SCREENSHOT_PATH=scrot