Skip to content

Commit

Permalink
#3987 expose more specific session-types
Browse files Browse the repository at this point in the history
  • Loading branch information
totaam committed Sep 11, 2023
1 parent cd71692 commit f83bbf0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
5 changes: 5 additions & 0 deletions xpra/platform/posix/fd_portal_shadow.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ class PortalShadow(GTKShadowServerBase):
def __init__(self, multi_window=True):
GTKShadowServerBase.__init__(self, multi_window=multi_window)
self.session = None
self.session_type = "portal desktop"
self.session_path : str = ""
self.session_handle : str = ""
self.authenticating_client = None
Expand All @@ -58,6 +59,10 @@ def __init__(self, multi_window=True):
os.environ["XPRA_UI_THREAD_CHECK"] = "0"


def get_server_mode(self) -> str:
return "portal shadow"


def notify_new_user(self, ss) -> None:
log("notify_new_user() start capture")
super().notify_new_user(ss)
Expand Down
1 change: 1 addition & 0 deletions xpra/platform/posix/remotedesktop.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
class RemoteDesktop(PortalShadow):
def __init__(self, multi_window=True):
super().__init__(multi_window)
self.session_type = "pipewire desktop"
self.input_devices = 0
self.keymap = Gdk.Keymap.get_default()
if not self.keymap:
Expand Down
5 changes: 4 additions & 1 deletion xpra/x11/shadow_x11_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,12 @@ class ShadowX11Server(GTKShadowServerBase, X11ServerCore):
def __init__(self, multi_window:bool=True):
GTKShadowServerBase.__init__(self, multi_window=multi_window)
X11ServerCore.__init__(self)
self.session_type = "X11 shadow"
self.session_type = "X11"
self.modify_keymap = False

def get_server_mode(self) -> str:
return "X11 shadow"

def init(self, opts) -> None:
GTKShadowServerBase.init(self, opts)
#don't call init on X11ServerCore,
Expand Down

0 comments on commit f83bbf0

Please sign in to comment.