From 5f428c5aa9f3e66cd23e4e75d54506960bd5b66c Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Wed, 12 Dec 2018 11:27:16 +0100

Subject: [PATCH 01/12] cursor-tracker: Add 'cursor-moved' signal

https://gitlab.gnome.org/GNOME/mutter/merge_requests/357

---

 src/backends/meta-cursor-tracker.c | 12 ++++++++++++

 1 file changed, 12 insertions(+)

diff --git a/src/backends/meta-cursor-tracker.c b/src/backends/meta-cursor-tracker.c

index 6244f11ee..060b6af3b 100644

--- a/src/backends/meta-cursor-tracker.c

+++ b/src/backends/meta-cursor-tracker.c

@@ -48,6 +48,7 @@ G_DEFINE_TYPE (MetaCursorTracker, meta_cursor_tracker, G_TYPE_OBJECT);

 enum {

   CURSOR_CHANGED,

+  CURSOR_MOVED,

   LAST_SIGNAL

 };

@@ -158,6 +159,15 @@ meta_cursor_tracker_class_init (MetaCursorTrackerClass *klass)

                                           0,

                                           NULL, NULL, NULL,

                                           G_TYPE_NONE, 0);

+

+  signals[CURSOR_MOVED] = g_signal_new ("cursor-moved",

+                                        G_TYPE_FROM_CLASS (klass),

+                                        G_SIGNAL_RUN_LAST,

+                                        0,

+                                        NULL, NULL, NULL,

+                                        G_TYPE_NONE, 2,

+                                        G_TYPE_FLOAT,

+                                        G_TYPE_FLOAT);

 }

 /**

@@ -334,6 +344,8 @@ meta_cursor_tracker_update_position (MetaCursorTracker *tracker,

   g_assert (meta_is_wayland_compositor ());

   meta_cursor_renderer_set_position (cursor_renderer, new_x, new_y);

+

+  g_signal_emit (tracker, signals[CURSOR_MOVED], 0, new_x, new_y);

 }

 static void

-- 

2.20.1

From 54c5034f6dcdaf382a8355460710ced47c05d91e Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Fri, 21 Dec 2018 17:28:33 +0100

Subject: [PATCH 02/12] clutter/stage: Add clutter_stage_is_redraw_queued() API

This will be used by the screen casting code to check whether it should

wait for a frame before reading cursor state, or send only the cursor

update, if no redraw is queued.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/357

---

 clutter/clutter/clutter-stage.c | 11 +++++++++++

 clutter/clutter/clutter-stage.h |  3 +++

 2 files changed, 14 insertions(+)

diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c

index 9352f49e8..763ec96ee 100644

--- a/clutter/clutter/clutter-stage.c

+++ b/clutter/clutter/clutter-stage.c

@@ -3722,6 +3722,17 @@ clutter_stage_ensure_redraw (ClutterStage *stage)

   _clutter_master_clock_start_running (master_clock);

 }

+/**

+ * clutter_stage_is_redraw_queued: (skip)

+ */

+gboolean

+clutter_stage_is_redraw_queued (ClutterStage *stage)

+{

+  ClutterStagePrivate *priv = stage->priv;

+

+  return priv->redraw_pending;

+}

+

 /**

  * clutter_stage_queue_redraw:

  * @stage: the #ClutterStage

diff --git a/clutter/clutter/clutter-stage.h b/clutter/clutter/clutter-stage.h

index e8fbda84c..ddf08fde4 100644

--- a/clutter/clutter/clutter-stage.h

+++ b/clutter/clutter/clutter-stage.h

@@ -250,6 +250,9 @@ void            clutter_stage_ensure_viewport                   (ClutterStage

 CLUTTER_AVAILABLE_IN_ALL

 void            clutter_stage_ensure_redraw                     (ClutterStage          *stage);

+CLUTTER_AVAILABLE_IN_ALL

+gboolean        clutter_stage_is_redraw_queued                  (ClutterStage          *stage);

+

 #ifdef CLUTTER_ENABLE_EXPERIMENTAL_API

 CLUTTER_AVAILABLE_IN_1_14

 void            clutter_stage_set_sync_delay                    (ClutterStage          *stage,

-- 

2.20.1

From 59e1c68143d9090e238198448fa400bb0776d38a Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Wed, 12 Dec 2018 11:32:11 +0100

Subject: [PATCH 03/12] screen-cast-monitor-stream: Don't pass monitor manager

 when creating

It can be fetched indirectly from the monitor already.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/357

---

 src/backends/meta-screen-cast-monitor-stream.c | 11 ++++++-----

 src/backends/meta-screen-cast-monitor-stream.h |  9 ++++-----

 src/backends/meta-screen-cast-session.c        |  1 -

 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/backends/meta-screen-cast-monitor-stream.c b/src/backends/meta-screen-cast-monitor-stream.c

index df43f977c..5a816e4df 100644

--- a/src/backends/meta-screen-cast-monitor-stream.c

+++ b/src/backends/meta-screen-cast-monitor-stream.c

@@ -105,12 +105,13 @@ meta_screen_cast_monitor_stream_get_monitor (MetaScreenCastMonitorStream *monito

 }

 MetaScreenCastMonitorStream *

-meta_screen_cast_monitor_stream_new (GDBusConnection     *connection,

-                                     MetaMonitorManager  *monitor_manager,

-                                     MetaMonitor         *monitor,

-                                     ClutterStage        *stage,

-                                     GError             **error)

+meta_screen_cast_monitor_stream_new (GDBusConnection  *connection,

+                                     MetaMonitor      *monitor,

+                                     ClutterStage     *stage,

+                                     GError          **error)

 {

+  MetaGpu *gpu = meta_monitor_get_gpu (monitor);

+  MetaMonitorManager *monitor_manager = meta_gpu_get_monitor_manager (gpu);

   MetaScreenCastMonitorStream *monitor_stream;

   if (!meta_monitor_is_active (monitor))

diff --git a/src/backends/meta-screen-cast-monitor-stream.h b/src/backends/meta-screen-cast-monitor-stream.h

index fbf3c77c3..1d24de93a 100644

--- a/src/backends/meta-screen-cast-monitor-stream.h

+++ b/src/backends/meta-screen-cast-monitor-stream.h

@@ -34,11 +34,10 @@ G_DECLARE_FINAL_TYPE (MetaScreenCastMonitorStream,

                       META, SCREEN_CAST_MONITOR_STREAM,

                       MetaScreenCastStream)

-MetaScreenCastMonitorStream * meta_screen_cast_monitor_stream_new (GDBusConnection    *connection,

-								   MetaMonitorManager *monitor_manager,

-                                                                   MetaMonitor        *monitor,

-                                                                   ClutterStage       *stage,

-                                                                   GError            **error);

+MetaScreenCastMonitorStream * meta_screen_cast_monitor_stream_new (GDBusConnection  *connection,

+                                                                   MetaMonitor      *monitor,

+                                                                   ClutterStage     *stage,

+                                                                   GError          **error);

 ClutterStage * meta_screen_cast_monitor_stream_get_stage (MetaScreenCastMonitorStream *monitor_stream);

diff --git a/src/backends/meta-screen-cast-session.c b/src/backends/meta-screen-cast-session.c

index d0f5a79d9..3ba59037f 100644

--- a/src/backends/meta-screen-cast-session.c

+++ b/src/backends/meta-screen-cast-session.c

@@ -301,7 +301,6 @@ handle_record_monitor (MetaDBusScreenCastSession *skeleton,

   stage = CLUTTER_STAGE (meta_backend_get_stage (backend));

   monitor_stream = meta_screen_cast_monitor_stream_new (connection,

-                                                        monitor_manager,

                                                         monitor,

                                                         stage,

                                                         &error);

-- 

2.20.1

From 45100944033987a946672fda6de309aa41a6139f Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Wed, 12 Dec 2018 11:35:58 +0100

Subject: [PATCH 04/12] screen-cast: Add getters to fetch object owners

MetaBackend owns MetaScreenCast which owns MetaScreenCastSession which

owns MetaScreenCastStream. Make it possible to fetch objects in the

oppositev direction too.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/357

---

 src/backends/meta-backend.c                   |  3 +-

 .../meta-screen-cast-monitor-stream.c         | 10 ++++---

 .../meta-screen-cast-monitor-stream.h         | 10 ++++---

 src/backends/meta-screen-cast-session.c       | 15 ++++++++--

 src/backends/meta-screen-cast-session.h       |  2 ++

 src/backends/meta-screen-cast-stream.c        | 30 +++++++++++++++++++

 src/backends/meta-screen-cast-stream.h        |  6 ++++

 src/backends/meta-screen-cast-window-stream.c |  8 +++--

 src/backends/meta-screen-cast-window-stream.h |  7 +++--

 src/backends/meta-screen-cast.c               | 15 ++++++++--

 src/backends/meta-screen-cast.h               |  6 +++-

 11 files changed, 92 insertions(+), 20 deletions(-)

diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c

index 888e51cd9..28f1cd92f 100644

--- a/src/backends/meta-backend.c

+++ b/src/backends/meta-backend.c

@@ -456,7 +456,8 @@ meta_backend_real_post_init (MetaBackend *backend)

   priv->remote_access_controller =

     g_object_new (META_TYPE_REMOTE_ACCESS_CONTROLLER, NULL);

   priv->dbus_session_watcher = g_object_new (META_TYPE_DBUS_SESSION_WATCHER, NULL);

-  priv->screen_cast = meta_screen_cast_new (priv->dbus_session_watcher);

+  priv->screen_cast = meta_screen_cast_new (backend,

+                                            priv->dbus_session_watcher);

   priv->remote_desktop = meta_remote_desktop_new (priv->dbus_session_watcher);

 #endif /* HAVE_REMOTE_DESKTOP */

diff --git a/src/backends/meta-screen-cast-monitor-stream.c b/src/backends/meta-screen-cast-monitor-stream.c

index 5a816e4df..a6bed1b52 100644

--- a/src/backends/meta-screen-cast-monitor-stream.c

+++ b/src/backends/meta-screen-cast-monitor-stream.c

@@ -105,10 +105,11 @@ meta_screen_cast_monitor_stream_get_monitor (MetaScreenCastMonitorStream *monito

 }

 MetaScreenCastMonitorStream *

-meta_screen_cast_monitor_stream_new (GDBusConnection  *connection,

-                                     MetaMonitor      *monitor,

-                                     ClutterStage     *stage,

-                                     GError          **error)

+meta_screen_cast_monitor_stream_new (MetaScreenCastSession  *session,

+                                     GDBusConnection        *connection,

+                                     MetaMonitor            *monitor,

+                                     ClutterStage           *stage,

+                                     GError                **error)

 {

   MetaGpu *gpu = meta_monitor_get_gpu (monitor);

   MetaMonitorManager *monitor_manager = meta_gpu_get_monitor_manager (gpu);

@@ -123,6 +124,7 @@ meta_screen_cast_monitor_stream_new (GDBusConnection  *connection,

   monitor_stream = g_initable_new (META_TYPE_SCREEN_CAST_MONITOR_STREAM,

                                    NULL,

                                    error,

+                                   "session", session,

                                    "connection", connection,

                                    "monitor", monitor,

                                    NULL);

diff --git a/src/backends/meta-screen-cast-monitor-stream.h b/src/backends/meta-screen-cast-monitor-stream.h

index 1d24de93a..98f160c88 100644

--- a/src/backends/meta-screen-cast-monitor-stream.h

+++ b/src/backends/meta-screen-cast-monitor-stream.h

@@ -27,6 +27,7 @@

 #include "backends/meta-monitor-manager-private.h"

 #include "backends/meta-screen-cast-stream.h"

+#include "backends/meta-screen-cast.h"

 #define META_TYPE_SCREEN_CAST_MONITOR_STREAM (meta_screen_cast_monitor_stream_get_type ())

 G_DECLARE_FINAL_TYPE (MetaScreenCastMonitorStream,

@@ -34,10 +35,11 @@ G_DECLARE_FINAL_TYPE (MetaScreenCastMonitorStream,

                       META, SCREEN_CAST_MONITOR_STREAM,

                       MetaScreenCastStream)

-MetaScreenCastMonitorStream * meta_screen_cast_monitor_stream_new (GDBusConnection  *connection,

-                                                                   MetaMonitor      *monitor,

-                                                                   ClutterStage     *stage,

-                                                                   GError          **error);

+MetaScreenCastMonitorStream * meta_screen_cast_monitor_stream_new (MetaScreenCastSession  *session,

+                                                                   GDBusConnection        *connection,

+                                                                   MetaMonitor            *monitor,

+                                                                   ClutterStage           *stage,

+                                                                   GError                **error);

 ClutterStage * meta_screen_cast_monitor_stream_get_stage (MetaScreenCastMonitorStream *monitor_stream);

diff --git a/src/backends/meta-screen-cast-session.c b/src/backends/meta-screen-cast-session.c

index 3ba59037f..6a8f2d328 100644

--- a/src/backends/meta-screen-cast-session.c

+++ b/src/backends/meta-screen-cast-session.c

@@ -38,6 +38,8 @@ struct _MetaScreenCastSession

 {

   MetaDBusScreenCastSessionSkeleton parent;

+  MetaScreenCast *screen_cast;

+

   char *peer_name;

   MetaScreenCastSessionType session_type;

@@ -159,6 +161,12 @@ meta_screen_cast_session_get_stream (MetaScreenCastSession *session,

   return NULL;

 }

+MetaScreenCast *

+meta_screen_cast_session_get_screen_cast (MetaScreenCastSession *session)

+{

+  return session->screen_cast;

+}

+

 char *

 meta_screen_cast_session_get_object_path (MetaScreenCastSession *session)

 {

@@ -300,7 +308,8 @@ handle_record_monitor (MetaDBusScreenCastSession *skeleton,

   stage = CLUTTER_STAGE (meta_backend_get_stage (backend));

-  monitor_stream = meta_screen_cast_monitor_stream_new (connection,

+  monitor_stream = meta_screen_cast_monitor_stream_new (session,

+                                                        connection,

                                                         monitor,

                                                         stage,

                                                         &error);

@@ -381,7 +390,8 @@ handle_record_window (MetaDBusScreenCastSession *skeleton,

   interface_skeleton = G_DBUS_INTERFACE_SKELETON (skeleton);

   connection = g_dbus_interface_skeleton_get_connection (interface_skeleton);

-  window_stream = meta_screen_cast_window_stream_new (connection,

+  window_stream = meta_screen_cast_window_stream_new (session,

+                                                      connection,

                                                       window,

                                                       &error);

   if (!window_stream)

@@ -441,6 +451,7 @@ meta_screen_cast_session_new (MetaScreenCast             *screen_cast,

   static unsigned int global_session_number = 0;

   session = g_object_new (META_TYPE_SCREEN_CAST_SESSION, NULL);

+  session->screen_cast = screen_cast;

   session->session_type = session_type;

   session->peer_name = g_strdup (peer_name);

   session->object_path =

diff --git a/src/backends/meta-screen-cast-session.h b/src/backends/meta-screen-cast-session.h

index ac0a31a16..105a65098 100644

--- a/src/backends/meta-screen-cast-session.h

+++ b/src/backends/meta-screen-cast-session.h

@@ -60,4 +60,6 @@ void meta_screen_cast_session_close (MetaScreenCastSession *session);

 MetaScreenCastStream * meta_screen_cast_session_get_stream (MetaScreenCastSession *session,

                                                             const char            *path);

+MetaScreenCast * meta_screen_cast_session_get_screen_cast (MetaScreenCastSession *session);

+

 #endif /* META_SCREEN_CAST_SESSION_H */

diff --git a/src/backends/meta-screen-cast-stream.c b/src/backends/meta-screen-cast-stream.c

index 97ee4bfcf..875ada01a 100644

--- a/src/backends/meta-screen-cast-stream.c

+++ b/src/backends/meta-screen-cast-stream.c

@@ -24,12 +24,15 @@

 #include "backends/meta-screen-cast-stream.h"

+#include "backends/meta-screen-cast-session.h"

+

 #define META_SCREEN_CAST_STREAM_DBUS_PATH "/org/gnome/Mutter/ScreenCast/Stream"

 enum

 {

   PROP_0,

+  PROP_SESSION,

   PROP_CONNECTION,

 };

@@ -44,6 +47,8 @@ static guint signals[N_SIGNALS];

 typedef struct _MetaScreenCastStreamPrivate

 {

+  MetaScreenCastSession *session;

+

   GDBusConnection *connection;

   char *object_path;

@@ -97,6 +102,15 @@ on_stream_src_ready (MetaScreenCastStreamSrc *src,

   meta_dbus_screen_cast_stream_emit_pipewire_stream_added (skeleton, node_id);

 }

+MetaScreenCastSession *

+meta_screen_cast_stream_get_session (MetaScreenCastStream *stream)

+{

+  MetaScreenCastStreamPrivate *priv =

+    meta_screen_cast_stream_get_instance_private (stream);

+

+  return priv->session;

+}

+

 gboolean

 meta_screen_cast_stream_start (MetaScreenCastStream  *stream,

                                GError               **error)

@@ -162,6 +176,9 @@ meta_screen_cast_stream_set_property (GObject      *object,

   switch (prop_id)

     {

+    case PROP_SESSION:

+      priv->session = g_value_get_object (value);

+      break;

     case PROP_CONNECTION:

       priv->connection = g_value_get_object (value);

       break;

@@ -182,6 +199,9 @@ meta_screen_cast_stream_get_property (GObject    *object,

   switch (prop_id)

     {

+    case PROP_SESSION:

+      g_value_set_object (value, priv->session);

+      break;

     case PROP_CONNECTION:

       g_value_set_object (value, priv->connection);

       break;

@@ -256,6 +276,16 @@ meta_screen_cast_stream_class_init (MetaScreenCastStreamClass *klass)

   object_class->set_property = meta_screen_cast_stream_set_property;

   object_class->get_property = meta_screen_cast_stream_get_property;

+  g_object_class_install_property (object_class,

+                                   PROP_SESSION,

+                                   g_param_spec_object ("session",

+                                                        "session",

+                                                        "MetaScreenSession",

+                                                        META_TYPE_SCREEN_CAST_SESSION,

+                                                        G_PARAM_READWRITE |

+                                                        G_PARAM_CONSTRUCT_ONLY |

+                                                        G_PARAM_STATIC_STRINGS));

+

   g_object_class_install_property (object_class,

                                    PROP_CONNECTION,

                                    g_param_spec_object ("connection",

diff --git a/src/backends/meta-screen-cast-stream.h b/src/backends/meta-screen-cast-stream.h

index fd7930c4c..dcc280da6 100644

--- a/src/backends/meta-screen-cast-stream.h

+++ b/src/backends/meta-screen-cast-stream.h

@@ -26,8 +26,12 @@

 #include <glib-object.h>

 #include "backends/meta-screen-cast-stream-src.h"

+#include "backends/meta-screen-cast.h"

+

 #include "meta-dbus-screen-cast.h"

+typedef struct _MetaScreenCastSession MetaScreenCastSession;

+

 #define META_TYPE_SCREEN_CAST_STREAM (meta_screen_cast_stream_get_type ())

 G_DECLARE_DERIVABLE_TYPE (MetaScreenCastStream, meta_screen_cast_stream,

                           META, SCREEN_CAST_STREAM,

@@ -48,6 +52,8 @@ struct _MetaScreenCastStreamClass

                                double               *y);

 };

+MetaScreenCastSession * meta_screen_cast_stream_get_session (MetaScreenCastStream *stream);

+

 gboolean meta_screen_cast_stream_start (MetaScreenCastStream *stream,

                                         GError              **error);

diff --git a/src/backends/meta-screen-cast-window-stream.c b/src/backends/meta-screen-cast-window-stream.c

index 1200a39ef..4c9227116 100644

--- a/src/backends/meta-screen-cast-window-stream.c

+++ b/src/backends/meta-screen-cast-window-stream.c

@@ -71,9 +71,10 @@ meta_screen_cast_window_stream_get_height (MetaScreenCastWindowStream *window_st

 }

 MetaScreenCastWindowStream *

-meta_screen_cast_window_stream_new (GDBusConnection  *connection,

-                                    MetaWindow       *window,

-                                    GError          **error)

+meta_screen_cast_window_stream_new (MetaScreenCastSession  *session,

+                                    GDBusConnection        *connection,

+                                    MetaWindow             *window,

+                                    GError                **error)

 {

   MetaScreenCastWindowStream *window_stream;

   MetaLogicalMonitor *logical_monitor;

@@ -90,6 +91,7 @@ meta_screen_cast_window_stream_new (GDBusConnection  *connection,

   window_stream = g_initable_new (META_TYPE_SCREEN_CAST_WINDOW_STREAM,

                                   NULL,

                                   error,

+                                  "session", session,

                                   "connection", connection,

                                   "window", window,

                                   NULL);

diff --git a/src/backends/meta-screen-cast-window-stream.h b/src/backends/meta-screen-cast-window-stream.h

index 6726ef873..3799be98a 100644

--- a/src/backends/meta-screen-cast-window-stream.h

+++ b/src/backends/meta-screen-cast-window-stream.h

@@ -32,9 +32,10 @@ G_DECLARE_FINAL_TYPE (MetaScreenCastWindowStream,

                       META, SCREEN_CAST_WINDOW_STREAM,

                       MetaScreenCastStream)

-MetaScreenCastWindowStream * meta_screen_cast_window_stream_new (GDBusConnection  *connection,

-                                                                 MetaWindow       *window,

-                                                                 GError          **error);

+MetaScreenCastWindowStream * meta_screen_cast_window_stream_new (MetaScreenCastSession  *session,

+                                                                 GDBusConnection        *connection,

+                                                                 MetaWindow             *window,

+                                                                 GError                **error);

 MetaWindow  * meta_screen_cast_window_stream_get_window (MetaScreenCastWindowStream *window_stream);

 int           meta_screen_cast_window_stream_get_width  (MetaScreenCastWindowStream *window_stream);

diff --git a/src/backends/meta-screen-cast.c b/src/backends/meta-screen-cast.c

index 4a67683e7..ceea9cbe1 100644

--- a/src/backends/meta-screen-cast.c

+++ b/src/backends/meta-screen-cast.c

@@ -43,6 +43,7 @@ struct _MetaScreenCast

   GList *sessions;

   MetaDbusSessionWatcher *session_watcher;

+  MetaBackend *backend;

 };

 static void

@@ -62,12 +63,20 @@ meta_screen_cast_get_connection (MetaScreenCast *screen_cast)

   return g_dbus_interface_skeleton_get_connection (interface_skeleton);

 }

+MetaBackend *

+meta_screen_cast_get_backend (MetaScreenCast *screen_cast)

+{

+  return screen_cast->backend;

+}

+

 static gboolean

 register_remote_desktop_screen_cast_session (MetaScreenCastSession  *session,

                                              const char             *remote_desktop_session_id,

                                              GError                **error)

 {

-  MetaBackend *backend = meta_get_backend ();

+  MetaScreenCast *screen_cast =

+    meta_screen_cast_session_get_screen_cast (session);

+  MetaBackend *backend = meta_screen_cast_get_backend (screen_cast);

   MetaRemoteDesktop *remote_desktop = meta_backend_get_remote_desktop (backend);

   MetaRemoteDesktopSession *remote_desktop_session;

@@ -244,11 +253,13 @@ meta_screen_cast_finalize (GObject *object)

 }

 MetaScreenCast *

-meta_screen_cast_new (MetaDbusSessionWatcher *session_watcher)

+meta_screen_cast_new (MetaBackend            *backend,

+                      MetaDbusSessionWatcher *session_watcher)

 {

   MetaScreenCast *screen_cast;

   screen_cast = g_object_new (META_TYPE_SCREEN_CAST, NULL);

+  screen_cast->backend = backend;

   screen_cast->session_watcher = session_watcher;

   return screen_cast;

diff --git a/src/backends/meta-screen-cast.h b/src/backends/meta-screen-cast.h

index a4fb8dd45..7e32b67b7 100644

--- a/src/backends/meta-screen-cast.h

+++ b/src/backends/meta-screen-cast.h

@@ -25,6 +25,7 @@

 #include <glib-object.h>

+#include "backends/meta-backend-private.h"

 #include "backends/meta-dbus-session-watcher.h"

 #include "meta-dbus-screen-cast.h"

@@ -35,6 +36,9 @@ G_DECLARE_FINAL_TYPE (MetaScreenCast, meta_screen_cast,

 GDBusConnection * meta_screen_cast_get_connection (MetaScreenCast *screen_cast);

-MetaScreenCast * meta_screen_cast_new (MetaDbusSessionWatcher *session_watcher);

+MetaBackend * meta_screen_cast_get_backend (MetaScreenCast *screen_cast);

+

+MetaScreenCast * meta_screen_cast_new (MetaBackend            *backend,

+                                       MetaDbusSessionWatcher *session_watcher);

 #endif /* META_SCREEN_CAST_H */

-- 

2.20.1

From 0bda3f694c9ea14239dd002856302e7d3007ae1c Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Wed, 12 Dec 2018 11:37:13 +0100

Subject: [PATCH 05/12] renderer: Add API to get view from logical monitor

Will be used to get the view scale for a logical monitor, which is

necessary for passing cursor sprites via PipeWire.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/357

---

 src/backends/meta-renderer.c | 18 ++++++++++++++++++

 src/backends/meta-renderer.h |  3 +++

 2 files changed, 21 insertions(+)

diff --git a/src/backends/meta-renderer.c b/src/backends/meta-renderer.c

index ceac7df57..ea93dc99e 100644

--- a/src/backends/meta-renderer.c

+++ b/src/backends/meta-renderer.c

@@ -94,6 +94,24 @@ meta_renderer_get_views (MetaRenderer *renderer)

   return priv->views;

 }

+MetaRendererView *

+meta_renderer_get_view_from_logical_monitor (MetaRenderer       *renderer,

+                                             MetaLogicalMonitor *logical_monitor)

+{

+  GList *l;

+

+  for (l = meta_renderer_get_views (renderer); l; l = l->next)

+    {

+      MetaRendererView *view = l->data;

+

+      if (meta_renderer_view_get_logical_monitor (view) ==

+          logical_monitor)

+        return view;

+    }

+

+  return NULL;

+}

+

 static void

 meta_renderer_finalize (GObject *object)

 {

diff --git a/src/backends/meta-renderer.h b/src/backends/meta-renderer.h

index bf51b51ab..1c617214b 100644

--- a/src/backends/meta-renderer.h

+++ b/src/backends/meta-renderer.h

@@ -53,4 +53,7 @@ void meta_renderer_set_legacy_view (MetaRenderer     *renderer,

 GList * meta_renderer_get_views (MetaRenderer *renderer);

+MetaRendererView * meta_renderer_get_view_from_logical_monitor (MetaRenderer       *renderer,

+                                                                MetaLogicalMonitor *logical_monitor);

+

 #endif /* META_RENDERER_H */

-- 

2.20.1

From 1a928d060cccd344004a06dacc008ae0654e8f3e Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Wed, 12 Dec 2018 11:39:00 +0100

Subject: [PATCH 06/12] backends/stage: Fix minor style issue

https://gitlab.gnome.org/GNOME/mutter/merge_requests/357

---

 src/backends/meta-stage.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/backends/meta-stage.c b/src/backends/meta-stage.c

index 73ca70118..d1b7185e8 100644

--- a/src/backends/meta-stage.c

+++ b/src/backends/meta-stage.c

@@ -30,7 +30,8 @@

 #include "backends/meta-backend-private.h"

 #include "clutter/clutter-mutter.h"

-struct _MetaOverlay {

+struct _MetaOverlay

+{

   gboolean enabled;

   CoglPipeline *pipeline;

-- 

2.20.1

From 44655d12468c26bf6949e4b5137d324f9ec3b651 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Wed, 12 Dec 2018 11:39:18 +0100

Subject: [PATCH 07/12] backends/stage: Emit signal between painting actors and

 overlays

Will be used by screen casting for embedding the cursor separately, or

not including at all.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/357

---

 src/backends/meta-stage.c | 18 ++++++++++++++++++

 1 file changed, 18 insertions(+)

diff --git a/src/backends/meta-stage.c b/src/backends/meta-stage.c

index d1b7185e8..4ed56c04b 100644

--- a/src/backends/meta-stage.c

+++ b/src/backends/meta-stage.c

@@ -30,6 +30,15 @@

 #include "backends/meta-backend-private.h"

 #include "clutter/clutter-mutter.h"

+enum

+{

+  ACTORS_PAINTED,

+

+  N_SIGNALS

+};

+

+static guint signals[N_SIGNALS];

+

 struct _MetaOverlay

 {

   gboolean enabled;

@@ -141,6 +150,8 @@ meta_stage_paint (ClutterActor *actor)

   CLUTTER_ACTOR_CLASS (meta_stage_parent_class)->paint (actor);

+  g_signal_emit (stage, signals[ACTORS_PAINTED], 0);

+

   for (l = priv->overlays; l; l = l->next)

     meta_overlay_paint (l->data);

 }

@@ -180,6 +191,13 @@ meta_stage_class_init (MetaStageClass *klass)

   stage_class->activate = meta_stage_activate;

   stage_class->deactivate = meta_stage_deactivate;

+

+  signals[ACTORS_PAINTED] = g_signal_new ("actors-painted",

+                                          G_TYPE_FROM_CLASS (klass),

+                                          G_SIGNAL_RUN_LAST,

+                                          0,

+                                          NULL, NULL, NULL,

+                                          G_TYPE_NONE, 0);

 }

 static void

-- 

2.20.1

From 6afa7372f3c8104fb5670130b1cd54980e9b6446 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Wed, 12 Dec 2018 15:29:21 +0100

Subject: [PATCH 08/12] screen-cast/monitor-stream-src: Copy content before

 cursor is drawn