X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.h;h=dff0a03bc43b30098190737bf2da002371407936;hb=e100cb6f8db79e5b3d26c04a405625ca368ee1ea;hp=0ab22933be5f03942763cb84a3ef24a23b87826c;hpb=fd52a8efaeb932e09342704a520a07ff01ef2ef1;p=chaz%2Ftint2

diff --git a/src/panel.h b/src/panel.h
index 0ab2293..dff0a03 100644
--- a/src/panel.h
+++ b/src/panel.h
@@ -20,68 +20,102 @@
 #include "taskbar.h"
 #include "systraybar.h"
 
+#ifdef ENABLE_BATTERY
+#include "battery.h"
+#endif
+
+
+extern int signal_pending;
+// --------------------------------------------------
+// mouse events
+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, MULTI_MONITOR };
+enum { SINGLE_DESKTOP=0, MULTI_DESKTOP };
+extern int panel_mode;
+extern int wm_menu;
+extern int panel_dock;
 
-//panel alignment
+//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 Task *task_active;
+extern Task *task_drag;
+extern Task *task_urgent;
+extern int  tick_urgent;
+extern int  max_tick_urgent;
+
+extern Imlib_Image default_icon;
 
 
 typedef struct {
    // always start with area
+   // area.list own all objects of the panel according to config file
    Area area;
 
-   // --------------------------------------------------
-   // backward compatibility
-   int old_config_file;
-   int old_task_icon;
-   int old_panel_background;
-   int old_task_background;
-   char *old_task_font;
-
    // --------------------------------------------------
    // panel
-   int signal_pending;
-   int sleep_mode;
-   int refresh;
+   Window main_win;
+   Pixmap temp_pmap;
+
+   // 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;
-   int position;
-   int marginleft, marginright, marginy;
 
    // --------------------------------------------------
-   // taskbar point to the first taskbar in panel.area.list. number of tasbar == nb_desktop x nb_monitor.
+   // task and taskbar parameter per panel
+	Area g_taskbar;
+	Global_task g_task;
+
+   // --------------------------------------------------
+   // taskbar point to the first taskbar in panel.area.list.
+   // number of tasbar == nb_desktop
+	// taskbar[i] is used to loop over taskbar,
+	// while panel->area.list is used to loop over all panel's objects
    Taskbar *taskbar;
-   int mode;
-   int nb_desktop;
-   int nb_monitor;
-   Task *task_active;
-   Task *task_drag;
+   int  nb_desktop;
 
    // --------------------------------------------------
    // clock
    Clock clock;
 
-   // --------------------------------------------------
-   // systray
-   Systraybar systraybar;
-
-   // --------------------------------------------------
-   // mouse events
-   int mouse_middle;
-   int mouse_right;
-   int mouse_scroll_up;
-   int mouse_scroll_down;
+	// --------------------------------------------------
+	// battery
+#ifdef ENABLE_BATTERY
+	Battery battery;
+#endif
 } Panel;
 
 
-Panel panel;
+extern Panel *panel1;
+extern int  nb_panel;
 
 
-void visual_refresh ();
-void set_panel_properties (Window win);
-void window_draw_panel ();
+void init_panel();
+void cleanup_panel();
+void resize_panel(void *obj);
+
+void set_panel_properties(Panel *p);
 void visible_object();
-void set_panel_background();
+
+// draw background panel
+void set_panel_background(Panel *p);
+
+// detect witch panel
+Panel *get_panel(Window win);
 
 #endif
+