summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2007-08-27 14:37:54 +0200
committerDanny Baumann <dannybaumann@web.de>2007-08-27 14:37:54 +0200
commitbf7998d40243ac10b3bfa6f066ad73f3f672b5a6 (patch)
treec9c447ad83e9c7b88467469c0d088f07ee853a92
parentbd65256cf56a34053a78a735825282e74de3c3de (diff)
downloadgroup-bf7998d40243ac10b3bfa6f066ad73f3f672b5a6.tar.gz
group-bf7998d40243ac10b3bfa6f066ad73f3f672b5a6.tar.bz2
Track core changes.
-rw-r--r--group-internal.h5
-rw-r--r--group.c9
-rw-r--r--init.c2
3 files changed, 6 insertions, 10 deletions
diff --git a/group-internal.h b/group-internal.h
index 39186ff..950e03f 100644
--- a/group-internal.h
+++ b/group-internal.h
@@ -465,8 +465,6 @@ typedef struct _GroupWindow {
float tx,ty;
float xVelocity, yVelocity;
-
- int lastState;
} GroupWindow;
/*
@@ -582,7 +580,8 @@ groupWindowMoveNotify (CompWindow *w,
Bool immediate);
void
-groupWindowStateChangeNotify (CompWindow *w);
+groupWindowStateChangeNotify (CompWindow *w,
+ unsigned int lastState);
void
groupGetOutputExtentsForWindow (CompWindow *w,
diff --git a/group.c b/group.c
index dce65ad..d833491 100644
--- a/group.c
+++ b/group.c
@@ -2077,7 +2077,8 @@ groupDamageWindowRect (CompWindow *w,
}
void
-groupWindowStateChangeNotify (CompWindow *w)
+groupWindowStateChangeNotify (CompWindow *w,
+ unsigned int lastState)
{
CompScreen *s = w->screen;
@@ -2087,7 +2088,7 @@ groupWindowStateChangeNotify (CompWindow *w)
if (gw->group && !gd->ignoreMode)
{
- if (((gw->lastState & MAXIMIZE_STATE) != (w->state & MAXIMIZE_STATE)) &&
+ if (((lastState & MAXIMIZE_STATE) != (w->state & MAXIMIZE_STATE)) &&
groupGetMaximizeUnmaximizeAll (s))
{
int i;
@@ -2105,9 +2106,7 @@ groupWindowStateChangeNotify (CompWindow *w)
}
}
- gw->lastState = w->state;
-
UNWRAP (gs, s, windowStateChangeNotify);
- (*s->windowStateChangeNotify) (w);
+ (*s->windowStateChangeNotify) (w, lastState);
WRAP (gs, s, windowStateChangeNotify, groupWindowStateChangeNotify);
}
diff --git a/init.c b/init.c
index a8bd400..8030bc6 100644
--- a/init.c
+++ b/init.c
@@ -465,8 +465,6 @@ static Bool groupInitWindow(CompPlugin * p, CompWindow * w)
else
gw->windowState = WindowNormal;
- gw->lastState = w->state;
-
w->privates[gs->windowPrivateIndex].ptr = gw;
gw->glowQuads = NULL;