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

diff --git a/src/util/area.c b/src/util/area.c
index 1e10947..0e151e2 100644
--- a/src/util/area.c
+++ b/src/util/area.c
@@ -41,23 +41,23 @@ void refresh (Area *a)
 	size(a);
 
 	// don't draw transparent objects (without foreground and without background)
-   if (a->redraw) {
-	   a->redraw = 0;
-	   //printf("draw area posx %d, width %d\n", a->posx, a->width);
-      draw(a, 0);
-      if (a->use_active)
-	      draw(a, 1);
+	if (a->redraw) {
+		a->redraw = 0;
+		//printf("draw area posx %d, width %d\n", a->posx, a->width);
+		draw(a, 0);
+		if (a->use_active)
+			draw(a, 1);
 	}
 
 	// draw current Area
-   Pixmap *pmap = (a->is_active == 0) ? (&a->pix.pmap) : (&a->pix_active.pmap);
+	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);
+	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
+	// and then refresh child object
 	GSList *l;
-   for (l = a->list; l ; l = l->next)
-      refresh(l->data);
+	for (l = a->list; l ; l = l->next)
+		refresh(l->data);
 }
 
 
@@ -66,13 +66,13 @@ void size (Area *a)
 	GSList *l;
 
 	if (a->resize) {
-      a->resize = 0;
+		a->resize = 0;
 		for (l = a->list; l ; l = l->next)
 			size(l->data);
 
-   	// resize can generate a redraw
-	   if (a->_resize) {
-      	a->_resize(a);
+		// resize can generate a redraw
+		if (a->_resize) {
+			a->_resize(a);
 		}
 	}
 }
@@ -80,159 +80,159 @@ void size (Area *a)
 
 void set_redraw (Area *a)
 {
-   a->redraw = 1;
+	a->redraw = 1;
 
-   GSList *l;
-   for (l = a->list ; l ; l = l->next)
-      set_redraw(l->data);
+	GSList *l;
+	for (l = a->list ; l ; l = l->next)
+		set_redraw(l->data);
 }
 
 
 void draw (Area *a, int active)
 {
-   Pixmap *pmap = (active == 0) ? (&a->pix.pmap) : (&a->pix_active.pmap);
+	Pixmap *pmap = (active == 0) ? (&a->pix.pmap) : (&a->pix_active.pmap);
 
-   if (*pmap) XFreePixmap (server.dsp, *pmap);
-   *pmap = XCreatePixmap (server.dsp, server.root_win, a->width, a->height, server.depth);
+	if (*pmap) XFreePixmap (server.dsp, *pmap);
+	*pmap = XCreatePixmap (server.dsp, server.root_win, a->width, a->height, server.depth);
 
-   // add layer of root pixmap
-   XCopyArea (server.dsp, ((Panel *)a->panel)->temp_pmap, *pmap, server.gc, a->posx, a->posy, a->width, a->height, 0, 0);
+	// add layer of root pixmap
+	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;
-   cairo_t *c;
+	cairo_surface_t *cs;
+	cairo_t *c;
 
-   cs = cairo_xlib_surface_create (server.dsp, *pmap, server.visual, a->width, a->height);
-   c = cairo_create (cs);
+	cs = cairo_xlib_surface_create (server.dsp, *pmap, server.visual, a->width, a->height);
+	c = cairo_create (cs);
 
-   draw_background (a, c, active);
+	draw_background (a, c, active);
 
-   if (a->_draw_foreground)
-      a->_draw_foreground(a, c, active);
+	if (a->_draw_foreground)
+		a->_draw_foreground(a, c, active);
 
-   cairo_destroy (c);
-   cairo_surface_destroy (cs);
+	cairo_destroy (c);
+	cairo_surface_destroy (cs);
 }
 
 
 void draw_background (Area *a, cairo_t *c, int active)
 {
-   Pmap *pix = (active == 0) ? (&a->pix) : (&a->pix_active);
-
-   if (pix->back.alpha > 0.0) {
-      //printf("    draw_background (%d %d) RGBA (%lf, %lf, %lf, %lf)\n", a->posx, a->posy, pix->back.color[0], pix->back.color[1], pix->back.color[2], pix->back.alpha);
-      draw_rect(c, pix->border.width, pix->border.width, a->width-(2.0 * pix->border.width), a->height-(2.0*pix->border.width), pix->border.rounded - pix->border.width/1.571);
-      cairo_set_source_rgba(c, pix->back.color[0], pix->back.color[1], pix->back.color[2], pix->back.alpha);
-
-      cairo_fill(c);
-   }
-
-   if (pix->border.width > 0 && pix->border.alpha > 0.0) {
-      cairo_set_line_width (c, pix->border.width);
-
-      // draw border inside (x, y, width, height)
-      draw_rect(c, pix->border.width/2.0, pix->border.width/2.0, a->width - pix->border.width, a->height - pix->border.width, pix->border.rounded);
-      /*
-      // convert : radian = degre * M_PI/180
-      // définir le dégradé dans un carré de (0,0) (100,100)
-      // ensuite ce dégradé est extrapolé selon le ratio width/height
-      // dans repère (0, 0) (100, 100)
-      double X0, Y0, X1, Y1, degre;
-      // x = X * (a->width / 100), y = Y * (a->height / 100)
-      double x0, y0, x1, y1;
-      X0 = 0;
-      Y0 = 100;
-      X1 = 100;
-      Y1 = 0;
-      degre = 45;
-      // et ensuite faire la changement d'unité du repère
-      // car ce qui doit resté inchangée est les traits et pas la direction
-
-      // il faut d'abord appliquer une rotation de 90° (et -180° si l'angle est supérieur à 180°)
-      // ceci peut être appliqué une fois pour toute au départ
-      // ensuite calculer l'angle dans le nouveau repère
-      // puis faire une rotation de 90°
-      x0 = X0 * ((double)a->width / 100);
-      x1 = X1 * ((double)a->width / 100);
-      y0 = Y0 * ((double)a->height / 100);
-      y1 = Y1 * ((double)a->height / 100);
-
-      x0 = X0 * ((double)a->height / 100);
-      x1 = X1 * ((double)a->height / 100);
-      y0 = Y0 * ((double)a->width / 100);
-      y1 = Y1 * ((double)a->width / 100);
-
-      cairo_pattern_t *linpat;
-      linpat = cairo_pattern_create_linear (x0, y0, x1, y1);
-      cairo_pattern_add_color_stop_rgba (linpat, 0, a->border.color[0], a->border.color[1], a->border.color[2], a->border.alpha);
-      cairo_pattern_add_color_stop_rgba (linpat, 1, a->border.color[0], a->border.color[1], a->border.color[2], 0);
-      cairo_set_source (c, linpat);
-      */
-      cairo_set_source_rgba (c, pix->border.color[0], pix->border.color[1], pix->border.color[2], pix->border.alpha);
-
-      cairo_stroke (c);
-      //cairo_pattern_destroy (linpat);
-   }
+	Pmap *pix = (active == 0) ? (&a->pix) : (&a->pix_active);
+
+	if (pix->back.alpha > 0.0) {
+		//printf("    draw_background (%d %d) RGBA (%lf, %lf, %lf, %lf)\n", a->posx, a->posy, pix->back.color[0], pix->back.color[1], pix->back.color[2], pix->back.alpha);
+		draw_rect(c, pix->border.width, pix->border.width, a->width-(2.0 * pix->border.width), a->height-(2.0*pix->border.width), pix->border.rounded - pix->border.width/1.571);
+		cairo_set_source_rgba(c, pix->back.color[0], pix->back.color[1], pix->back.color[2], pix->back.alpha);
+
+		cairo_fill(c);
+	}
+
+	if (pix->border.width > 0 && pix->border.alpha > 0.0) {
+		cairo_set_line_width (c, pix->border.width);
+
+		// draw border inside (x, y, width, height)
+		draw_rect(c, pix->border.width/2.0, pix->border.width/2.0, a->width - pix->border.width, a->height - pix->border.width, pix->border.rounded);
+		/*
+		// convert : radian = degre * M_PI/180
+		// définir le dégradé dans un carré de (0,0) (100,100)
+		// ensuite ce dégradé est extrapolé selon le ratio width/height
+		// dans repère (0, 0) (100, 100)
+		double X0, Y0, X1, Y1, degre;
+		// x = X * (a->width / 100), y = Y * (a->height / 100)
+		double x0, y0, x1, y1;
+		X0 = 0;
+		Y0 = 100;
+		X1 = 100;
+		Y1 = 0;
+		degre = 45;
+		// et ensuite faire la changement d'unité du repère
+		// car ce qui doit resté inchangée est les traits et pas la direction
+
+		// il faut d'abord appliquer une rotation de 90° (et -180° si l'angle est supérieur à 180°)
+		// ceci peut être appliqué une fois pour toute au départ
+		// ensuite calculer l'angle dans le nouveau repère
+		// puis faire une rotation de 90°
+		x0 = X0 * ((double)a->width / 100);
+		x1 = X1 * ((double)a->width / 100);
+		y0 = Y0 * ((double)a->height / 100);
+		y1 = Y1 * ((double)a->height / 100);
+
+		x0 = X0 * ((double)a->height / 100);
+		x1 = X1 * ((double)a->height / 100);
+		y0 = Y0 * ((double)a->width / 100);
+		y1 = Y1 * ((double)a->width / 100);
+
+		cairo_pattern_t *linpat;
+		linpat = cairo_pattern_create_linear (x0, y0, x1, y1);
+		cairo_pattern_add_color_stop_rgba (linpat, 0, a->border.color[0], a->border.color[1], a->border.color[2], a->border.alpha);
+		cairo_pattern_add_color_stop_rgba (linpat, 1, a->border.color[0], a->border.color[1], a->border.color[2], 0);
+		cairo_set_source (c, linpat);
+		*/
+		cairo_set_source_rgba (c, pix->border.color[0], pix->border.color[1], pix->border.color[2], pix->border.alpha);
+
+		cairo_stroke (c);
+		//cairo_pattern_destroy (linpat);
+	}
 }
 
 
 void remove_area (Area *a)
 {
-   Area *parent = (Area*)a->parent;
+	Area *parent = (Area*)a->parent;
 
-   parent->list = g_slist_remove(parent->list, a);
-   set_redraw (parent);
+	parent->list = g_slist_remove(parent->list, a);
+	set_redraw (parent);
 
 }
 
 
 void add_area (Area *a)
 {
-   Area *parent = (Area*)a->parent;
+	Area *parent = (Area*)a->parent;
 
-   parent->list = g_slist_remove(parent->list, a);
-   set_redraw (parent);
+	parent->list = g_slist_remove(parent->list, a);
+	set_redraw (parent);
 
 }
 
 
 void free_area (Area *a)
 {
-   GSList *l0;
-   for (l0 = a->list; l0 ; l0 = l0->next)
-      free_area (l0->data);
-
-   if (a->list) {
-      g_slist_free(a->list);
-      a->list = 0;
-   }
-   if (a->pix.pmap) {
-   	XFreePixmap (server.dsp, a->pix.pmap);
-   	a->pix.pmap = 0;
+	GSList *l0;
+	for (l0 = a->list; l0 ; l0 = l0->next)
+		free_area (l0->data);
+
+	if (a->list) {
+		g_slist_free(a->list);
+		a->list = 0;
 	}
-   if (a->pix_active.pmap) {
-   	XFreePixmap (server.dsp, a->pix_active.pmap);
-   	a->pix_active.pmap = 0;
+	if (a->pix.pmap) {
+		XFreePixmap (server.dsp, a->pix.pmap);
+		a->pix.pmap = 0;
+	}
+	if (a->pix_active.pmap) {
+		XFreePixmap (server.dsp, a->pix_active.pmap);
+		a->pix_active.pmap = 0;
 	}
 }
 
 
 void draw_rect(cairo_t *c, double x, double y, double w, double h, double r)
 {
-   if (r > 0.0) {
-      double c1 = 0.55228475 * r;
-
-      cairo_move_to(c, x+r, y);
-      cairo_rel_line_to(c, w-2*r, 0);
-      cairo_rel_curve_to(c, c1, 0.0, r, c1, r, r);
-      cairo_rel_line_to(c, 0, h-2*r);
-      cairo_rel_curve_to(c, 0.0, c1, c1-r, r, -r, r);
-      cairo_rel_line_to (c, -w +2*r, 0);
-      cairo_rel_curve_to (c, -c1, 0, -r, -c1, -r, -r);
-      cairo_rel_line_to (c, 0, -h + 2 * r);
-      cairo_rel_curve_to (c, 0, -c1, r - c1, -r, r, -r);
-   }
-   else
-      cairo_rectangle(c, x, y, w, h);
+	if (r > 0.0) {
+		double c1 = 0.55228475 * r;
+
+		cairo_move_to(c, x+r, y);
+		cairo_rel_line_to(c, w-2*r, 0);
+		cairo_rel_curve_to(c, c1, 0.0, r, c1, r, r);
+		cairo_rel_line_to(c, 0, h-2*r);
+		cairo_rel_curve_to(c, 0.0, c1, c1-r, r, -r, r);
+		cairo_rel_line_to (c, -w +2*r, 0);
+		cairo_rel_curve_to (c, -c1, 0, -r, -c1, -r, -r);
+		cairo_rel_line_to (c, 0, -h + 2 * r);
+		cairo_rel_curve_to (c, 0, -c1, r - c1, -r, r, -r);
+	}
+	else
+		cairo_rectangle(c, x, y, w, h);
 }