Finished XDirectFB everything should finally work

6 files changed, 100 insertions, 98 deletions

diff --git a/x11-base/xdirectfb/ChangeLog b/x11-base/xdirectfb/ChangeLog
index 49d9cda4e19b..ee2d5ea1e9d0 100644
--- a/x11-base/xdirectfb/ChangeLog
+++ b/x11-base/xdirectfb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-base/xdirectfb
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/ChangeLog,v 1.1 2002/06/17 08:28:54 naz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xdirectfb/ChangeLog,v 1.2 2002/07/07 08:44:42 naz Exp $
+
+
+*xdirectfb-1.0_rc2-r1.ebuild (06 Jul 2002)
+
+  06 Jul 2002; M.Nazaroff <naz@gentoo.org> xdirectfb-1.0_rc2-r1.ebuild:
+  Updated startxdfb so it actually works and add a few more files to bring the
+  package all together, and added a slot to each ebuild. This should be finally
+  the package will be released.
 
 *xdirectfb-1.0_rc2.ebuild (16 Jun 2002)
 
diff --git a/x11-base/xdirectfb/files/.dfbserverrc b/x11-base/xdirectfb/files/.dfbserverrc
new file mode 100644
index 000000000000..5babde7d127e
--- /dev/null
+++ b/x11-base/xdirectfb/files/.dfbserverrc
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+/usr/X11R6/bin/XDirectFB -enableRoot -defaultOpacity 230 -enableUnfocused -unfocusedOpacity 200 
+
+# In addition to the standard options accepted by all X servers (see Xserver(1)), XDirectFB accepts  the  following 
+# options:
+#
+# -defaultOpacity value
+#	set  the  default opacity for toplevel windows, value ranges from 1 
+#	(almost invisible) to 255 (fully opaque).
+#
+# -unfocusedOpacity value
+#	set the opacity used for unfocused toplevel windows, value ranges from 1 
+#	(almost invisible)  to  255 (fully opaque).
+#
+# -enableUnfocused
+#	enable usage of unfocused opacity value.
+#
+# -enableFadeIn
+#	enable fade in of showing windows.
+#
+# -enableFadeOut
+#	enable fade out of showing windows.
+#
+# -enableRoot
+#	enable creation of a root window.
+#
+# In additon to your desktop wm ability to set a root image XDirectFB will set
+# it's own root image in a file called .directfbrc for example:	
+# bg-image = /home/(user)/image.jpg
diff --git a/x11-base/xdirectfb/files/dfbserverrc b/x11-base/xdirectfb/files/dfbserverrc
new file mode 100644
index 000000000000..0f8d0a2d53a0
--- /dev/null
+++ b/x11-base/xdirectfb/files/dfbserverrc
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/X11R6/bin/XDirectFB
diff --git a/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc2-r1 b/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc2-r1
new file mode 100644
index 000000000000..2f89f2f05e84
--- /dev/null
+++ b/x11-base/xdirectfb/files/digest-xdirectfb-1.0_rc2-r1
@@ -0,0 +1,6 @@
+MD5 21390561571cf1c34b145e4d2aad9a4a X4299-1.tar.bz2 9228113
+MD5 761753507f6c5d29ef54b4ba27ff8bf7 X4299-2.tar.bz2 13307537
+MD5 15426bacbaf9b9783c0020a9865038a3 X4299-3.tar.bz2 11350279
+MD5 896a27d7b00c100ab80cf0f01f1a10ac X4299-4.tar.bz2 16685884
+MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1524606
+MD5 24fbcdbfc02b4e2f6dc2e19c47f35c5a XDirectFB-1.0-rc2.tar.gz 63748
diff --git a/x11-base/xdirectfb/files/startxdfb b/x11-base/xdirectfb/files/startxdfb
index ce94f5a0fa44..b764ab4cec2c 100644
--- a/x11-base/xdirectfb/files/startxdfb
+++ b/x11-base/xdirectfb/files/startxdfb
@@ -1,127 +1,71 @@
 #!/bin/sh
 
-userclientrc=$HOME/.xinitrc
-sysclientrc=/usr/X11R6/lib/X11/xinit/xinitrc
-defaultclient=/usr/X11R6/bin/xterm
-defaultserver=/usr/X11R6/bin/XDirectFB
-defaultclientargs=""
-defaultserverargs=""
-clientargs=""
+userclientrc=$HOME/.xdfbrc
+userserverrc=$HOME/.dfbserverrc
+sysclientrc=/usr/X11R6/lib/X11/xinit/xdfbrc
+sysserverrc=/usr/X11R6/lib/X11/xinit/dfbserverrc
 serverargs=""
-
+clientargs=""
 
 if [ -f $userclientrc ]; then
-    defaultclientargs=$userclientrc
-elif [ -f $sysclientrc ]; then
-    defaultclientargs=$sysclientrc
+    clientargs=$userclientrc
+else if [ -f $sysclientrc ]; then
+    clientargs=$sysclientrc
+fi
 fi
 
+if [ -f $userserverrc ]; then
+    serverargs=$userserverrc
+else if [ -f $sysserverrc ]; then
+    serverargs=$sysserverrc
+fi
+fi
 
+display=:0
 whoseargs="client"
-while [ x"$1" != x ]; do
+while [ "x$1" != "x" ]; do
     case "$1" in
-    # '' required to prevent cpp from treating "/*" as a C comment.
-    /''*|\./''*)
-	if [ "$whoseargs" = "client" ]; then
-	    if [ x"$clientargs" = x ]; then
-		client="$1"
-	    else
-		clientargs="$clientargs $1"
-	    fi
-	else
-	    if [ x"$serverargs" = x ]; then
-		server="$1"
-	    else
-		serverargs="$serverargs $1"
-	    fi
-	fi
-	;;
     --)
-	whoseargs="server"
-	;;
+        whoseargs="server"
+        ;;
     *)
-	if [ "$whoseargs" = "client" ]; then
-	    clientargs="$clientargs $1"
-	else
-	    # display must be the FIRST server argument
-	    if [ x"$serverargs" = x ] && 		 expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then
-
-		display="$1"
-	    else
-		serverargs="$serverargs $1"
-	    fi
-	fi
-	;;
+        if [ "$whoseargs" = "client" ]; then
+            clientargs="$clientargs $1"
+        else
+            serverargs="$serverargs $1"
+	    case "$1" in
+            :[0-9]*)
+                display="$1"
+                ;;
+            esac
+        fi
+        ;;
     esac
     shift
 done
-
-# process client arguments
-if [ x"$client" = x ]; then
-    # if no client arguments either, use rc file instead
-    if [ x"$clientargs" = x ]; then
-	client="$defaultclientargs"
-    else
-	client=$defaultclient
-    fi
-fi
-
-# process server arguments
-if [ x"$server" = x ]; then
-    # if no server arguments or display either, use rc file instead
-    if [ x"$serverargs" = x -a x"$display" = x ]; then
-	server="$defaultserverargs"
-    else
-	server=$defaultserver
-    fi
-fi
-
-if [ x"$XAUTHORITY" = x ]; then
+    
+if [ X"$XAUTHORITY" = X ]; then
     export XAUTHORITY=$HOME/.Xauthority
 fi
 
 removelist=
 
-
 # set up default Xauth info for this machine
-
-
-
-
-
-
-
-
-authdisplay=${display:-:0}
 mcookie=`mcookie`
-for displayname in $authdisplay `hostname -f`$authdisplay; do
+for displayname in $display `hostname -f`$display; do
     if ! xauth list "$displayname" | grep "$displayname " >/dev/null 2>&1; then
-	xauth add $displayname . $mcookie
-	removelist="$displayname $removelist"
+        xauth add $displayname . $mcookie
+        removelist="$displayname $removelist"
     fi
 done
 
-
-xinit $client $clientargs -- $server $display $serverargs
+echo $serverargs
+xinit $clientargs -- $serverargs
 
 if [ x"$removelist" != x ]; then
     xauth remove $removelist
 fi
 
-
-
-
-
 if command -v deallocvt > /dev/null 2>&1; then
     deallocvt
 fi
-
-
-
-
-
-
-
-
-
-
diff --git a/x11-base/xdirectfb/xdirectfb-1.0_rc2.ebuild b/x11-base/xdirectfb/xdirectfb-1.0_rc2-r1.ebuild
index 46412257fd3c..c12f3c6dd178 100644
--- a/x11-base/xdirectfb/xdirectfb-1.0_rc2.ebuild
+++ b/x11-base/xdirectfb/xdirectfb-1.0_rc2-r1.ebuild
@@ -9,7 +9,7 @@ MY_P=${MY_PN}-${MY_PV}
 MY_V=X4299
 S=${WORKDIR}/xc
 X=${WORKDIR}/${MY_P}
-DESCRIPTION="XDDirectFB is a rootless XServer on top of DirectFB"
+DESCRIPTION="XDirectFB is a rootless XServer on top of DirectFB"
 
 SRC_URI="http://www.ibiblio.org/gentoo/gentoo-sources/${MY_V}-1.tar.bz2
 	http://www.ibiblio.org/gentoo/gentoo-sources/${MY_V}-2.tar.bz2
@@ -20,6 +20,7 @@ SRC_URI="http://www.ibiblio.org/gentoo/gentoo-sources/${MY_V}-1.tar.bz2
 
 HOMEPAGE="http://www.directfb.org"
 LICENSE="X11"
+SLOT="0"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-libs/zlib-1.1.3-r2
@@ -62,6 +63,8 @@ src_install() {
 	mv ${S}/programs/Xserver/hw/directfb/XDirectFB.man ./XDirectFB.1x
 	insinto /usr/X11R6/man/man1
 	doins ${S}/XDirectFB.1x
+	cp ${FILESDIR}/.dfbserverrc /etc/skel
+	cp ${FILESDIR}/dfbserverrc /etc/X11/xinit
 	
 	dohtml ${S}/programs/Xserver/hw/directfb/XDirectFB.1x.html
 	
@@ -79,6 +82,9 @@ pkg_postinst() {
 	echo '#######################################################'
 	echo '#                                                     #'
 	echo '#     To start XDirectFB use startxdfb utility.       #'
+	echo '#     For example startxdfb -- -enableRoot			#'
+	echo '#     Use -enableRoot if you have issues with menus   #'
+	echo '#     not working in fluxbox or blackbox, etc.        #'
 	echo '#                                                     #'
 	echo '#     To set a background in XDirectFB create a       #'
 	echo '#     file called directfbrc in /etc                  #'
@@ -86,9 +92,14 @@ pkg_postinst() {
 	echo '#     in $HOME. XDirectFB will also just use your     #'
 	echo '#     Window Managers background.                     #'
 	echo '#                                                     #'
-	echo '#     XDirectFB reads ~/.xinitrc or                   #'
-	echo '#     /etc/X11/xinit/xinitrc by default so please     #'
-	echo '#     edit this to you likeing.                       #'
+	echo '#     XDirectFB needs ~/.dfbserverrc or               #'
+	echo '#     /etc/X11/xinit/dfbserverrc by default so please #'
+	echo '#     edit these to you likeing.                      #'
+	echo '#     cp /etc/skel/.dfbserverrc $HOME                 #'
+	echo '#     Please take a look at this file and edit it,    #' 
+	echo '#     you can add a options like -enableRoot, etc to  #'
+	echo '#     it.  Though XDirectFB should just start with    #'
+	echo '#     startxdfb                                       #'
 	echo '#                                                     #'
 	echo '#######################################################'
 	echo