diff options
author | marha <marha@users.sourceforge.net> | 2014-04-13 14:28:06 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-04-13 14:28:06 +0200 |
commit | 0bd141efd4832e01c8b269b8566dd5749e30ed55 (patch) | |
tree | cdad95c688236c6e2e36f13a3495c498393dabc8 /xorg-server/include/scrnintstr.h | |
parent | feab85024204c7db3ad243697fe06bf3960349a9 (diff) | |
parent | d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed (diff) | |
download | vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.tar.gz vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.tar.bz2 vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/include/scrnintstr.h')
-rw-r--r-- | xorg-server/include/scrnintstr.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h index 2ad029599..f6a5ef3aa 100644 --- a/xorg-server/include/scrnintstr.h +++ b/xorg-server/include/scrnintstr.h @@ -357,6 +357,11 @@ typedef Bool (*StopPixmapTrackingProcPtr)(PixmapPtr, PixmapPtr); typedef Bool (*ReplaceScanoutPixmapProcPtr)(DrawablePtr, PixmapPtr, Bool); +typedef WindowPtr (*XYToWindowProcPtr)(ScreenPtr pScreen, + SpritePtr pSprite, int x, int y); + +typedef int (*NameWindowPixmapProcPtr)(WindowPtr, PixmapPtr, CARD32); + typedef struct _Screen { int myNum; /* index of this instance in Screens[] */ ATOM id; @@ -467,6 +472,7 @@ typedef struct _Screen { SetWindowPixmapProcPtr SetWindowPixmap; GetScreenPixmapProcPtr GetScreenPixmap; SetScreenPixmapProcPtr SetScreenPixmap; + NameWindowPixmapProcPtr NameWindowPixmap; PixmapPtr pScratchPixmap; /* scratch pixmap "pool" */ @@ -517,6 +523,7 @@ typedef struct _Screen { struct xorg_list offload_head; ReplaceScanoutPixmapProcPtr ReplaceScanoutPixmap; + XYToWindowProcPtr XYToWindow; } ScreenRec; static inline RegionPtr |