X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftask.h;h=051c7198472360ce1cf114ea5f8dda5dcfce06f0;hb=9ad50cc90314fb960c8eea1d41f912f6d9e402fd;hp=b0c445ac0349f550a9aec5af466d85b33244c450;hpb=8269d3d140bce7dafde5c8448a96d4a90bc557e7;p=chaz%2Ftint2

diff --git a/src/taskbar/task.h b/src/taskbar/task.h
index b0c445a..051c719 100644
--- a/src/taskbar/task.h
+++ b/src/taskbar/task.h
@@ -1,6 +1,6 @@
 /**************************************************************************
-* task : 
-* - 
+* task :
+* -
 *
 **************************************************************************/
 
@@ -9,60 +9,61 @@
 
 #include <X11/Xlib.h>
 #include <pango/pangocairo.h>
+#include <Imlib2.h>
 #include "common.h"
 
 
 // --------------------------------------------------
 // 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;
-   // 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 hue, saturation, brightness;
+   int hue_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;
-   Area area_active;
-   Area area_inactive;
-
-   // 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;
+	// ARGB icon
+	unsigned int *icon_data;
+	unsigned int *icon_data_active;
+	int icon_width;
+	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);
 
-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