fixed : lost of active task on SIGUSR1

[chaz/tint2] / src / taskbar / task.h

diff --git a/src/taskbar/task.h b/src/taskbar/task.h
index ec1544d09e5b9ce23cb23045beffda466380a42b..b29e57624995d145284a9a5e7306792582f8a5cf 100644 (file)
--- a/src/taskbar/task.h
+++ b/src/taskbar/task.h
@@ -9,56 +9,60 @@
 
 #include <X11/Xlib.h>
 #include <pango/pangocairo.h>
+#include <Imlib2.h>
 #include "common.h"
 
 
 // --------------------------------------------------
 // global task parameter
 typedef struct {
-   Area area;
-
-   int text;
-   int icon;
-   int icon_size1;
-   int centered;
-   int maximum_width;
-   int font_shadow;
-   // icon position
-   int icon_posy;
-   // starting position for text ~ task_padding + task_border + icon_size
-   double text_posx, text_posy;
-   PangoFontDescription *font_desc;
-   config_color font;
-   config_color font_active;
+       Area area;
+
+       int text;
+       int icon;
+       int centered;
+
+       int icon_posy;
+       int icon_size1;
+       int maximum_width;
+       int maximum_height;
+       int alpha, saturation, brightness;
+       int alpha_active, saturation_active, brightness_active;
+       // 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;
 } Global_task;
 
 
 
-// --------------------------------------------------
-// task parameter
 typedef struct {
-   // always start with area
-   Area area;
-
-   // TODO: group task with list of windows here
-   Window win;
-   long *icon_data;
-   int icon_width;
-   int icon_height;
-   char *title;
+       // always start with area
+       Area area;
+
+       // TODO: group task with list of windows here
+       Window win;
+       int  desktop;
+       Imlib_Image icon;
+       Imlib_Image icon_active;
+       unsigned int icon_width;
+       unsigned int icon_height;
+       char *title;
 } Task;
 
 
-Global_task g_task;
-
 
-void add_task (Window win);
+Task *add_task (Window win);
 void remove_task (Task *tsk);
 
-void draw_foreground_task (void *obj, cairo_t *c, int active);
+void draw_task (void *obj, cairo_t *c, int active);
 
 void get_icon (Task *tsk);
 void get_title(Task *tsk);
+void active_task();
 
 #endif