set_redraw(l->data);
//printf("draw area posx %d, width %d\n", a->posx, a->width);
set_redraw(l->data);
//printf("draw area posx %d, width %d\n", a->posx, a->width);
- 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);
+ if (a->pix == 0) printf("empty area posx %d, width %d\n", a->posx, a->width);
+ XCopyArea (server.dsp, a->pix, ((Panel *)a->panel)->temp_pmap, server.gc, 0, 0, a->width, a->height, a->posx, a->posy);
- 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 (a->pix) XFreePixmap (server.dsp, a->pix);
+ a->pix = XCreatePixmap (server.dsp, server.root_win, a->width, a->height, server.depth);
- 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);
+ clear_pixmap(a->pix, 0 ,0, a->width, a->height);
+ XCopyArea (server.dsp, ((Panel *)a->panel)->temp_pmap, a->pix, server.gc, a->posx, a->posy, a->width, a->height, 0, 0);
- cs = cairo_xlib_surface_create (server.dsp, *pmap, server.visual, a->width, a->height);
+ cs = cairo_xlib_surface_create (server.dsp, a->pix, server.visual, a->width, a->height);
//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);
//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);
-
+ draw_rect(c, a->bg->border.width, a->bg->border.width, a->width-(2.0 * a->bg->border.width), a->height-(2.0*a->bg->border.width), a->bg->border.rounded - a->bg->border.width/1.571);
+ cairo_set_source_rgba(c, a->bg->back.color[0], a->bg->back.color[1], a->bg->back.color[2], a->bg->back.alpha);
- if (pix->border.width > 0 && pix->border.alpha > 0.0) {
- cairo_set_line_width (c, pix->border.width);
+ if (a->bg->border.width > 0 && a->bg->border.alpha > 0.0) {
+ cairo_set_line_width (c, a->bg->border.width);
// draw border inside (x, y, width, height)
// 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);
+ draw_rect(c, a->bg->border.width/2.0, a->bg->border.width/2.0, a->width - a->bg->border.width, a->height - a->bg->border.width, a->bg->border.rounded);
/*
// convert : radian = degre * M_PI/180
// définir le dégradé dans un carré de (0,0) (100,100)
/*
// convert : radian = degre * M_PI/180
// définir le dégradé dans un carré de (0,0) (100,100)
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_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_set_source_rgba (c, a->bg->border.color[0], a->bg->border.color[1], a->bg->border.color[2], a->bg->border.alpha);
- 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;
+ if (a->pix) {
+ XFreePixmap (server.dsp, a->pix);
+ a->pix = 0;
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);
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);