Skip to content

N
nx-libs
Commit 778e83a3 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

hw/nxagent/NX{glyphstr,picturestr}.h: Don't ship the complete header files in…

hw/nxagent/NX{glyphstr,picturestr}.h: Don't ship the complete header files in nxagent's code base. Rather replace structures we need modified only.
parent de03d622
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 130 deletions
nx-X11/programs/Xserver/fb/Imakefile
View file @ 778e83a3
......@@ -34,7 +34,7 @@ SUBDIRS = module
#include <Server.tmpl>
#ifdef FbNoPixelAddrCode
DEFINES=-DFBNOPIXADDR -DFBNO24BIT
FB_DEFINES=-DFBNOPIXADDR -DFBNO24BIT
#endif
#if defined(IHaveModules)
......@@ -47,6 +47,16 @@ RENDERSRC = fbcompose.c
RENDEROBJ = fbcompose.o
#endif
#if defined(NXAgentServer) && NXAgentServer
NX_DEFINES = -DNXAGENT_SERVER
#endif
#if defined(NXAgentServer) && NXAgentServer
DEFINES = $(FB_DEFINES) $(NX_DEFINES)
#else
DEFINES = $(FB_DEFINES)
#endif
SRCS = $(XFMODSRC) \
fballpriv.c \
fbbits.c \
......
nx-X11/programs/Xserver/hw/nxagent/NXglyph.c
View file @ 778e83a3
......@@ -60,8 +60,7 @@
#ifdef NXAGENT_SERVER
#include "NXpicturestr.h"
#include "NXglyphstr.h"
#include "picturestr.h"
#include "Render.h"
#define PANIC
......@@ -72,10 +71,11 @@
#else
#include "picturestr.h"
#include "glyphstr.h"
#endif
#include "glyphstr.h"
#include <stdint.h>
/*
......
nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphRef.h 0 → 100644
View file @ 778e83a3
/**************************************************************************/
/* */
/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */
/* */
/* NXAGENT, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
/* software is allowed according to terms specified in the file LICENSE */
/* which comes in the source distribution. */
/* */
/* Check http://www.nomachine.com/licensing.html for applicability. */
/* */
/* NX and NoMachine are trademarks of Medialogic S.p.A. */
/* */
/* All rights reserved. */
/* */
/**************************************************************************/
/*
* $XFree86: xc/programs/Xserver/render/glyphstr.h,v 1.3 2000/11/20 07:13:13 keithp Exp $
*
* Copyright © 2000 SuSE, Inc.
*
* 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 SuSE not be used in advertising or
* publicity pertaining to distribution of the software without specific,
* written prior permission. SuSE makes no representations about the
* suitability of this software for any purpose. It is provided "as is"
* without express or implied warranty.
*
* SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
* 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.
*
* Author: Keith Packard, SuSE, Inc.
*/
/* this header file gets included into Xserver/render/glyphstr.h */
#ifndef NX_GLYPHSTR_GLYPHREF_H
#define NX_GLYPHSTR_GLYPHREF_H 1
typedef struct _GlyphRef {
CARD32 signature;
GlyphPtr glyph;
CARD16 corruptedGlyph;
} GlyphRefRec, *GlyphRefPtr;
#endif /* NX_GLYPHSTR_GLYPHREF_H */
nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h → nx-X11/programs/Xserver/hw/nxagent/NXglyphstr_GlyphSet.h
View file @ 778e83a3
......@@ -40,53 +40,10 @@
* Author: Keith Packard, SuSE, Inc.
*/
/*
* This must keep the same symbol as the original glyphstr.h
* or symbols will be redefined. The code here adds a field
* to _GlyphSet. This should be done by defining a new type
* and casting when appropriate.
*/
#ifndef _GLYPHSTR_H_
#define _GLYPHSTR_H_
#include <nx-X11/extensions/renderproto.h>
#include "../../render/picture.h"
#include "screenint.h"
#define GlyphFormat1 0
#define GlyphFormat4 1
#define GlyphFormat8 2
#define GlyphFormat16 3
#define GlyphFormat32 4
#define GlyphFormatNum 5
typedef struct _Glyph {
CARD32 refcnt;
CARD32 size; /* info + bitmap */
xGlyphInfo info;
/* bits follow */
} GlyphRec, *GlyphPtr;
typedef struct _GlyphRef {
CARD32 signature;
GlyphPtr glyph;
CARD16 corruptedGlyph;
} GlyphRefRec, *GlyphRefPtr;
#define DeletedGlyph ((GlyphPtr) 1)
typedef struct _GlyphHashSet {
CARD32 entries;
CARD32 size;
CARD32 rehash;
} GlyphHashSetRec, *GlyphHashSetPtr;
/* this header file gets included into Xserver/render/glyphstr.h */
typedef struct _GlyphHash {
GlyphRefPtr table;
GlyphHashSetPtr hashSet;
CARD32 tableEntries;
} GlyphHashRec, *GlyphHashPtr;
#ifndef NX_GLYPHSTR_GLYPHSET_H
#define NX_GLYPHSTR_GLYPHSET_H 1
typedef struct _GlyphSet {
CARD32 refcnt;
......@@ -98,77 +55,4 @@ typedef struct _GlyphSet {
CARD32 remoteID;
} GlyphSetRec, *GlyphSetPtr;
#define GlyphSetGetPrivate(pGlyphSet,n) \
((n) > (pGlyphSet)->maxPrivate ? \
(void *) 0 : \
(pGlyphSet)->devPrivates[n])
#define GlyphSetSetPrivate(pGlyphSet,n,ptr) \
((n) > (pGlyphSet)->maxPrivate ? \
_GlyphSetSetNewPrivate(pGlyphSet, n, ptr) : \
((((pGlyphSet)->devPrivates[n] = (ptr)) != 0) || TRUE))
typedef struct _GlyphList {
INT16 xOff;
INT16 yOff;
CARD8 len;
PictFormatPtr format;
} GlyphListRec, *GlyphListPtr;
extern GlyphHashRec globalGlyphs[GlyphFormatNum];
GlyphHashSetPtr
FindGlyphHashSet (CARD32 filled);
int
AllocateGlyphSetPrivateIndex (void);
void
ResetGlyphSetPrivateIndex (void);
Bool
_GlyphSetSetNewPrivate (GlyphSetPtr glyphSet, int n, void * ptr);
Bool
GlyphInit (ScreenPtr pScreen);
GlyphRefPtr
FindGlyphRef (GlyphHashPtr hash, CARD32 signature, Bool match, GlyphPtr compare);
CARD32
HashGlyph (GlyphPtr glyph);
void
FreeGlyph (GlyphPtr glyph, int format);
void
AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id);
Bool
DeleteGlyph (GlyphSetPtr glyphSet, Glyph id);
GlyphPtr
FindGlyph (GlyphSetPtr glyphSet, Glyph id);
GlyphPtr
AllocateGlyph (xGlyphInfo *gi, int format);
Bool
AllocateGlyphHash (GlyphHashPtr hash, GlyphHashSetPtr hashSet);
Bool
ResizeGlyphHash (GlyphHashPtr hash, CARD32 change, Bool global);
Bool
ResizeGlyphSet (GlyphSetPtr glyphSet, CARD32 change);
GlyphSetPtr
AllocateGlyphSet (int fdepth, PictFormatPtr format);
int
FreeGlyphSet (void *value,
XID gid);
#endif /* _GLYPHSTR_H_ */
#endif /* NX_GLYPHSTR_GLYPHSET_H */
nx-X11/programs/Xserver/hw/nxagent/NXpicture.c
View file @ 778e83a3
......@@ -40,7 +40,7 @@
* Author: Keith Packard, SuSE, Inc.
*/
#include "NXpicturestr.h"
#include "picturestr.h"
#include "Screen.h"
#include "Pixmaps.h"
......
nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h 0 → 100644
View file @ 778e83a3
/**************************************************************************/
/* */
/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */
/* */
/* NXAGENT, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
/* software is allowed according to terms specified in the file LICENSE */
/* which comes in the source distribution. */
/* */
/* Check http://www.nomachine.com/licensing.html for applicability. */
/* */
/* NX and NoMachine are trademarks of Medialogic S.p.A. */
/* */
/* All rights reserved. */
/* */
/**************************************************************************/
/*
* $Id: picturestr.h,v 1.15 2005/12/09 18:35:21 ajax Exp $
*
* Copyright © 2000 SuSE, Inc.
*
* 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 SuSE not be used in advertising or
* publicity pertaining to distribution of the software without specific,
* written prior permission. SuSE makes no representations about the
* suitability of this software for any purpose. It is provided "as is"
* without express or implied warranty.
*
* SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
* 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.
*
* Author: Keith Packard, SuSE, Inc.
*/
/* this header file gets included into Xserver/render/picturestr.h */
#ifndef NX_PICTURESTR_PICTSOLIDFILL_H
#define NX_PICTURESTR_PICTSOLIDFILL_H 1
typedef struct _PictSolidFill {
unsigned int type;
CARD32 color;
xRenderColor fullColor;
} PictSolidFill, *PictSolidFillPtr;
#endif /* NX_PICTURESTR_PICTSOLIDFILL_H */
nx-X11/programs/Xserver/hw/nxagent/NXrender.c
View file @ 778e83a3
......@@ -71,8 +71,8 @@
#define UINT32_MAX 0xffffffffU
#endif
#include "NXpicturestr.h"
#include "NXglyphstr.h"
#include "picturestr.h"
#include "glyphstr.h"
#include "Trap.h"
......
nx-X11/programs/Xserver/hw/nxagent/Render.c
View file @ 778e83a3
......@@ -15,8 +15,8 @@
/* */
/**************************************************************************/
#include "NXpicturestr.h"
#include "NXglyphstr.h"
#include "picturestr.h"
#include "glyphstr.h"
#include "Render.h"
......
nx-X11/programs/Xserver/hw/nxagent/Render.h
View file @ 778e83a3
......@@ -23,7 +23,7 @@
#include "picture.h"
#include "renderproto.h"
#include "NXglyphstr.h"
#include "glyphstr.h"
#include "Agent.h"
......
nx-X11/programs/Xserver/render/Imakefile
View file @ 778e83a3
......@@ -15,6 +15,8 @@ NXAGENT_SKIP_OBJS = \
mitrap.o \
picture.o \
$(NULL)
#else
DEFINES = -DNXAGENT_SERVER
#endif
SRCS = animcur.c \
......
nx-X11/programs/Xserver/render/glyphstr.h
View file @ 778e83a3
......@@ -44,10 +44,14 @@ typedef struct _Glyph {
/* bits follow */
} GlyphRec, *GlyphPtr;
#ifdef NXAGENT_SERVER
#include "../hw/nxagent/NXglyphstr_GlyphRef.h"
#else
typedef struct _GlyphRef {
CARD32 signature;
GlyphPtr glyph;
} GlyphRefRec, *GlyphRefPtr;
#endif /* NXAGENT_SERVER */
#define DeletedGlyph ((GlyphPtr) 1)
......@@ -63,6 +67,9 @@ typedef struct _GlyphHash {
CARD32 tableEntries;
} GlyphHashRec, *GlyphHashPtr;
#ifdef NXAGENT_SERVER
#include "../hw/nxagent/NXglyphstr_GlyphSet.h"
#else
typedef struct _GlyphSet {
CARD32 refcnt;
PictFormatPtr format;
......@@ -71,6 +78,7 @@ typedef struct _GlyphSet {
int maxPrivate;
void **devPrivates;
} GlyphSetRec, *GlyphSetPtr;
#endif /* NXAGENT_SERVER */
#define GlyphSetGetPrivate(pGlyphSet,n) \
((n) > (pGlyphSet)->maxPrivate ? \
......
nx-X11/programs/Xserver/render/picturestr.h
View file @ 778e83a3
......@@ -65,10 +65,14 @@ typedef struct pixman_transform PictTransform, *PictTransformPtr;
#define SourcePictTypeRadial 2
#define SourcePictTypeConical 3
#ifdef NXAGENT_SERVER
#include "../hw/nxagent/NXpicturestr_PictSolidFill.h"
#else
typedef struct _PictSolidFill {
unsigned int type;
CARD32 color;
} PictSolidFill, *PictSolidFillPtr;
#endif /* NXAGENT_SERVER */
typedef struct _PictGradientStop {
xFixed x;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment