diff options
| author | Pauli Nieminen <ext-pauli.nieminen@nokia.com> | 2010-12-30 19:19:35 +0200 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2010-12-31 12:52:51 +0000 |
| commit | ed8db09b4bff5c4a8d8056808368650e1876547b (patch) | |
| tree | ec1cb367358961cb9fb9951357044bcaaf716d23 | |
| parent | c038b8b28e5c436cd31bea7a3bef2c8c9d818b58 (diff) | |
composite: Remove unnecessary variable.
We know that there is damage if the dynamic block handler is registered.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | composite/compalloc.c | 12 | ||||
| -rw-r--r-- | composite/compinit.c | 1 | ||||
| -rw-r--r-- | composite/compint.h | 1 |
3 files changed, 2 insertions, 12 deletions
diff --git a/composite/compalloc.c b/composite/compalloc.c index e628c45bd..86a6f8ea9 100644 --- a/composite/compalloc.c +++ b/composite/compalloc.c @@ -50,14 +50,8 @@ static void compScreenUpdate (ScreenPtr pScreen) { - CompScreenPtr cs = GetCompScreen (pScreen); - compCheckTree (pScreen); - if (cs->damaged) - { - compWindowUpdate (pScreen->root); - cs->damaged = FALSE; - } + compWindowUpdate (pScreen->root); } static void @@ -85,11 +79,9 @@ compReportDamage (DamagePtr pDamage, RegionPtr pRegion, void *closure) CompScreenPtr cs = GetCompScreen (pScreen); CompWindowPtr cw = GetCompWindow (pWin); - if (!cs->damaged) { + if (!cs->BlockHandler) { cs->BlockHandler = pScreen->BlockHandler; pScreen->BlockHandler = compBlockHandler; - - cs->damaged = TRUE; } cw->damaged = TRUE; } diff --git a/composite/compinit.c b/composite/compinit.c index 885cc73a6..276ed75f8 100644 --- a/composite/compinit.c +++ b/composite/compinit.c @@ -301,7 +301,6 @@ compScreenInit (ScreenPtr pScreen) if (!cs) return FALSE; - cs->damaged = FALSE; cs->overlayWid = FakeClientID(0); cs->pOverlayWin = NULL; cs->pOverlayClients = NULL; diff --git a/composite/compint.h b/composite/compint.h index 9ba5dd0ed..4b058e7c3 100644 --- a/composite/compint.h +++ b/composite/compint.h @@ -152,7 +152,6 @@ typedef struct _CompScreen { ScreenBlockHandlerProcPtr BlockHandler; CloseScreenProcPtr CloseScreen; - Bool damaged; int numAlternateVisuals; VisualID *alternateVisuals; |