diff options
| author | Adam Jackson <ajax@redhat.com> | 2014-06-20 13:31:20 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2014-10-27 15:46:05 -0400 |
| commit | 73e2383b7350723256894c5076d0c731aec5cd1f (patch) | |
| tree | 1ceac2d3dbec5820802ce3be12fac72b754cce20 /include | |
| parent | e7b9295551d55b42b416ba70cce11dae79ece5e7 (diff) | |
dix: Always store GC client clip as a region (v2)
Again, this changes FixesCreateRegionFromGC to throw BadMatch when fed a
GC with no client clip.
v2: Fix Xnest and some variable names (Keith)
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/gcstruct.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/gcstruct.h b/include/gcstruct.h index 6358b8cb7..32e89a147 100644 --- a/include/gcstruct.h +++ b/include/gcstruct.h @@ -254,13 +254,12 @@ typedef struct _GC { unsigned int arcMode:1; unsigned int subWindowMode:1; unsigned int graphicsExposures:1; - unsigned int clientClipType:2; /* CT_<kind> */ unsigned int miTranslate:1; /* should mi things translate? */ unsigned int tileIsPixel:1; /* tile is solid pixel */ unsigned int fExpose:1; /* Call exposure handling */ unsigned int freeCompClip:1; /* Free composite clip */ unsigned int scratch_inuse:1; /* is this GC in a pool for reuse? */ - unsigned int unused:13; /* see comment above */ + unsigned int unused:15; /* see comment above */ unsigned long planemask; unsigned long fgPixel; unsigned long bgPixel; @@ -273,7 +272,7 @@ typedef struct _GC { DDXPointRec patOrg; /* origin for (tile, stipple) */ struct _Font *font; DDXPointRec clipOrg; - void *clientClip; + RegionPtr clientClip; unsigned long stateChanges; /* masked with GC_<kind> */ unsigned long serialNumber; const GCFuncs *funcs; |