From 06aa41671963dac9fa4bf84a8fc996a5360c94b0 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 27 Apr 2015 16:08:06 +0200 Subject: library clean-up: Don't build libNX_Xdamage anymore. Use system's libXdamage shared library. (Fixes ArcticaProject/nx-libs#6, X2GoBTS#826). --- nx-X11/include/extensions/Imakefile | 4 - nx-X11/include/extensions/damageproto.h | 149 -------------------------------- nx-X11/include/extensions/damagewire.h | 57 ------------ 3 files changed, 210 deletions(-) delete mode 100644 nx-X11/include/extensions/damageproto.h delete mode 100644 nx-X11/include/extensions/damagewire.h (limited to 'nx-X11/include/extensions') diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index 3f2992b77..4f88d2bab 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -47,9 +47,6 @@ RENDERHEADERS = render.h renderproto.h #if BuildXfixes || BuildXfixesLibrary XFIXESHEADERS = xfixeswire.h xfixesproto.h #endif -#if BuildDamage || BuildDamageLibrary -DAMAGEHEADERS = damagewire.h damageproto.h -#endif #if BuildComposite || BuildCompositeLibrary COMPOSITEHEADERS = composite.h compositeproto.h #endif @@ -82,7 +79,6 @@ EXTRAHEADERS = \ $(RENDERHEADERS) \ $(RANDRHEADERS) \ $(XFIXESHEADERS) \ - $(DAMAGEHEADERS) \ $(COMPOSITEHEADERS) \ $(XEVIEHEADERS) \ $(XTRAPHEADERS) \ diff --git a/nx-X11/include/extensions/damageproto.h b/nx-X11/include/extensions/damageproto.h deleted file mode 100644 index b190d68c7..000000000 --- a/nx-X11/include/extensions/damageproto.h +++ /dev/null @@ -1,149 +0,0 @@ -/* - * $Id: damageproto.h,v 1.2 2004/07/29 19:29:55 stukreit 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 _DAMAGEPROTO_H_ -#define _DAMAGEPROTO_H_ - -#include -#include -#include - -#define Window CARD32 -#define Drawable CARD32 -#define Font CARD32 -#define Pixmap CARD32 -#define Cursor CARD32 -#define Colormap CARD32 -#define GContext CARD32 -#define Atom CARD32 -#define VisualID CARD32 -#define Time CARD32 -#define KeyCode CARD8 -#define KeySym CARD32 -#define Picture CARD32 -#define Region CARD32 -#define Damage CARD32 - -/************** Version 0 ******************/ - -typedef struct { - CARD8 reqType; - CARD8 damageReqType; - CARD16 length B16; -} xDamageReq; - -/* - * requests and replies - */ - -typedef struct { - CARD8 reqType; - CARD8 damageReqType; - CARD16 length B16; - CARD32 majorVersion B32; - CARD32 minorVersion B32; -} xDamageQueryVersionReq; - -#define sz_xDamageQueryVersionReq 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; -} xDamageQueryVersionReply; - -#define sz_xDamageQueryVersionReply 32 - -typedef struct { - CARD8 reqType; - CARD8 damageReqType; - CARD16 length B16; - Damage damage B32; - Drawable drawable B32; - CARD8 level; - CARD8 pad1; - CARD16 pad2 B16; -} xDamageCreateReq; - -#define sz_xDamageCreateReq 16 - -typedef struct { - CARD8 reqType; - CARD8 damageReqType; - CARD16 length B16; - Damage damage B32; -} xDamageDestroyReq; - -#define sz_xDamageDestroyReq 8 - -typedef struct { - CARD8 reqType; - CARD8 damageReqType; - CARD16 length B16; - Damage damage B32; - Region repair B32; - Region parts B32; -} xDamageSubtractReq; - -#define sz_xDamageSubtractReq 16 - -/* Events */ - -#define DamageNotifyMore 0x80 - -typedef struct { - CARD8 type; - CARD8 level; - CARD16 sequenceNumber B16; - Drawable drawable B32; - Damage damage B32; - Time timestamp B32; - xRectangle area; - xRectangle geometry; -} xDamageNotifyEvent; - -#undef Damage -#undef Region -#undef Picture -#undef Window -#undef Drawable -#undef Font -#undef Pixmap -#undef Cursor -#undef Colormap -#undef GContext -#undef Atom -#undef VisualID -#undef Time -#undef KeyCode -#undef KeySym - -#endif /* _DAMAGEPROTO_H_ */ diff --git a/nx-X11/include/extensions/damagewire.h b/nx-X11/include/extensions/damagewire.h deleted file mode 100644 index d523cea98..000000000 --- a/nx-X11/include/extensions/damagewire.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * $Id: damagewire.h,v 1.2 2004/07/29 19:29:55 stukreit 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 _DAMAGEWIRE_H_ -#define _DAMAGEWIRE_H_ - -#define DAMAGE_NAME "DAMAGE" -#define DAMAGE_MAJOR 1 -#define DAMAGE_MINOR 0 - -/************* Version 1 ****************/ - -/* Constants */ -#define XDamageReportRawRectangles 0 -#define XDamageReportDeltaRectangles 1 -#define XDamageReportBoundingBox 2 -#define XDamageReportNonEmpty 3 - -/* Requests */ -#define X_DamageQueryVersion 0 -#define X_DamageCreate 1 -#define X_DamageDestroy 2 -#define X_DamageSubtract 3 - -#define XDamageNumberRequests (X_DamageSubtract + 1) - -/* Events */ -#define XDamageNotify 0 - -#define XDamageNumberEvents (XDamageNotify + 1) - -/* Errors */ -#define BadDamage 0 -#define XDamageNumberErrors (BadDamage + 1) - -#endif /* _DAMAGEWIRE_H_ */ -- cgit v1.2.3