summaryrefslogtreecommitdiff
path: root/package/debian/patches/01_debian_system_twmrc.diff
blob: b7e33309cacc8e7cca2120ff2f29334561032c83 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
From: Branden Robinson <branden@debian.org>

Fix system.twmrc to actually be useful and tabbed right, as well as add
the Debian menu.

Index: twm/src/system.twmrc
===================================================================
--- twm.orig/src/system.twmrc
+++ twm/src/system.twmrc
@@ -48,7 +48,8 @@ Function "move-or-iconify" { f.move f.de
 #
 # Set some useful bindings.  Sort of uwm-ish, sort of simple-button-ish
 #
-Button1 = : root : f.menu "defops"
+Button1 = : root : f.menu "main"
+Button2 = : root : f.menu "windowops"
 
 Button1 = m : window|icon : f.function "move-or-lower"
 Button2 = m : window|icon : f.iconify
@@ -66,25 +67,39 @@ Button2 = : iconmgr : f.iconify
 #
 # And a menus with the usual things
 #
-menu "defops"
+menu "main"
 {
-"Twm"	f.title
-"Iconify"	f.iconify
-"Resize"	f.resize
-"Move"		f.move
-"Raise"		f.raise
-"Lower"		f.lower
-""		f.nop
-"Focus"		f.focus
-"Unfocus"	f.unfocus
-"Show Iconmgr"	f.showiconmgr
-"Hide Iconmgr"	f.hideiconmgr
-""		f.nop
-"Xterm"		f.exec "exec xterm &"
-""		f.nop
-"Kill"		f.destroy
-"Delete"	f.delete
-""		f.nop
-"Restart"	f.restart
-"Exit"		f.quit
+		"Main Menu"		f.title
+		"Debian"		f.menu "/Debian"
+		""			f.nop
+		"Show Icon Manager"	f.showiconmgr
+		"Hide Icon Manager"	f.hideiconmgr
+		""			f.nop
+		"Exit"			f.menu "Quit-Verify"
 }
+
+menu "Quit-Verify"
+{
+		"Really quit twm?"	f.title
+		"No, restart twm"	f.restart
+		"Yes, really quit"	f.quit
+}
+
+menu "windowops"
+{
+		"Window Ops"		f.title
+		""			f.nop
+		"Iconify"		f.iconify
+		"Resize"		f.resize
+		"Move"			f.move
+		"Raise"			f.raise
+		"Lower"			f.lower
+		""			f.nop
+		"Focus"			f.focus
+		"Unfocus"		f.unfocus
+		""			f.nop
+		"Delete"		f.delete
+		"Destroy"		f.destroy
+}
+
+include-menu-defs
Index: twm/src/Makefile.am
===================================================================
--- twm.orig/src/Makefile.am
+++ twm/src/Makefile.am
@@ -24,13 +24,13 @@ AM_YFLAGS = -d
 
 bin_PROGRAMS = twm
 
-rcdir = ${datadir}/X11/twm
+rcdir = ${sysconfdir}/X11/twm
 dist_rc_DATA = system.twmrc
 
 AM_CPPFLAGS =							\
 	-DXVENDORNAME=\"The\ X.Org\ Foundation\"		\
 	-DXORG_RELEASE=\"Release\ $(VERSION)\"			\
-	-DSYSTEM_INIT_FILE=\"${datadir}/X11/twm/system.twmrc\"
+	-DSYSTEM_INIT_FILE=\"$(rcdir)/system.twmrc\"
 
 AM_CFLAGS = $(TWM_CFLAGS)
 twm_LDADD = $(TWM_LIBS)