X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Futil%2Farea.c;h=acce72550f109e8a847b539aca23f7521fe2ab34;hb=8abd6d423bffc9cd35928e1911c138163f7dbda9;hp=0e151e28bcf663cbfb3bbf66f7efbaef7fc78014;hpb=9cb781048d0a1cf55f0044e2f9f65ac9a5a241e9;p=chaz%2Ftint2

diff --git a/src/util/area.c b/src/util/area.c
index 0e151e2..acce725 100644
--- a/src/util/area.c
+++ b/src/util/area.c
@@ -20,6 +20,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
+#include <X11/extensions/Xrender.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -29,6 +30,10 @@
 #include "server.h"
 #include "panel.h"
 
+// QUESTION: Why do we need Pixmaps for drawing? Can't we draw directly in the Window???
+// Parent could pass a cairo_surface_t to the children, and children use it, for drawing...
+
+
 // 1) resize child
 // 2) resize parent
 // 3) redraw parent
@@ -43,6 +48,11 @@ void refresh (Area *a)
 	// don't draw transparent objects (without foreground and without background)
 	if (a->redraw) {
 		a->redraw = 0;
+		// force redraw of child
+		GSList *l;
+		for (l = a->list ; l ; l = l->next)
+			set_redraw(l->data);
+
 		//printf("draw area posx %d, width %d\n", a->posx, a->width);
 		draw(a, 0);
 		if (a->use_active)
@@ -50,9 +60,9 @@ void refresh (Area *a)
 	}
 
 	// draw current Area
-	Pixmap *pmap = (a->is_active == 0) ? (&a->pix.pmap) : (&a->pix_active.pmap);
-	if (*pmap == 0) printf("empty area posx %d, width %d\n", a->posx, a->width);
-	XCopyArea (server.dsp, *pmap, ((Panel *)a->panel)->temp_pmap, server.gc, 0, 0, a->width, a->height, a->posx, a->posy);
+	Pixmap pmap = (a->is_active == 0) ? (a->pix.pmap) : (a->pix_active.pmap);
+	if (pmap == 0) printf("empty area posx %d, width %d\n", a->posx, a->width);
+	XCopyArea (server.dsp, pmap, ((Panel *)a->panel)->temp_pmap, server.gc, 0, 0, a->width, a->height, a->posx, a->posy);
 
 	// and then refresh child object
 	GSList *l;
@@ -67,13 +77,16 @@ void size (Area *a)
 
 	if (a->resize) {
 		a->resize = 0;
-		for (l = a->list; l ; l = l->next)
-			size(l->data);
+		// force the resize of childs
+		for (l = a->list; l ; l = l->next) {
+			Area *area = (Area*)l->data;
+			area->resize = 1;
+			size(area);
+		}
 
 		// resize can generate a redraw
-		if (a->_resize) {
+		if (a->_resize)
 			a->_resize(a);
-		}
 	}
 }
 
@@ -95,7 +108,9 @@ void draw (Area *a, int active)
 	if (*pmap) XFreePixmap (server.dsp, *pmap);
 	*pmap = XCreatePixmap (server.dsp, server.root_win, a->width, a->height, server.depth);
 
-	// add layer of root pixmap
+	// add layer of root pixmap (or clear pixmap if real_transparency==true)
+	if (real_transparency)
+		clear_pixmap(*pmap, 0 ,0, a->width, a->height);
 	XCopyArea (server.dsp, ((Panel *)a->panel)->temp_pmap, *pmap, server.gc, a->posx, a->posy, a->width, a->height, 0, 0);
 
 	cairo_surface_t *cs;
@@ -236,3 +251,10 @@ void draw_rect(cairo_t *c, double x, double y, double w, double h, double r)
 }
 
 
+void clear_pixmap(Pixmap p, int x, int y, int w, int h)
+{
+	Picture pict = XRenderCreatePicture(server.dsp, p, XRenderFindVisualFormat(server.dsp, server.visual), 0, 0);
+	XRenderColor col = { .red=0, .green=0, .blue=0, .alpha=0 };
+	XRenderFillRectangle(server.dsp, PictOpSrc, pict, &col, x, y, w, h);
+	XRenderFreePicture(server.dsp, pict);
+}