Add option to add font path

Author: feklee

.gitignore

@@ -1,3 +1,5 @@
+vncdesk/font_path.py
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

README.rst

@@ -15,7 +15,7 @@ with::
 
   vncdesk 2 drawing.fig
 
-The optional argument ``drawing.fig`` is passed to the startup script.
+Optional arguments, here ``drawing.fig``, are passed to the startup script.
 
 Files:
 
@@ -75,11 +75,19 @@ Installation
 
    - Python 3
 
-   - TigerVNC_ 1.4 or a compatible VNC server
+   - A compatible VNC server such as TigerVNC_ 1.4 or TightVNC_
 
    - gtk-vnc_ 0.5 or compatible
 
-3. Run with sufficient permissions::
+3. If you want to set up an explicit font path for the VNC server, at the same
+   level as ``__init__.py`` create ``font_path.py``. Example contents::
+
+     font_path = ','.join('/usr/share/fonts/misc/',
+                          '/usr/share/fonts/75dpi/',
+                          '/usr/share/fonts/100dpi/',
+                          '/usr/share/fonts/Type1/')
+
+4. Run with sufficient permissions::
 
      python setup.py install
 

setup.py

@@ -1,4 +1,5 @@
-from distutils.core import setup
+from setuptools import setup
+
 exec(open('vncdesk/version.py').read())
 
 setup(
@@ -11,5 +12,6 @@
     scripts = ["bin/vncdesk"],
     license = "WTFPL",
     description = "Runs applications via VNC. Allows scaling applications.",
-    long_description = open('README.rst').read()
+    long_description = open('README.rst').read(),
+    zip_safe = True
 )

vncdesk/vnc_server.py

@@ -26,22 +26,36 @@ def wait_for_xvnc():
     while not path.isfile(_xvnc_lock_filename):
         sleep(0.1)
 
-def start_xvnc():
+def font_path():
+    try:
+        from .font_path import font_path
+        return font_path
+    except:
+        return None
+
+def xvnc_cmd():
     global _display, _number, port
 
     geometry = settings['desktop']['width'] + "x" + \
                settings['desktop']['height']
     port = 5900 + _number
-    cmd = " ".join(["Xvnc",
-                    _display,
-                    "-desktop xfig",
-                    "-geometry " + geometry,
-                    "-rfbauth " + _password_filename,
-                    "-rfbport " + str(port),
-                    "-pn",
-                    "&"])
+    fp = font_path()
+    a = ["Xvnc",
+         _display,
+         "-desktop xfig",
+         "-geometry " + geometry,
+         "-rfbauth " + _password_filename,
+         "-rfbport " + str(port),
+         "-pn"]
+    if fp:
+        a.append("-fp " + fp)
+    a.append("&")
+
+    return " ".join(a)
+
+def start_xvnc():
     terminate()
-    system(cmd)
+    system(xvnc_cmd())
     wait_for_xvnc()
 
 def write_password_to_file():