9838b7032e
This is strictly the application of the script 'x-indent-all.sh' from util/modular. Compared to the patch that Daniel posted in January, I've added a few indent flags: -bap -psl -T PrivatePtr -T pmWait -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT The typedefs were needed to make the output of sdksyms.sh match the previous output, otherwise, the code is formatted badly enough that sdksyms.sh generates incorrect output. The generated code was compared with the previous version and found to be essentially identical -- "assert" line numbers and BUILD_TIME were the only differences found. The comparison was done with this script: dir1=$1 dir2=$2 for dir in $dir1 $dir2; do (cd $dir && find . -name '*.o' | while read file; do dir=`dirname $file` base=`basename $file .o` dump=$dir/$base.dump objdump -d $file > $dump done) done find $dir1 -name '*.dump' | while read dump; do otherdump=`echo $dump | sed "s;$dir1;$dir2;"` diff -u $dump $otherdump done Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
137 lines
3.9 KiB
C
137 lines
3.9 KiB
C
/*
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef _GLYPHSTR_H_
|
|
#define _GLYPHSTR_H_
|
|
|
|
#include <X11/extensions/renderproto.h>
|
|
#include "picture.h"
|
|
#include "screenint.h"
|
|
#include "regionstr.h"
|
|
#include "miscstruct.h"
|
|
#include "privates.h"
|
|
|
|
#define GlyphFormat1 0
|
|
#define GlyphFormat4 1
|
|
#define GlyphFormat8 2
|
|
#define GlyphFormat16 3
|
|
#define GlyphFormat32 4
|
|
#define GlyphFormatNum 5
|
|
|
|
typedef struct _Glyph {
|
|
CARD32 refcnt;
|
|
PrivateRec *devPrivates;
|
|
unsigned char sha1[20];
|
|
CARD32 size; /* info + bitmap */
|
|
xGlyphInfo info;
|
|
/* per-screen pixmaps follow */
|
|
} GlyphRec, *GlyphPtr;
|
|
|
|
#define GlyphPicture(glyph) ((PicturePtr *) ((glyph) + 1))
|
|
|
|
typedef struct _GlyphRef {
|
|
CARD32 signature;
|
|
GlyphPtr glyph;
|
|
} GlyphRefRec, *GlyphRefPtr;
|
|
|
|
#define DeletedGlyph ((GlyphPtr) 1)
|
|
|
|
typedef struct _GlyphHashSet {
|
|
CARD32 entries;
|
|
CARD32 size;
|
|
CARD32 rehash;
|
|
} GlyphHashSetRec, *GlyphHashSetPtr;
|
|
|
|
typedef struct _GlyphHash {
|
|
GlyphRefPtr table;
|
|
GlyphHashSetPtr hashSet;
|
|
CARD32 tableEntries;
|
|
} GlyphHashRec, *GlyphHashPtr;
|
|
|
|
typedef struct _GlyphSet {
|
|
CARD32 refcnt;
|
|
int fdepth;
|
|
PictFormatPtr format;
|
|
GlyphHashRec hash;
|
|
PrivateRec *devPrivates;
|
|
} GlyphSetRec, *GlyphSetPtr;
|
|
|
|
#define GlyphSetGetPrivate(pGlyphSet,k) \
|
|
dixLookupPrivate(&(pGlyphSet)->devPrivates, k)
|
|
|
|
#define GlyphSetSetPrivate(pGlyphSet,k,ptr) \
|
|
dixSetPrivate(&(pGlyphSet)->devPrivates, k, ptr)
|
|
|
|
typedef struct _GlyphList {
|
|
INT16 xOff;
|
|
INT16 yOff;
|
|
CARD8 len;
|
|
PictFormatPtr format;
|
|
} GlyphListRec, *GlyphListPtr;
|
|
|
|
extern _X_EXPORT void
|
|
GlyphUninit(ScreenPtr pScreen);
|
|
|
|
extern _X_EXPORT GlyphHashSetPtr FindGlyphHashSet(CARD32 filled);
|
|
|
|
extern _X_EXPORT GlyphRefPtr
|
|
FindGlyphRef(GlyphHashPtr hash,
|
|
CARD32 signature, Bool match, unsigned char sha1[20]);
|
|
|
|
extern _X_EXPORT GlyphPtr FindGlyphByHash(unsigned char sha1[20], int format);
|
|
|
|
extern _X_EXPORT int
|
|
|
|
HashGlyph(xGlyphInfo * gi,
|
|
CARD8 *bits, unsigned long size, unsigned char sha1[20]);
|
|
|
|
extern _X_EXPORT void
|
|
FreeGlyph(GlyphPtr glyph, int format);
|
|
|
|
extern _X_EXPORT void
|
|
AddGlyph(GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id);
|
|
|
|
extern _X_EXPORT Bool
|
|
DeleteGlyph(GlyphSetPtr glyphSet, Glyph id);
|
|
|
|
extern _X_EXPORT GlyphPtr FindGlyph(GlyphSetPtr glyphSet, Glyph id);
|
|
|
|
extern _X_EXPORT GlyphPtr AllocateGlyph(xGlyphInfo * gi, int format);
|
|
|
|
extern _X_EXPORT Bool
|
|
AllocateGlyphHash(GlyphHashPtr hash, GlyphHashSetPtr hashSet);
|
|
|
|
extern _X_EXPORT Bool
|
|
ResizeGlyphHash(GlyphHashPtr hash, CARD32 change, Bool global);
|
|
|
|
extern _X_EXPORT Bool
|
|
ResizeGlyphSet(GlyphSetPtr glyphSet, CARD32 change);
|
|
|
|
extern _X_EXPORT GlyphSetPtr AllocateGlyphSet(int fdepth, PictFormatPtr format);
|
|
|
|
extern _X_EXPORT int
|
|
FreeGlyphSet(pointer value, XID gid);
|
|
|
|
#endif /* _GLYPHSTR_H_ */
|