diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-03-21 14:42:35 +0100 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-03-25 18:59:10 +0200 |
commit | 359fc1cb5dbbcf32132c3e8ee6f881a23deff684 (patch) | |
tree | 3ae7cc1c8b4d0449d50a13cb9640a6ef75f51f11 /common/rect.h | |
parent | 4df135c858d7dfb1aa0ae5d3cb17d786410d1544 (diff) | |
download | spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.tar.gz spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.tar.xz spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.zip |
Use the spice-common submodule
This patch will replace the common/ directory with the spice-common
project. It is for now a simple project subdirectory shared with
spice-gtk, but the goal is to make it a proper library later on.
With this change, the spice-server build is broken. The following
commits fix the build, and have been seperated to ease the review.
v2
- moves all the generated marshallers to spice-common library
- don't attempt to fix windows VS build, which should somehow be
splitted with spice-common (or built from tarball only to avoid
generation tools/libs deps)
v3
- uses libspice-common-client
- fix a mutex.h inclusion reported by Alon
Diffstat (limited to 'common/rect.h')
-rw-r--r-- | common/rect.h | 122 |
1 files changed, 0 insertions, 122 deletions
diff --git a/common/rect.h b/common/rect.h deleted file mode 100644 index ef265cd9..00000000 --- a/common/rect.h +++ /dev/null @@ -1,122 +0,0 @@ -/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* - Copyright (C) 2009 Red Hat, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, see <http://www.gnu.org/licenses/>. -*/ - -#ifndef _H_RECT -#define _H_RECT - -#include "draw.h" -#include <spice/macros.h> - -#ifdef __cplusplus -extern "C" { -#endif - -static INLINE void rect_sect(SpiceRect* r, const SpiceRect* bounds) -{ - r->left = MAX(r->left, bounds->left); - r->right = MIN(r->right, bounds->right); - r->right = MAX(r->left, r->right); - - r->top = MAX(r->top, bounds->top); - r->bottom = MIN(r->bottom, bounds->bottom); - r->bottom = MAX(r->top, r->bottom); -} - -static INLINE void rect_offset(SpiceRect* r, int dx, int dy) -{ - r->left += dx; - r->right += dx; - r->top += dy; - r->bottom += dy; -} - -static INLINE int rect_is_empty(const SpiceRect* r) -{ - return r->top == r->bottom || r->left == r->right; -} - -static INLINE int rect_intersects(const SpiceRect* r1, const SpiceRect* r2) -{ - return r1->left < r2->right && r1->right > r2->left && - r1->top < r2->bottom && r1->bottom > r2->top; -} - -static INLINE int rect_is_equal(const SpiceRect *r1, const SpiceRect *r2) -{ - return r1->top == r2->top && r1->left == r2->left && - r1->bottom == r2->bottom && r1->right == r2->right; -} - -static INLINE void rect_union(SpiceRect *dest, const SpiceRect *r) -{ - dest->top = MIN(dest->top, r->top); - dest->left = MIN(dest->left, r->left); - dest->bottom = MAX(dest->bottom, r->bottom); - dest->right = MAX(dest->right, r->right); -} - -static INLINE int rect_is_same_size(const SpiceRect *r1, const SpiceRect *r2) -{ - return r1->right - r1->left == r2->right - r2->left && - r1->bottom - r1->top == r2->bottom - r2->top; -} - -#ifdef __cplusplus -} -#endif - -#ifdef __cplusplus - -static inline void rect_sect(SpiceRect& r, const SpiceRect& bounds) -{ - rect_sect(&r, &bounds); -} - -static inline void rect_offset(SpiceRect& r, int dx, int dy) -{ - rect_offset(&r, dx, dy); -} - -static inline int rect_is_empty(const SpiceRect& r) -{ - return rect_is_empty(&r); -} - -static inline int rect_intersects(const SpiceRect& r1, const SpiceRect& r2) -{ - return rect_intersects(&r1, &r2); -} - -static inline int rect_is_equal(const SpiceRect& r1, const SpiceRect& r2) -{ - return rect_is_equal(&r1, &r2); -} - -static inline void rect_union(SpiceRect& dest, const SpiceRect& r) -{ - rect_union(&dest, &r); -} - -static inline int rect_is_same_size(const SpiceRect& r1, const SpiceRect& r2) -{ - return rect_is_same_size(&r1, &r2); -} - -#endif - -#endif |