components/x11/xdm/patches/09.Xsession.patch

   1 ###############################################################################
   2 #
   3 # Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
   4 #
   5 # Permission is hereby granted, free of charge, to any person obtaining a
   6 # copy of this software and associated documentation files (the "Software"),
   7 # to deal in the Software without restriction, including without limitation
   8 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
   9 # and/or sell copies of the Software, and to permit persons to whom the
  10 # Software is furnished to do so, subject to the following conditions:
  11 #
  12 # The above copyright notice and this permission notice (including the next
  13 # paragraph) shall be included in all copies or substantial portions of the
  14 # Software.
  15 #
  16 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  17 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  18 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  19 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  20 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  21 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  22 # DEALINGS IN THE SOFTWARE.
  23 #
  24 ###############################################################################
  25
  26 Set default Xsession scripts/programs for Solaris/OpenSolaris.
  27
  28 --- a/config/Xsession.in        2020-09-22 08:10:04.022219142 -0700
  29 +++ b/config/Xsession.in        2020-09-22 08:14:31.762399514 -0700
  30 @@ -47,6 +47,14 @@
  31         esac
  32  esac
  33
  34 +XCOMM Run system session script if present - these will do various setup,
  35 +XCOMM then run $HOME/.xsession if it exists, so we can just run them
  36 +if [[ -x /etc/X11/gdm/Xsession && -x /usr/bin/dtstart ]] ; then
  37 +        exec /etc/X11/gdm/Xsession /usr/bin/dtstart jds
  38 +elif [[ -x /usr/dt/config/Xsession.jds ]] ; then
  39 +        exec /usr/dt/config/Xsession.jds
  40 +fi
  41 +
  42  XCOMM The startup script is not intended to have arguments.
  43
  44  startup=$HOME/.xsession
  45 @@ -62,5 +70,6 @@
  46         if [ -r "$resources" ]; then
  47                 BINDIR/xrdb -load "$resources"
  48         fi
  49 -       exec BINDIR/xsm
  50 +        BINDIR/xterm -geometry 80x24+10+10 -ls &
  51 +        exec BINDIR/twm
  52  fi