XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 08:04:30 +00:00
Code Issues Packages 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
parent 75199129c6
commit 9838b7032e
1258 changed files with 257574 additions and 252857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
include/cursor.h
View File

@@ -22,7 +22,6 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
@@ -46,7 +45,7 @@ SOFTWARE.
******************************************************************/
#ifndef CURSOR_H
#define CURSOR_H
#define CURSOR_H
#include "misc.h"
#include "screenint.h"
@@ -64,77 +63,70 @@ typedef struct _Cursor *CursorPtr;
typedef struct _CursorMetric *CursorMetricPtr;
extern _X_EXPORT DevScreenPrivateKeyRec cursorScreenDevPriv;
#define CursorScreenKey (&cursorScreenDevPriv)
extern _X_EXPORT CursorPtr rootCursor;
extern _X_EXPORT int FreeCursor(
pointer /*pCurs*/,
XID /*cid*/);
extern _X_EXPORT int FreeCursor(pointer /*pCurs */ ,
XID /*cid */ );
extern _X_EXPORT int AllocARGBCursor(
unsigned char* /*psrcbits*/,
unsigned char* /*pmaskbits*/,
CARD32* /*argb*/,
CursorMetricPtr /*cm*/,
unsigned /*foreRed*/,
unsigned /*foreGreen*/,
unsigned /*foreBlue*/,
unsigned /*backRed*/,
unsigned /*backGreen*/,
unsigned /*backBlue*/,
CursorPtr* /*ppCurs*/,
ClientPtr /*client*/,
XID /*cid*/);
extern _X_EXPORT int AllocARGBCursor(unsigned char * /*psrcbits */ ,
unsigned char * /*pmaskbits */ ,
CARD32 * /*argb */ ,
CursorMetricPtr /*cm */ ,
unsigned /*foreRed */ ,
unsigned /*foreGreen */ ,
unsigned /*foreBlue */ ,
unsigned /*backRed */ ,
unsigned /*backGreen */ ,
unsigned /*backBlue */ ,
CursorPtr * /*ppCurs */ ,
ClientPtr /*client */ ,
XID /*cid */ );
extern _X_EXPORT int AllocGlyphCursor(
Font /*source*/,
unsigned int /*sourceChar*/,
Font /*mask*/,
unsigned int /*maskChar*/,
unsigned /*foreRed*/,
unsigned /*foreGreen*/,
unsigned /*foreBlue*/,
unsigned /*backRed*/,
unsigned /*backGreen*/,
unsigned /*backBlue*/,
CursorPtr* /*ppCurs*/,
ClientPtr /*client*/,
XID /*cid*/);
extern _X_EXPORT int AllocGlyphCursor(Font /*source */ ,
unsigned int /*sourceChar */ ,
Font /*mask */ ,
unsigned int /*maskChar */ ,
unsigned /*foreRed */ ,
unsigned /*foreGreen */ ,
unsigned /*foreBlue */ ,
unsigned /*backRed */ ,
unsigned /*backGreen */ ,
unsigned /*backBlue */ ,
CursorPtr * /*ppCurs */ ,
ClientPtr /*client */ ,
XID /*cid */ );
extern _X_EXPORT CursorPtr CreateRootCursor(
char* /*pfilename*/,
unsigned int /*glyph*/);
extern _X_EXPORT CursorPtr CreateRootCursor(char * /*pfilename */ ,
unsigned int /*glyph */ );
extern _X_EXPORT int ServerBitsFromGlyph(
FontPtr /*pfont*/,
unsigned int /*ch*/,
CursorMetricPtr /*cm*/,
unsigned char ** /*ppbits*/);
extern _X_EXPORT int ServerBitsFromGlyph(FontPtr /*pfont */ ,
unsigned int /*ch */ ,
CursorMetricPtr /*cm */ ,
unsigned char ** /*ppbits */ );
extern _X_EXPORT Bool CursorMetricsFromGlyph(
FontPtr /*pfont*/,
unsigned /*ch*/,
CursorMetricPtr /*cm*/);
extern _X_EXPORT Bool CursorMetricsFromGlyph(FontPtr /*pfont */ ,
unsigned /*ch */ ,
CursorMetricPtr /*cm */ );
extern _X_EXPORT void CheckCursorConfinement(
WindowPtr /*pWin*/);
extern _X_EXPORT void CheckCursorConfinement(WindowPtr /*pWin */ );
extern _X_EXPORT void NewCurrentScreen(
struct _DeviceIntRec* /*pDev*/,
ScreenPtr /*newScreen*/,
int /*x*/,
int /*y*/);
extern _X_EXPORT void NewCurrentScreen(struct _DeviceIntRec * /*pDev */ ,
ScreenPtr /*newScreen */ ,
int /*x */ ,
int /*y */ );
extern _X_EXPORT Bool PointerConfinedToScreen(struct _DeviceIntRec* /* pDev */);
extern _X_EXPORT Bool PointerConfinedToScreen(struct _DeviceIntRec * /* pDev */
);
extern _X_EXPORT void GetSpritePosition(
struct _DeviceIntRec* /* pDev */,
int * /*px*/,
int * /*py*/);
extern _X_EXPORT void GetSpritePosition(struct _DeviceIntRec * /* pDev */ ,
int * /*px */ ,
int * /*py */ );
#ifdef PANORAMIX
extern _X_EXPORT int XineramaGetCursorScreen(struct _DeviceIntRec* pDev);
#endif /* PANORAMIX */
extern _X_EXPORT int XineramaGetCursorScreen(struct _DeviceIntRec *pDev);
#endif /* PANORAMIX */
#endif /* CURSOR_H */
#endif /* CURSOR_H */