Skip to content

Multi EIS in remote desktop and PW stream integration #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jadahl wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Multi EIS in remote desktop and PW stream integration #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3822e7f
eis: Remove meta_ prefix from variables
jadahl Aug 15, 2023
51230a7
eis: Don't expose global socket
jadahl Aug 28, 2023
6e0b658
remote-desktop/session: Take over EIS context
jadahl Aug 28, 2023
51443d1
eis/client: Fix indentation
jadahl Aug 28, 2023
52ae2b4
eis/client: Fix minor coding style issues
jadahl Aug 28, 2023
bdb33fd
remote-desktop/session: Limit device type access when using libei
jadahl Aug 28, 2023
7e353c8
eis: Add some spacing in API declarations
jadahl Aug 28, 2023
bfe5e5e
eis/client: Add user_data to add-device helper
jadahl Aug 28, 2023
e8bf360
eis: Add "viewport" interface
jadahl Aug 28, 2023
5ecd275
eis: Fix header include style
jadahl Aug 28, 2023
dfd4262
screen-cast: Pass remote desktop session on construction
jadahl Aug 29, 2023
cac54fa
eis: Tear down in dispose
jadahl Aug 29, 2023
44e11a1
remote-desktop/session: Add API to acquire new mapping ID
jadahl Aug 29, 2023
51e2a43
screen-cast: Implement MetaEisViewport in all stream types
jadahl Aug 29, 2023
a327c23
eis: Use either standalone or shared devices for absolute input
jadahl Aug 28, 2023
df32cd5
eis: Don't treat EIS errors as fatal
jadahl Aug 30, 2023
ae8df67
remote-desktop/session: Add regions for all monitors if input-only
jadahl Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions data/dbus-interfaces/org.gnome.Mutter.RemoteDesktop.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,10 @@
ConnectToEIS:

Request a connection to an EIS implementation.

Available @options include:

* "device-types" u: Bitmask of device types to expose (see SupportedDeviceTypes)
-->
<method name="ConnectToEIS">
<arg type="a{sv}" name="options" direction="in"/>
Expand Down
2 changes: 0 additions & 2 deletions src/backends/meta-backend-private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,6 @@ MetaDbusSessionWatcher * meta_backend_get_dbus_session_watcher (MetaBackend *bac
MetaRemoteDesktop * meta_backend_get_remote_desktop (MetaBackend *backend);

MetaScreenCast * meta_backend_get_screen_cast (MetaBackend *backend);

MetaEis * meta_backend_get_eis (MetaBackend *backend);
#endif

MetaInputCapture * meta_backend_get_input_capture (MetaBackend *backend);
Expand Down
1 change: 1 addition & 0 deletions src/backends/meta-backend-types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ typedef struct _MetaRenderer MetaRenderer;
typedef struct _MetaRendererView MetaRendererView;

typedef struct _MetaRemoteDesktop MetaRemoteDesktop;
typedef struct _MetaRemoteDesktopSession MetaRemoteDesktopSession;
typedef struct _MetaScreenCast MetaScreenCast;
typedef struct _MetaScreenCastSession MetaScreenCastSession;
typedef struct _MetaScreenCastStream MetaScreenCastStream;
Expand Down
14 changes: 0 additions & 14 deletions src/backends/meta-backend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@

#ifdef HAVE_REMOTE_DESKTOP
#include "backends/meta-dbus-session-watcher.h"
#include "backends/meta-eis.h"
#include "backends/meta-remote-access-controller-private.h"
#include "backends/meta-remote-desktop.h"
#include "backends/meta-screen-cast.h"
Expand Down Expand Up @@ -140,7 +139,6 @@ struct _MetaBackendPrivate
#ifdef HAVE_REMOTE_DESKTOP
MetaScreenCast *screen_cast;
MetaRemoteDesktop *remote_desktop;
MetaEis *eis;
#endif
MetaInputCapture *input_capture;

Expand Down Expand Up @@ -210,7 +208,6 @@ meta_backend_dispose (GObject *object)
#ifdef HAVE_REMOTE_DESKTOP
g_clear_object (&priv->remote_desktop);
g_clear_object (&priv->screen_cast);
g_clear_object (&priv->eis);
#endif
g_clear_object (&priv->input_capture);
g_clear_object (&priv->dbus_session_watcher);
Expand Down Expand Up @@ -584,7 +581,6 @@ meta_backend_real_post_init (MetaBackend *backend)
meta_remote_access_controller_add (
priv->remote_access_controller,
META_DBUS_SESSION_MANAGER (priv->remote_desktop));
priv->eis = meta_eis_new (backend);
#endif /* HAVE_REMOTE_DESKTOP */

priv->input_capture = meta_input_capture_new (backend);
Expand Down Expand Up @@ -1443,16 +1439,6 @@ meta_backend_get_screen_cast (MetaBackend *backend)

return priv->screen_cast;
}

/**
* meta_backend_get_eis: (skip)
*/
MetaEis *
meta_backend_get_eis (MetaBackend *backend)
{
MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
return priv->eis;
}
#endif /* HAVE_REMOTE_DESKTOP */

MetaInputCapture *
Expand Down
Loading