[X2Go-Commits] [python-x2go] 02/02: x2go/backends/terminal/plain.py: supply xinerama parameters to x2gostartagent and x2goresume-session, currently defaulting to false since this feature is not implemented.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit a8b4ad84750a3934466aaf2db3f4c65ab7c9bd8a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Jan 12 11:10:31 2018 +0100

    x2go/backends/terminal/plain.py: supply xinerama parameters to x2gostartagent and x2goresume-session, currently defaulting to false since this feature is not implemented.
    
    Cherry-picked from release/0.5.0.x branch.
---
 debian/changelog                |  6 ++++++
 x2go/backends/terminal/plain.py | 15 +++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2151972..7b0577c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,12 @@ python-x2go (0.5.0.6-0x2go1) unstable; urgency=medium
     - x2go/session.py: Only release locks if actually locked.
     - x2go/session.py: Drop duplicated method is_locked().
 
+  [ Mihai Moldovan ]
+  * New upstream version (0.5.0.6):
+    - x2go/backends/terminal/plain.py: supply xinerama parameters to
+      x2gostartagent and x2goresume-session, currently defaulting to false
+      since this feature is not implemented.
+
  -- X2Go Release Manager <git-admin at x2go.org>  Sat, 23 Sep 2017 21:48:51 +0200
 
 python-x2go (0.5.0.5-0x2go1) unstable; urgency=low
diff --git a/x2go/backends/terminal/plain.py b/x2go/backends/terminal/plain.py
index 5726fca..ad388ad 100644
--- a/x2go/backends/terminal/plain.py
+++ b/x2go/backends/terminal/plain.py
@@ -1509,6 +1509,14 @@ class X2GoTerminalSession(object):
         if self.params.dpi:
             cmd_line = ['X2GODPI=%s' % self.params.dpi] + cmd_line
 
+        xinerama = False
+        xinerama_check = getattr(self.params, 'xinerama', None)
+        if xinerama_check is not None:
+            if instanceof(xinerama_check, int):
+                xinerama = xinerama_check
+
+        cmd_line = ['X2GO_XINERAMA=%s' % str(xinerama)] + cmd_line
+
         (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line)
 
         _stdout = stdout.read()
@@ -1575,6 +1583,12 @@ class X2GoTerminalSession(object):
         if self.params.kbtype != "null/null":
             setkbd = "1"
 
+        xinerama = False
+        xinerama_check = getattr(self.params, 'xinerama', None)
+        if xinerama_check is not None:
+            if instanceof(xinerama_check, int):
+                xinerama = xinerama_check
+
         if self.params.geometry == 'maximize':
             _geometry = utils.get_workarea_geometry()
             if _geometry is None or len(_geometry) != 2:
@@ -1593,6 +1607,7 @@ class X2GoTerminalSession(object):
                      self.params.kbtype,
                      setkbd,
                      self.params.clipboard,
+                     str(xinerama),
                    ]
 
         (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git