group: Use pixmap instead of raw image buffer

3 files changed, 22 insertions, 18 deletions

diff --git a/src/group/group.h b/src/group/group.h
index 37587bd..adaa4c2 100644
--- a/src/group/group.h
+++ b/src/group/group.h
@@ -198,8 +198,7 @@ typedef enum {
 
 
 typedef struct _GroupCairoLayer {
-	unsigned char		*texBuf;
-	Pixmap				pixmap;
+	Pixmap			pixmap;
 	CompTexture		texture;
 	cairo_surface_t		*surface;
 	cairo_t			*cairo;
diff --git a/src/group/paint.c b/src/group/paint.c
index 7e79bbf..6ba2490 100644
--- a/src/group/paint.c
+++ b/src/group/paint.c
@@ -154,9 +154,6 @@ void groupRenderTopTabHighlight(GroupSelection *group)
 		(group->color[2] / 65535.0f),
 		(group->color[3] / 65535.0f));
 	cairo_stroke(cr);
-
-	imageBufferToTexture(group->screen, &layer->texture, 
-		(char*) layer->texBuf, layer->texWidth, layer->texHeight);
 }
 
 /*
@@ -470,9 +467,6 @@ void groupRenderTabBarBackground(GroupSelection *group)
 	a = groupGetTabBorderColorAlpha(group->screen) / 65535.0f;
 	cairo_set_source_rgba(cr, r, g, b, a);
 	cairo_stroke(cr);
-
-	imageBufferToTexture(group->screen, &layer->texture, 
-		(char*) layer->texBuf, layer->texWidth, layer->texHeight);
 }
 
 /*
diff --git a/src/group/tab.c b/src/group/tab.c
index 5d2b11c..a426762 100644
--- a/src/group/tab.c
+++ b/src/group/tab.c
@@ -1766,10 +1766,7 @@ void groupDestroyCairoLayer(CompScreen *s, GroupCairoLayer *layer)
 		cairo_destroy(layer->cairo);
 
 	if (layer->surface)
-		cairo_surface_destroy(layer->surface);
-
-	if (layer->texBuf)
-		free(layer->texBuf);
+		cairo_surface_destroy(layer->surface);;
 
 	if (&layer->texture)
 		finiTexture(s, &layer->texture);
@@ -1787,10 +1784,14 @@ void groupDestroyCairoLayer(CompScreen *s, GroupCairoLayer *layer)
 GroupCairoLayer* groupCreateCairoLayer(CompScreen *s, int width, int height)
 {
 	GroupCairoLayer* layer = (GroupCairoLayer*) malloc(sizeof(GroupCairoLayer));
+	
+	Screen *screen;
+	Display *display;
+	display = s->display->display;
+	screen = ScreenOfDisplay (display, s->screenNum);
 
 	layer->surface	= NULL;
 	layer->cairo	= NULL;
-	layer->texBuf   = NULL;
 	layer->animationTime = 0;
 	layer->state = PaintOff;
 	layer->texWidth = width;
@@ -1798,19 +1799,29 @@ GroupCairoLayer* groupCreateCairoLayer(CompScreen *s, int width, int height)
 	layer->pixmap = None;
 
 	initTexture(s, &layer->texture);
-	layer->texBuf = calloc(4 * width * height, sizeof (unsigned char));
-	layer->surface = cairo_image_surface_create_for_data(layer->texBuf, CAIRO_FORMAT_ARGB32,
-														width, height, 4 * width);
+
+	XRenderPictFormat *format;
+	format = XRenderFindStandardFormat (display, PictStandardARGB32);
+	layer->pixmap = XCreatePixmap (display, s->root, width, height, 32);
+
+	if (!bindPixmapToTexture(s, &layer->texture, layer->pixmap, width, height, 32)) {
+		XFreePixmap(display, layer->pixmap);
+		free(layer);
+		return NULL;
+	}
+
+	layer->surface = 
+		cairo_xlib_surface_create_with_xrender_format(display, layer->pixmap, screen, format, width, height);
 
 	if (cairo_surface_status(layer->surface) != CAIRO_STATUS_SUCCESS) {
-		free(layer->texBuf);
+		XFreePixmap(display, layer->pixmap);
 		free(layer);
         return NULL;
 	}
 
 	layer->cairo = cairo_create(layer->surface);
 	if (cairo_status(layer->cairo) != CAIRO_STATUS_SUCCESS) {
-		free(layer->texBuf);
+		XFreePixmap(display, layer->pixmap);
 		free(layer);
         return NULL;
 	}