[metacity] xrender: remove get_toplevel_xwindow
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] xrender: remove get_toplevel_xwindow
- Date: Fri, 13 Sep 2019 12:38:11 +0000 (UTC)
commit b88f73dc1732d761e79244676b95fd83b64a3c25
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Wed Sep 11 23:53:58 2019 +0300
xrender: remove get_toplevel_xwindow
src/compositor/meta-compositor-xrender.c | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
---
diff --git a/src/compositor/meta-compositor-xrender.c b/src/compositor/meta-compositor-xrender.c
index 9a2f62ef..f6018d70 100644
--- a/src/compositor/meta-compositor-xrender.c
+++ b/src/compositor/meta-compositor-xrender.c
@@ -183,19 +183,6 @@ get_toplevel_xvisual (MetaWindow *window)
return window->xvisual;
}
-static Window
-get_toplevel_xwindow (MetaWindow *window)
-{
- MetaFrame *frame;
-
- frame = meta_window_get_frame (window);
-
- if (frame != NULL)
- return meta_frame_get_xwindow (frame);
-
- return meta_window_get_xwindow (window);
-}
-
/* Gaussian stuff for creating the shadows */
static double
gaussian (double r,
@@ -1130,7 +1117,7 @@ get_window_region (MetaDisplay *display,
XserverRegion region;
xdisplay = meta_display_get_xdisplay (display);
- xwindow = get_toplevel_xwindow (cw->window);
+ xwindow = meta_window_get_toplevel_xwindow (cw->window);
meta_error_trap_push (display);
region = XFixesCreateRegionFromWindow (xdisplay, xwindow, WindowRegionBounding);
@@ -1264,7 +1251,7 @@ get_window_picture (MetaDisplay *display,
XRenderPictFormat *format;
xdisplay = meta_display_get_xdisplay (display);
- xwindow = get_toplevel_xwindow (cw->window);
+ xwindow = meta_window_get_toplevel_xwindow (cw->window);
if (cw->back_pixmap == None)
{
@@ -1320,7 +1307,7 @@ get_window_mask (MetaDisplay *display,
{
Window xwindow;
- xwindow = get_toplevel_xwindow (cw->window);
+ xwindow = meta_window_get_toplevel_xwindow (cw->window);
meta_error_trap_push (display);
cw->mask_pixmap = XCreatePixmap (xdisplay, xwindow, width, height,
@@ -2155,7 +2142,7 @@ notify_decorated_cb (MetaWindow *window,
}
cw->damage = XDamageCreate (xrender->xdisplay,
- get_toplevel_xwindow (window),
+ meta_window_get_toplevel_xwindow (window),
XDamageReportNonEmpty);
determine_mode (xrender, cw);
@@ -2499,7 +2486,7 @@ meta_compositor_xrender_add_window (MetaCompositor *compositor,
cw->rect.x, cw->rect.y);
}
- xwindow = get_toplevel_xwindow (window);
+ xwindow = meta_window_get_toplevel_xwindow (window);
cw->damage = XDamageCreate (xrender->xdisplay, xwindow, XDamageReportNonEmpty);
cw->alpha_pict = None;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]