#endif // HAVE_CONFIG_H
extern "C" {
+#include <X11/Xatom.h>
+
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#if defined(HAVE_PROCESS_H) && defined(__EMX__)
# include <process.h>
#endif // HAVE_PROCESS_H __EMX__
-}
-
-#include <X11/Xatom.h>
#include <assert.h>
+}
#include <algorithm>
}
+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;
setsid();
int ret = putenv(const_cast<char *>(displaystring.c_str()));
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", command.c_str(), NULL);
+ exit(ret);
}
#else // __EMX__
- spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", command, NULL);
+ spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", command.c_str(), NULL);
#endif // !__EMX__
}
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;
}