*fix* Check wmhints for NULL

[chaz/tint2] / src / panel.h

diff --git a/src/panel.h b/src/panel.h
index 8e0c3053a5ad7159ca16c36b20acfba92ecfc987..b1ca46c33d1fcd22d47a2d22992e769873ad5fb7 100644 (file)
--- a/src/panel.h
+++ b/src/panel.h
@@ -14,13 +14,15 @@
 #include <pango/pangocairo.h>
 #include <sys/time.h>
 
-#include "battery.h"
 #include "common.h"
 #include "clock.h"
 #include "task.h"
 #include "taskbar.h"
 #include "systraybar.h"
 
+#ifdef ENABLE_BATTERY
+#include "battery.h"
+#endif
 
 
 extern int signal_pending;
@@ -30,20 +32,27 @@ 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, SINGLE_MONITOR };
+enum { SINGLE_DESKTOP=0, MULTI_DESKTOP };
 extern int panel_mode;
+extern int wm_menu;
+extern int panel_dock;
 
 //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;
 
 
 typedef struct {
@@ -72,6 +81,8 @@ typedef struct {
    // --------------------------------------------------
    // 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  nb_desktop;
 
@@ -81,8 +92,9 @@ typedef struct {
 
        // --------------------------------------------------
        // battery
+#ifdef ENABLE_BATTERY
        Battery battery;
-
+#endif
 } Panel;