diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-04-14 09:42:35 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-04-16 17:59:18 +0200 |
commit | a5f71f084e9f32e947a04da69edb7aae96d61697 (patch) | |
tree | 03acc5d7d7bb0d35152bfc597eb788b938f09647 /nx-X11/programs/Xserver/hw/nxagent/NXcompositeproto.h | |
parent | fad840cfe558601a8ec02414f1235824bc9f3168 (diff) | |
download | nx-libs-a5f71f084e9f32e947a04da69edb7aae96d61697.tar.gz nx-libs-a5f71f084e9f32e947a04da69edb7aae96d61697.tar.bz2 nx-libs-a5f71f084e9f32e947a04da69edb7aae96d61697.zip |
NXAGENT_UPGRADE code cleanup:
NX agent contains/ed two build trees. An old one (probably pre-3.x.y)
and a "newer" one. The "newer" code tree used to become enabled by
setting NXUpgradeAgentServer in nx-X11/config/cf/host.def to YES.
As building the NXUpgradeAgentServer has been the default for
years now, we drop all code that does not get used at build time
for NXUpgradeAgentServer == YES (i.e., the code that belongs to the
pre-3.x.y phase of NX agent).
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXcompositeproto.h')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXcompositeproto.h | 148 |
1 files changed, 0 insertions, 148 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeproto.h b/nx-X11/programs/Xserver/hw/nxagent/NXcompositeproto.h deleted file mode 100644 index cd31c7c8c..000000000 --- a/nx-X11/programs/Xserver/hw/nxagent/NXcompositeproto.h +++ /dev/null @@ -1,148 +0,0 @@ -#ifndef NXAGENT_UPGRADE - -/* - * $Id: compositeproto.h,v 1.4 2004/07/08 07:20:55 keithp Exp $ - * - * Copyright © 2003 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _COMPOSITEPROTO_H_ -#define _COMPOSITEPROTO_H_ - -#include <X11/Xmd.h> - -#ifdef NXAGENT_SERVER - -#include "NXcomposite.h" - -#else - -#include <X11/extensions/composite.h> - -#endif - -#define Window CARD32 -#define Region CARD32 - -/* - * requests and replies - */ -typedef struct { - CARD8 reqType; - CARD8 compositeReqType; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; -} xCompositeQueryVersionReq; - -#define sz_xCompositeQueryVersionReq 12 - -typedef struct { - BYTE type; /* X_Reply */ - BYTE pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 majorVersion B32; - CARD32 minorVersion B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; -} xCompositeQueryVersionReply; - -#define sz_xCompositeQueryVersionReply 32 - -typedef struct { - CARD8 reqType; - CARD8 compositeReqType; - CARD16 length B16; - Window window B32; - CARD8 update; - CARD8 pad1; - CARD16 pad2 B16; -} xCompositeRedirectWindowReq; - -#define sz_xCompositeRedirectWindowReq 12 - -typedef struct { - CARD8 reqType; - CARD8 compositeReqType; - CARD16 length B16; - Window window B32; - CARD8 update; - CARD8 pad1; - CARD16 pad2 B16; -} xCompositeRedirectSubwindowsReq; - -#define sz_xCompositeRedirectSubwindowsReq 12 - -typedef struct { - CARD8 reqType; - CARD8 compositeReqType; - CARD16 length B16; - Window window B32; - CARD8 update; - CARD8 pad1; - CARD16 pad2 B16; -} xCompositeUnredirectWindowReq; - -#define sz_xCompositeUnredirectWindowReq 12 - -typedef struct { - CARD8 reqType; - CARD8 compositeReqType; - CARD16 length B16; - Window window B32; - CARD8 update; - CARD8 pad1; - CARD16 pad2 B16; -} xCompositeUnredirectSubwindowsReq; - -#define sz_xCompositeUnredirectSubwindowsReq 12 - -typedef struct { - CARD8 reqType; - CARD8 compositeReqType; - CARD16 length B16; - Region region B32; - Window window B32; -} xCompositeCreateRegionFromBorderClipReq; - -#define sz_xCompositeCreateRegionFromBorderClipReq 12 - -/* Version 0.2 additions */ - -typedef struct { - CARD8 reqType; - CARD8 compositeReqType; - CARD16 length; - Window window B32; - Pixmap pixmap B32; -} xCompositeNameWindowPixmapReq; - -#define sz_xCompositeNameWindowPixmapReq 12 - -#undef Window -#undef Region - -#endif /* _COMPOSITEPROTO_H_ */ - -#endif /* #ifndef NXAGENT_UPGRADE */ |