Take menu file from rc file if it isn't specified on the command line.

[chaz/openbox] / src / Util.hh

diff --git a/src/Util.hh b/src/Util.hh
index 2a40308d8c34ad84e44ca4d39b071df82ea16024..40a2254abc72177f929e64e224930b0d3684f970 100644 (file)
--- a/src/Util.hh
+++ b/src/Util.hh
@@ -28,6 +28,7 @@
 #include <X11/Xutil.h>
 
 #include <string>
+#include <vector>
 
 class Rect {
 public:
@@ -71,11 +72,21 @@ public:
   inline bool valid(void) const { return _x2 > _x1 && _y2 > _y1; }
 
   bool intersects(const Rect &a) const;
+  bool contains(int __x, int __y) const;
+  bool contains(const Rect &a) const;
 
 private:
   int _x1, _y1, _x2, _y2;
 };
 
+typedef std::vector<Rect> RectList;
+
+struct Strut {
+  unsigned int top, bottom, left, right;
+
+  Strut(void): top(0), bottom(0), left(0), right(0) {}
+};
+
 /* XXX: this needs autoconf help */
 const unsigned int BSENTINEL = 65535;
 
@@ -101,11 +112,9 @@ struct PointerAssassin {
 
 std::string itostring(unsigned long i);
 std::string itostring(long i);
-inline std::string itostring(unsigned int i) {
-  return itostring((unsigned long) i);
-}
-inline std::string itostring(int i) {
-  return itostring((long) i);
-}
-
+inline std::string itostring(unsigned int i)
+  { return itostring((unsigned long) i); }
+inline std::string itostring(int i)
+  { return itostring((long) i); }
+  
 #endif