package/xorg/xinit/startwm.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../xinit/startwm.patch
   5 # Copyright (C) 2004 - 2008 The T2 SDE Project
   6 # Copyright (C) 1998 - 2004 ROCK Linux Project
   7 #
   8 # More information can be found in the files COPYING and README.
   9 #
  10 # This patch file is dual-licensed. It is available under the license the
  11 # patched project is licensed under, as long as it is an OpenSource license
  12 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  13 # of the GNU General Public License as published by the Free Software
  14 # Foundation; either version 2 of the License, or (at your option) any later
  15 # version.
  16 # --- T2-COPYRIGHT-NOTE-END ---
  17
  18 More flexible root application startup.
  19
  20 --- xinit-0.99.4/xinitrc.cpp_orig       2005-11-15 05:03:10.000000000 +0100
  21 +++ xinit-0.99.4/xinitrc.cpp    2005-12-15 01:42:29.000000000 +0100
  22 @@ -24,7 +24,7 @@
  23      XMODMAP $usermodmap
  24  fi
  25
  26 -XCOMM start some nice programs
  27 +XCOMM start windowmanager or some programs
  28
  29  #if defined(__SCO__) || defined(__UNIXWARE__)
  30  if [ -r /etc/default/xdesktops ]; then
  31 @@ -96,8 +96,7 @@
  32
  33  #endif
  34
  35 -TWM &
  36 -XCLOCK -geometry 50x50-1+1 &
  37 -XTERM -geometry 80x50+494+51 &
  38 -XTERM -geometry 80x20+494-0 &
  39 -exec XTERM -geometry 80x66+0+0 -name login
  40 +[ "$WINDOWMANAGER" =  "gnome" ] && WINDOWMANAGER="gnome-session"
  41 +[ "$WINDOWMANAGER" =  "kde"   ] && WINDOWMANAGER="startkde"
  42 +[ "$WINDOWMANAGER" != "twm"   ] && exec $WINDOWMANAGER
  43 +xsetroot -solid darkcyan ; exec twm ; exec xterm