[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.4-251-g3799cc5
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:31:05 CET 2014
The branch, build-baikal has been updated
via 3799cc549bc8120a72abe73b2fcdfd6971f0c73c (commit)
from 0294d5b5fdd1174f63271dab28f7149df8d8c891 (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 | 2 ++
x2go/backends/terminal/_stdout.py | 10 ++++++++--
x2go/session.py | 2 +-
x2go/utils.py | 6 ++++--
4 files changed, 15 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fc3d676..4a70238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -138,6 +138,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
- Add support for re-registering sessions after session profile changes.
- Add new session profile parameter: ,,variant''. Add support to set the
keyboard layout _and_ the keyboard variant from the client-side.
+ - Give functionality to the ,,setdpi'' and the ,,dpi'' session profile
+ parameter (setting the DPI allows font scaling).
* Depend on python-xlib.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 91a7c8c..60e1b92 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -181,8 +181,8 @@ class X2goTerminalSessionSTDOUT(object):
"""
def __init__(self, control_session, session_info=None,
- geometry="800x600", depth=_local_color_depth, link="adsl", pack="16m-jpeg-9",
- cache_type="unix-kde",
+ geometry="800x600", depth=_local_color_depth, link="adsl", pack="16m-jpeg-9", dpi='',
+ cache_type="unix-kde",
kbtype='null/null', kblayout='null', kbvariant='null',
session_type="application", snd_system='pulse', snd_port=4713, cmd=None,
published_applications=False,
@@ -215,6 +215,8 @@ class X2goTerminalSessionSTDOUT(object):
@type link: str
@param pack: compression method for NX based session proxying
@type pack: str
+ @param dpi: dots-per-inch value for the session screen (has an impact on the font size on screen)
+ @type dpi: str
@param cache_type: a dummy parameter that is passed to the L{X2goProxyBASE}. In NX Proxy
(class C{X2goProxyNX3}) this originally is the session name. With X2Go it
defines the name of the NX cache directory. Best is to leave it untouched.
@@ -285,6 +287,7 @@ class X2goTerminalSessionSTDOUT(object):
self.params.geometry = str(geometry)
self.params.link = str(link)
self.params.pack = str(pack)
+ self.params.dpi = str(dpi)
self.params.cache_type = str(cache_type)
self.params.session_type = str(session_type)
self.params.kbtype = str(kbtype)
@@ -1207,6 +1210,9 @@ class X2goTerminalSessionSTDOUT(object):
if self.params.cmd == 'XDMCP' and self.params.xdmcp_server:
cmd_line = ['X2GOXDMCP=%s' % self.params.xdmcp_server] + cmd_line
+ if self.params.dpi:
+ cmd_line = ['X2GODPI=%s' % self.params.dpi] + cmd_line
+
(stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line)
_stdout = stdout.read()
diff --git a/x2go/session.py b/x2go/session.py
index 26baeda..17b3aed 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -73,7 +73,7 @@ _X2GO_SESSION_PARAMS = ('use_sshproxy', 'profile_id', 'session_name',
)
"""A list of allowed X2Go pure session parameters (i.e. parameters that are passed on neither to an X2goControlSession, X2goSSHProxy nor an X2goControlSession object."""
# options of the paramiko.SSHClient().connect() method, any option that is allowed for a terminal session instance
-_X2GO_TERMINAL_PARAMS = ('geometry', 'depth', 'link', 'pack',
+_X2GO_TERMINAL_PARAMS = ('geometry', 'depth', 'link', 'pack', 'dpi',
'cache_type', 'kbtype', 'kblayout', 'kbvariant',
'session_type', 'snd_system', 'snd_port',
'cmd', 'set_session_title', 'session_title',
diff --git a/x2go/utils.py b/x2go/utils.py
index 99b4c13..06b6727 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -265,10 +265,12 @@ def _convert_SessionProfileOptions_2_SessionParams(_options):
if not _params['kblayout'].strip(): _params['kblayout'] = 'null'
if not _params['kbvariant'].strip(): _params['kbvariant'] = 'null'
+ if not _options['setdpi']:
+ del _params['dpi']
+ del _params['setdpi']
+
# currently known but ignored in Python X2go
_ignored_options = [
- 'dpi',
- 'setdpi',
'startsoundsystem',
'soundtunnel',
'defsndport',
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
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 "python-x2go.git" (Python X2Go Client API).
More information about the x2go-commits
mailing list