Index: x11/xpra/Makefile
===================================================================
--- x11/xpra/Makefile	(revision 413876)
+++ x11/xpra/Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xpra
-PORTVERSION=	0.15.10
-PORTREVISION=	2
+PORTVERSION=	0.16.3
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/
 
@@ -13,13 +12,15 @@
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	cython:lang/cython \
+		${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1 \
 		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2
-RUN_DEPENDS=	py${PYTHON_SUFFIX}-lz4>=0.7.0_1:archivers/py-lz4 \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4 \
 		${PYTHON_SITELIBDIR}/rencode/__init__.py:converters/py-rencode \
 		${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus \
 		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-opengl \
 		${PYTHON_SITELIBDIR}/OpenGL_accelerate/__init__.py:graphics/py-opengl-accelerate \
 		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1 \
 		${PYTHON_SITELIBDIR}/netifaces.so:net/py-netifaces \
 		ssh-askpass:security/openssh-askpass \
 		setxkbmap:x11/setxkbmap \
@@ -31,7 +32,7 @@
 		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gtkgl/__init__.py:x11-toolkits/py-gtkglext
 
 USES=		desktop-file-utils pkgconfig python shared-mime-info tar:xz
-USE_GSTREAMER=	good python
+USE_GSTREAMER1=	good #python
 USE_PYTHON=	distutils
 USE_XORG=	x11 xcomposite xdamage xfixes xkbfile xrandr xtst
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER}
@@ -69,7 +70,7 @@
 XPRA_OPTIONS_ALL+=	enc_x264 enc_x265 vpx webp
 XPRA_OPTIONS_ALL+=	${XPRA_OPTIONS_DISABLED}
 XPRA_OPTIONS_DISABLED=	Xdummy Xdummy_wrapper
-XPRA_OPTIONS_DISABLED+=	nvenc3 nvenc4 nvenc5
+XPRA_OPTIONS_DISABLED+=	nvenc4 nvenc5
 
 .include <bsd.port.options.mk>
 
Index: x11/xpra/distinfo
===================================================================
--- x11/xpra/distinfo	(revision 413876)
+++ x11/xpra/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xpra-0.15.10.tar.xz) = 1403aaf571c486bb4a67bc9e9d431e5f863c9b7912bd65e6aec62fcea2d9d4e0
-SIZE (xpra-0.15.10.tar.xz) = 1200040
+SHA256 (xpra-0.16.3.tar.xz) = 1516ab10eb348092077ffb698bce234d06a234a5748e422fdf92f34922fb39ea
+SIZE (xpra-0.16.3.tar.xz) = 1343392
Index: x11/xpra/files/patch-setup.py
===================================================================
--- x11/xpra/files/patch-setup.py	(revision 413876)
+++ x11/xpra/files/patch-setup.py	(working copy)
@@ -1,15 +1,15 @@
---- setup.py.orig	2015-09-10 14:42:44 UTC
+--- setup.py.orig	2015-12-27 17:19:18 UTC
 +++ setup.py
-@@ -147,7 +147,7 @@ nvenc4_ENABLED          = pkg_config_ok(
- nvenc5_ENABLED          = pkg_config_ok("--exists", "nvenc5")
- #elif os.path.exists("C:\\nvenc_3.0_windows_sdk")
- #...
+@@ -165,7 +165,7 @@ else:
+     nvenc4_ENABLED          = pkg_config_ok("--exists", "nvenc4")
+     nvenc5_ENABLED          = pkg_config_ok("--exists", "nvenc5")
+ 
 -csc_opencl_ENABLED      = pkg_config_ok("--exists", "OpenCL") and check_pyopencl_AMD()
 +csc_opencl_ENABLED      = pkg_config_ok("--exists", "OpenCL")
- memoryview_ENABLED      = PYTHON3
+ memoryview_ENABLED      = sys.version>='2.7'
  
- warn_ENABLED            = True
-@@ -1560,12 +1560,12 @@ if WIN32:
+ annotate_ENABLED        = True
+@@ -1649,12 +1649,12 @@ if WIN32:
  else:
      #OSX and *nix:
      scripts += ["scripts/xpra", "scripts/xpra_launcher"]
@@ -24,8 +24,17 @@
      add_data_files("share/appdata",       ["xdg/xpra.appdata.xml"])
      html5_dir = "share/xpra/www"
  
-@@ -1688,7 +1688,7 @@ if html5_ENABLED:
+@@ -1707,7 +1707,7 @@ else:
+         #(we remove it during the 'install' step below if it isn't actually needed)
+         scripts.append("scripts/xpra_Xdummy")
+         #not supported by all distros, but doesn't hurt to install it anyway:
+-        add_data_files("lib/tmpfiles.d", ["tmpfiles.d/xpra.conf"])
++        #add_data_files("lib/tmpfiles.d", ["tmpfiles.d/xpra.conf"])
  
+     #gentoo does weird things, calls --no-compile with build *and* install
+     #then expects to find the cython modules!? ie:
+@@ -1781,7 +1781,7 @@ if html5_ENABLED:
+ 
  if printing_ENABLED and os.name=="posix":
      #"/usr/lib/cups/backend":
 -    cups_backend_dir = os.path.join(sys.prefix, "lib", "cups", "backend")
@@ -32,4 +41,4 @@
 +    cups_backend_dir = os.path.join(sys.prefix, "libexec", "cups", "backend")
      add_data_files(cups_backend_dir, ["cups/xpraforwarder"])
  
- 
+ if annotate_ENABLED:
Index: x11/xpra/files/patch-xpra_codecs_buffers_memalign.c
===================================================================
--- x11/xpra/files/patch-xpra_codecs_buffers_memalign.c	(revision 413876)
+++ x11/xpra/files/patch-xpra_codecs_buffers_memalign.c	(nonexistent)
@@ -1,11 +0,0 @@
---- xpra/codecs/buffers/memalign.c.orig	2015-04-30 15:00:04 UTC
-+++ xpra/codecs/buffers/memalign.c
-@@ -13,7 +13,7 @@
- #ifdef _WIN32
- #define _STDINT_H
- #endif
--#if !defined(__APPLE__) && !defined(__FreeBSD__)
-+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
- #include <malloc.h>
- #endif
- 
Index: x11/xpra/files/patch-xpra_net_net__util.py
===================================================================
--- x11/xpra/files/patch-xpra_net_net__util.py	(revision 413876)
+++ x11/xpra/files/patch-xpra_net_net__util.py	(nonexistent)
@@ -1,11 +0,0 @@
---- xpra/net/net_util.py.orig	2015-04-30 14:59:58 UTC
-+++ xpra/net/net_util.py
-@@ -127,7 +127,7 @@ if not sys.platform.startswith("win"):
- 	elif sys.platform.startswith("sunos"):
- 		library = "libsocket.so.1"
- 	elif sys.platform.startswith("freebsd"):
--		library = "/usr/lib/libc.so"
-+		library = "/lib/libc.so.7"
- 	elif sys.platform.startswith("openbsd"):
- 		library = "libc.so"
- 	try:
Index: x11/xpra/pkg-plist
===================================================================
--- x11/xpra/pkg-plist	(revision 413876)
+++ x11/xpra/pkg-plist	(working copy)
@@ -3,6 +3,10 @@
 bin/xpra_launcher
 %%ETCDIR%%/xorg.conf
 @sample %%ETCDIR%%/xpra.conf.sample
+%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
 %%PYTHON_SITELIBDIR%%/xpra/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/__init__.pyo
@@ -72,9 +76,6 @@
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_window.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_window.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_window.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/custom_client_window.py
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/custom_client_window.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/custom_client_window.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/debuginfo_client_window.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/debuginfo_client_window.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/debuginfo_client_window.pyo
@@ -87,9 +88,6 @@
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/pixmap_backing.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/pixmap_backing.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/pixmap_backing.pyo
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/topbar_client_window.py
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/topbar_client_window.pyc
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/topbar_client_window.pyo
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/tray_menu.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/tray_menu.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk2/tray_menu.pyo
@@ -181,6 +179,9 @@
 %%PYTHON_SITELIBDIR%%/xpra/codecs/argb/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/argb/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/argb/argb.so
+%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_checks.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_checks.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_checks.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.pyo
@@ -222,12 +223,22 @@
 %%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/av_log.so
 %%PYTHON_SITELIBDIR%%/xpra/codecs/loader.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/loader.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/loader.pyo
-%%PYTHON_SITELIBDIR%%/xpra/codecs/nv_util.py
-%%PYTHON_SITELIBDIR%%/xpra/codecs/nv_util.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/nv_util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/decode.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/decode.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/decode.pyo
+%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/encode.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/encode.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/encode.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyo
@@ -245,9 +256,24 @@
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/cyxor.so
-%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.py
-%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.pyc
-%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.pyo
+%%PYTHON_SITELIBDIR%%/xpra/colorstreamhandler.py
+%%PYTHON_SITELIBDIR%%/xpra/colorstreamhandler.pyc
+%%PYTHON_SITELIBDIR%%/xpra/colorstreamhandler.pyo
+%%PYTHON_SITELIBDIR%%/xpra/dbus/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/dbus/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/dbus/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/dbus/common.py
+%%PYTHON_SITELIBDIR%%/xpra/dbus/common.pyc
+%%PYTHON_SITELIBDIR%%/xpra/dbus/common.pyo
+%%PYTHON_SITELIBDIR%%/xpra/dbus/gtk_menuactions.py
+%%PYTHON_SITELIBDIR%%/xpra/dbus/gtk_menuactions.pyc
+%%PYTHON_SITELIBDIR%%/xpra/dbus/gtk_menuactions.pyo
+%%PYTHON_SITELIBDIR%%/xpra/dbus/helper.py
+%%PYTHON_SITELIBDIR%%/xpra/dbus/helper.pyc
+%%PYTHON_SITELIBDIR%%/xpra/dbus/helper.pyo
+%%PYTHON_SITELIBDIR%%/xpra/dbus/notifications_forwarder.py
+%%PYTHON_SITELIBDIR%%/xpra/dbus/notifications_forwarder.pyc
+%%PYTHON_SITELIBDIR%%/xpra/dbus/notifications_forwarder.pyo
 %%PYTHON_SITELIBDIR%%/xpra/dotxpra.py
 %%PYTHON_SITELIBDIR%%/xpra/dotxpra.pyc
 %%PYTHON_SITELIBDIR%%/xpra/dotxpra.pyo
@@ -306,6 +332,9 @@
 %%PYTHON_SITELIBDIR%%/xpra/log.py
 %%PYTHON_SITELIBDIR%%/xpra/log.pyc
 %%PYTHON_SITELIBDIR%%/xpra/log.pyo
+%%PYTHON_SITELIBDIR%%/xpra/make_thread.py
+%%PYTHON_SITELIBDIR%%/xpra/make_thread.pyc
+%%PYTHON_SITELIBDIR%%/xpra/make_thread.pyo
 %%PYTHON_SITELIBDIR%%/xpra/net/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/net/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/__init__.pyo
@@ -331,6 +360,9 @@
 %%PYTHON_SITELIBDIR%%/xpra/net/fake_jitter.py
 %%PYTHON_SITELIBDIR%%/xpra/net/fake_jitter.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/fake_jitter.pyo
+%%PYTHON_SITELIBDIR%%/xpra/net/file_transfer.py
+%%PYTHON_SITELIBDIR%%/xpra/net/file_transfer.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/file_transfer.pyo
 %%PYTHON_SITELIBDIR%%/xpra/net/header.py
 %%PYTHON_SITELIBDIR%%/xpra/net/header.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/header.pyo
@@ -400,6 +432,9 @@
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/features.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/features.pyc
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/features.pyo
+%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gtkmenu_tray.py
+%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gtkmenu_tray.pyc
+%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gtkmenu_tray.pyo
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gui.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gui.pyc
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gui.pyo
@@ -433,6 +468,12 @@
 %%PYTHON_SITELIBDIR%%/xpra/scripts/exec_util.py
 %%PYTHON_SITELIBDIR%%/xpra/scripts/exec_util.pyc
 %%PYTHON_SITELIBDIR%%/xpra/scripts/exec_util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/scripts/fdproxy.py
+%%PYTHON_SITELIBDIR%%/xpra/scripts/fdproxy.pyc
+%%PYTHON_SITELIBDIR%%/xpra/scripts/fdproxy.pyo
+%%PYTHON_SITELIBDIR%%/xpra/scripts/gtk_info.py
+%%PYTHON_SITELIBDIR%%/xpra/scripts/gtk_info.pyc
+%%PYTHON_SITELIBDIR%%/xpra/scripts/gtk_info.pyo
 %%PYTHON_SITELIBDIR%%/xpra/scripts/main.py
 %%PYTHON_SITELIBDIR%%/xpra/scripts/main.pyc
 %%PYTHON_SITELIBDIR%%/xpra/scripts/main.pyo
@@ -478,16 +519,19 @@
 %%PYTHON_SITELIBDIR%%/xpra/server/background_worker.py
 %%PYTHON_SITELIBDIR%%/xpra/server/background_worker.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/background_worker.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/batch_config.py
-%%PYTHON_SITELIBDIR%%/xpra/server/batch_config.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/batch_config.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/batch_delay_calculator.py
-%%PYTHON_SITELIBDIR%%/xpra/server/batch_delay_calculator.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/batch_delay_calculator.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/control_command.py
+%%PYTHON_SITELIBDIR%%/xpra/server/control_command.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/control_command.pyo
 %%PYTHON_SITELIBDIR%%/xpra/server/cystats.so
-%%PYTHON_SITELIBDIR%%/xpra/server/gtk_root_window_model.py
-%%PYTHON_SITELIBDIR%%/xpra/server/gtk_root_window_model.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/gtk_root_window_model.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/dbus/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/server/dbus/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/dbus/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_server.py
+%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_server.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_server.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_source.py
+%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_source.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_source.pyo
 %%PYTHON_SITELIBDIR%%/xpra/server/gtk_server_base.py
 %%PYTHON_SITELIBDIR%%/xpra/server/gtk_server_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/gtk_server_base.pyo
@@ -497,16 +541,15 @@
 %%PYTHON_SITELIBDIR%%/xpra/server/picture_encode.py
 %%PYTHON_SITELIBDIR%%/xpra/server/picture_encode.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/picture_encode.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/proxy.py
-%%PYTHON_SITELIBDIR%%/xpra/server/proxy.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/proxy.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/proxy_instance_process.py
-%%PYTHON_SITELIBDIR%%/xpra/server/proxy_instance_process.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/proxy_instance_process.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/proxy_server.py
-%%PYTHON_SITELIBDIR%%/xpra/server/proxy_server.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/proxy_server.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/region.so
+%%PYTHON_SITELIBDIR%%/xpra/server/proxy/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/server/proxy/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/proxy/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_instance_process.py
+%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_instance_process.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_instance_process.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_server.py
+%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_server.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_server.pyo
 %%PYTHON_SITELIBDIR%%/xpra/server/server_base.py
 %%PYTHON_SITELIBDIR%%/xpra/server/server_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/server_base.pyo
@@ -516,9 +559,21 @@
 %%PYTHON_SITELIBDIR%%/xpra/server/server_uuid.py
 %%PYTHON_SITELIBDIR%%/xpra/server/server_uuid.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/server_uuid.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/shadow_server_base.py
-%%PYTHON_SITELIBDIR%%/xpra/server/shadow_server_base.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/shadow_server_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/gtk_root_window_model.py
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/gtk_root_window_model.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/gtk_root_window_model.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/root_window_model.py
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/root_window_model.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/root_window_model.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_dbus_server.py
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_dbus_server.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_dbus_server.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_server_base.py
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_server_base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_server_base.pyo
 %%PYTHON_SITELIBDIR%%/xpra/server/source.py
 %%PYTHON_SITELIBDIR%%/xpra/server/source.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/source.pyo
@@ -525,18 +580,28 @@
 %%PYTHON_SITELIBDIR%%/xpra/server/source_stats.py
 %%PYTHON_SITELIBDIR%%/xpra/server/source_stats.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/source_stats.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/video_subregion.py
-%%PYTHON_SITELIBDIR%%/xpra/server/video_subregion.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/video_subregion.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/window_source.py
-%%PYTHON_SITELIBDIR%%/xpra/server/window_source.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/window_source.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/window_stats.py
-%%PYTHON_SITELIBDIR%%/xpra/server/window_stats.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/window_stats.pyo
-%%PYTHON_SITELIBDIR%%/xpra/server/window_video_source.py
-%%PYTHON_SITELIBDIR%%/xpra/server/window_video_source.pyc
-%%PYTHON_SITELIBDIR%%/xpra/server/window_video_source.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/window/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/server/window/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/window/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_config.py
+%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_config.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_config.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_delay_calculator.py
+%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_delay_calculator.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_delay_calculator.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/window/region.so
+%%PYTHON_SITELIBDIR%%/xpra/server/window/video_subregion.py
+%%PYTHON_SITELIBDIR%%/xpra/server/window/video_subregion.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/window/video_subregion.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/window/window_source.py
+%%PYTHON_SITELIBDIR%%/xpra/server/window/window_source.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/window/window_source.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/window/window_stats.py
+%%PYTHON_SITELIBDIR%%/xpra/server/window/window_stats.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/window/window_stats.pyo
+%%PYTHON_SITELIBDIR%%/xpra/server/window/window_video_source.py
+%%PYTHON_SITELIBDIR%%/xpra/server/window/window_video_source.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/window/window_video_source.pyo
 %%PYTHON_SITELIBDIR%%/xpra/simple_stats.py
 %%PYTHON_SITELIBDIR%%/xpra/simple_stats.pyc
 %%PYTHON_SITELIBDIR%%/xpra/simple_stats.pyo
@@ -546,6 +611,18 @@
 %%PYTHON_SITELIBDIR%%/xpra/sound/gstreamer_util.py
 %%PYTHON_SITELIBDIR%%/xpra/sound/gstreamer_util.pyc
 %%PYTHON_SITELIBDIR%%/xpra/sound/gstreamer_util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_common_util.py
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_common_util.pyc
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_common_util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_none_util.py
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_none_util.pyc
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_none_util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_pactl_util.py
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_pactl_util.pyc
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_pactl_util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_palib_util.py
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_palib_util.pyc
+%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_palib_util.pyo
 %%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_util.py
 %%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_util.pyc
 %%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_util.pyo
@@ -584,23 +661,65 @@
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/wait_for_x_server.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/window_bindings.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/ximage.so
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_common.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_common.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_common.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_helper.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_helper.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_helper.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_notifications_forwarder.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_notifications_forwarder.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_notifications_forwarder.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/menu.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/menu.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/menu.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/x11_dbus_server.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/x11_dbus_server.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/x11_dbus_server.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/fakeXinerama.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/fakeXinerama.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/fakeXinerama.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/composite.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/composite.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/composite.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/gdk_bindings.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/gdk_display_source.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/__init__.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/base.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/base.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/core.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/core.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/core.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/or_window.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/or_window.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/or_window.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/size_hints_util.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/size_hints_util.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/size_hints_util.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/systray.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/systray.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/systray.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/window.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/window.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/window.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/selection.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/selection.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/selection.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/tray.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/tray.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/tray.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/window.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/window.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/window.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/wm.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/wm.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/wm.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/world_window.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/world_window.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/world_window.pyo
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/__init__.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/composite.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/composite.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/composite.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/gdk_bindings.so
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/gdk_display_source.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/keys.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/keys.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/keys.pyo
@@ -607,24 +726,9 @@
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/prop.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/prop.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/prop.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/selection.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/selection.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/selection.pyo
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/send_wm.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/send_wm.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/send_wm.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/tray.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/tray.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/tray.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/window.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/window.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/window.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/wm.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/wm.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/wm.pyo
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/world_window.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/world_window.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/world_window.pyo
 %%PYTHON_SITELIBDIR%%/xpra/x11/server.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/server.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/server.pyo
@@ -637,6 +741,9 @@
 %%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.pyo
+%%PYTHON_SITELIBDIR%%/xpra/x11/x11_source.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/x11_source.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/x11_source.pyo
 %%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.pyo
@@ -649,10 +756,6 @@
 %%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.pyo
-%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
 libexec/cups/backend/xpraforwarder
 man/man1/xpra.1.gz
 man/man1/xpra_launcher.1.gz
@@ -685,6 +788,7 @@
 %%DATADIR%%/icons/quit.png
 %%DATADIR%%/icons/raise.png
 %%DATADIR%%/icons/retry.png
+%%DATADIR%%/icons/scaling.png
 %%DATADIR%%/icons/slider.png
 %%DATADIR%%/icons/speaker.png
 %%DATADIR%%/icons/speed.png
@@ -691,6 +795,7 @@
 %%DATADIR%%/icons/statistics.png
 %%DATADIR%%/icons/ticked-small.png
 %%DATADIR%%/icons/unticked-small.png
+%%DATADIR%%/icons/upload.png
 %%DATADIR%%/icons/win32.png
 %%DATADIR%%/icons/xpra.png
 %%DATADIR%%/www/connect.html
@@ -707,6 +812,7 @@
 %%DATADIR%%/www/include/broadway/LICENSE
 %%DATADIR%%/www/include/close.png
 %%DATADIR%%/www/include/deflate.min.js
+%%DATADIR%%/www/include/forge.min.js
 %%DATADIR%%/www/include/inflate.min.js
 %%DATADIR%%/www/include/jquery.min.js
 %%DATADIR%%/www/include/jquery.throttle-debounce.min.js
@@ -715,6 +821,7 @@
 %%DATADIR%%/www/include/lz4.min.js
 %%DATADIR%%/www/include/maximize.png
 %%DATADIR%%/www/include/minimize.png
+%%DATADIR%%/www/include/spinner.css
 %%DATADIR%%/www/include/websock.js
 %%DATADIR%%/www/include/wsworker_check.js
 %%DATADIR%%/www/include/xpra-logo.png