summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoronestone <onestone>2006-11-14 20:52:23 +0000
committeronestone <onestone>2006-11-14 20:52:23 +0000
commit94fe6d2cb12eb517ae6f596f6f5e0f779011a04e (patch)
tree8ab3bc3033be62b9e41590054e1febc055cb0f2a
parentca34b506d7a3e291c1df0c2688ab974d9556b6e1 (diff)
downloadaquamarine-94fe6d2cb12eb517ae6f596f6f5e0f779011a04e.tar.gz
aquamarine-94fe6d2cb12eb517ae6f596f6f5e0f779011a04e.tar.bz2
aquamarine: added compiz compatiblity
-rw-r--r--src/aquamarine.cpp4
-rw-r--r--src/decorator.h2
-rw-r--r--src/switcher.cpp10
-rw-r--r--src/window.cpp10
4 files changed, 16 insertions, 10 deletions
diff --git a/src/aquamarine.cpp b/src/aquamarine.cpp
index 44c4069..b488781 100644
--- a/src/aquamarine.cpp
+++ b/src/aquamarine.cpp
@@ -135,6 +135,10 @@ main (int argc, char **argv)
{
berylRunning = true;
}
+ if (strcmp(buf,"compiz") == 0)
+ {
+ berylRunning = true;
+ }
}
if (!berylRunning)
diff --git a/src/decorator.h b/src/decorator.h
index 1e9186b..c341f92 100644
--- a/src/decorator.h
+++ b/src/decorator.h
@@ -43,6 +43,8 @@
#define C(name) { 0, XC_ ## name }
+#define DECOR_INTERFACE_VERSION 20061011
+
struct _cursor
{
Cursor cursor;
diff --git a/src/switcher.cpp b/src/switcher.cpp
index 43a745b..1d5596a 100644
--- a/src/switcher.cpp
+++ b/src/switcher.cpp
@@ -193,7 +193,7 @@ Aquamarine::Switcher::updateWindowProperties ()
long *
data = mdata;
- *data++ = 0;
+ *data++ = DECOR_INTERFACE_VERSION;
memcpy (data++, &m_pixmap, sizeof (m_pixmap));
*data++ = LEFT;
@@ -227,7 +227,7 @@ Aquamarine::Switcher::updateWindowProperties ()
*data++ =
((GRAVITY_NORTH | GRAVITY_WEST) << 0) |
((GRAVITY_NORTH | GRAVITY_EAST) << 4) |
- (0 << 8) | ((CLAMP_HORZ | CLAMP_VERT) << 10) | (XX_MASK) | (YY_MASK);
+ (0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
*data++ = 0;
*data++ = -TOP;
@@ -272,7 +272,7 @@ Aquamarine::Switcher::updateWindowProperties ()
*data++ =
((GRAVITY_SOUTH | GRAVITY_WEST) << 0) |
((GRAVITY_SOUTH | GRAVITY_EAST) << 4) |
- (0 << 8) | ((CLAMP_HORZ | CLAMP_VERT) << 10) | (XX_MASK) | (YY_MASK);
+ (0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
*data++ = 0;
*data++ = 0;
@@ -301,7 +301,7 @@ Aquamarine::Switcher::updateWindowProperties ()
*data++ =
((GRAVITY_NORTH | GRAVITY_WEST) << 0) |
((GRAVITY_SOUTH | GRAVITY_WEST) << 4) |
- (0 << 8) | ((CLAMP_HORZ | CLAMP_VERT) << 10) | (XX_MASK) | (YY_MASK);
+ (0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
*data++ = -LEFT;
*data++ = 0;
@@ -316,7 +316,7 @@ Aquamarine::Switcher::updateWindowProperties ()
*data++ =
((GRAVITY_NORTH | GRAVITY_EAST) << 0) |
((GRAVITY_SOUTH | GRAVITY_EAST) << 4) |
- (0 << 8) | ((CLAMP_HORZ | CLAMP_VERT) << 10) | (XX_MASK) | (YY_MASK);
+ (0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
*data++ = 0;
*data++ = 0;
diff --git a/src/window.cpp b/src/window.cpp
index c186c63..a6eeaf6 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -978,7 +978,7 @@ Aquamarine::Window::updateWindowProperties ()
long *
data = mdata;
- *data++ = 0;
+ *data++ = DECOR_INTERFACE_VERSION;
memcpy (data++, &m_pixmap, sizeof (m_pixmap));
*data++ = left;
@@ -1012,7 +1012,7 @@ Aquamarine::Window::updateWindowProperties ()
*data++ =
((GRAVITY_NORTH | GRAVITY_WEST) << 0) |
((GRAVITY_NORTH | GRAVITY_EAST) << 4) |
- (0 << 8) | ((CLAMP_HORZ | CLAMP_VERT) << 10) | (XX_MASK) | (YY_MASK);
+ (0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
*data++ = 0;
*data++ = -top;
@@ -1056,7 +1056,7 @@ Aquamarine::Window::updateWindowProperties ()
*data++ =
((GRAVITY_SOUTH | GRAVITY_WEST) << 0) |
((GRAVITY_SOUTH | GRAVITY_EAST) << 4) |
- (0 << 8) | ((CLAMP_HORZ | CLAMP_VERT) << 10) | (XX_MASK) | (YY_MASK);
+ (0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
*data++ = 0;
*data++ = 0;
@@ -1085,7 +1085,7 @@ Aquamarine::Window::updateWindowProperties ()
*data++ =
((GRAVITY_NORTH | GRAVITY_WEST) << 0) |
((GRAVITY_SOUTH | GRAVITY_WEST) << 4) |
- (0 << 8) | ((CLAMP_HORZ | CLAMP_VERT) << 10) | (XX_MASK) | (YY_MASK);
+ (0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
*data++ = -left;
*data++ = 0;
@@ -1100,7 +1100,7 @@ Aquamarine::Window::updateWindowProperties ()
*data++ =
((GRAVITY_NORTH | GRAVITY_EAST) << 0) |
((GRAVITY_SOUTH | GRAVITY_EAST) << 4) |
- (0 << 8) | ((CLAMP_HORZ | CLAMP_VERT) << 10) | (XX_MASK) | (YY_MASK);
+ (0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
*data++ = 0;
*data++ = 0;