[metacity] compositor: remove MetaDisplay parameter from make_shadow
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] compositor: remove MetaDisplay parameter from make_shadow
- Date: Sat, 4 Mar 2017 16:49:56 +0000 (UTC)
commit 8987edd114ac6b51970bc04e84fd540f50def2a4
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sat Mar 4 17:30:42 2017 +0200
compositor: remove MetaDisplay parameter from make_shadow
src/compositor/meta-compositor-xrender.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/src/compositor/meta-compositor-xrender.c b/src/compositor/meta-compositor-xrender.c
index 07386b5..3b1fc62 100644
--- a/src/compositor/meta-compositor-xrender.c
+++ b/src/compositor/meta-compositor-xrender.c
@@ -421,13 +421,12 @@ generate_shadows (MetaCompositorXRender *xrender)
static XImage *
make_shadow (MetaCompositorXRender *xrender,
- MetaDisplay *display,
MetaShadowType shadow_type,
double opacity,
int width,
int height)
{
- Display *xdisplay = meta_display_get_xdisplay (display);
+ Display *xdisplay;
XImage *ximage;
guchar *data;
shadow *shad;
@@ -449,6 +448,7 @@ make_shadow (MetaCompositorXRender *xrender,
data = g_malloc (swidth * sheight * sizeof (guchar));
+ xdisplay = xrender->xdisplay;
screen_number = DefaultScreen (xdisplay);
ximage = XCreateImage (xdisplay, DefaultVisual (xdisplay, screen_number),
8, ZPixmap, 0, (char *) data,
@@ -678,8 +678,7 @@ shadow_picture (MetaCompositorXRender *xrender,
Picture shadow_picture;
GC gc;
- shadow_image = make_shadow (xrender, display, cw->shadow_type,
- opacity, width, height);
+ shadow_image = make_shadow (xrender, cw->shadow_type, opacity, width, height);
if (!shadow_image)
return None;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]