OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

46 lines
1.7 KiB

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