summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKristopher Ives <kris@leetbook2.(none)>2009-10-22 07:03:08 -0700
committerKristopher Ives <kris@leetbook2.(none)>2009-10-22 07:03:08 -0700
commit3de799cafd047665e6e451d364f063b68a1f799a (patch)
treefae24dc1b416d2e19ecd18f6ee6c2b83f7cce21e /include
parent470aa6409063a7ad51901981e280a186a2464bd4 (diff)
downloadzcomp-3de799cafd047665e6e451d364f063b68a1f799a.tar.gz
zcomp-3de799cafd047665e6e451d364f063b68a1f799a.tar.bz2
Trying to make sure I'm not versioning autobackup files.
Diffstat (limited to 'include')
-rw-r--r--include/core/icon.h~47
-rw-r--r--include/core/point.h~70
-rw-r--r--include/core/region.h~112
3 files changed, 0 insertions, 229 deletions
diff --git a/include/core/icon.h~ b/include/core/icon.h~
deleted file mode 100644
index c0b9027..0000000
--- a/include/core/icon.h~
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright © 2008 Dennis Kasprzyk
- * Copyright © 2007 Novell, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Dennis Kasprzyk not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Dennis Kasprzyk makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Authors: Dennis Kasprzyk <onestone@compiz-fusion.org>
- * David Reveman <davidr@novell.com>
- */
-
-#ifndef _COMPICON_H
-#define _COMPICON_H
-
-#include <core/size.h>
-
-class CompScreen;
-
-class CompIcon : public CompSize {
- public:
- CompIcon (CompScreen *screen, unsigned width, unsigned int height);
- ~CompIcon ();
-
- unsigned char* data ();
-
- private:
- CompSize mSize;
- unsigned char *mData;
-};
-
-#endif
diff --git a/include/core/point.h~ b/include/core/point.h~
deleted file mode 100644
index 5d1a3e8..0000000
--- a/include/core/point.h~
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright © 2008 Dennis Kasprzyk
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Dennis Kasprzyk not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Dennis Kasprzyk makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Authors: Dennis Kasprzyk <onestone@compiz-fusion.org>
- */
-
-#ifndef _COMPPOINT_H
-#define _COMPPOINT_H
-
-#include <vector>
-#include <list>
-
-class CompPoint {
-
- public:
- CompPoint ();
- CompPoint (int, int);
-
- int x () const;
- int y () const;
-
- void set (int, int);
- void setX (int);
- void setY (int);
-
- bool operator== (const CompPoint &) const;
- bool operator!= (const CompPoint &) const;
-
- typedef std::vector<CompPoint> vector;
- typedef std::vector<CompPoint *> ptrVector;
- typedef std::list<CompPoint> list;
- typedef std::list<CompPoint *> ptrList;
-
- private:
- int mX, mY;
-};
-
-inline int
-CompPoint::x () const
-{
- return mX;
-}
-
-inline int
-CompPoint::y () const
-{
- return mY;
-}
-
-
-#endif
diff --git a/include/core/region.h~ b/include/core/region.h~
deleted file mode 100644
index 8dea933..0000000
--- a/include/core/region.h~
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright © 2008 Dennis Kasprzyk
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Dennis Kasprzyk not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Dennis Kasprzyk makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Authors: Dennis Kasprzyk <onestone@compiz-fusion.org>
- */
-
-#ifndef _COMPREGION_H
-#define _COMPREGION_H
-
-#include <X11/Xutil.h>
-#include <X11/Xregion.h>
-
-#include <core/rect.h>
-#include <core/point.h>
-
-class PrivateRegion;
-
-///
-/// A 2D region in screen coordinates with an (x,y) position and
-/// (width, height) dimensions. It's data membmers are private and
-/// must be mutated with set() methods.
-///
-class CompRegion {
- public:
- typedef std::vector<CompRegion> List;
- typedef std::vector<CompRegion *> PtrList;
- typedef std::vector<CompRegion> Vector;
- typedef std::vector<CompRegion *> PtrVector;
-
- public:
- CompRegion ();
- CompRegion (const CompRegion &);
- CompRegion (int x, int y, int w, int h);
- CompRegion (const CompRect &);
- ~CompRegion ();
-
- CompRect boundingRect () const;
-
- bool isEmpty () const;
- int numRects () const;
- CompRect::vector rects () const;
- const Region handle () const;
-
- bool contains (const CompPoint &) const;
- bool contains (const CompRect &) const;
-
- CompRegion intersected (const CompRegion &) const;
- CompRegion intersected (const CompRect &) const;
- bool intersects (const CompRegion &) const;
- bool intersects (const CompRect &) const;
- CompRegion subtracted (const CompRegion &) const;
- CompRegion subtracted (const CompRect &) const;
- void translate (int, int);
- void translate (const CompPoint &);
- CompRegion translated (int, int) const;
- CompRegion translated (const CompPoint &) const;
- void shrink (int, int);
- void shrink (const CompPoint &);
- CompRegion shrinked (int, int) const;
- CompRegion shrinked (const CompPoint &) const;
- CompRegion united (const CompRegion &) const;
- CompRegion united (const CompRect &) const;
- CompRegion xored (const CompRegion &) const;
-
- bool operator== (const CompRegion &) const;
- bool operator!= (const CompRegion &) const;
- const CompRegion operator& (const CompRegion &) const;
- const CompRegion operator& (const CompRect &) const;
- CompRegion & operator&= (const CompRegion &);
- CompRegion & operator&= (const CompRect &);
- const CompRegion operator+ (const CompRegion &) const;
- const CompRegion operator+ (const CompRect &) const;
- CompRegion & operator+= (const CompRegion &);
- CompRegion & operator+= (const CompRect &);
- const CompRegion operator- (const CompRegion &) const;
- const CompRegion operator- (const CompRect &) const;
- CompRegion & operator-= (const CompRegion &);
- CompRegion & operator-= (const CompRect &);
- CompRegion & operator= (const CompRegion &);
-
- const CompRegion operator^ (const CompRegion &) const;
- CompRegion & operator^= (const CompRegion &);
- const CompRegion operator| (const CompRegion &) const;
- CompRegion & operator|= (const CompRegion &);
-
- private:
- PrivateRegion *priv;
-};
-
-extern const CompRegion infiniteRegion;
-extern const CompRegion emptyRegion;
-
-#endif