X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=src%2Ftaskbar%2Ftask.h;h=a42caa0016e0c9d549fe6a6738e501851f70edb3;hb=b68d4db999a5912c2fc7f29aef8ab75e2f742706;hp=b0c445ac0349f550a9aec5af466d85b33244c450;hpb=8269d3d140bce7dafde5c8448a96d4a90bc557e7;p=chaz%2Ftint2

diff --git a/src/taskbar/task.h b/src/taskbar/task.h
index b0c445a..a42caa0 100644
--- a/src/taskbar/task.h
+++ b/src/taskbar/task.h
@@ -1,6 +1,6 @@
 /**************************************************************************
-* task : 
-* - 
+* task :
+* -
 *
 **************************************************************************/
 
@@ -16,19 +16,19 @@
 // global task parameter
 typedef struct {
    Area area;
-   Area area_active;
-   Area area_inactive;
-   
+
    int text;
    int icon;
-   int icon_size1;
    int centered;
-   int maximum_width;
-   int font_shadow;
-   // icon position
+
    int icon_posy;
+   int icon_size1;
+   int maximum_width;
+   int maximum_height;
    // 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;
@@ -36,16 +36,13 @@ typedef struct {
 
 
 
-// --------------------------------------------------
-// task parameter
 typedef struct {
    // always start with area
    Area area;
-   Area area_active;
-   Area area_inactive;
 
    // TODO: group task with list of windows here
    Window win;
+   int  desktop;
    long *icon_data;
    int icon_width;
    int icon_height;
@@ -53,16 +50,15 @@ typedef struct {
 } Task;
 
 
-Global_task g_task;
-
 
-void add_task (Window win);
+Task *add_task (Window win);
 void remove_task (Task *tsk);
 
-int draw_foreground_task (void *obj, cairo_t *c);
+void draw_task (void *obj, cairo_t *c, int active);
 
 void get_icon (Task *tsk);
 void get_title(Task *tsk);
 
+
 #endif