mirror of the now-defunct rocklinux.org
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.

61 lines
2.4 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/x11/xfree86/startwm.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
  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. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. More flexible root application startup. Kind of ROCK Linux specific.
  20. --- ./programs/xdm/config/Xsession.orig Sun Jan 11 04:48:32 1998
  21. +++ ./programs/xdm/config/Xsession Thu Dec 28 15:23:15 2000
  22. @@ -33,5 +33,11 @@
  23. if [ -r "$resources" ]; then
  24. xrdb -load "$resources"
  25. fi
  26. +
  27. + WINDOWMANAGER="${WINDOWMANAGER:-startkde}"
  28. + [ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session"
  29. + [ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde"
  30. + [ "$WINDOWMANAGER" != "twm" ] && exec $WINDOWMANAGER
  31. + xsetroot -solid darkcyan ; exec twm ; exec xterm
  32. exec xsm
  33. fi
  34. --- ./programs/xdm/config/Xsetup_0.orig Wed Apr 27 09:20:03 1994
  35. +++ ./programs/xdm/config/Xsetup_0 Thu Dec 28 15:23:15 2000
  36. @@ -1,3 +1,4 @@
  37. #!/bin/sh
  38. # $XConsortium: Xsetup_0,v 1.3 93/09/28 14:30:31 gildea Exp $
  39. xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
  40. +xsetroot -solid black
  41. --- ./programs/xinit/xinitrc.cpp.orig Wed Apr 27 09:13:07 1994
  42. +++ ./programs/xinit/xinitrc.cpp Thu Dec 28 15:23:15 2000
  43. @@ -24,10 +24,10 @@
  44. xmodmap $usermodmap
  45. fi
  46. -XCOMM start some nice programs
  47. +XCOMM start the window manager
  48. -twm &
  49. -xclock -geometry 50x50-1+1 &
  50. -xterm -geometry 80x50+494+51 &
  51. -xterm -geometry 80x20+494-0 &
  52. -exec xterm -geometry 80x66+0+0 -name login
  53. +WINDOWMANAGER="${WINDOWMANAGER:-startkde}"
  54. +[ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session"
  55. +[ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde"
  56. +[ "$WINDOWMANAGER" != "twm" ] && exec $WINDOWMANAGER
  57. +xsetroot -solid darkcyan ; exec twm ; exec xterm