cleanup code

[chaz/tint2] / src / panel.h

diff --git a/src/panel.h b/src/panel.h
index a53bc458bb7add6ac33d993a2c1ab55be10b497d..833666644ff2b98800b640bb7cb2f30395d5a95b 100644 (file)
--- a/src/panel.h
+++ b/src/panel.h
@@ -19,6 +19,7 @@
 #include "task.h"
 #include "taskbar.h"
 #include "systraybar.h"
+#include "launcher.h"
 
 #ifdef ENABLE_BATTERY
 #include "battery.h"
@@ -49,19 +50,21 @@ extern int panel_position;
 extern int panel_horizontal;
 
 extern int panel_refresh;
+extern int task_dragged;
 
 //panel autohide
-enum { STRUT_MINIMUM, STRUT_FOLLOW_SIZE };
+enum { STRUT_MINIMUM, STRUT_FOLLOW_SIZE, STRUT_NONE };
 extern int panel_autohide;
 extern int panel_autohide_show_timeout;
 extern int panel_autohide_hide_timeout;
 extern int panel_autohide_height;  // for vertical panels this is of course the width
 extern int panel_strut_policy;
+extern char *panel_items_order;
 
-extern Task *task_active;
-extern Task *task_drag;
 extern int  max_tick_urgent;
 
+extern GArray* backgrounds;
+
 extern Imlib_Image default_icon;
 
 
@@ -85,7 +88,7 @@ typedef struct {
 
        // --------------------------------------------------
        // task and taskbar parameter per panel
-       Area g_taskbar;
+       Global_taskbar g_taskbar;
        Global_task g_task;
 
        // --------------------------------------------------
@@ -105,10 +108,14 @@ typedef struct {
 #ifdef ENABLE_BATTERY
        Battery battery;
 #endif
+
+       Launcher launcher;
+
+       // autohide
        int is_hidden;
        int hidden_width, hidden_height;
        Pixmap hidden_pixmap;
-       const struct timeout* autohide_timeout;
+       timeout* autohide_timeout;
 } Panel;
 
 
@@ -116,16 +123,21 @@ extern Panel panel_config;
 extern Panel *panel1;
 extern int  nb_panel;
 
+
+// default global data
+void default_panel();
+
+// freed memory
+void cleanup_panel();
+
 // realloc panels according to number of monitor
 // use panel_config as default value
 void init_panel();
 
 void init_panel_size_and_position(Panel *panel);
-void cleanup_panel();
-void resize_panel(void *obj);
 
+void set_panel_items_order(Panel *p);
 void set_panel_properties(Panel *p);
-void visible_object();
 
 // draw background panel
 void set_panel_background(Panel *p);
@@ -135,11 +147,15 @@ Panel *get_panel(Window win);
 
 Taskbar *click_taskbar (Panel *panel, int x, int y);
 Task *click_task (Panel *panel, int x, int y);
+Launcher *click_launcher (Panel *panel, int x, int y);
+LauncherIcon *click_launcher_icon (Panel *panel, int x, int y);
 int click_padding(Panel *panel, int x, int y);
 int click_clock(Panel *panel, int x, int y);
 Area* click_area(Panel *panel, int x, int y);
 
-void autohide_trigger_show();
-void autohide_trigger_hide();
+void autohide_show(void* p);
+void autohide_hide(void* p);
+void autohide_trigger_show(Panel* p);
+void autohide_trigger_hide(Panel* p);
 
 #endif