[metacity] compositor: remove xwindow parameter from add_window

[Alberts Muktupāvels <muktupavels src gnome org>]

commit ba2ba812ceeeb27d241a31179a584b0a43a4edd6
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Mar 5 19:22:32 2017 +0200

    compositor: remove xwindow parameter from add_window

 src/compositor/meta-compositor-none.c    |    3 +--
 src/compositor/meta-compositor-private.h |    3 +--
 src/compositor/meta-compositor-xrender.c |   10 ++++++++--
 src/compositor/meta-compositor.c         |    5 ++---
 src/core/screen.c                        |    5 +++--
 src/core/window.c                        |    2 +-
 src/include/meta-compositor.h            |    3 +--
 7 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/src/compositor/meta-compositor-none.c b/src/compositor/meta-compositor-none.c
index fe9ad69..f42b848 100644
--- a/src/compositor/meta-compositor-none.c
+++ b/src/compositor/meta-compositor-none.c
@@ -40,8 +40,7 @@ meta_compositor_none_unmanage (MetaCompositor *compositor)
 
 static void
 meta_compositor_none_add_window (MetaCompositor *compositor,
-                                 MetaWindow     *window,
-                                 Window          xwindow)
+                                 MetaWindow     *window)
 {
 }
 
diff --git a/src/compositor/meta-compositor-private.h b/src/compositor/meta-compositor-private.h
index 5c7c42c..43da63d 100644
--- a/src/compositor/meta-compositor-private.h
+++ b/src/compositor/meta-compositor-private.h
@@ -33,8 +33,7 @@ struct _MetaCompositorClass
   void              (* unmanage)           (MetaCompositor     *compositor);
 
   void              (* add_window)         (MetaCompositor     *compositor,
-                                            MetaWindow         *window,
-                                            Window              xwindow);
+                                            MetaWindow         *window);
 
   void              (* remove_window)      (MetaCompositor     *compositor,
                                             MetaWindow         *window);
diff --git a/src/compositor/meta-compositor-xrender.c b/src/compositor/meta-compositor-xrender.c
index 03064ee..869942c 100644
--- a/src/compositor/meta-compositor-xrender.c
+++ b/src/compositor/meta-compositor-xrender.c
@@ -3017,11 +3017,17 @@ meta_compositor_xrender_unmanage (MetaCompositor *compositor)
 
 static void
 meta_compositor_xrender_add_window (MetaCompositor *compositor,
-                                    MetaWindow     *window,
-                                    Window          xwindow)
+                                    MetaWindow     *window)
 {
   MetaCompositorXRender *xrender = META_COMPOSITOR_XRENDER (compositor);
   MetaDisplay *display = meta_compositor_get_display (compositor);
+  MetaFrame *frame = meta_window_get_frame (window);
+  Window xwindow;
+
+  if (frame)
+    xwindow = meta_frame_get_xwindow (frame);
+  else
+    xwindow = meta_window_get_xwindow (window);
 
   meta_error_trap_push (NULL);
   add_win (xrender, display->screen, window, xwindow);
diff --git a/src/compositor/meta-compositor.c b/src/compositor/meta-compositor.c
index d6bfc87..ea71479 100644
--- a/src/compositor/meta-compositor.c
+++ b/src/compositor/meta-compositor.c
@@ -197,14 +197,13 @@ meta_compositor_new (MetaCompositorType  type,
 
 void
 meta_compositor_add_window (MetaCompositor *compositor,
-                            MetaWindow     *window,
-                            Window          xwindow)
+                            MetaWindow     *window)
 {
   MetaCompositorClass *compositor_class;
 
   compositor_class = META_COMPOSITOR_GET_CLASS (compositor);
 
-  compositor_class->add_window (compositor, window, xwindow);
+  compositor_class->add_window (compositor, window);
 }
 
 void
diff --git a/src/core/screen.c b/src/core/screen.c
index 1ac602f..6916d80 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -797,8 +797,9 @@ meta_screen_composite_all_windows (MetaScreen *screen)
       }
 
       window = meta_display_lookup_x_window (display, info->xwindow);
-      meta_compositor_add_window (display->compositor, window,
-                                  info->xwindow);
+
+      if (window != NULL)
+        meta_compositor_add_window (display->compositor, window);
     }
 
   meta_stack_thaw (screen->stack);
diff --git a/src/core/window.c b/src/core/window.c
index 8bf451c..301ebf3 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -828,7 +828,7 @@ meta_window_new (MetaDisplay    *display,
       set_net_wm_state (window);
     }
 
-  meta_compositor_add_window (window->display->compositor, window, window->xwindow);
+  meta_compositor_add_window (window->display->compositor, window);
 
   /* Sync stack changes */
   meta_stack_thaw (window->screen->stack);
diff --git a/src/include/meta-compositor.h b/src/include/meta-compositor.h
index a4cf4a6..0d4d2fd 100644
--- a/src/include/meta-compositor.h
+++ b/src/include/meta-compositor.h
@@ -50,8 +50,7 @@ MetaCompositor  *meta_compositor_new                (MetaCompositorType  type,
                                                      MetaDisplay        *display);
 
 void             meta_compositor_add_window         (MetaCompositor     *compositor,
-                                                     MetaWindow         *window,
-                                                     Window              xwindow);
+                                                     MetaWindow         *window);
 
 void             meta_compositor_remove_window      (MetaCompositor     *compositor,
                                                      MetaWindow         *window);