Skip to content

Commit

Permalink
#3750 stub screencast capture
Browse files Browse the repository at this point in the history
  • Loading branch information
totaam committed Feb 5, 2023
1 parent 18c317a commit 5f5f940
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
11 changes: 7 additions & 4 deletions xpra/scripts/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
from xpra.exit_codes import ExitCode
from xpra.os_util import (
SIGNAMES, POSIX, WIN32, OSX,
is_Wayland,
force_quit,
which,
get_saved_env, get_saved_env_var,
Expand Down Expand Up @@ -314,10 +315,12 @@ def make_server(clobber):
return XpraServer(clobber)

def make_shadow_server(multi_window=False):
from xpra.platform.shadow_server import ShadowServer
ss = ShadowServer()
ss.multi_window = multi_window
return ss
if envbool("XPRA_SHADOW_SCREENCAST", is_Wayland()):
#try screen casting
from xpra.platform.xposix.fdscreencast import ScreenCast
return ScreenCast(multi_window)
from xpra.x11.shadow_x11_server import ShadowX11Server
return ShadowX11Server(multi_window)

def make_proxy_server():
from xpra.platform.proxy_server import ProxyServer
Expand Down
4 changes: 2 additions & 2 deletions xpra/server/shadow/gtk_shadow_server_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ def parse_geometries(s):

class GTKShadowServerBase(ShadowServerBase, GTKServerBase):

def __init__(self):
def __init__(self, multi_window=True):
ShadowServerBase.__init__(self, get_default_root_window())
GTKServerBase.__init__(self)
self.session_type = "shadow"
self.multi_window = True
self.multi_window = multi_window
#for managing the systray
self.tray_menu = None
self.tray_menu_shown = False
Expand Down
4 changes: 2 additions & 2 deletions xpra/x11/shadow_x11_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,8 @@ def __repr__(self):
#so many calls will happen twice there (__init__ and init)
class ShadowX11Server(GTKShadowServerBase, X11ServerCore):

def __init__(self):
GTKShadowServerBase.__init__(self)
def __init__(self, multi_window=True):
GTKShadowServerBase.__init__(self, multi_window=multi_window)
X11ServerCore.__init__(self)
self.session_type = "X11 shadow"
self.modify_keymap = False
Expand Down

0 comments on commit 5f5f940

Please sign in to comment.