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.

64 lines
2.5 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 program is free software; you can redistribute it and/or modify
  12. # it under the terms of the GNU General Public License as published by
  13. # the Free Software Foundation; either version 2 of the License, or
  14. # (at your option) any later version. A copy of the GNU General Public
  15. # License can be found at Documentation/COPYING.
  16. #
  17. # Many people helped and are helping developing ROCK Linux. Please
  18. # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
  19. # file for details.
  20. #
  21. # --- ROCK-COPYRIGHT-NOTE-END ---
  22. More flexible root application startup. Kind of ROCK Linux specific.
  23. --- ./programs/xdm/config/Xsession.orig Sun Jan 11 04:48:32 1998
  24. +++ ./programs/xdm/config/Xsession Thu Dec 28 15:23:15 2000
  25. @@ -33,5 +33,11 @@
  26. if [ -r "$resources" ]; then
  27. xrdb -load "$resources"
  28. fi
  29. +
  30. + WINDOWMANAGER="${WINDOWMANAGER:-startkde}"
  31. + [ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session"
  32. + [ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde"
  33. + [ "$WINDOWMANAGER" != "twm" ] && exec $WINDOWMANAGER
  34. + xsetroot -solid darkcyan ; exec twm ; exec xterm
  35. exec xsm
  36. fi
  37. --- ./programs/xdm/config/Xsetup_0.orig Wed Apr 27 09:20:03 1994
  38. +++ ./programs/xdm/config/Xsetup_0 Thu Dec 28 15:23:15 2000
  39. @@ -1,3 +1,4 @@
  40. #!/bin/sh
  41. # $XConsortium: Xsetup_0,v 1.3 93/09/28 14:30:31 gildea Exp $
  42. xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
  43. +xsetroot -solid black
  44. --- ./programs/xinit/xinitrc.cpp.orig Wed Apr 27 09:13:07 1994
  45. +++ ./programs/xinit/xinitrc.cpp Thu Dec 28 15:23:15 2000
  46. @@ -24,10 +24,10 @@
  47. xmodmap $usermodmap
  48. fi
  49. -XCOMM start some nice programs
  50. +XCOMM start the window manager
  51. -twm &
  52. -xclock -geometry 50x50-1+1 &
  53. -xterm -geometry 80x50+494+51 &
  54. -xterm -geometry 80x20+494-0 &
  55. -exec xterm -geometry 80x66+0+0 -name login
  56. +WINDOWMANAGER="${WINDOWMANAGER:-startkde}"
  57. +[ "$WINDOWMANAGER" = "gnome" ] && WINDOWMANAGER="gnome-session"
  58. +[ "$WINDOWMANAGER" = "kde" ] && WINDOWMANAGER="startkde"
  59. +[ "$WINDOWMANAGER" != "twm" ] && exec $WINDOWMANAGER
  60. +xsetroot -solid darkcyan ; exec twm ; exec xterm