X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FUtil.cc;h=a97ffe50a591baa91a3ec11b54109c4e51a61dfb;hb=5377e3fde108da56894185716d47c3058032b97f;hp=14e0f32ac1beea3c51b3c363b9b10e26be07b9f0;hpb=fda410fdf206c908c5d3db133150743b38e36c96;p=chaz%2Fopenbox diff --git a/src/Util.cc b/src/Util.cc index 14e0f32a..a97ffe50 100644 --- a/src/Util.cc +++ b/src/Util.cc @@ -1,8 +1,7 @@ // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -// Util.cc for Openbox -// Copyright (c) 2002 - 2002 Ben Jansens (ben at orodu.net) -// Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry (shaleh at debian.org) -// Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net) +// Util.cc for Blackbox - an X11 Window manager +// Copyright (c) 2002 Sean 'Shaleh' Perry +// Copyright (c) 1997 - 2000, 2002 Brad Hughes (bhughes@tcac.net) // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the "Software"), @@ -22,47 +21,223 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#include "../config.h" +#ifdef HAVE_CONFIG_H +# include "../config.h" +#endif // HAVE_CONFIG_H -#ifdef HAVE_SYS_TYPES_H -# include +extern "C" { +#ifdef HAVE_STRING_H +#include #endif - -#ifdef HAVE_UNISTD_H -# include -#endif - #ifdef HAVE_STDLIB_H -# include +#include #endif +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else // !TIME_WITH_SYS_TIME +# ifdef HAVE_SYS_TIME_H +# include +# else // !HAVE_SYS_TIME_H +# include +# endif // HAVE_SYS_TIME_H +#endif // TIME_WITH_SYS_TIME +#ifdef HAVE_UNISTD_H +#include +#endif // HAVE_UNISTD_H +#if defined(HAVE_PROCESS_H) && defined(__EMX__) +# include +#endif // HAVE_PROCESS_H __EMX__ +} + +#include + +#include + +#include "Util.hh" + +using std::string; + + +void Rect::setX(int __x) { + _x2 += __x - _x1; + _x1 = __x; +} + + +void Rect::setY(int __y) +{ + _y2 += __y - _y1; + _y1 = __y; +} + + +void Rect::setPos(int __x, int __y) { + _x2 += __x - _x1; + _x1 = __x; + _y2 += __y - _y1; + _y1 = __y; +} +void Rect::setWidth(unsigned int __w) { + _x2 = __w + _x1 - 1; +} + + +void Rect::setHeight(unsigned int __h) { + _y2 = __h + _y1 - 1; +} + + +void Rect::setSize(unsigned int __w, unsigned int __h) { + _x2 = __w + _x1 - 1; + _y2 = __h + _y1 - 1; +} + + +void Rect::setRect(int __x, int __y, unsigned int __w, unsigned int __h) { + *this = Rect(__x, __y, __w, __h); +} + + +void Rect::setCoords(int __l, int __t, int __r, int __b) { + _x1 = __l; + _y1 = __t; + _x2 = __r; + _y2 = __b; +} + + +Rect Rect::operator|(const Rect &a) const { + Rect b; + + b._x1 = std::min(_x1, a._x1); + b._y1 = std::min(_y1, a._y1); + b._x2 = std::max(_x2, a._x2); + b._y2 = std::max(_y2, a._y2); + + return b; +} + + +Rect Rect::operator&(const Rect &a) const { + Rect b; + + b._x1 = std::max(_x1, a._x1); + b._y1 = std::max(_y1, a._y1); + b._x2 = std::min(_x2, a._x2); + b._y2 = std::min(_y2, a._y2); + + return b; +} + + +bool Rect::intersects(const Rect &a) const { + return std::max(_x1, a._x1) <= std::min(_x2, a._x2) && + std::max(_y1, a._y1) <= std::min(_y2, a._y2); +} + + +string expandTilde(const string& s) { + if (s[0] != '~') return s; + + const char* const home = getenv("HOME"); + if (home == NULL) return s; + + return string(home + s.substr(s.find('/'))); +} + + +void bexec(const string& command, const string& displaystring) { #ifndef __EMX__ -void bexec(const char *command, char* displaystring) { if (! fork()) { setsid(); - putenv(displaystring); - execl("/bin/sh", "/bin/sh", "-c", command, NULL); + int ret = putenv(const_cast(displaystring.c_str())); + assert(ret != -1); + string cmd = "exec "; + cmd += command; + execl("/bin/sh", "/bin/sh", "-c", cmd.c_str(), NULL); exit(0); } -} +#else // __EMX__ + spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", command, NULL); #endif // !__EMX__ +} -char *bstrdup(const char *s) { - const int l = strlen(s) + 1; - char *n = new char[l]; - strncpy(n, s, l); - return n; +#ifndef HAVE_BASENAME +string basename (const string& path) { + string::size_type slash = path.rfind('/'); + if (slash == string::npos) + return path; + return path.substr(slash+1); } +#endif // HAVE_BASENAME -#ifndef HAVE_BASENAME -char *basename (char *s) { - char *save = s; +string textPropertyToString(Display *display, XTextProperty& text_prop) { + string ret; - while (*s) if (*s++ == '/') save = s; + if (text_prop.value && text_prop.nitems > 0) { + ret = (char *) text_prop.value; + if (text_prop.encoding != XA_STRING) { + text_prop.nitems = strlen((char *) text_prop.value); - return save; + char **list; + int num; + if (XmbTextPropertyToTextList(display, &text_prop, + &list, &num) == Success && + num > 0 && *list) { + ret = *list; + XFreeStringList(list); + } + } + } + + return ret; +} + + +timeval normalizeTimeval(const timeval &tm) { + timeval ret = tm; + + while (ret.tv_usec < 0) { + if (ret.tv_sec > 0) { + --ret.tv_sec; + ret.tv_usec += 1000000; + } else { + ret.tv_usec = 0; + } + } + + if (ret.tv_usec >= 1000000) { + ret.tv_sec += ret.tv_usec / 1000000; + ret.tv_usec %= 1000000; + } + + if (ret.tv_sec < 0) ret.tv_sec = 0; + + return ret; +} + + +string itostring(unsigned long i) { + if (i == 0) + return string("0"); + + string tmp; + for (; i > 0; i /= 10) + tmp.insert(tmp.begin(), "0123456789"[i%10]); + return tmp; +} + + +string itostring(long i) { + if (i < 0) { + std::string tmp = itostring( (unsigned long) -i); + tmp.insert(tmp.begin(), '-'); + return tmp; + } else + return itostring( (unsigned long) i); } -#endif // HAVE_BASENAME