Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug with active task

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@24 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr
2009-01-17 14:07:56 +00:00
parent e2e134b302
commit 0ecea24ee6
12 changed files with 356 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/util/area.c
View File

@@ -1,9 +1,9 @@
/**************************************************************************
*
* Tint2 : area
*
*
* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
* as published by the Free Software Foundation.
@@ -33,74 +33,80 @@
void refresh (Area *a)
{
if (a->redraw) {
if (a->draw)
a->draw(a);
else
draw(a);
}
XCopyArea (server.dsp, a->pmap, server.pmap, server.gc, 0, 0, a->width, a->height, a->posx, a->posy);
//printf("draw pix\n");
draw(a, 0);
if (a->use_active)
draw(a, 1);
a->redraw = 0;
//printf("end draw pix\n");
}
Pixmap *pmap = (a->is_active == 0) ? (&a->pix.pmap) : (&a->pix_active.pmap);
// draw current Area
XCopyArea (server.dsp, *pmap, server.pmap, server.gc, 0, 0, a->width, a->height, a->posx, a->posy);
// and then refresh child object
GSList *l = a->list;
// refresh child object (after refreshing parent)
for (; l ; l = l->next)
refresh(l->data);
//printf("end refresh area\n");
}
void set_redraw (Area *a)
{
a->redraw = 1;
GSList *l;
for (l = a->list ; l ; l = l->next)
for (l = a->list ; l ; l = l->next)
set_redraw(l->data);
}
void draw (Area *a)
void draw (Area *a, int active)
{
cairo_surface_t *cs;
cairo_t *c;
Pixmap *pmap = (active == 0) ? (&a->pix.pmap) : (&a->pix_active.pmap);
//printf("begin draw area\n");
if (a->pmap) XFreePixmap (server.dsp, a->pmap);
a->pmap = server_create_pixmap (a->width, a->height);
if (*pmap) XFreePixmap (server.dsp, *pmap);
*pmap = server_create_pixmap (a->width, a->height);
// add layer of root pixmap
XCopyArea (server.dsp, server.pmap, a->pmap, server.gc, a->posx, a->posy, a->width, a->height, 0, 0);
XCopyArea (server.dsp, server.pmap, *pmap, server.gc, a->posx, a->posy, a->width, a->height, 0, 0);
cs = cairo_xlib_surface_create (server.dsp, a->pmap, server.visual, a->width, a->height);
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);
draw_background (a, c);
draw_background (a, c, active);
if (a->draw_foreground)
a->draw_foreground(a, c);
a->draw_foreground(a, c, active);
cairo_destroy (c);
cairo_surface_destroy (cs);
a->redraw = 0;
}
void draw_background (Area *a, cairo_t *c)
void draw_background (Area *a, cairo_t *c, int active)
{
if (a->back.alpha > 0.0) {
//printf(" draw_background %d %d\n", a->width, a->height);
draw_rect(c, a->border.width, a->border.width, a->width-(2.0 * a->border.width), a->height-(2.0*a->border.width), a->border.rounded - a->border.width/1.571);
cairo_set_source_rgba(c, a->back.color[0], a->back.color[1], a->back.color[2], a->back.alpha);
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 (a->border.width > 0 && a->border.alpha > 0.0) {
cairo_set_line_width (c, a->border.width);
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, a->border.width/2.0, a->border.width/2.0, a->width - a->border.width, a->height - a->border.width, a->border.rounded);
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)
@@ -116,7 +122,7 @@ void draw_background (Area *a, cairo_t *c)
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
@@ -125,21 +131,21 @@ void draw_background (Area *a, cairo_t *c)
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);
printf("repère (%d, %d) points (%lf, %lf) (%lf, %lf)\n", a->width, a->height, x0, y0, x1, y1);
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, a->border.color[0], a->border.color[1], a->border.color[2], a->border.alpha);
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);
}
@@ -149,7 +155,7 @@ void draw_background (Area *a, cairo_t *c)
void remove_area (Area *a)
{
Area *parent;
parent = (Area*)a->parent;
parent->list = g_slist_remove(parent->list, a);
set_redraw (parent);
@@ -160,7 +166,7 @@ void remove_area (Area *a)
void add_area (Area *a)
{
Area *parent;
parent = (Area*)a->parent;
parent->list = g_slist_remove(parent->list, a);
set_redraw (parent);
@@ -171,12 +177,12 @@ void add_area (Area *a)
void free_area (Area *a)
{
GSList *l0;
for (l0 = a->list; l0 ; l0 = l0->next)
for (l0 = a->list; l0 ; l0 = l0->next)
free_area (l0->data);
if (a->list) {
g_slist_free(a->list);
a->list = 0;
a->list = 0;
}
}

59
src/util/area.h
View File

@@ -1,26 +1,28 @@
/**************************************************************************
* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
*
*
* base class for all graphical objects (panel, taskbar, task, systray, clock, ...).
* Area is at the begining of each graphical object so &object == &area.
*
* Area is at the begining of each object (&object == &area).
*
* Area manage the background and border drawing, size and padding.
* Area also manage the tree of visible objects
* Each Area have 2 Pixmap (pix and pix_active).
*
* Area also manage the tree of visible objects. Parent object drawn before child object.
* panel -> taskbars -> tasks
* -> systray -> icons
* -> clock
*
* draw_foreground(obj) and draw(obj) are virtual function.
*
*
* draw_foreground(obj) is virtual function.
*
* TODO :
* resize_width(obj, width) = 0 : fonction virtuelle à redéfinir
* recalcule la largeur de l'objet (car la hauteur est fixe)
* - taille systray calculée à partir de la liste des icones
* - taille clock calculée à partir de l'heure
* - taille d'une tache calculée à partir de la taskbar (ajout, suppression, taille)
* - taille d'une taskbar calculée à partir de la taille du panel et des autres objets
*
*
* voir resize_taskbar(), resize_clock() et resize_tasks()
* variable widthChanged ou bien emission d'un signal ???
* voir config(obj) configure un objet (définie les positions verticales)
*
**************************************************************************/
@@ -34,7 +36,6 @@
#include "common.h"
typedef struct
{
double color[3];
@@ -51,31 +52,37 @@ typedef struct
} Color;
typedef struct
{
Pixmap pmap;
Color back;
Border border;
} Pmap;
// TODO: isoler 'draw' de 'refresh'
// TODO: isoler les données locales des données communes aux freres
typedef struct {
// TODO: isoler 'draw' de 'refresh'
// TODO: isoler les données locales des données communes aux freres
// absolute coordinate in panel
int posx, posy;
int width, height;
Pixmap pmap;
Pmap pix;
Pmap pix_active;
// list of child : Area object
GSList *list;
// need redraw Pixmap
int redraw;
int paddingx, paddingy;
int redraw;
int use_active, is_active;
int paddingx, paddingy;
// parent Area
void *parent;
Color back;
Border border;
// each object can overwrite following function
void (*draw)(void *obj);
void (*draw_foreground)(void *obj, cairo_t *c);
void (*draw_foreground)(void *obj, cairo_t *c, int active);
void (*add_child)(void *obj);
int (*remove_child)(void *obj);
int (*remove_child)(void *obj);
} Area;
@@ -85,8 +92,10 @@ void refresh (Area *a);
// set 'redraw' on an area and childs
void set_redraw (Area *a);
void draw (Area *a);
void draw_background (Area *a, cairo_t *c);
// draw pixmap and pixmap_active
void draw (Area *a, int active);
void draw_background (Area *a, cairo_t *c, int active);
void remove_area (Area *a);
void add_area (Area *a);