r1345 - in trunk: etc/X11 packages/xfce

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Mon Jan 9 00:03:15 PST 2006


Author: alexander
Date: 2006-01-09 01:03:13 -0700 (Mon, 09 Jan 2006)
New Revision: 1345

Modified:
   trunk/etc/X11/xorg.conf
   trunk/packages/xfce/Makefile
   trunk/packages/xfce/cleanup-panel.pl
Log:
Enabled Composite support in XFCE, disabled the "Lock Screen" panel button.


Modified: trunk/etc/X11/xorg.conf
===================================================================
--- trunk/etc/X11/xorg.conf	2006-01-08 11:22:16 UTC (rev 1344)
+++ trunk/etc/X11/xorg.conf	2006-01-09 08:03:13 UTC (rev 1345)
@@ -12,6 +12,11 @@
 	Load	"vbe"
 EndSection
 
+# Uncomment to see nice shadows and make the panel semi-transparent
+# Section "Extensions"
+# 	Option "Composite"
+# EndSection
+
 Section "InputDevice"
 	Identifier	"Generic Keyboard"
 	Driver		"kbd"

Modified: trunk/packages/xfce/Makefile
===================================================================
--- trunk/packages/xfce/Makefile	2006-01-08 11:22:16 UTC (rev 1344)
+++ trunk/packages/xfce/Makefile	2006-01-09 08:03:13 UTC (rev 1345)
@@ -25,7 +25,7 @@
 	cd $$i ; \
 	 ./configure --prefix=/usr --sysconfdir=/etc \
 	 --enable-debug=no --enable-panel --enable-startup-notification \
-	 --libexecdir=/usr/sbin ; \
+	 --libexecdir=/usr/sbin --enable-compositor ; \
 	make $(PM) ; \
 	make install ; cd .. ; done
 	# FIXME: maybe copy to /etc/X11/xinit/xinitrc? The default there

Modified: trunk/packages/xfce/cleanup-panel.pl
===================================================================
--- trunk/packages/xfce/cleanup-panel.pl	2006-01-08 11:22:16 UTC (rev 1344)
+++ trunk/packages/xfce/cleanup-panel.pl	2006-01-09 08:03:13 UTC (rev 1345)
@@ -6,12 +6,22 @@
 open(FH, "<$ARGV[0]");
 my $content = <FH>;
 close FH;
+
+# Remove popup menus related to Konqueror etc.
 $content =~ s,<Popup>.*?</Popup>,<Popup/>,sg;
 $content =~ s,popup="1",popup="0",g;
+
+# Use Firefox and Thunderbird for web and mail
 $content =~ s,Mozilla,Firefox,g;
 $content =~ s,mozilla -mail,thunderbird,g;
 $content =~ s,mozilla,firefox,g;
 
+# Hide the non-functional "Lock Screen" button
+$content =~ s,button1=".",button1="1",g;
+$content =~ s,button2=".",button2="0",g;
+$content =~ s,showtwo=".",showtwo="0",g;
+
+# Remove non-functional buttons related to multimedia and printing.
 # Hack. Works for now, but may break in the future. Check with:
 # for a in contents.xml* ; do grep --count Group $a ; done
 # Should print the same number for all files.




More information about the livecd mailing list