cleanup code

[chaz/tint2] / src / panel.h

diff --git a/src/panel.h b/src/panel.h
index 5746a5574806706df596f378f9f90e9af7a67eba..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"
@@ -37,9 +38,11 @@ extern int mouse_tilt_right;
 
 //panel mode
 enum { SINGLE_DESKTOP=0, MULTI_DESKTOP };
+enum { BOTTOM_LAYER, NORMAL_LAYER, TOP_LAYER };
 extern int panel_mode;
 extern int wm_menu;
 extern int panel_dock;
+extern int panel_layer;
 
 //panel position
 enum { LEFT=0x01, RIGHT=0x02, CENTER=0X04, TOP=0X08, BOTTOM=0x10 };
@@ -47,13 +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, 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 Task *task_urgent;
-extern int  tick_urgent;
 extern int  max_tick_urgent;
 
+extern GArray* backgrounds;
+
 extern Imlib_Image default_icon;
 
 
@@ -71,14 +82,13 @@ typedef struct {
        // position relative to root window
        int posx, posy;
        int marginx, marginy;
-       float initial_width, initial_height;
        int pourcentx, pourcenty;
        // location of the panel (monitor number)
        int monitor;
 
        // --------------------------------------------------
        // task and taskbar parameter per panel
-       Area g_taskbar;
+       Global_taskbar g_taskbar;
        Global_task g_task;
 
        // --------------------------------------------------
@@ -98,19 +108,36 @@ typedef struct {
 #ifdef ENABLE_BATTERY
        Battery battery;
 #endif
+
+       Launcher launcher;
+
+       // autohide
+       int is_hidden;
+       int hidden_width, hidden_height;
+       Pixmap hidden_pixmap;
+       timeout* autohide_timeout;
 } Panel;
 
 
+extern Panel panel_config;
 extern Panel *panel1;
 extern int  nb_panel;
 
 
-void init_panel();
+// default global data
+void default_panel();
+
+// freed memory
 void cleanup_panel();
-void resize_panel(void *obj);
 
+// 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 set_panel_items_order(Panel *p);
 void set_panel_properties(Panel *p);
-void visible_object();
 
 // draw background panel
 void set_panel_background(Panel *p);
@@ -118,5 +145,17 @@ void set_panel_background(Panel *p);
 // detect witch panel
 Panel *get_panel(Window win);
 
-#endif
+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_show(void* p);
+void autohide_hide(void* p);
+void autohide_trigger_show(Panel* p);
+void autohide_trigger_hide(Panel* p);
 
+#endif