[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.0-2

X2Go dev team git-admin at x2go.org
Fri Jan 3 18:03:51 CET 2014


The branch, build-baikal has been updated
       via  df26fa042d97b8c90cc9821910bc3f890314aace (commit)
      from  24a8f38963badf1ba8a32276c5f67807cdf5148b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog   |    8 ++++++++
 x2goresume-session |   16 ++++++++--------
 x2goruncommand     |   13 ++++++++++++-
 x2gostartagent     |   15 ++++++++++++---
 4 files changed, 40 insertions(+), 12 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c6b7b40..a34c13a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+x2goserver (3.0.0-2) unstable; urgency=low
+
+  * Support for rdesktop sessions
+  * Transform xorg rules to evdev in x2goserver
+  * Changes in keyboard settings
+
+ -- Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>  Fri, 10 Jul 2009 08:26:41 +0200
+
 x2goserver (3.0.0-1) unstable; urgency=low
 
   * Printing support (need x2goprint and cups-x2go)
diff --git a/x2goresume-session b/x2goresume-session
index f55a36d..bd14495 100755
--- a/x2goresume-session
+++ b/x2goresume-session
@@ -33,25 +33,25 @@ fi
 SESSION_DIR=${X2GO_ROOT}/C-${SESSION_NAME}
 OPTIONS=`cat ${SESSION_DIR}/options`
 
-GSTR=`echo "$OPTIONS" | awk -F, {'print $15'}`
-RSTR=`echo "$OPTIONS" | awk -F, {'print $16'}`
-FSTR=`echo "$OPTIONS" | awk -F, {'print $17'}`
+GSTR=`echo "$OPTIONS" | awk -F, {'print $13'}`
+RSTR=`echo "$OPTIONS" | awk -F, {'print $14'}`
+FSTR=`echo "$OPTIONS" | awk -F, {'print $15'}`
 LSTR=`echo "$OPTIONS" | awk -F, {'print $2'}`
 PSTR=`echo "$OPTIONS" | awk -F, {'print $3'}`
-KLSTR=`echo "$OPTIONS" | awk -F, {'print $12'}`
-KTSTR=`echo "$OPTIONS" | awk -F, {'print $13'}`
-KSSTR=`echo "$OPTIONS" | awk -F, {'print $14'}`
+KTSTR=`echo "$OPTIONS" | awk -F, {'print $12'}`
 
 
 KTSTR=`echo $KTSTR | sed "s/\//\\\\\\\\\//"`
 X2GO_KBD_TYPE=`echo $X2GO_KBD_TYPE | sed "s/\//\\\\\\\\\//"`
 
+if [ "$X2GO_SET_KBD" == "0" ]
+then
+    X2GO_KBD_TYPE="null\/null"
+fi
 
 NEWOPTIONS=`echo "$OPTIONS" | sed  -e  "s/$LSTR/link=$X2GO_LINK/"\
  -e "s/$PSTR/pack=$X2GO_PACK/"\
- -e "s/$KLSTR/keyboard=$X2GO_KBD_LAYOUT/"\
  -e "s/$KTSTR/kbtype=$X2GO_KBD_TYPE/"\
- -e "s/$KSSTR/keybd=$X2GO_SET_KBD/"\
  -e "s/$GSTR/geometry=$X2GO_GEOMETRY/"\
  -e "s/$RSTR/resize=$X2GO_RESIZE/"\
  -e "s/$FSTR/fullscreen=$X2GO_FULLSCREEN/"`
diff --git a/x2goruncommand b/x2goruncommand
index 66071db..7c0ac30 100755
--- a/x2goruncommand
+++ b/x2goruncommand
@@ -15,6 +15,8 @@ X2GO_ROOT=${HOME}/.x2go
 MESSAGE_FILE=$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput
 echo "exec $cmd" >> $MESSAGE_FILE
 
+IMEXIT="false"
+
 if [ "$sndsys" == "esd" ]
 then
   export ESPEAKER=localhost:$4
@@ -70,6 +72,7 @@ fi
 
 if [ "$cmd" == "TERMINAL" ]
 then
+     IMEXIT="true"
      if [ -e "/usr/bin/konsole" ]
      then
          cmd="/usr/bin/konsole"
@@ -86,10 +89,18 @@ then
 fi
 
 EXEC=`which $cmd`
+
+BNAME=`basename $EXEC`
+if [ "$BNAME" == "rdesktop" ]
+then
+     IMEXIT="true"
+fi
+
 if [ "$EXEC" != "" ] && [ -x `which $cmd` ]
 then
   $cmd
-  if [  "$X2GO_SESS_TYPE" == "R" ] #### some applications can quit immediately, we waiting until x2goagent exists
+  #### some applications can quit immediately, we waiting until x2goagent exists
+  if [  "$X2GO_SESS_TYPE" == "R" ] && [ "$IMEXIT" == "false" ]
   then
      while [ -d /proc/$X2GO_AGENT_PID ]
      do
diff --git a/x2gostartagent b/x2gostartagent
index cf48c4d..9f08860 100755
--- a/x2gostartagent
+++ b/x2gostartagent
@@ -141,11 +141,20 @@ xauth add ${HOSTNAME}/unix:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE}
 xauth add ${HOSTNAME}:${X2GO_PORT} MIT-MAGIC-COOKIE-1 ${X2GO_COOKIE}
 
 
+
+if [ "$X2GO_SET_KBD" == "0" ]
+then
+X2GO_HOST=nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},\
+id=${SESSION_NAME},\
+cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,kbtype=null/null,\
+geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux
+else
 X2GO_HOST=nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},\
 id=${SESSION_NAME},\
-cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,keyboard=${X2GO_KBD_LAYOUT},kbtype=${X2GO_KBD_TYPE},\
-keybd=${X2GO_SET_KBD},\
-geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT}
+cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,kbtype=${X2GO_KBD_TYPE},\
+geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux
+fi
+
 
 
 echo "${X2GO_HOST}:${X2GO_PORT}" >${SESSION_DIR}/options


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).




More information about the x2go-commits mailing list