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

*add* more task states (normal, active, iconified, urgent), with each an own background, font and asb

Browse Source 
*fix* two memleaks
*fix* some code beautification



git-svn-id: http://tint2.googlecode.com/svn/trunk@327 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85
2010-01-09 00:11:01 +00:00
parent 8042047cd4
commit 739af13714
24 changed files with 518 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
src/taskbar/task.c
View File

@@ -35,7 +35,7 @@
#include "tooltip.h"
#include "timer.h"
static const struct timeout* urgent_timeout = 0;
static timeout* urgent_timeout = 0;
static GSList* urgent_list = 0;
const char* task_get_tooltip(void* obj)
@@ -61,11 +61,14 @@ Task *add_task (Window win)
}
else monitor = 0;
new_tsk.area.panel = &panel1[monitor];
new_tsk.current_state = window_is_iconified(win) ? TASK_ICONIFIED : TASK_NORMAL;
// allocate only one title and one icon
// even with task_on_all_desktop and with task_on_all_panel
new_tsk.title = 0;
new_tsk.icon = new_tsk.icon_active = NULL;
int k;
for (k=0; k<TASK_STATE_COUNT; ++k)
new_tsk.icon[k] = 0;
get_title(&new_tsk);
get_icon(&new_tsk);
@@ -87,14 +90,15 @@ Task *add_task (Window win)
new_tsk2->area.parent = tskbar;
new_tsk2->win = new_tsk.win;
new_tsk2->desktop = new_tsk.desktop;
set_task_state(new_tsk2, new_tsk.current_state);
if (new_tsk2->desktop == ALLDESKTOP && server.desktop != j) {
// hide ALLDESKTOP task on non-current desktop
new_tsk2->area.on_screen = 0;
}
new_tsk2->title = new_tsk.title;
new_tsk2->area._get_tooltip_text = task_get_tooltip;
new_tsk2->icon = new_tsk.icon;
new_tsk2->icon_active = new_tsk.icon_active;
for (k=0; k<TASK_STATE_COUNT; ++k)
new_tsk2->icon[k] = new_tsk.icon[k];
new_tsk2->icon_width = new_tsk.icon_width;
new_tsk2->icon_height = new_tsk.icon_height;
tskbar->area.list = g_slist_append(tskbar->area.list, new_tsk2);
@@ -120,12 +124,13 @@ void remove_task (Task *tsk)
//printf("remove_task %s %d\n", tsk->title, tsk->desktop);
if (tsk->title)
free (tsk->title);
if (tsk->icon) {
imlib_context_set_image(tsk->icon);
imlib_free_image();
imlib_context_set_image(tsk->icon_active);
imlib_free_image();
tsk->icon = tsk->icon_active = NULL;
int k;
for (k=0; k<TASK_STATE_COUNT; ++k) {
if (tsk->icon[k]) {
imlib_context_set_image(tsk->icon[k]);
imlib_free_image();
tsk->icon[k] = 0;
}
}
int i, j;
@@ -151,8 +156,7 @@ void remove_task (Task *tsk)
if (g_slist_find(urgent_list, tsk2))
del_urgent(tsk2);
XFreePixmap (server.dsp, tsk2->area.pix.pmap);
XFreePixmap (server.dsp, tsk2->area.pix_active.pmap);
XFreePixmap (server.dsp, tsk2->area.pix);
free(tsk2);
}
}
@@ -203,12 +207,13 @@ void get_icon (Task *tsk)
XWMHints *hints = 0;
long *data = 0;
if (tsk->icon) {
imlib_context_set_image(tsk->icon);
imlib_free_image();
imlib_context_set_image(tsk->icon_active);
imlib_free_image();
tsk->icon = tsk->icon_active = NULL;
int k;
for (k=0; k<TASK_STATE_COUNT; ++k) {
if (tsk->icon[k]) {
imlib_context_set_image(tsk->icon[k]);
imlib_free_image();
tsk->icon[k] = 0;
}
}
tsk->area.redraw = 1;
@@ -259,27 +264,25 @@ void get_icon (Task *tsk)
int w, h;
w = imlib_image_get_width();
h = imlib_image_get_height();
tsk->icon = imlib_create_cropped_scaled_image(0, 0, w, h, panel->g_task.icon_size1, panel->g_task.icon_size1);
Imlib_Image orig_image = imlib_create_cropped_scaled_image(0, 0, w, h, panel->g_task.icon_size1, panel->g_task.icon_size1);
imlib_free_image();
imlib_context_set_image(tsk->icon);
imlib_context_set_image(orig_image);
tsk->icon_width = imlib_image_get_width();
tsk->icon_height = imlib_image_get_height();
tsk->icon_active = imlib_clone_image();
DATA32 *data32;
if (panel->g_task.alpha != 100 || panel->g_task.saturation != 0 || panel->g_task.brightness != 0) {
data32 = imlib_image_get_data();
adjust_asb(data32, tsk->icon_width, tsk->icon_height, panel->g_task.alpha, (float)panel->g_task.saturation/100, (float)panel->g_task.brightness/100);
imlib_image_put_back_data(data32);
}
if (panel->g_task.alpha_active != 100 || panel->g_task.saturation_active != 0 || panel->g_task.brightness_active != 0) {
imlib_context_set_image(tsk->icon_active);
data32 = imlib_image_get_data();
adjust_asb(data32, tsk->icon_width, tsk->icon_height, panel->g_task.alpha_active, (float)panel->g_task.saturation_active/100, (float)panel->g_task.brightness_active/100);
imlib_image_put_back_data(data32);
for (k=0; k<TASK_STATE_COUNT; ++k) {
imlib_context_set_image(orig_image);
tsk->icon[k] = imlib_clone_image();
imlib_context_set_image(tsk->icon[k]);
DATA32 *data32;
if (panel->g_task.alpha[k] != 100 || panel->g_task.saturation[k] != 0 || panel->g_task.brightness[k] != 0) {
data32 = imlib_image_get_data();
adjust_asb(data32, tsk->icon_width, tsk->icon_height, panel->g_task.alpha[k], (float)panel->g_task.saturation[k]/100, (float)panel->g_task.brightness[k]/100);
imlib_image_put_back_data(data32);
}
}
imlib_context_set_image(orig_image);
imlib_free_image();
if (hints)
XFree(hints);
@@ -288,9 +291,9 @@ void get_icon (Task *tsk)
}
void draw_task_icon (Task *tsk, int text_width, int active)
void draw_task_icon (Task *tsk, int text_width)
{
if (tsk->icon == NULL || tsk->icon_active == NULL) return;
if (tsk->icon[tsk->current_state] == 0) return;
// Find pos
int pos_x;
@@ -301,33 +304,25 @@ void draw_task_icon (Task *tsk, int text_width, int active)
else
pos_x = (tsk->area.width - panel->g_task.icon_size1) / 2;
}
else pos_x = panel->g_task.area.paddingxlr + panel->g_task.area.pix.border.width;
else pos_x = panel->g_task.area.paddingxlr + tsk->area.bg->border.width;
// Render
Pixmap *pmap;
if (active == 0) {
imlib_context_set_image (tsk->icon);
pmap = &tsk->area.pix.pmap;
}
else {
imlib_context_set_image (tsk->icon_active);
pmap = &tsk->area.pix_active.pmap;
}
imlib_context_set_image (tsk->icon[tsk->current_state]);
if (real_transparency) {
render_image(*pmap, pos_x, panel->g_task.icon_posy, imlib_image_get_width(), imlib_image_get_height() );
render_image(tsk->area.pix, pos_x, panel->g_task.icon_posy, imlib_image_get_width(), imlib_image_get_height() );
}
else {
imlib_context_set_drawable (*pmap);
imlib_context_set_drawable(tsk->area.pix);
imlib_render_image_on_drawable (pos_x, panel->g_task.icon_posy);
}
}
void draw_task (void *obj, cairo_t *c, int active)
void draw_task (void *obj, cairo_t *c)
{
Task *tsk = obj;
PangoLayout *layout;
config_color *config_text;
Color *config_text;
int width=0, height;
Panel *panel = (Panel*)tsk->area.panel;
@@ -348,8 +343,7 @@ void draw_task (void *obj, cairo_t *c, int active)
pango_layout_get_pixel_size (layout, &width, &height);
if (active) config_text = &panel->g_task.font_active;
else config_text = &panel->g_task.font;
config_text = &panel->g_task.font[tsk->current_state];
cairo_set_source_rgba (c, config_text->color[0], config_text->color[1], config_text->color[2], config_text->alpha);
@@ -368,7 +362,7 @@ void draw_task (void *obj, cairo_t *c, int active)
if (panel->g_task.icon) {
// icon use same opacity as text
draw_task_icon (tsk, width, active);
draw_task_icon (tsk, width);
}
}
@@ -433,7 +427,8 @@ void active_task()
for (j=0 ; j < panel1[i].nb_desktop ; j++) {
for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
tsk1 = l0->data;
tsk1->area.is_active = 0;
if (tsk1->win == task_active->win)
set_task_state(tsk1, window_is_iconified(tsk1->win) ? TASK_ICONIFIED : TASK_NORMAL);
}
}
}
@@ -449,18 +444,18 @@ void active_task()
if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
if (w2) tsk2 = task_get_task(w2);
}
if ( g_slist_find(urgent_list, tsk2) ) {
if ( g_slist_find(urgent_list, tsk2) )
del_urgent(tsk2);
}
// put active state on all task (multi_desktop)
if (tsk2) {
for (i=0 ; i < nb_panel ; i++) {
for (j=0 ; j < panel1[i].nb_desktop ; j++) {
for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
tsk1 = l0->data;
if (tsk1->win == tsk2->win) {
tsk1->area.is_active = 1;
}
if (tsk1->win == tsk2->win)
set_task_state(tsk1, TASK_ACTIVE);
}
}
}
@@ -469,15 +464,24 @@ void active_task()
}
void set_task_state(Task *tsk, int state)
{
tsk->current_state = state;
tsk->area.bg = panel1[0].g_task.background[state];
tsk->area.redraw = 1;
}
void blink_urgent(void* arg)
{
GSList* urgent_task = urgent_list;
while (urgent_task) {
Task* t = urgent_task->data;
if ( t->urgent_tick < max_tick_urgent) {
t->area.is_active = !t->area.is_active;
t->area.redraw = 1;
t->urgent_tick++;
if (t->urgent_tick++ % 2)
set_task_state(t, TASK_URGENT);
else
set_task_state(t, window_is_iconified(t->win) ? TASK_ICONIFIED : TASK_NORMAL);
}
urgent_task = urgent_task->next;
}
@@ -525,6 +529,7 @@ void del_urgent(Task *tsk)
urgent_list = g_slist_remove(urgent_list, it->data);
it = it->next;
}
g_slist_free(urgent_del);
if (!urgent_list) {
stop_timeout(urgent_timeout);
urgent_timeout = 0;

21
src/taskbar/task.h
View File

@@ -13,6 +13,8 @@
#include "common.h"
enum { TASK_NORMAL, TASK_ACTIVE, TASK_ICONIFIED, TASK_URGENT, TASK_STATE_COUNT };
// --------------------------------------------------
// global task parameter
typedef struct {
@@ -26,15 +28,19 @@ typedef struct {
int icon_size1;
int maximum_width;
int maximum_height;
int alpha, saturation, brightness;
int alpha_active, saturation_active, brightness_active;
int alpha[TASK_STATE_COUNT];
int saturation[TASK_STATE_COUNT];
int brightness[TASK_STATE_COUNT];
int config_asb_mask;
Background* background[TASK_STATE_COUNT];
int config_background_mask;
// starting position for text ~ task_padding + task_border + icon_size
double text_posx, text_posy;
int font_shadow;
PangoFontDescription *font_desc;
config_color font;
config_color font_active;
Color font[TASK_STATE_COUNT];
int config_font_mask;
} Global_task;
@@ -46,8 +52,8 @@ typedef struct {
// TODO: group task with list of windows here
Window win;
int desktop;
Imlib_Image icon;
Imlib_Image icon_active;
int current_state;
Imlib_Image icon[TASK_STATE_COUNT];
unsigned int icon_width;
unsigned int icon_height;
char *title;
@@ -58,11 +64,12 @@ typedef struct {
Task *add_task (Window win);
void remove_task (Task *tsk);
void draw_task (void *obj, cairo_t *c, int active);
void draw_task (void *obj, cairo_t *c);
void get_icon (Task *tsk);
void get_title(Task *tsk);
void active_task();
void set_task_state(Task* tsk, int state);
Task *next_task (Task *tsk);
Task *prev_task (Task *tsk);

79
src/taskbar/taskbar.c
View File

@@ -48,36 +48,62 @@ void init_taskbar()
}
// taskbar
panel->g_taskbar._resize = resize_taskbar;
panel->g_taskbar.redraw = 1;
panel->g_taskbar.on_screen = 1;
panel->g_taskbar.area._resize = resize_taskbar;
panel->g_taskbar.area.redraw = 1;
panel->g_taskbar.area.on_screen = 1;
if (panel_horizontal) {
panel->g_taskbar.posy = panel->area.pix.border.width + panel->area.paddingy;
panel->g_taskbar.height = panel->area.height - (2 * panel->g_taskbar.posy);
panel->g_taskbar.area.posy = panel->area.bg->border.width + panel->area.paddingy;
panel->g_taskbar.area.height = panel->area.height - (2 * panel->g_taskbar.area.posy);
}
else {
panel->g_taskbar.posx = panel->area.pix.border.width + panel->area.paddingy;
panel->g_taskbar.width = panel->area.width - (2 * panel->g_taskbar.posx);
panel->g_taskbar.area.posx = panel->area.bg->border.width + panel->area.paddingy;
panel->g_taskbar.area.width = panel->area.width - (2 * panel->g_taskbar.area.posx);
}
// task
panel->g_task.area._draw_foreground = draw_task;
panel->g_task.area.use_active = 1;
panel->g_task.area.redraw = 1;
panel->g_task.area.on_screen = 1;
if ((panel->g_task.config_asb_mask & (1<<TASK_ACTIVE)) == 0) {
panel->g_task.alpha[TASK_ACTIVE] = panel->g_task.alpha[TASK_NORMAL];
panel->g_task.saturation[TASK_ACTIVE] = panel->g_task.saturation[TASK_NORMAL];
panel->g_task.brightness[TASK_ACTIVE] = panel->g_task.brightness[TASK_NORMAL];
}
if ((panel->g_task.config_asb_mask & (1<<TASK_ICONIFIED)) == 0) {
panel->g_task.alpha[TASK_ICONIFIED] = panel->g_task.alpha[TASK_NORMAL];
panel->g_task.saturation[TASK_ICONIFIED] = panel->g_task.saturation[TASK_NORMAL];
panel->g_task.brightness[TASK_ICONIFIED] = panel->g_task.brightness[TASK_NORMAL];
}
if ((panel->g_task.config_asb_mask & (1<<TASK_URGENT)) == 0) {
panel->g_task.alpha[TASK_URGENT] = panel->g_task.alpha[TASK_ACTIVE];
panel->g_task.saturation[TASK_URGENT] = panel->g_task.saturation[TASK_ACTIVE];
panel->g_task.brightness[TASK_URGENT] = panel->g_task.brightness[TASK_ACTIVE];
}
if ((panel->g_task.config_font_mask & (1<<TASK_ACTIVE)) == 0) panel->g_task.font[TASK_ACTIVE] = panel->g_task.font[TASK_NORMAL];
if ((panel->g_task.config_font_mask & (1<<TASK_ICONIFIED)) == 0) panel->g_task.font[TASK_ICONIFIED] = panel->g_task.font[TASK_NORMAL];
if ((panel->g_task.config_font_mask & (1<<TASK_URGENT)) == 0) panel->g_task.font[TASK_URGENT] = panel->g_task.font[TASK_ACTIVE];
if ((panel->g_task.config_background_mask & (1<<TASK_ACTIVE)) == 0) panel->g_task.background[TASK_ACTIVE] = panel->g_task.background[TASK_NORMAL];
if ((panel->g_task.config_background_mask & (1<<TASK_ICONIFIED)) == 0) panel->g_task.background[TASK_ICONIFIED] = panel->g_task.background[TASK_NORMAL];
if ((panel->g_task.config_background_mask & (1<<TASK_URGENT)) == 0) panel->g_task.background[TASK_URGENT] = panel->g_task.background[TASK_ACTIVE];
if (panel_horizontal) {
panel->g_task.area.posy = panel->g_taskbar.posy + panel->g_taskbar.pix.border.width + panel->g_taskbar.paddingy;
panel->g_task.area.posy = panel->g_taskbar.area.posy + panel->g_taskbar.bg->border.width + panel->g_taskbar.area.paddingy;
panel->g_task.area.height = panel->area.height - (2 * panel->g_task.area.posy);
}
else {
panel->g_task.area.posx = panel->g_taskbar.posx + panel->g_taskbar.pix.border.width + panel->g_taskbar.paddingy;
panel->g_task.area.posx = panel->g_taskbar.area.posx + panel->g_taskbar.bg->border.width + panel->g_taskbar.area.paddingy;
panel->g_task.area.width = panel->area.width - (2 * panel->g_task.area.posx);
panel->g_task.area.height = panel->g_task.maximum_height;
}
if (panel->g_task.area.pix.border.rounded > panel->g_task.area.height/2) {
panel->g_task.area.pix.border.rounded = panel->g_task.area.height/2;
panel->g_task.area.pix_active.border.rounded = panel->g_task.area.pix.border.rounded;
int k;
for (k=0; k<TASK_STATE_COUNT; ++k) {
if (panel->g_task.background[k]->border.rounded > panel->g_task.area.height/2) {
printf("task%sbackground_id is too big. Please fix your tint2rc\n", k==0 ? "_" : k==1 ? "_active_" : k==2 ? "_iconified_" : "_urgent_");
g_array_append_val(backgrounds, *panel->g_task.background[k]);
panel->g_task.background[k] = &g_array_index(backgrounds, Background, backgrounds->len-1);
panel->g_task.background[k]->border.rounded = panel->g_task.area.height/2;
}
}
// compute vertical position : text and icon
@@ -87,7 +113,7 @@ void init_taskbar()
if (!panel->g_task.maximum_width && panel_horizontal)
panel->g_task.maximum_width = server.monitor[panel->monitor].width;
panel->g_task.text_posx = panel->g_task.area.pix.border.width + panel->g_task.area.paddingxlr;
panel->g_task.text_posx = panel->g_task.background[0]->border.width + panel->g_task.area.paddingxlr;
panel->g_task.text_posy = (panel->g_task.area.height - height) / 2.0;
if (panel->g_task.icon) {
panel->g_task.icon_size1 = panel->g_task.area.height - (2 * panel->g_task.area.paddingy);
@@ -103,8 +129,8 @@ void init_taskbar()
tskbar = &panel->taskbar[j];
memcpy(&tskbar->area, &panel->g_taskbar, sizeof(Area));
tskbar->desktop = j;
if (j == server.desktop && tskbar->area.use_active)
tskbar->area.is_active = 1;
if (j == server.desktop && panel->g_taskbar.use_active)
tskbar->area.bg = panel->g_taskbar.bg_active;
// add taskbar to the panel
panel->area.list = g_slist_append(panel->area.list, tskbar);
@@ -237,10 +263,7 @@ void resize_taskbar(void *obj)
//printf("resize_taskbar : posx et width des taches\n");
taskbar->area.redraw = 1;
if (taskbar->area.is_active && taskbar->area.use_active)
border_width = taskbar->area.pix_active.border.width;
else
border_width = taskbar->area.pix.border.width;
border_width = taskbar->area.bg->border.width;
if (panel_horizontal) {
int pixel_width, modulo_width=0;
@@ -250,8 +273,8 @@ void resize_taskbar(void *obj)
task_count = g_slist_length(taskbar->area.list);
if (!task_count) pixel_width = panel->g_task.maximum_width;
else {
taskbar_width = taskbar->area.width - (2 * border_width) - (2 * panel->g_taskbar.paddingxlr);
if (task_count>1) taskbar_width -= ((task_count-1) * panel->g_taskbar.paddingx);
taskbar_width = taskbar->area.width - (2 * border_width) - (2 * panel->g_taskbar.area.paddingxlr);
if (task_count>1) taskbar_width -= ((task_count-1) * panel->g_taskbar.area.paddingx);
pixel_width = taskbar_width / task_count;
if (pixel_width > panel->g_task.maximum_width)
@@ -262,7 +285,7 @@ void resize_taskbar(void *obj)
taskbar->task_width = pixel_width;
taskbar->task_modulo = modulo_width;
taskbar->text_width = pixel_width - panel->g_task.text_posx - panel->g_task.area.pix.border.width - panel->g_task.area.paddingx;
taskbar->text_width = pixel_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
// change pos_x and width for all tasks
x = taskbar->area.posx + border_width + taskbar->area.paddingxlr;
@@ -276,7 +299,7 @@ void resize_taskbar(void *obj)
modulo_width--;
}
x += tsk->area.width + panel->g_taskbar.paddingx;
x += tsk->area.width + panel->g_taskbar.area.paddingx;
}
}
else {
@@ -287,8 +310,8 @@ void resize_taskbar(void *obj)
task_count = g_slist_length(taskbar->area.list);
if (!task_count) pixel_height = panel->g_task.maximum_height;
else {
taskbar_height = taskbar->area.height - (2 * border_width) - (2 * panel->g_taskbar.paddingxlr);
if (task_count>1) taskbar_height -= ((task_count-1) * panel->g_taskbar.paddingx);
taskbar_height = taskbar->area.height - (2 * border_width) - (2 * panel->g_taskbar.area.paddingxlr);
if (task_count>1) taskbar_height -= ((task_count-1) * panel->g_taskbar.area.paddingx);
pixel_height = taskbar_height / task_count;
if (pixel_height > panel->g_task.maximum_height)
@@ -299,7 +322,7 @@ void resize_taskbar(void *obj)
taskbar->task_width = pixel_height;
taskbar->task_modulo = modulo_height;
taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.paddingy) - panel->g_task.text_posx - panel->g_task.area.pix.border.width - panel->g_task.area.paddingx;
taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
// change pos_y and height for all tasks
y = taskbar->area.posy + border_width + taskbar->area.paddingxlr;
@@ -313,7 +336,7 @@ void resize_taskbar(void *obj)
modulo_height--;
}
y += tsk->area.height + panel->g_taskbar.paddingx;
y += tsk->area.height + panel->g_taskbar.area.paddingx;
}
}
}

7
src/taskbar/taskbar.h
View File

@@ -24,6 +24,13 @@ typedef struct {
} Taskbar;
typedef struct {
//always start with area
Area area;
Background* bg;
Background* bg_active;
int use_active;
} Global_taskbar;
void init_taskbar();
void cleanup_taskbar();