aboutsummaryrefslogtreecommitdiff
path: root/util/fbcompose/plugins/xrender
diff options
context:
space:
mode:
Diffstat (limited to 'util/fbcompose/plugins/xrender')
-rw-r--r--util/fbcompose/plugins/xrender/fade/FadePlugin.cc8
-rw-r--r--util/fbcompose/plugins/xrender/preview/PreviewPlugin.cc2
2 files changed, 7 insertions, 3 deletions
diff --git a/util/fbcompose/plugins/xrender/fade/FadePlugin.cc b/util/fbcompose/plugins/xrender/fade/FadePlugin.cc
index ac01189..e9fd97c 100644
--- a/util/fbcompose/plugins/xrender/fade/FadePlugin.cc
+++ b/util/fbcompose/plugins/xrender/fade/FadePlugin.cc
@@ -74,7 +74,10 @@ void FadePlugin::windowMapped(const BaseCompWindow &window) {
74 while (true) { 74 while (true) {
75 if (it == m_negative_fades.end()) { 75 if (it == m_negative_fades.end()) {
76 fade.fade_alpha = 0; 76 fade.fade_alpha = 0;
77 fade.fade_picture = new XRenderPicture(xrenderScreen(), m_fade_pict_format, xrenderScreen().pictFilter()); 77 fade.fade_picture.reset(
78 new XRenderPicture(
79 xrenderScreen(), m_fade_pict_format,
80 xrenderScreen().pictFilter()));
78 break; 81 break;
79 } else if (it->window_id == window.window()) { 82 } else if (it->window_id == window.window()) {
80 fade.fade_alpha = it->fade_alpha; 83 fade.fade_alpha = it->fade_alpha;
@@ -105,7 +108,8 @@ void FadePlugin::windowUnmapped(const BaseCompWindow &window) {
105 m_positive_fades.erase(it); 108 m_positive_fades.erase(it);
106 } else { 109 } else {
107 fade.fade_alpha = 255; 110 fade.fade_alpha = 255;
108 fade.fade_picture = new XRenderPicture(xrenderScreen(), m_fade_pict_format, xrenderScreen().pictFilter()); 111 fade.fade_picture.reset( new XRenderPicture(xrenderScreen(),
112 m_fade_pict_format, xrenderScreen().pictFilter()));
109 } 113 }
110 114
111 if (xr_window.contentPicture()->pictureHandle() != None) { 115 if (xr_window.contentPicture()->pictureHandle() != None) {
diff --git a/util/fbcompose/plugins/xrender/preview/PreviewPlugin.cc b/util/fbcompose/plugins/xrender/preview/PreviewPlugin.cc
index 14a0e61..fdc4d29 100644
--- a/util/fbcompose/plugins/xrender/preview/PreviewPlugin.cc
+++ b/util/fbcompose/plugins/xrender/preview/PreviewPlugin.cc
@@ -59,7 +59,7 @@ PreviewPlugin::PreviewPlugin(const BaseScreen &screen, const std::vector<FbTk::F
59 unsigned long mask_color = 0x01010101 * PREVIEW_ALPHA; 59 unsigned long mask_color = 0x01010101 * PREVIEW_ALPHA;
60 Pixmap mask_pixmap = createSolidPixmap(screen, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, mask_color); 60 Pixmap mask_pixmap = createSolidPixmap(screen, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT, mask_color);
61 XRenderPictFormat *pict_format = XRenderFindStandardFormat(display(), PictStandardARGB32); 61 XRenderPictFormat *pict_format = XRenderFindStandardFormat(display(), PictStandardARGB32);
62 m_mask_picture = new XRenderPicture(xrenderScreen(), pict_format, FilterFast); 62 m_mask_picture.reset( new XRenderPicture(xrenderScreen(), pict_format, FilterFast));
63 m_mask_picture->setPixmap(mask_pixmap, true); 63 m_mask_picture->setPixmap(mask_pixmap, true);
64 64
65 m_previous_damage.width = 0; 65 m_previous_damage.width = 0;