Updated themes. / Cancel [Ctrl]+[C] when configured

6 files changed, 50 insertions, 235 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bafa0578846e..2e7c543b1b92 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,7 +12,6 @@ pkgbase = xdm-xfreq
 	depends = xorg-xmessage
 	depends = xorg-xsetroot
 	depends = xorg-xdpyinfo
-	depends = xorg-twm
 	depends = xdg-utils
 	depends = xterm
 	depends = scrot
@@ -28,8 +27,6 @@ pkgbase = xdm-xfreq
 	source = xdm-xfreq.rc
 	source = xdm-xfreq-xdesktops
 	source = xdm-xfreq.service
-	source = twm-xfreq.desktop
-	source = start-twm-xfreq
 	source = chocolate.rc
 	source = navy.rc
 	md5sums = SKIP
@@ -41,8 +38,6 @@ pkgbase = xdm-xfreq
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
 
 pkgname = xdm-xfreq
 
diff --git a/chocolate.rc b/chocolate.rc
index 7431c5a91a3b..1d1b0ecefd4a 100755
--- a/chocolate.rc
+++ b/chocolate.rc
@@ -11,7 +11,6 @@ GREETFACE="DejaVuSans-8"
 
 GREETFOREGROUND="#cc4c00"
 
-
 # Login
 LOGINFONT="-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"
 LOGINFACE="Sans-9"
@@ -109,5 +108,7 @@ WMTITLEFONT="-misc-fixed-*-*-*-*-14-110-*-*-*-*-*-*"
 WMICONFONT="-misc-fixed-*-*-*-*-14-110-*-*-*-*-*-*"
 WMRESIZEFONT="-misc-fixed-*-*-*-*-12-*-*-*-*-*-*-*"
 WMPOPUPFONT="-misc-fixed-*-*-*-*-14-*-*-*-*-*-*-*"
-WMTERMFONT="-misc-fixed-medium-*-*-*-18-*-*-*-*-*-*-*"
 WMCLOCKFACE="DejaVuSans-9:bold"
+WMTERMBIGFONT="-misc-fixed-medium-*-*-*-18-*-*-*-*-*-*-*"
+WMTERMMEDFONT="-misc-fixed-medium-*-*-*-15-*-*-*-*-*-*-*"
+WMTERMSMLFONT="-misc-fixed-medium-*-*-*-12-*-*-*-*-*-*-*"
diff --git a/navy.rc b/navy.rc
index e64ecd76090d..ab981a14d0b1 100755
--- a/navy.rc
+++ b/navy.rc
@@ -11,7 +11,6 @@ GREETFACE="DejaVuSans-8"
 
 GREETFOREGROUND="cyan"
 
-
 # Login
 LOGINFONT="-xos4-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"
 LOGINFACE="Sans-9"
@@ -69,3 +68,47 @@ XFREQWALLBOARD="1"
 XFREQFOREGROUND="0x737373"
 XFREQBACKGROUND="0x000088"
 XFREQGEOMETRY="0:0x0+24+48,1:0x0-24+48,2:0x0+24-16,3:0x0+672-16,4:0x0-24-16,5:0x0+672+48"
+
+# WM
+WMBORDERCOLOR=$BACKGROUND
+WMBORDERCLOCK=$BACKGROUND
+WMBORDERPOPUP=$BACKGROUND
+WMBORDERTASKS=$BACKGROUND
+WMBORDERTILEBG=$BACKGROUND
+WMBORDERTILEFG="cyan"
+WMBORDERMENUBG="cyan"
+WMBORDERICON="cyan"
+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="cyan"
+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-*-*-*-*-14-*-*-*-*-*-*-*"
+WMCLOCKFACE="DejaVuSans-9:bold"
+WMTERMBIGFONT="-misc-fixed-medium-*-*-*-18-*-*-*-*-*-*-*"
+WMTERMMEDFONT="-misc-fixed-medium-*-*-*-15-*-*-*-*-*-*-*"
+WMTERMSMLFONT="-misc-fixed-medium-*-*-*-12-*-*-*-*-*-*-*"
diff --git a/start-twm-xfreq b/start-twm-xfreq
deleted file mode 100755
index 402d2662840e..000000000000
--- a/start-twm-xfreq
+++ /dev/null
@@ -1,220 +0,0 @@
-#!/bin/sh
-
-source /etc/xdm-xfreq/xdm-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 "" >> $USERTMPFS/twm-xfreq.Xresources
-	echo "XTerm*vt100.allowBoldFonts:false" >> $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 "" >> $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 "" >> $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 &' '$USERTMPFS/%Y%m%d-%H%M%S-\$wx\$h.png'\"" >> $USERTMPFS/twm-xfreq.rc
-	echo "}" >> $USERTMPFS/twm-xfreq.rc
-	echo "" >> $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|iconmgr : 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 "\"F2\" =          : 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 "" >> $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' -geometry -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.desktop b/twm-xfreq.desktop
deleted file mode 100644
index f103ebd3da5b..000000000000
--- a/twm-xfreq.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Twm for XFreq
-Comment=Tab Window Manager
-Exec=start-twm-xfreq
-Icon=twm
-Type=XSession
diff --git a/xdm-xfreq-xdesktops b/xdm-xfreq-xdesktops
index e428b472aa80..7c9ef4c80819 100755
--- a/xdm-xfreq-xdesktops
+++ b/xdm-xfreq-xdesktops
@@ -49,6 +49,9 @@ case $# in
 			echo "    Ctrl<Key>R: abort-display()\n\\" >> /var/run/xdm-xfreq.Xresources
 			echo "    Ctrl<Key>S: abort-session()\n\\" >> /var/run/xdm-xfreq.Xresources
 			echo "    Ctrl<Key>C: restart-session()\n\\" >> /var/run/xdm-xfreq.Xresources
+		else
+			echo "    Ctrl<Key>C: erase-line()\n\\" >> /var/run/xdm-xfreq.Xresources
+			echo "    Ctrl<Key>\\: erase-to-end-of-line()\n\\" >> /var/run/xdm-xfreq.Xresources
 		fi
 		echo "    <Key>Delete: delete-character()\n\\" >> /var/run/xdm-xfreq.Xresources
 		echo "    <Key>Left: move-backward-character()\n\\" >> /var/run/xdm-xfreq.Xresources