summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyrIng2015-12-14 16:02:28 +0100
committerCyrIng2015-12-14 16:02:28 +0100
commit66dfb8ddefa9747dd8aee166ad664dcf94d869be (patch)
treea2a9abaecb9b81ace42dbf834f05db20385cd256
parent1e8663a61fae4cf3c2ddbae625c95886a7c3802a (diff)
downloadaur-66dfb8ddefa9747dd8aee166ad664dcf94d869be.tar.gz
Auto-generation of Twm resources.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rwxr-xr-xchocolate.rc44
-rwxr-xr-xstart-twm-xfreq220
-rw-r--r--twm-xfreq.Xresources10
-rw-r--r--twm-xfreq.rc232
-rwxr-xr-xxdm-xfreq.rc7
7 files changed, 269 insertions, 260 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4f7d5bd3242f..2778c398ba3a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,8 +21,6 @@ pkgbase = xdm-xfreq
optdepends = imagemagick
optdepends = numlockx
backup = etc/xdm-xfreq/xdm-xfreq.rc
- backup = etc/xdm-xfreq/twm-xfreq.rc
- backup = etc/xdm-xfreq/twm-xfreq.Xresources
source = xdm-config
source = Xsetup
source = Xstartup
@@ -31,8 +29,6 @@ pkgbase = xdm-xfreq
source = xdm-xfreq-xdesktops
source = xdm-xfreq.service
source = twm-xfreq.desktop
- source = twm-xfreq.rc
- source = twm-xfreq.Xresources
source = start-twm-xfreq
source = chocolate.rc
source = navy.rc
@@ -47,8 +43,6 @@ pkgbase = xdm-xfreq
md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
- md5sums = SKIP
- md5sums = SKIP
pkgname = xdm-xfreq
diff --git a/PKGBUILD b/PKGBUILD
index 933e7cddcbf0..7ea3d17c389e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,9 +9,7 @@ license=('GPL')
url="http://github.com/cyring/xdm-xfreq"
depends=('xfreq-git' 'xorg-xdm' 'xorg-xclock' 'xorg-xmessage' 'xorg-xsetroot' 'xorg-xdpyinfo' 'xorg-twm' 'xdg-utils' 'xterm' 'scrot' 'dmenu' 'gawk')
optdepends=('imagemagick' 'numlockx')
-backup=(etc/xdm-xfreq/xdm-xfreq.rc
- etc/xdm-xfreq/twm-xfreq.rc
- etc/xdm-xfreq/twm-xfreq.Xresources)
+backup=(etc/xdm-xfreq/xdm-xfreq.rc)
install=xdm-xfreq.install
source=(xdm-config
Xsetup
@@ -21,8 +19,6 @@ source=(xdm-config
xdm-xfreq-xdesktops
xdm-xfreq.service
twm-xfreq.desktop
- twm-xfreq.rc
- twm-xfreq.Xresources
start-twm-xfreq
chocolate.rc
navy.rc)
@@ -36,14 +32,12 @@ md5sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'SKIP'
- 'SKIP'
'SKIP')
package() {
mkdir -p ${pkgdir}/etc/xdm-xfreq/theme
cp chocolate.rc navy.rc ${pkgdir}/etc/xdm-xfreq/theme
- cp xdm-xfreq.rc twm-xfreq.rc twm-xfreq.Xresources ${pkgdir}/etc/xdm-xfreq
+ cp xdm-xfreq.rc ${pkgdir}/etc/xdm-xfreq
chmod 0755 ${pkgdir}/etc/xdm-xfreq/xdm-xfreq.rc
ln -s /etc/xdm-xfreq/theme/chocolate.rc ${pkgdir}/etc/xdm-xfreq/xdm-theme.rc
mkdir -p ${pkgdir}/etc/X11/xdm/xdm-xfreq
diff --git a/chocolate.rc b/chocolate.rc
index d4fb97a971a7..2b6d2b9fa934 100755
--- a/chocolate.rc
+++ b/chocolate.rc
@@ -24,7 +24,7 @@ FAILFACE="DejaVuSans-9:bold:italic"
FAILTEXT="Access denied"
FAILTIMEOUT="10"
-LOGINBACKGROUND="#2a0308"
+LOGINBACKGROUND=$BACKGROUND
LOGINFOREGROUND="white"
LOGINSHDCOLOR="#404040"
LOGINHICOLOR="#737373"
@@ -69,3 +69,45 @@ XFREQWALLBOARD="1"
XFREQFOREGROUND="0x994c00"
XFREQBACKGROUND="0x2a0308"
XFREQGEOMETRY="0:0x0+24-48,1:0x0-24+16,2:0x0+24+16,3:0x0+540+16,4:0x0-24-48,5:0x0+540-48"
+
+# WM
+WMBORDERCOLOR=$BACKGROUND
+WMBORDERCLOCK=$BACKGROUND
+WMBORDERPOPUP=$BACKGROUND
+WMBORDERTASKS=$BACKGROUND
+WMBORDERTILEBG=$BACKGROUND
+WMBORDERTILEFG="chocolate"
+WMBORDERMENUBG=$BACKGROUND
+WMBORDERICON="chocolate"
+WMDEFAULTBG=$BACKGROUND
+WMDEFAULTFG="#dfdfdf"
+WMTITLEBG=$BACKGROUND
+WMTITLEFG="#dfdfdf"
+WMMENUBG=$BACKGROUND
+WMMENUFG="#dfdfdf"
+WMMENUSHADOW=$BACKGROUND
+WMMENUTITLEBG=$BACKGROUND
+WMMENUTITLEFG="#efefef"
+WMICONBG=$BACKGROUND
+WMICONFG="#dfdfdf"
+WMTASKSBG=$BACKGROUND
+WMTASKSFG="#dfdfdf"
+WMTASKSLIGHT="#efefef"
+WMRUNWINBG=$BACKGROUND
+WMRUNWINFG="white"
+WMRUNSELBG="chocolate"
+WMRUNSELFG=$WMRUNWINFG
+WMPOPUPBG=$BACKGROUND
+WMPOPUPFG="#dfdfdf"
+WMTERMBG="black"
+WMTERMFG="white"
+WMCLOCKBG=$BACKGROUND
+WMCLOCKFG="white"
+
+WMMENUFONT="-misc-fixed-*-*-*-*-15-*-*-*-*-*-*-*"
+WMTITLEFONT="-misc-fixed-*-*-*-*-14-110-*-*-*-*-*-*"
+WMICONFONT="-misc-fixed-*-*-*-*-14-110-*-*-*-*-*-*"
+WMRESIZEFONT="-misc-fixed-*-*-*-*-12-*-*-*-*-*-*-*"
+WMPOPUPFONT="-misc-fixed-*-*-*-*-15-*-*-*-*-*-*-*"
+WMTERMFONT="-misc-fixed-medium-*-*-*-18-*-*-*-*-*-*-*"
+WMCLOCKFACE="DejaVuSans-9:bold"
diff --git a/start-twm-xfreq b/start-twm-xfreq
index b8528874d7b2..742f0f6ba057 100755
--- a/start-twm-xfreq
+++ b/start-twm-xfreq
@@ -1,5 +1,221 @@
#!/bin/sh
-xrdb -load /etc/xdm-xfreq/twm-xfreq.Xresources
+source /etc/xdm-xfreq/xdm-xfreq.rc
-twm -f /etc/xdm-xfreq/twm-xfreq.rc
+if [ -d $USERTMPFS ]; then
+ echo "Xmessage*borderWidth:1" > $USERTMPFS/twm-xfreq.Xresources
+ echo "Xmessage*Command.highlightThickness:1" >> $USERTMPFS/twm-xfreq.Xresources
+ echo "Xmessage*Command.internalWidth:12" >> $USERTMPFS/twm-xfreq.Xresources
+ echo "Xmessage*Command.internalHeight:4" >> $USERTMPFS/twm-xfreq.Xresources
+ echo "Xmessage*Command.shapeStyle:rectangle" >> $USERTMPFS/twm-xfreq.Xresources
+ echo "Xmessage*message.scrollVertical:never" >> $USERTMPFS/twm-xfreq.Xresources
+ echo "Xmessage*message.scrollHorizontal:never" >> $USERTMPFS/twm-xfreq.Xresources
+ echo "Xmessage*Text.borderWidth:0" >> $USERTMPFS/twm-xfreq.Xresources
+ echo -e "\r" >> $USERTMPFS/twm-xfreq.Xresources
+ echo "XTerm*vt100.allowBoldFonts:false" >> $USERTMPFS/twm-xfreq.Xresources
+ echo "" >> $USERTMPFS/twm-xfreq.Xresources
+
+ xrdb -load $USERTMPFS/twm-xfreq.Xresources
+
+ echo "AutoRaise { 'TWM Icon Manager' 'Clock' 'PopUp' 'XFreq-Gui' }" > $USERTMPFS/twm-xfreq.rc
+ echo "BorderWidth 4" >> $USERTMPFS/twm-xfreq.rc
+ echo "ButtonIndent 2" >> $USERTMPFS/twm-xfreq.rc
+ echo "DecorateTransients" >> $USERTMPFS/twm-xfreq.rc
+ echo "FramePadding 1" >> $USERTMPFS/twm-xfreq.rc
+ echo "IconBorderWidth 1" >> $USERTMPFS/twm-xfreq.rc
+ echo "IconifyByUnmapping" >> $USERTMPFS/twm-xfreq.rc
+ echo "IconBorderWidth 1" >> $USERTMPFS/twm-xfreq.rc
+ echo "IconDirectory /usr/share/icons" >> $USERTMPFS/twm-xfreq.rc
+ echo "IconFont $WMICONFONT" >> $USERTMPFS/twm-xfreq.rc
+ echo "IconRegion '=160x1024+0+64' North West 5 10" >> $USERTMPFS/twm-xfreq.rc
+ echo "IconRegion '=160x1024-0+64' North East 5 10" >> $USERTMPFS/twm-xfreq.rc
+ echo "IconManagerDontShow { 'Clock' 'PopUp' }" >> $USERTMPFS/twm-xfreq.rc
+ echo "IconManagerGeometry '$(( $WIDTH - 176 ))x32+0+0' 16" >> $USERTMPFS/twm-xfreq.rc
+ echo "IconManagerFont $WMICONFONT" >> $USERTMPFS/twm-xfreq.rc
+ echo "NoGrabServer" >> $USERTMPFS/twm-xfreq.rc
+ echo "NoHighlight" >> $USERTMPFS/twm-xfreq.rc
+ echo "NoTitle { 'TWM Icon Manager' 'Clock' 'PopUp'}" >> $USERTMPFS/twm-xfreq.rc
+ echo "MenuBorderWidth 1" >> $USERTMPFS/twm-xfreq.rc
+ echo "MenuFont $WMMENUFONT" >> $USERTMPFS/twm-xfreq.rc
+ echo "OpaqueMove" >> $USERTMPFS/twm-xfreq.rc
+ echo "RandomPlacement" >> $USERTMPFS/twm-xfreq.rc
+ echo "ResizeFont $WMRESIZEFONT" >> $USERTMPFS/twm-xfreq.rc
+ echo "RestartPreviousState" >> $USERTMPFS/twm-xfreq.rc
+ echo "ShowIconManager" >> $USERTMPFS/twm-xfreq.rc
+ echo "SqueezeTitle" >> $USERTMPFS/twm-xfreq.rc
+ echo "TitleButtonBorderWidth 1" >> $USERTMPFS/twm-xfreq.rc
+ echo "TitleFont $WMTITLEFONT" >> $USERTMPFS/twm-xfreq.rc
+ echo "TitlePadding 8" >> $USERTMPFS/twm-xfreq.rc
+ echo -e "\r" >> $USERTMPFS/twm-xfreq.rc
+ echo "Color" >> $USERTMPFS/twm-xfreq.rc
+ echo "{" >> $USERTMPFS/twm-xfreq.rc
+ echo " BorderColor '$WMBORDERCOLOR'" >> $USERTMPFS/twm-xfreq.rc
+ echo " {" >> $USERTMPFS/twm-xfreq.rc
+ echo " 'Clock' '$WMBORDERCLOCK'" >> $USERTMPFS/twm-xfreq.rc
+ echo " 'PopUp' '$WMBORDERPOPUP'" >> $USERTMPFS/twm-xfreq.rc
+ echo " 'TWM Icon Manager' '$WMBORDERTASKS'" >> $USERTMPFS/twm-xfreq.rc
+ echo " }" >> $USERTMPFS/twm-xfreq.rc
+ echo " BorderTileBackground '$WMBORDERTILEBG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " BorderTileForeground '$WMBORDERTILEFG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " DefaultBackground '$WMDEFAULTBG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " DefaultForeground '$WMDEFAULTFG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " TitleBackground '$WMTITLEBG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " TitleForeground '$WMTITLEFG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " MenuBackground '$WMMENUBG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " MenuForeground '$WMMENUFG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " MenuBorderColor '$WMBORDERMENUBG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " MenuShadowColor '$WMMENUSHADOW'" >> $USERTMPFS/twm-xfreq.rc
+ echo " MenuTitleBackground '$WMMENUTITLEBG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " MenuTitleForeground '$WMMENUTITLEFG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " IconBackground '$WMICONBG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " IconForeground '$WMICONFG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " IconBorderColor '$WMBORDERICON'" >> $USERTMPFS/twm-xfreq.rc
+ echo " IconManagerBackground '$WMTASKSBG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " IconManagerForeground '$WMTASKSFG'" >> $USERTMPFS/twm-xfreq.rc
+ echo " IconManagerHighlight '$WMTASKSLIGHT'" >> $USERTMPFS/twm-xfreq.rc
+ echo "}" >> $USERTMPFS/twm-xfreq.rc
+ echo -e "\r" >> $USERTMPFS/twm-xfreq.rc
+ echo "MoveDelta 3" >> $USERTMPFS/twm-xfreq.rc
+ echo "Function 'move-or-lower' { f.move f.deltastop f.lower }" >> $USERTMPFS/twm-xfreq.rc
+ echo "Function 'move-or-raise' { f.move f.deltastop f.raise }" >> $USERTMPFS/twm-xfreq.rc
+ echo "Function 'move-or-iconify' { f.move f.deltastop f.iconify }" >> $USERTMPFS/twm-xfreq.rc
+ echo "Function 'raise-and-focus' { f.raise f.focus }" >> $USERTMPFS/twm-xfreq.rc
+ echo "Function 'raise-and-move' { f.raise f.move }" >> $USERTMPFS/twm-xfreq.rc
+ echo "Function 'raise-and-resize' { f.raise f.resize }" >> $USERTMPFS/twm-xfreq.rc
+ echo "Function 'run-app'" >> $USERTMPFS/twm-xfreq.rc
+ echo "{" >> $USERTMPFS/twm-xfreq.rc
+ echo " f.exec dmenu_run -b -nb '$WMRUNWINBG' -nf '$WMRUNWINFG' -sb '$WMRUNSELBG' -sf '$WMRUNSELFG'" >> $USERTMPFS/twm-xfreq.rc
+ echo "}" >> $USERTMPFS/twm-xfreq.rc
+ echo "Function 'screenshot-root'" >> $USERTMPFS/twm-xfreq.rc
+ echo "{" >> $USERTMPFS/twm-xfreq.rc
+ echo " f.exec scrot --silent --delay 1 --exec 'xmessage -buttons Close -timeout 15 -fg \"$WMPOPUPFG\" -bg \"$WMPOPUPBG\" -bd \"$WMPOPUPFG\" -geometry -16-32 -fn $WMPOPUPFONT -name PopUp \$f &' '/tmp/%Y%m%d-%H%M%S-\$wx\$h.png'" >> $USERTMPFS/twm-xfreq.rc
+ echo "}" >> $USERTMPFS/twm-xfreq.rc
+ echo -e "\r" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button1 = : root : f.menu 'leftops'" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button2 = : root : f.menu 'TwmWindows'" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button3 = : root : f.menu 'rightops'" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button4 = : root : f.warpring 'prev'" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button5 = : root : f.warpring 'next'" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button1 = : window : f.raise" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button1 = m : window|icon : f.function 'move-or-lower'" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button2 = m : window|icon : f.iconify" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button3 = m : window|icon : f.function 'move-or-raise'" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button1 = : title : f.function 'move-or-raise'" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button2 = : title : f.fullzoom" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button3 = : title : f.menu 'winops'" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button1 = : icon : f.function 'move-or-iconify'" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button2 = : icon : f.iconify" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button1 = : iconmgr : f.iconify" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button2 = : iconmgr : f.fullzoom" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button1 = : frame : f.function 'raise-and-move'" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button2 = : frame : f.hzoom" >> $USERTMPFS/twm-xfreq.rc
+ echo "Button3 = : frame : f.function 'raise-and-resize'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'F1' = : root : f.function 'run-app'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'r' = c : root : f.function 'run-app'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'p' = c : root : f.function 'screenshot-root'" >> $USERTMPFS/twm-xfreq.rc
+ echo -e "\r" >> $USERTMPFS/twm-xfreq.rc
+ echo "menu 'winops'" >> $USERTMPFS/twm-xfreq.rc
+ echo "{" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Fullzoom' f.fullzoom" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Iconify' f.iconify" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Resize' f.resize" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Move' f.move" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Raise' f.raise" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Lower' f.lower" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Focus' f.focus" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Unfocus' f.unfocus" >> $USERTMPFS/twm-xfreq.rc
+ echo "'AutoRaise' f.autoraise" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Kill' f.destroy" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Close' f.delete" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "}" >> $USERTMPFS/twm-xfreq.rc
+ echo "menu 'sysops'" >> $USERTMPFS/twm-xfreq.rc
+ echo "{" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Sleep' f.exec 'systemctl suspend'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Hibernate' f.exec 'systemctl hibernate'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Hybrid-sleep' f.exec 'systemctl hybrid-sleep'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Rescue' f.exec (xmessage -buttons Rescue:11,Cancel:99 -default Cancel -timeout 30 -fg '$WMPOPUPFG' -bg '$WMPOPUPBG' -bd '$WMPOPUPFG' -16-32 -fn '$WMPOPUPFONT' -name PopUp 'Enter rescue mode ?'; if [[ \$? == 11 ]]; then systemctl rescue; fi) &" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Reboot' f.exec (xmessage -buttons Reboot:11,Cancel:99 -default Cancel -timeout 30 -fg '$WMPOPUPFG' -bg '$WMPOPUPBG' -bd '$WMPOPUPFG' -geometry -16-32 -fn '$WMPOPUPFONT' -name PopUp 'Shut down and reboot the system ?'; if [[ \$? == 11 ]]; then systemctl reboot; fi) &" >> $USERTMPFS/twm-xfreq.rc
+ echo "'PowerOff' f.exec (xmessage -buttons PowerOff:11,Cancel:99 -default Cancel -timeout 30 -fg '$WMPOPUPFG' -bg '$WMPOPUPBG' -bd '$WMPOPUPFG' -geometry -16-32 -fn '$WMPOPUPFONT' -name PopUp 'Shut down and power-off the system ?'; if [[ \$? == 11 ]]; then systemctl poweroff; fi) &" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "}" >> $USERTMPFS/twm-xfreq.rc
+ echo "menu 'screensaver'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "' Default' f.exec 'xset s default'" >> $USERTMPFS/twm-xfreq.rc
+ echo "' 5 minutes' f.exec 'xset s 300 300'" >> $USERTMPFS/twm-xfreq.rc
+ echo "' 7 minutes' f.exec 'xset s 420 420'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'10 minutes' f.exec 'xset s 600 600'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'12 minutes' f.exec 'xset s 720 720'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'15 minutes' f.exec 'xset s 900 900'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'20 minutes' f.exec 'xset s 1500 1500'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "}" >> $USERTMPFS/twm-xfreq.rc
+ echo "menu 'screenoff'" >> $USERTMPFS/twm-xfreq.rc
+ echo "{" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "' Disable' f.exec 'xset dpms 0 0 0'" >> $USERTMPFS/twm-xfreq.rc
+ echo "' 5 minutes' f.exec 'xset dpms 300 300 300'" >> $USERTMPFS/twm-xfreq.rc
+ echo "' 7 minutes' f.exec 'xset dpms 420 420 420'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'10 minutes' f.exec 'xset dpms 600 600 600'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'12 minutes' f.exec 'xset dpms 720 720 720'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'15 minutes' f.exec 'xset dpms 900 900 900'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'20 minutes' f.exec 'xset dpms 1500 1500 1500'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "}" >> $USERTMPFS/twm-xfreq.rc
+ echo "menu 'iconmgr'" >> $USERTMPFS/twm-xfreq.rc
+ echo "{" >> $USERTMPFS/twm-xfreq.rc
+ echo "' Show ' f.showiconmgr" >> $USERTMPFS/twm-xfreq.rc
+ echo "' Hide ' f.hideiconmgr" >> $USERTMPFS/twm-xfreq.rc
+ echo "}" >> $USERTMPFS/twm-xfreq.rc
+ echo "menu 'settings'" >> $USERTMPFS/twm-xfreq.rc
+ echo "{" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Icon Manager' f.menu 'iconmgr'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Screen Saver' f.menu 'screensaver'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Screen Off' f.menu 'screenoff'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "}" >> $USERTMPFS/twm-xfreq.rc
+ echo "menu 'twmops'" >> $USERTMPFS/twm-xfreq.rc
+ echo "{" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Restart' f.restart" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Quit' f.quit" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "}" >> $USERTMPFS/twm-xfreq.rc
+ echo "menu 'leftops'" >> $USERTMPFS/twm-xfreq.rc
+ echo "{" >> $USERTMPFS/twm-xfreq.rc
+ echo "'$(hostname)' f.title" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Window' f.menu 'winops'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'System' f.menu 'sysops'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Settings' f.menu 'settings'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Manager' f.menu 'twmops'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "}" >> $USERTMPFS/twm-xfreq.rc
+ echo "menu 'termops'" >> $USERTMPFS/twm-xfreq.rc
+ echo "{" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "'96x30-18px' f.exec exec xterm -bg '$WMTERMBG' -fg '$WMTERMFG' -geometry 96x30 -fn '$WMTERMFONT' -name Terminal &" >> $USERTMPFS/twm-xfreq.rc
+ echo "'96x30-15px' f.exec exec xterm -bg '$WMTERMBG' -fg '$WMTERMFG' -geometry 96x30 -fn '$WMTERMFONT' -name Terminal &" >> $USERTMPFS/twm-xfreq.rc
+ echo "'80x25-12px' f.exec exec xterm -bg '$WMTERMBG' -fg '$WMTERMFG' -geometry 80x25 -fn '$WMTERMFONT' -name Terminal &" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "}" >> $USERTMPFS/twm-xfreq.rc
+ echo "menu 'rightops'" >> $USERTMPFS/twm-xfreq.rc
+ echo "{" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Applications' f.title" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Run...' f.function 'run-app'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'XFreq' f.exec 'xfreq-gui &'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Clock' f.exec xclock -digital -twentyfour -update 1 -strftime '$CLOCKFORMAT' -bg '$WMCLOCKBG' -fg '$WMCLOCKFG' -geometry 175x26-0+0 -fa '$WMCLOCKFACE' -name Clock &" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Terminal' f.menu 'termops'" >> $USERTMPFS/twm-xfreq.rc
+ echo "'Internet' f.exec $(grep -w 'Exec' /usr/share/applications/$(xdg-settings get default-web-browser)|cut -d '=' -f 2) &" >> $USERTMPFS/twm-xfreq.rc
+ echo "'' f.nop" >> $USERTMPFS/twm-xfreq.rc
+ echo "}" >> $USERTMPFS/twm-xfreq.rc
+
+ twm -f $USERTMPFS/twm-xfreq.rc
+fi
diff --git a/twm-xfreq.Xresources b/twm-xfreq.Xresources
deleted file mode 100644
index d66961e59c67..000000000000
--- a/twm-xfreq.Xresources
+++ /dev/null
@@ -1,10 +0,0 @@
-Xmessage*borderWidth:1
-Xmessage*Command.highlightThickness:1
-Xmessage*Command.internalWidth:12
-Xmessage*Command.internalHeight:4
-Xmessage*Command.shapeStyle:rectangle
-Xmessage*message.scrollVertical:never
-Xmessage*message.scrollHorizontal:never
-Xmessage*Text.borderWidth:0
-
-XTerm*vt100.allowBoldFonts:false
diff --git a/twm-xfreq.rc b/twm-xfreq.rc
deleted file mode 100644
index 465d445756ed..000000000000
--- a/twm-xfreq.rc
+++ /dev/null
@@ -1,232 +0,0 @@
-#
-AutoRaise { "TWM Icon Manager" "Clock" "PopUp" "XFreq-Gui" }
-BorderWidth 4
-ButtonIndent 2
-# ClientBorderWidth
-DecorateTransients
-# ForceIcons
-FramePadding 1
-IconFont "-misc-fixed-*-*-*-*-15-*-*-*-*-*-*-*"
-IconBorderWidth 1
-IconifyByUnmapping
-IconBorderWidth 1
-# IconDirectory "/usr/share/icons"
-IconFont "-misc-fixed-*-*-*-*-14-110-*-*-*-*-*-*"
-IconRegion "=160x1024+0+64" North West 5 10
-IconRegion "=160x1024-0+64" North East 5 10
-IconManagerDontShow { "Clock" "PopUp" }
-IconManagerGeometry "2384x32+0+0" 16
-IconManagerFont "-misc-fixed-*-*-*-*-14-110-*-*-*-*-*-*"
-NoGrabServer
-NoHighlight
-NoTitle { "TWM Icon Manager" "Clock" "PopUp"}
-MenuBorderWidth 1
-MenuFont "-misc-fixed-*-*-*-*-15-*-*-*-*-*-*-*"
-OpaqueMove
-RandomPlacement
-ResizeFont "-misc-fixed-*-*-*-*-12-*-*-*-*-*-*-*"
-RestartPreviousState
-ShowIconManager
-SqueezeTitle
-TitleButtonBorderWidth 1
-TitleFont "-misc-fixed-*-*-*-*-14-110-*-*-*-*-*-*"
-TitlePadding 8
-
-Color
-{
- BorderColor "#2a0308"
- {
-# "Clock" "#dfdfdf"
-# "PopUp" "#2a0308"
- "TWM Icon Manager" "#2a0308"
- }
- BorderTileBackground "#2a0308"
- BorderTileForeground "chocolate"
- DefaultBackground "#2a0308"
- DefaultForeground "#dfdfdf"
- TitleBackground "#2a0308"
- TitleForeground "#dfdfdf"
- MenuBackground "#2a0308"
- MenuForeground "#dfdfdf"
- MenuBorderColor "chocolate"
- MenuShadowColor "#2a0308"
- MenuTitleBackground "#2a0308"
- MenuTitleForeground "#efefef"
- IconBackground "#2a0308"
- IconForeground "#dfdfdf"
- IconBorderColor "chocolate"
- IconManagerBackground "#2a0308"
- IconManagerForeground "#dfdfdf"
- IconManagerHighlight "#efefef"
-}
-
-#
-# Motion-based actions.
-#
-MoveDelta 3
-Function "move-or-lower" { f.move f.deltastop f.lower }
-Function "move-or-raise" { f.move f.deltastop f.raise }
-Function "move-or-iconify" { f.move f.deltastop f.iconify }
-Function "raise-and-focus" { f.raise f.focus }
-Function "raise-and-move" { f.raise f.move }
-Function "raise-and-resize" { f.raise f.resize }
-Function "run-app"
-{
- f.exec "dmenu_run -b -nb '#2a0308' -nf white -sb chocolate"
-}
-Function "screenshot-root"
-{
- f.exec "scrot --silent --delay 1 --exec 'xmessage -buttons Close -timeout 15 -fg \"#dfdfdf\" -bg \"#2a0308\" -bd \"#dfdfdf\" -geometry -16-32 -fn -misc-fixed-*-*-*-*-15-*-*-*-*-*-*-* -name PopUp $f &' '/tmp/%Y%m%d-%H%M%S-\$wx\$h.png'"
-}
-
-#
-# Mouse buttons bindings.
-#
-Button1 = : root : f.menu "leftops"
-Button2 = : root : f.menu "TwmWindows"
-Button3 = : root : f.menu "rightops"
-Button4 = : root : f.warpring "prev"
-Button5 = : root : f.warpring "next"
-
-Button1 = : window : f.raise
-
-Button1 = m : window|icon : f.function "move-or-lower"
-Button2 = m : window|icon : f.iconify
-Button3 = m : window|icon : f.function "move-or-raise"
-
-Button1 = : title : f.function "move-or-raise"
-Button2 = : title : f.fullzoom
-Button3 = : title : f.menu "winops"
-
-Button1 = : icon : f.function "move-or-iconify"
-Button2 = : icon : f.iconify
-
-Button1 = : iconmgr : f.iconify
-Button2 = : iconmgr : f.fullzoom
-
-Button1 = : frame : f.function "raise-and-move"
-Button2 = : frame : f.hzoom
-Button3 = : frame : f.function "raise-and-resize"
-
-#
-# Keyboard bindings.
-#
-"F1" = : root : f.function "run-app"
-"r" = c : root : f.function "run-app"
-"p" = c : root : f.function "screenshot-root"
-
-#
-# Menus
-#
-menu "winops"
-{
-"" f.nop
-"Fullzoom" f.fullzoom
-"Iconify" f.iconify
-"Resize" f.resize
-"Move" f.move
-"" f.nop
-"Raise" f.raise
-"Lower" f.lower
-"Focus" f.focus
-"Unfocus" f.unfocus
-"AutoRaise" f.autoraise
-"" f.nop
-"Kill" f.destroy
-"Delete" f.delete
-"" f.nop
-}
-
-menu "sysops"
-{
-"" f.nop
-"Sleep" f.exec "systemctl suspend"
-"Hibernate" f.exec "systemctl hibernate"
-"Hybrid-sleep" f.exec "systemctl hybrid-sleep"
-"" f.nop
-"Rescue" f.exec "(xmessage -buttons Rescue:11,Cancel:99 -default Cancel -timeout 30 -fg '#dfdfdf' -bg '#2a0308' -bd '#dfdfdf' -geometry -16-32 -fn -misc-fixed-*-*-*-*-15-*-*-*-*-*-*-* -name PopUp 'Enter rescue mode ?';if [[ $? == 11 ]]; then systemctl rescue; fi) &"
-"Reboot" f.exec "(xmessage -buttons Reboot:11,Cancel:99 -default Cancel -timeout 30 -fg '#dfdfdf' -bg '#2a0308' -bd '#dfdfdf' -geometry -16-32 -fn -misc-fixed-*-*-*-*-15-*-*-*-*-*-*-* -name PopUp 'Shut down and reboot the system ?';if [[ $? == 11 ]]; then systemctl reboot; fi) &"
-"PowerOff" f.exec "(xmessage -buttons PowerOff:11,Cancel:99 -default Cancel -timeout 30 -fg '#dfdfdf' -bg '#2a0308' -bd '#dfdfdf' -geometry -16-32 -fn -misc-fixed-*-*-*-*-15-*-*-*-*-*-*-* -name PopUp 'Shut down and power-off the system ?';if [[ $? == 11 ]]; then systemctl poweroff; fi) &"
-"" 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 "iconmgr"
-{
-" Show " f.showiconmgr
-" Hide " f.hideiconmgr
-}
-
-menu "settings"
-{
-"" f.nop
-"Icon Manager" f.menu "iconmgr"
-"Screen Saver" f.menu "screensaver"
-"Screen Off" f.menu "screenoff"
-"" f.nop
-}
-
-menu "twmops"
-{
-"" f.nop
-"Restart" f.restart
-"Quit" f.quit
-"" f.nop
-}
-
-menu "leftops"
-{
-"Computer" f.title
-"" f.nop
-"Window" f.menu "winops"
-"System" f.menu "sysops"
-"Settings" f.menu "settings"
-"Manager" f.menu "twmops"
-"" f.nop
-}
-
-menu "termops"
-{
-"" f.nop
-"96x30-18px" f.exec "exec xterm -bg black -fg white -geometry 96x30 -fn -misc-fixed-medium-*-*-*-18-*-*-*-*-*-*-* -name Terminal &"
-"96x30-15px" f.exec "exec xterm -bg black -fg white -geometry 96x30 -fn -misc-fixed-medium-*-*-*-15-*-*-*-*-*-*-* -name Terminal &"
-"80x25-12px" f.exec "exec xterm -bg black -fg white -geometry 80x25 -fn -misc-fixed-medium-*-*-*-12-*-*-*-*-*-*-* -name Terminal &"
-"" f.nop
-}
-
-menu "rightops"
-{
-"Applications" f.title
-"" f.nop
-"Run..." f.function "run-app"
-"XFreq" f.exec "xfreq-gui &"
-"Clock" f.exec "xclock -digital -twentyfour -update 1 -strftime '%a %e %b %H:%M:%S' -bg '#2a0308' -fg white -geometry 175x26-0+0 -fa DejaVuSans-9:bold -name Clock &"
-"Terminal" f.menu "termops"
-"Internet" f.exec "$(grep -w 'Exec' /usr/share/applications/$(xdg-settings get default-web-browser)|cut -d '=' -f 2) &"
-"" f.nop
-}
diff --git a/xdm-xfreq.rc b/xdm-xfreq.rc
index a0dabb69331b..7e589a347ee3 100755
--- a/xdm-xfreq.rc
+++ b/xdm-xfreq.rc
@@ -75,5 +75,10 @@ XDM_XFREQ_SLEEP_CMD="systemctl suspend"
XDM_XFREQ_RESCUE_CMD="systemctl rescue"
# Users settings
-XSESSION_ERR_PATH="$HOME/.xsession-errors"
+USERTMPFS="/var/run/user/$(id --user)"
+if [ -d $USERTMPFS ]; then
+ XSESSION_ERR_PATH="$USERTMPFS/.xsession-errors"
+else
+ XSESSION_ERR_PATH="$HOME/.xsession-errors"
+fi
XSESSION_LAST_NUM=1