X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FUtil.cc;h=3c494901b18cea69c77e2a899611fc4038b94a5e;hb=5ec63388b8fbbdffc0999ba727ad718f87d683fc;hp=1b521aafb6f872259e2eff92e64a7486194e55a3;hpb=888c0bac90d4932d00dd7f7447ea52117aff6de0;p=chaz%2Fopenbox

diff --git a/src/Util.cc b/src/Util.cc
index 1b521aaf..3c494901 100644
--- a/src/Util.cc
+++ b/src/Util.cc
@@ -26,6 +26,8 @@
 #endif // HAVE_CONFIG_H
 
 extern "C" {
+#include <X11/Xatom.h>
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -48,11 +50,9 @@ extern "C" {
 #if defined(HAVE_PROCESS_H) && defined(__EMX__)
 #  include <process.h>
 #endif //   HAVE_PROCESS_H             __EMX__
-}
-
-#include <X11/Xatom.h>
 
 #include <assert.h>
+}
 
 #include <algorithm>
 
@@ -141,6 +141,18 @@ bool Rect::intersects(const Rect &a) const {
 }
 
 
+bool Rect::contains(int __x, int __y) const {
+  return __x >= _x1 && __x <= _x2 &&
+         __y >= _y1 && __y <= _y2;
+}
+
+
+bool Rect::contains(const Rect& a) const {
+  return a._x1 >= _x1 && a._x2 <= _x2 &&
+         a._y1 >= _y1 && a._y2 <= _y2;
+}
+
+
 string expandTilde(const string& s) {
   if (s[0] != '~') return s;
 
@@ -159,8 +171,8 @@ void bexec(const string& command, const string& displaystring) {
     assert(ret != -1);
     string cmd = "exec ";
     cmd += command;
-    execl("/bin/sh", "/bin/sh", "-c", cmd.c_str(), NULL);
-    exit(0);
+    ret = execl("/bin/sh", "/bin/sh", "-c", cmd.c_str(), NULL);
+    exit(ret);
   }
 #else //   __EMX__
   spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", command, NULL);
@@ -237,10 +249,8 @@ string itostring(unsigned long i) {
 
 
 string itostring(long i) {
-  if (i < 0) {
-    std::string tmp = itostring( (unsigned long) -i);
+  std::string tmp = itostring( (unsigned long) std::abs(i));
+  if (i < 0)
     tmp.insert(tmp.begin(), '-');
-    return tmp;
-  } else
-    return itostring( (unsigned long) i);
+  return tmp;
 }