X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.h;h=5992f7a803a0c106a5ccfa8c96335f8dac9ce3da;hb=0357305cec0f78ba4d4717467025ead6be25ce0c;hp=4a3e245622be0341366351f68017119d81d49a56;hpb=88a08d8838c1b6dce06c73160005249bf3f1ed60;p=chaz%2Ftint2

diff --git a/src/panel.h b/src/panel.h
index 4a3e245..5992f7a 100644
--- a/src/panel.h
+++ b/src/panel.h
@@ -1,8 +1,10 @@
 /**************************************************************************
-* panel : 
+* Copyright (C) 2008 PÃ¥l Staurland (staura@gmail.com)
+* Modified (C) 2008/2009 thierry lorthiois (lorthiois@bbsoft.fr)
+*
+* panel :
 * - draw panel and all objects according to panel_layout
-* 
-* Check COPYING file for Copyright
+*
 *
 **************************************************************************/
 
@@ -16,68 +18,83 @@
 #include "clock.h"
 #include "task.h"
 #include "taskbar.h"
+#include "systraybar.h"
+
 
 
+extern int signal_pending;
+// --------------------------------------------------
+// mouse events
+extern int mouse_middle;
+extern int mouse_right;
+extern int mouse_scroll_up;
+extern int mouse_scroll_down;
+
 //panel mode
-enum { SINGLE_DESKTOP=0, MULTI_DESKTOP, MULTI_MONITOR };
+enum { SINGLE_DESKTOP=0, MULTI_DESKTOP, SINGLE_MONITOR };
+extern int panel_mode;
 
-//panel alignment
+//panel position
 enum { LEFT=0x01, RIGHT=0x02, CENTER=0X04, TOP=0X08, BOTTOM=0x10 };
+extern int panel_position;
+
+extern int panel_refresh;
+
+extern Task *task_active;
+extern Task *task_drag;
 
 
 typedef struct {
    // always start with area
    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;
-   int monitor;
-   int position;
+   Window main_win;
+   Pixmap root_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;
+
+   // --------------------------------------------------
+   // task annd 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 x nb_monitor.
+   // taskbar point to the first taskbar in panel.area.list.
+   // number of tasbar == nb_desktop
    Taskbar *taskbar;
-   int mode;
-   int nb_desktop;
-   int nb_monitor;
-   Task *task_active;
-   Task *task_drag;
-   
+   int  nb_desktop;
+
    // --------------------------------------------------
    // clock
    Clock clock;
 
    // --------------------------------------------------
    // systray
-
-   // --------------------------------------------------
-   // mouse events
-   int mouse_middle;
-   int mouse_right;
-   int mouse_scroll_up;
-   int mouse_scroll_down;
+   Systraybar systraybar;
 } 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 visual_refresh(Panel *p);
+void set_panel_properties(Panel *p);
 void visible_object();
-void set_panel_background();
+
+// draw background panel
+void set_panel_background(Panel *p);
+
+Panel *get_panel(Window win);
 
 #endif
+