hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-05 22:46:06 +00:00
Code Issues Projects Releases Wiki Activity

Introduce a consistent coding style

Browse source 
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>
This commit is contained in:
Keith Packard 2012-03-21 12:55:09 -07:00
commit 9838b7032e
1258 changed files with 264655 additions and 259938 deletions
Download patch file Download diff file Expand all files Collapse all files

145
glx/xfont.c
View file

@ -48,16 +48,18 @@
/*
** Make a single GL bitmap from a single X glyph
*/
static int __glXMakeBitmapFromGlyph(FontPtr font, CharInfoPtr pci)
static int
__glXMakeBitmapFromGlyph(FontPtr font, CharInfoPtr pci)
{
int i, j;
int widthPadded; /* width of glyph in bytes, as padded by X */
int allocBytes; /* bytes to allocate to store bitmap */
int w; /* width of glyph in bits */
int h; /* height of glyph */
int widthPadded; /* width of glyph in bytes, as padded by X */
int allocBytes; /* bytes to allocate to store bitmap */
int w; /* width of glyph in bits */
int h; /* height of glyph */
register unsigned char *pglyph;
register unsigned char *p;
unsigned char *allocbuf;
#define __GL_CHAR_BUF_SIZE 2048
unsigned char buf[__GL_CHAR_BUF_SIZE];
@ -66,35 +68,36 @@ static int __glXMakeBitmapFromGlyph(FontPtr font, CharInfoPtr pci)
widthPadded = GLYPHWIDTHBYTESPADDED(pci);
/*
** Use the local buf if possible, otherwise malloc.
*/
** Use the local buf if possible, otherwise malloc.
*/
allocBytes = widthPadded * h;
if (allocBytes <= __GL_CHAR_BUF_SIZE) {
p = buf;
allocbuf = 0;
} else {
p = (unsigned char *) malloc(allocBytes);
if (!p)
return BadAlloc;
allocbuf = p;
p = buf;
allocbuf = 0;
}
else {
p = (unsigned char *) malloc(allocBytes);
if (!p)
return BadAlloc;
allocbuf = p;
}
/*
** We have to reverse the picture, top to bottom
*/
** We have to reverse the picture, top to bottom
*/
pglyph = FONTGLYPHBITS(FONTGLYPHS(font), pci) + (h-1)*widthPadded;
for (j=0; j < h; j++) {
for (i=0; i < widthPadded; i++) {
p[i] = pglyph[i];
}
pglyph -= widthPadded;
p += widthPadded;
pglyph = FONTGLYPHBITS(FONTGLYPHS(font), pci) + (h - 1) * widthPadded;
for (j = 0; j < h; j++) {
for (i = 0; i < widthPadded; i++) {
p[i] = pglyph[i];
}
pglyph -= widthPadded;
p += widthPadded;
}
CALL_Bitmap( GET_DISPATCH(), (w, h, -pci->metrics.leftSideBearing,
pci->metrics.descent,
pci->metrics.characterWidth, 0,
allocbuf ? allocbuf : buf) );
CALL_Bitmap(GET_DISPATCH(), (w, h, -pci->metrics.leftSideBearing,
pci->metrics.descent,
pci->metrics.characterWidth, 0,
allocbuf ? allocbuf : buf));
free(allocbuf);
return Success;
@ -106,46 +109,48 @@ static int __glXMakeBitmapFromGlyph(FontPtr font, CharInfoPtr pci)
** in a display list.
*/
static int
static int
MakeBitmapsFromFont(FontPtr pFont, int first, int count, int list_base)
{
unsigned long i, nglyphs;
CARD8 chs[2]; /* the font index we are going after */
CharInfoPtr pci;
int rv; /* return value */
unsigned long i, nglyphs;
CARD8 chs[2]; /* the font index we are going after */
CharInfoPtr pci;
int rv; /* return value */
int encoding = (FONTLASTROW(pFont) == 0) ? Linear16Bit : TwoD16Bit;
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, FALSE) );
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, BITMAP_BIT_ORDER == LSBFirst) );
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH, 0) );
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, 0) );
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS, 0) );
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT, GLYPHPADBYTES) );
for (i=0; i < count; i++) {
chs[0] = (first + i) >> 8; /* high byte is first byte */
chs[1] = first + i;
(*pFont->get_glyphs)(pFont, 1, chs, (FontEncoding)encoding,
&nglyphs, &pci);
CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, FALSE));
CALL_PixelStorei(GET_DISPATCH(),
(GL_UNPACK_LSB_FIRST, BITMAP_BIT_ORDER == LSBFirst));
CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH, 0));
CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, 0));
CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS, 0));
CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ALIGNMENT, GLYPHPADBYTES));
for (i = 0; i < count; i++) {
chs[0] = (first + i) >> 8; /* high byte is first byte */
chs[1] = first + i;
/*
** Define a display list containing just a glBitmap() call.
*/
CALL_NewList( GET_DISPATCH(), (list_base + i, GL_COMPILE) );
if (nglyphs ) {
rv = __glXMakeBitmapFromGlyph(pFont, pci);
if (rv) {
return rv;
}
}
CALL_EndList( GET_DISPATCH(), () );
(*pFont->get_glyphs) (pFont, 1, chs, (FontEncoding) encoding,
&nglyphs, &pci);
/*
** Define a display list containing just a glBitmap() call.
*/
CALL_NewList(GET_DISPATCH(), (list_base + i, GL_COMPILE));
if (nglyphs) {
rv = __glXMakeBitmapFromGlyph(pFont, pci);
if (rv) {
return rv;
}
}
CALL_EndList(GET_DISPATCH(), ());
}
return Success;
}
/************************************************************************/
int __glXDisp_UseXFont(__GLXclientState *cl, GLbyte *pc)
int
__glXDisp_UseXFont(__GLXclientState * cl, GLbyte * pc)
{
ClientPtr client = cl->client;
xGLXUseXFontReq *req;
@ -159,28 +164,28 @@ int __glXDisp_UseXFont(__GLXclientState *cl, GLbyte *pc)
req = (xGLXUseXFontReq *) pc;
cx = __glXForceCurrent(cl, req->contextTag, &error);
if (!cx) {
return error;
return error;
}
CALL_GetIntegerv( GET_DISPATCH(), (GL_LIST_INDEX, (GLint*) &currentListIndex) );
CALL_GetIntegerv(GET_DISPATCH(),
(GL_LIST_INDEX, (GLint *) & currentListIndex));
if (currentListIndex != 0) {
/*
** A display list is currently being made. It is an error
** to try to make a font during another lists construction.
*/
client->errorValue = cx->id;
return __glXError(GLXBadContextState);
/*
** A display list is currently being made. It is an error
** to try to make a font during another lists construction.
*/
client->errorValue = cx->id;
return __glXError(GLXBadContextState);
}
/*
** Font can actually be either the ID of a font or the ID of a GC
** containing a font.
*/
** Font can actually be either the ID of a font or the ID of a GC
** containing a font.
*/
error = dixLookupFontable(&pFont, req->font, client, DixReadAccess);
if (error != Success)
return error;
return error;
return MakeBitmapsFromFont(pFont, req->first, req->count,
req->listBase);
return MakeBitmapsFromFont(pFont, req->first, req->count, req->listBase);
}