mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 03:44:06 +00:00
Integrate COMPOSITEWRAP branch including composite wrapper. This code still
has several issues, including:
- CopyWindow and PaintWindow wrappers missing (will be done soon)
- Some segfaults seen in the Render wrappers.
- Xprt server build breaks with Composite.
- DDXs must be recompiled for Composite due to VisualRec size change.
- Composite bugs pointed out by Deron Johnson in email.
Also, reorder XFixes initialization according to comments by Keith which
are also in xserver CVS.
This commit is contained in:
@@ -79,6 +79,10 @@ typedef struct _Pixmap {
|
||||
#ifdef PIXPRIV
|
||||
DevUnion *devPrivates; /* real devPrivates like gcs & windows */
|
||||
#endif
|
||||
#ifdef COMPOSITE
|
||||
short screen_x;
|
||||
short screen_y;
|
||||
#endif
|
||||
} PixmapRec;
|
||||
|
||||
#endif /* PIXMAPSTRUCT_H */
|
||||
|
||||
@@ -75,6 +75,10 @@ typedef struct _Visual {
|
||||
* it may have more or fewer */
|
||||
unsigned long redMask, greenMask, blueMask;
|
||||
int offsetRed, offsetGreen, offsetBlue;
|
||||
#ifdef COMPOSITE
|
||||
unsigned long alphaMask;
|
||||
int offsetAlpha;
|
||||
#endif
|
||||
} VisualRec;
|
||||
|
||||
typedef struct _Depth {
|
||||
|
||||
@@ -135,6 +135,9 @@ typedef struct _Window {
|
||||
#define DBE_BACK_BUFFER 0
|
||||
unsigned dstBuffer:1; /* destination buffer for rendering */
|
||||
unsigned srcBuffer:1; /* source buffer for rendering */
|
||||
#endif
|
||||
#ifdef COMPOSITE
|
||||
unsigned redirectDraw:1; /* rendering is redirected from here */
|
||||
#endif
|
||||
DevUnion *devPrivates;
|
||||
} WindowRec;
|
||||
|
||||
Reference in New Issue
Block a user