cleanup code

[chaz/tint2] / src / panel.h

diff --git a/src/panel.h b/src/panel.h
index a8247a91af375c6803a1d05393f099a633bc00a0..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"
@@ -32,76 +33,111 @@ extern int mouse_middle;
 extern int mouse_right;
 extern int mouse_scroll_up;
 extern int mouse_scroll_down;
+extern int mouse_tilt_left;
+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 };
 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;
+
 
+// tint2 use one panel per monitor and one taskbar per desktop.
 typedef struct {
-   // always start with area
-   // area.list own all objects of the panel according to config file
-   Area area;
+       // always start with area
+       // area.list own all objects of the panel according to config file
+       Area area;
 
-   // --------------------------------------------------
-   // panel
-   Window main_win;
-   Pixmap temp_pmap;
+       // --------------------------------------------------
+       // panel
+       Window main_win;
+       Pixmap temp_pmap;
 
-   // position relative to root window
+       // 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;
+       int marginx, marginy;
+       int pourcentx, pourcenty;
+       // location of the panel (monitor number)
+       int monitor;
+
+       // --------------------------------------------------
+       // task and taskbar parameter per panel
+       Global_taskbar g_taskbar;
        Global_task g_task;
 
-   // --------------------------------------------------
-   // taskbar point to the first taskbar in panel.area.list.
-   // number of tasbar == nb_desktop
-   Taskbar *taskbar;
-   int  nb_desktop;
+       // --------------------------------------------------
+       // taskbar point to the first taskbar in panel.area.list.
+       // number of tasbar == nb_desktop. taskbar[i] is for desktop(i).
+       // taskbar[i] is used to loop over taskbar,
+       // while panel->area.list is used to loop over all panel's objects
+       Taskbar *taskbar;
+       int  nb_desktop;
 
-   // --------------------------------------------------
-   // clock
-   Clock clock;
+       // --------------------------------------------------
+       // clock
+       Clock clock;
 
        // --------------------------------------------------
        // battery
 #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);
@@ -109,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