Changeset 1262 in xpra

Timestamp:

08/03/12 09:59:28 (11 months ago)

Author:

antoine

Message:

#163:

• add a new --dpi=VALUE command line option
• server defines the default value
• client can override this
• global default is 96
• remove --dpi from Xorg examples (since it doesn't work)
• when we apply the client's resource-manager values, we set/override the dpi
• when the client connects, we fake a "resource-manager" settings update as some clients never send this

Location:

trunk/src

Files:

• etc/xpra/xpra.conf (modified) (2 diffs)
• etc/xpra/xpra.conf.template (modified) (2 diffs)
• setup.py (modified) (1 diff)
• tests/wimpiggy/test_prop.py (modified) (1 diff)
• xpra.1 (modified) (4 diffs)
• xpra/client.py (modified) (2 diffs)
• xpra/scripts/client_launcher.py (modified) (2 diffs)
• xpra/scripts/main.py (modified) (3 diffs)
• xpra/server.py (modified) (3 diffs)
• xpra/xposix/xsettings.py (modified) (2 diffs)

trunk/src/etc/xpra/xpra.conf

@@ -33 +33 @@
 encoding = png
 
+# Default DPI:
+dpi = 96
+
 # Client window title:
 title=@title@ on @client-machine@
@@ -50 +53 @@
 # Virtual display command:
 # Old Xvfb option:
-# xvfb=Xvfb -dpi 96 +extension Composite -screen 0 3840x2560x24+32 -nolisten tcp -noreset -auth $XAUTHORITY
+# xvfb=Xvfb +extension Composite -screen 0 3840x2560x24+32 -nolisten tcp -noreset -auth $XAUTHORITY
 # With Xorg 1.12 or newer and the dummy driver:
-# xvfb=/usr/bin/Xorg-nosuid -dpi 96 -noreset -nolisten tcp +extension GLX +extension RANDR +extension RENDER -logfile ${HOME}/.xpra/Xorg.${DISPLAY}.log -config /etc/xpra/xorg.conf
+# xvfb=/usr/bin/Xorg-nosuid -noreset -nolisten tcp +extension GLX +extension RANDR +extension RENDER -logfile ${HOME}/.xpra/Xorg.${DISPLAY}.log -config /etc/xpra/xorg.conf
+xvfb=/usr/bin/Xorg-nosuid -noreset -nolisten tcp +extension GLX +extension RANDR +extension RENDER -logfile ${HOME}/.xpra/Xorg.${DISPLAY}.log -config /etc/xpra/xorg.conf

trunk/src/etc/xpra/xpra.conf.template

@@ -33 +33 @@
 encoding = png
 
+# Default DPI:
+dpi = 96
+
 # Client window title:
 title=@title@ on @client-machine@
@@ -50 +53 @@
 # Virtual display command:
 # Old Xvfb option:
-# xvfb=Xvfb -dpi 96 +extension Composite -screen 0 3840x2560x24+32 -nolisten tcp -noreset -auth $XAUTHORITY
+# xvfb=Xvfb +extension Composite -screen 0 3840x2560x24+32 -nolisten tcp -noreset -auth $XAUTHORITY
 # With Xorg 1.12 or newer and the dummy driver:
-# xvfb=/usr/bin/Xorg-nosuid -dpi 96 -noreset -nolisten tcp +extension GLX +extension RANDR +extension RENDER -logfile ${HOME}/.xpra/Xorg.${DISPLAY}.log -config /etc/xpra/xorg.conf
+# xvfb=/usr/bin/Xorg-nosuid -noreset -nolisten tcp +extension GLX +extension RANDR +extension RENDER -logfile ${HOME}/.xpra/Xorg.${DISPLAY}.log -config /etc/xpra/xorg.conf

trunk/src/setup.py

@@ -265 +265 @@
                 print("enabling Xdummy in config file")
                 f = open("etc/xpra/xpra.conf", mode='a')
-                f.write("xvfb=/usr/bin/Xorg-nosuid -dpi 96 -noreset -nolisten tcp "+
+                f.write("xvfb=/usr/bin/Xorg-nosuid -noreset -nolisten tcp "+
                         "+extension GLX +extension RANDR +extension RENDER "+
                         "-logfile ${HOME}/.xpra/Xorg.${DISPLAY}.log -config /etc/xpra/xorg.conf")

trunk/src/tests/wimpiggy/test_prop.py

@@ -6 +6 @@
 #@PydevCodeAnalysisIgnore
 
-from wimpiggy.test import *
+from tests.wimpiggy import *
 import struct
 import gtk

trunk/src/xpra.1

@@ -24 +24 @@
 [\fB\-\-bind\-tcp=[HOST]:PORT\fP]
 [\fB\-\-password\-file=filename\fP]
+[\fB\-\-dpi=VALUE\fP]
 [\fB\-\-socket\-dir=DIR\fP]
 .HP
@@ -46 +47 @@
 [\fB\-\-ssh=CMD\fP] [\fB\-\-remote\-xpra=CMD\fP]
 [\fB\-\-password\-file=filename\fP]
+[\fB\-\-dpi=VALUE\fP]
 [\fB\-\-socket\-dir=DIR\fP]
 [\fB\-\-mmap\-group\fP]
@@ -348 +350 @@
 Use it only if you have special needs, and understand the consequences
 of your actions.
+
+.SS Options for start, upgrade and attach
 .TP
 \fB\-\-password\-file\fP=\fIFILENAME\fP
@@ -354 +358 @@
 If this is used on the server, it will reject any client connections
 that do not provide the same password value.
+[\fB\-\-dpi=VALUE\fP]
+The 'dots per inch' value that client applications should try to honour.
+This numeric value should be in the range 10 to 500 to be useful.
+Many applications will only read this value when starting up,
+so connecting to an existing session started with a different DPI
+value may not have the desired effect.
 
 .SS Options for attach

trunk/src/xpra/client.py

@@ -96 +96 @@
             self.jpegquality = 50
 
+        self.dpi = int(opts.dpi)
         self.mmap_enabled = False
         self.server_start_time = -1
@@ -513 +514 @@
         capabilities["randr_notify"] = True
         capabilities["compressible_cursors"] = True
+        capabilities["dpi"] = self.dpi
         #these should be turned into options:
         capabilities["cursors"] = True

trunk/src/xpra/scripts/client_launcher.py

@@ -174 +174 @@
 xpra_opts.compression_level = default_int("compression", 3)
 xpra_opts.send_pings = default_bool("pings", False)
+xpra_opts.dpi = default_int("dpi", 96)
 #these would need testing/work:
 xpra_opts.auto_refresh_delay = 0.0
@@ -419 +420 @@
                 opts.keyboard_sync = xpra_opts.keyboard_sync
                 opts.send_pings = xpra_opts.send_pings
+                opts.dpi = xpra_opts.dpi
 
                 import logging

trunk/src/xpra/scripts/main.py

@@ -153 +153 @@
         print("invalid value for '%s': %s, using default value %s instead" % (varname, v, default_value))
         return default_value
+    def int_default(varname, default_value):
+        v = defaults.get(varname)
+        if not v:
+            return default_value
+        try:
+            return int(v)
+        except:
+            return default_value
 
     if XPRA_LOCAL_SERVERS_SUPPORTED:
@@ -292 +300 @@
                       dest="password_file", default=None,
                       help="The file containing the password required to connect (useful to secure TCP mode)")
+    group.add_option("--dpi", action="store",
+                      dest="dpi", default=int_default("dpi", 96),
+                      help="The 'dots per inch' value that client applications should try to honour (default: %s)")
     default_socket_dir = defaults.get("socket-dir")
     default_socket_dir_str = default_socket_dir or "$XPRA_SOCKET_DIR or '~/.xpra'"
@@ -328 +339 @@
         options.jpegquality = 80
         options.max_bandwidth = 0
+    try:
+        int(options.dpi)
+    except Exception, e:
+        parser.error("invalid dpi: %s" % e)
 
     if not args:

trunk/src/xpra/server.py

@@ -199 +199 @@
                             xpra.__version__)
         add_event_receiver(root, self)
+
+        self.default_dpi = int(opts.dpi)
+        self.dpi = self.default_dpi
 
         # This must happen early, before loading in windows at least:
@@ -1095 +1098 @@
         self.encodings = capabilities.get("encodings", [])
         self._set_encoding(capabilities.get("encoding", None), None)
+        self.dpi = capabilities.get("dpi", self.default_dpi)
+        if self.dpi>0:
+            #some non-posix clients never send us 'resource-manager' settings
+            #so just use a fake one to ensure the dpi gets applied:
+            self.update_server_settings({'resource-manager' : ""})
         #mmap:
         self.close_mmap()
@@ -1369 +1377 @@
 
     def _process_server_settings(self, proto, packet):
-        settings = packet[1]
+        self.update_server_settings(packet[1])
+
+    def update_server_settings(self, settings):
         old_settings = dict(self._settings)
+        log("server_settings: old=%s, updating with=%s", old_settings, settings)
         self._settings.update(settings)
+        root = gtk.gdk.get_default_root_window()
         for k, v in settings.items():
+            #cook the "resource-manager" value to add the DPI:
+            if k == "resource-manager" and self.dpi>0:
+                value = v.decode("utf-8")
+                #parse the resources into a dict:
+                values={}
+                options = value.split("\n")
+                for option in options:
+                    if not option:
+                        continue
+                    parts = option.split(":\t")
+                    if len(parts)!=2:
+                        continue
+                    values[parts[0]] = parts[1]
+                values["Xft.dpi"] = self.dpi
+                log("server_settings: resource-manager values=%s", values)
+                #convert the dict back into a resource string:
+                value = u''
+                for vk, vv in values.items():
+                    value += "%s:\t%s\n" % (vk, vv)
+                value += '\n'
+                #record the actual value used
+                self._settings["resource-manager"] = value
+                v = value.encode("utf-8")
+
             if k not in old_settings or v != old_settings[k]:
                 def root_set(p):
-                    prop_set(gtk.gdk.get_default_root_window(),
-                             p, "latin1", v.decode("utf-8"))
+                    log("server_settings: setting %s to %s", p, v)
+                    prop_set(root, p, "latin1", v.decode("utf-8"))
                 if k == "xsettings-blob":
                     self._xsettings_manager = XSettingsManager(v)

trunk/src/xpra/xposix/xsettings.py

@@ +1 @@
+# This file is part of Parti.
+# Copyright (C) 2010-2012 Antoine Martin <antoine@devloop.org.uk>
+# Copyright (C) 2008 Nathaniel Smith <njs@pobox.com>
+# Parti is released under the terms of the GNU GPL v2, or, at your option, any
+# later version. See the file COPYING for details.
+
 import gobject
 import gtk
@@ -13 +19 @@
 from wimpiggy.log import Logger
 log = Logger()
+
 
 class XSettingsManager(object):