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 5453f225adfb0055190030c3e30d2e542117e9ba..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,15 @@ 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;