summaryrefslogtreecommitdiff
path: root/xserver/composite/compinit.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2019-07-27 07:57:27 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2019-07-27 07:57:27 +0000
commitd4a0bed4b91da9de86c311c7fef9a8aa9a6f500c (patch)
treea1b439049dee87bc951e190db93f5bbe8b43b0b5 /xserver/composite/compinit.c
parentb6bc775539a31f663f9e22ce3ccaf0aa96adf3b6 (diff)
Update to xserver 1.20.5. Tested by jsg@
Diffstat (limited to 'xserver/composite/compinit.c')
-rw-r--r--xserver/composite/compinit.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/xserver/composite/compinit.c b/xserver/composite/compinit.c
index 791fec922..6ea33ea4e 100644
--- a/xserver/composite/compinit.c
+++ b/xserver/composite/compinit.c
@@ -284,9 +284,6 @@ static CompAlternateVisual altVisuals[] = {
{32, PICT_a8r8g8b8},
};
-static const int NUM_COMP_ALTERNATE_VISUALS = sizeof(altVisuals) /
- sizeof(CompAlternateVisual);
-
static Bool
compAddAlternateVisual(ScreenPtr pScreen, CompScreenPtr cs,
CompAlternateVisual * alt)
@@ -362,7 +359,7 @@ compAddAlternateVisuals(ScreenPtr pScreen, CompScreenPtr cs)
{
int alt, ret = 0;
- for (alt = 0; alt < NUM_COMP_ALTERNATE_VISUALS; alt++)
+ for (alt = 0; alt < ARRAY_SIZE(altVisuals); alt++)
ret |= compAddAlternateVisual(pScreen, cs, altVisuals + alt);
return ! !ret;
@@ -390,6 +387,8 @@ compScreenInit(ScreenPtr pScreen)
cs->pOverlayWin = NULL;
cs->pOverlayClients = NULL;
+ cs->pendingScreenUpdate = FALSE;
+
cs->numAlternateVisuals = 0;
cs->alternateVisuals = NULL;
cs->numImplicitRedirectExceptions = 0;
@@ -445,8 +444,6 @@ compScreenInit(ScreenPtr pScreen)
cs->ChangeWindowAttributes = pScreen->ChangeWindowAttributes;
pScreen->ChangeWindowAttributes = compChangeWindowAttributes;
- cs->BlockHandler = NULL;
-
cs->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = compCloseScreen;