andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mark everything in dixsym.c as _X_EXPORT.

Browse Source
This commit is contained in:
Adam Jackson 2006-02-15 20:44:13 +00:00
parent 010d6effa6
commit f105b8da11
48 changed files with 387 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ChangeLog
View File

@ -42,6 +42,55 @@
* dix/atom.c:
Mark everything in {ext,font}sym.c as _X_EXPORT.
* XTrap/xtrapddmi.c:
* Xext/xvmain.c:
* Xi/exevents.c:
* Xi/extinit.c:
* dix/atom.c:
* dix/colormap.c:
* dix/cursor.c:
* dix/devices.c:
* dix/dispatch.c:
* dix/dixfonts.c:
* dix/dixutils.c:
* dix/events.c:
* dix/extension.c:
* dix/gc.c:
* dix/globals.c:
* dix/main.c:
* dix/pixmap.c:
* dix/privates.c:
* dix/property.c:
* dix/resource.c:
* dix/swaprep.c:
* dix/swapreq.c:
* dix/tables.c:
* dix/window.c:
* hw/xfree86/common/xf86DGA.c:
* hw/xfree86/common/xf86xvmc.c:
* hw/xfree86/dummylib/fatalerror.c:
* hw/xfree86/dummylib/logvwrite.c:
* hw/xfree86/dummylib/verrorf.c:
* hw/xfree86/dummylib/xalloc.c:
* hw/xfree86/dummylib/xf86errorf.c:
* hw/xfree86/parser/cpconfig.c:
* os/WaitFor.c:
* os/access.c:
* os/connection.c:
* os/io.c:
* os/log.c:
* os/utils.c:
* os/xalloc.c:
* render/filter.c:
* render/miglyph.c:
* render/mipict.c:
* render/mirect.c:
* render/picture.c:
* render/renderedge.c:
* xkb/xkbAccessX.c:
* xkb/xkbInit.c:
Mark everything in dixsym.c as _X_EXPORT.
2006-02-15 Kristian Høgsberg <krh@redhat.com>
* GL/symlink-mesa.sh:

9
XTrap/xtrapddmi.c
View File

@ -165,20 +165,15 @@ int XETrapSimulateXEvent(register xXTrapInputReq *request,
#if defined vms && !defined LINKED_IN
/* Used by swapping code not visible from VMS (from main.c) */
#ifndef BLADE
void
_X_EXPORT void
NotImplemented()
{
FatalError("Not implemented");
}
#endif
int
#ifdef __STDC__
_X_EXPORT int
ProcBadRequest( ClientPtr client)
#else
ProcBadRequest(client)
ClientPtr client;
#endif
{
return (BadRequest);
}

8
Xext/xvmain.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/Xext/xvmain.c,v 1.6 2005/07/03 08:53:36 daniels Exp $ */
/* $XdotOrg: xserver/xorg/Xext/xvmain.c,v 1.7 2006/02/10 22:00:20 anholt Exp $ */
/***********************************************************
Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@ -255,7 +255,7 @@ CreateResourceTypes()
}
int
_X_EXPORT int
XvScreenInit(ScreenPtr pScreen)
{
XvScreenPtr pxvs;
@ -336,13 +336,13 @@ XvResetProc(ExtensionEntry* extEntry)
{
}
int
_X_EXPORT int
XvGetScreenIndex()
{
return XvScreenIndex;
}
unsigned long
_X_EXPORT unsigned long
XvGetRTPort()
{
return XvRTPort;

4
Xi/exevents.c
View File

@ -297,7 +297,7 @@ ProcessOtherEvent (xE, other, count)
(*other->DeactivateGrab)(other);
}
int
_X_EXPORT int
InitProximityClassDeviceStruct( DeviceIntPtr dev)
{
register ProximityClassPtr proxc;
@ -309,7 +309,7 @@ InitProximityClassDeviceStruct( DeviceIntPtr dev)
return TRUE;
}
void
_X_EXPORT void
InitValuatorAxisStruct( DeviceIntPtr dev,
int axnum,
int minval,

2
Xi/extinit.c
View File

@ -863,7 +863,7 @@ IResetProc(unused)
*
*/
void
_X_EXPORT void
AssignTypeAndName (dev, type, name)
DeviceIntPtr dev;
Atom type;

4
dix/atom.c
View File

@ -74,7 +74,7 @@ static NodePtr *nodeTable;
void FreeAtom(NodePtr patom);
Atom
_X_EXPORT Atom
MakeAtom(char *string, unsigned len, Bool makeit)
{
register NodePtr * np;
@ -151,7 +151,7 @@ MakeAtom(char *string, unsigned len, Bool makeit)
return None;
}
Bool
_X_EXPORT Bool
ValidAtom(Atom atom)
{
return (atom != None) && (atom <= lastAtom);

20
dix/colormap.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.7 2005/04/20 12:25:19 daniels Exp $ */
/* $XdotOrg: xserver/xorg/dix/colormap.c,v 1.11 2005/09/05 07:40:50 daniels Exp $ */
/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.11 2003/11/03 05:10:59 tsi Exp $ */
/***********************************************************
@ -255,7 +255,7 @@ typedef struct _colorResource
* \param mid resource to use for this colormap
* \param alloc 1 iff all entries are allocated writable
*/
int
_X_EXPORT int
CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
ColormapPtr *ppcmap, int alloc, int client)
{
@ -505,7 +505,7 @@ TellNoMap (WindowPtr pwin, Colormap *pmid)
}
/* Tell window that pmid got uninstalled */
int
_X_EXPORT int
TellLostMap (WindowPtr pwin, pointer value)
{
Colormap *pmid = (Colormap *)value;
@ -530,7 +530,7 @@ TellLostMap (WindowPtr pwin, pointer value)
}
/* Tell window that pmid got installed */
int
_X_EXPORT int
TellGainedMap (WindowPtr pwin, pointer value)
{
Colormap *pmid = (Colormap *)value;
@ -803,7 +803,7 @@ UpdateColors (ColormapPtr pmap)
/* Get a read-only color from a ColorMap (probably slow for large maps)
* Returns by changing the value in pred, pgreen, pblue and pPix
*/
int
_X_EXPORT int
AllocColor (ColormapPtr pmap,
unsigned short *pred, unsigned short *pgreen, unsigned short *pblue,
Pixel *pPix, int client)
@ -988,7 +988,7 @@ AllocColor (ColormapPtr pmap,
* is that this routine will never return failure.
*/
void
_X_EXPORT void
FakeAllocColor (register ColormapPtr pmap, register xColorItem *item)
{
Pixel pixR, pixG, pixB;
@ -1054,7 +1054,7 @@ FakeAllocColor (register ColormapPtr pmap, register xColorItem *item)
}
/* free a pixel value obtained from FakeAllocColor */
void
_X_EXPORT void
FakeFreeColor(register ColormapPtr pmap, Pixel pixel)
{
register VisualPtr pVisual;
@ -1417,7 +1417,7 @@ BlueComp (EntryPtr pent, xrgb *prgb)
/* Read the color value of a cell */
int
_X_EXPORT int
QueryColors (ColormapPtr pmap, int count, Pixel *ppixIn, xrgb *prgbList)
{
Pixel *ppix, pixel;
@ -2256,7 +2256,7 @@ AllocShared (ColormapPtr pmap, Pixel *ppix, int c, int r, int g, int b,
/** FreeColors
* Free colors and/or cells (probably slow for large numbers)
*/
int
_X_EXPORT int
FreeColors (ColormapPtr pmap, int client, int count, Pixel *pixels, Pixel mask)
{
int rval, result, class;
@ -2500,7 +2500,7 @@ FreeCo (ColormapPtr pmap, int client, int color, int npixIn, Pixel *ppixIn, Pixe
/* Redefine color values */
int
_X_EXPORT int
StoreColors (ColormapPtr pmap, int count, xColorItem *defs)
{
register Pixel pix;

2
dix/cursor.c
View File

@ -109,7 +109,7 @@ FreeCursorBits(CursorBitsPtr bits)
*
* \param value must conform to DeleteType
*/
int
_X_EXPORT int
FreeCursor(pointer value, XID cid)
{
int nscr;

34
dix/devices.c
View File

@ -48,7 +48,7 @@ SOFTWARE.
/* $Xorg: devices.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
/* $XdotOrg: xc/programs/Xserver/dix/devices.c,v 1.5 2005/05/22 01:12:49 alanc Exp $ */
/* $XdotOrg: xserver/xorg/dix/devices.c,v 1.8 2005/07/03 08:53:38 daniels Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
@ -400,13 +400,13 @@ _RegisterKeyboardDevice(DeviceIntPtr device)
}
}
DevicePtr
_X_EXPORT DevicePtr
LookupKeyboardDevice()
{
return inputInfo.keyboard ? &inputInfo.keyboard->public : NULL;
}
DevicePtr
_X_EXPORT DevicePtr
LookupPointerDevice()
{
return inputInfo.pointer ? &inputInfo.pointer->public : NULL;
@ -528,7 +528,7 @@ InitModMap(register KeyClassPtr keyc)
return TRUE;
}
Bool
_X_EXPORT Bool
InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers[])
{
int i;
@ -566,7 +566,7 @@ InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers
return TRUE;
}
Bool
_X_EXPORT Bool
InitButtonClassDeviceStruct(register DeviceIntPtr dev, int numButtons,
CARD8 *map)
{
@ -590,7 +590,7 @@ InitButtonClassDeviceStruct(register DeviceIntPtr dev, int numButtons,
return TRUE;
}
Bool
_X_EXPORT Bool
InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes,
ValuatorMotionProcPtr motionProc,
int numMotionEvents, int mode)
@ -616,7 +616,7 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes,
return TRUE;
}
Bool
_X_EXPORT Bool
InitFocusClassDeviceStruct(DeviceIntPtr dev)
{
register FocusClassPtr focc;
@ -634,7 +634,7 @@ InitFocusClassDeviceStruct(DeviceIntPtr dev)
return TRUE;
}
Bool
_X_EXPORT Bool
InitKbdFeedbackClassDeviceStruct(DeviceIntPtr dev, BellProcPtr bellProc,
KbdCtrlProcPtr controlProc)
{
@ -662,7 +662,7 @@ InitKbdFeedbackClassDeviceStruct(DeviceIntPtr dev, BellProcPtr bellProc,
return TRUE;
}
Bool
_X_EXPORT Bool
InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc)
{
register PtrFeedbackPtr feedc;
@ -703,7 +703,7 @@ IntegerCtrl defaultIntegerControl = {
DEFAULT_INT_DISPLAYED,
0};
Bool
_X_EXPORT Bool
InitStringFeedbackClassDeviceStruct (
DeviceIntPtr dev, StringCtrlProcPtr controlProc,
int max_symbols, int num_symbols_supported, KeySym *symbols)
@ -743,7 +743,7 @@ InitStringFeedbackClassDeviceStruct (
return TRUE;
}
Bool
_X_EXPORT Bool
InitBellFeedbackClassDeviceStruct (DeviceIntPtr dev, BellProcPtr bellProc,
BellCtrlProcPtr controlProc)
{
@ -763,7 +763,7 @@ InitBellFeedbackClassDeviceStruct (DeviceIntPtr dev, BellProcPtr bellProc,
return TRUE;
}
Bool
_X_EXPORT Bool
InitLedFeedbackClassDeviceStruct (DeviceIntPtr dev, LedCtrlProcPtr controlProc)
{
register LedFeedbackPtr feedc;
@ -784,7 +784,7 @@ InitLedFeedbackClassDeviceStruct (DeviceIntPtr dev, LedCtrlProcPtr controlProc)
return TRUE;
}
Bool
_X_EXPORT Bool
InitIntegerFeedbackClassDeviceStruct (DeviceIntPtr dev, IntegerCtrlProcPtr controlProc)
{
register IntegerFeedbackPtr feedc;
@ -802,7 +802,7 @@ InitIntegerFeedbackClassDeviceStruct (DeviceIntPtr dev, IntegerCtrlProcPtr contr
return TRUE;
}
Bool
_X_EXPORT Bool
InitPointerDeviceStruct(DevicePtr device, CARD8 *map, int numButtons,
ValuatorMotionProcPtr motionProc,
PtrCtrlProcPtr controlProc, int numMotionEvents)
@ -815,7 +815,7 @@ InitPointerDeviceStruct(DevicePtr device, CARD8 *map, int numButtons,
InitPtrFeedbackClassDeviceStruct(dev, controlProc));
}
Bool
_X_EXPORT Bool
InitKeyboardDeviceStruct(DevicePtr device, KeySymsPtr pKeySyms,
CARD8 pModifiers[], BellProcPtr bellProc,
KbdCtrlProcPtr controlProc)
@ -827,7 +827,7 @@ InitKeyboardDeviceStruct(DevicePtr device, KeySymsPtr pKeySyms,
InitKbdFeedbackClassDeviceStruct(dev, bellProc, controlProc));
}
void
_X_EXPORT void
SendMappingNotify(unsigned request, unsigned firstKeyCode, unsigned count,
ClientPtr client)
{
@ -1199,7 +1199,7 @@ NoteLedState(DeviceIntPtr keybd, int led, Bool on)
ctrl->leds &= ~((Leds)1 << (led - 1));
}
int
_X_EXPORT int
Ones(unsigned long mask) /* HACKMEM 169 */
{
register unsigned long y;

24
dix/dispatch.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.9 2005/06/10 04:01:14 ajax Exp $ */
/* $XdotOrg: xserver/xorg/dix/dispatch.c,v 1.13 2005/09/13 01:33:19 daniels Exp $ */
/* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
/************************************************************
@ -134,8 +134,8 @@ int ProcInitialConnection();
extern xConnSetupPrefix connSetupPrefix;
extern char *ConnectionInfo;
Selection *CurrentSelections;
int NumCurrentSelections;
_X_EXPORT Selection *CurrentSelections;
_X_EXPORT int NumCurrentSelections;
CallbackListPtr SelectionCallback = NULL;
static ClientPtr grabClient;
@ -144,7 +144,7 @@ static ClientPtr grabClient;
#define GrabKickout 2
static int grabState = GrabNone;
static long grabWaiters[mskcnt];
CallbackListPtr ServerGrabCallback = NULL;
_X_EXPORT CallbackListPtr ServerGrabCallback = NULL;
HWEventQueuePtr checkForInput[2];
extern int connBlockScreenStart;
@ -156,15 +156,15 @@ static int nextFreeClientID; /* always MIN free client ID */
static int nClients; /* number of authorized clients */
CallbackListPtr ClientStateCallback;
_X_EXPORT CallbackListPtr ClientStateCallback;
/* dispatchException & isItTimeToYield must be declared volatile since they
* are modified by signal handlers - otherwise optimizer may assume it doesn't
* need to actually check value in memory when used and may miss changes from
* signal handlers.
*/
volatile char dispatchException = 0;
volatile char isItTimeToYield;
_X_EXPORT volatile char dispatchException = 0;
_X_EXPORT volatile char isItTimeToYield;
/* Various of the DIX function interfaces were not designed to allow
* the client->errorValue to be set on BadValue and other errors.
@ -176,14 +176,14 @@ XID clientErrorValue; /* XXX this is a kludge */
#define SAME_SCREENS(a, b) (\
(a.pScreen == b.pScreen))
void
_X_EXPORT void
SetInputCheck(HWEventQueuePtr c0, HWEventQueuePtr c1)
{
checkForInput[0] = c0;
checkForInput[1] = c1;
}
void
_X_EXPORT void
UpdateCurrentTime()
{
TimeStamp systime;
@ -202,7 +202,7 @@ UpdateCurrentTime()
}
/* Like UpdateCurrentTime, but can't call ProcessInputEvents */
void
_X_EXPORT void
UpdateCurrentTimeIf()
{
TimeStamp systime;
@ -492,7 +492,7 @@ Dispatch(void)
#undef MAJOROP
int
_X_EXPORT int
ProcBadRequest(ClientPtr client)
{
return (BadRequest);
@ -3968,7 +3968,7 @@ ProcEstablishConnection(register ClientPtr client)
return(client->noClientException);
}
void
_X_EXPORT void
SendErrorToClient(ClientPtr client, unsigned majorCode, unsigned minorCode,
XID resId, int errorCode)
{

10
dix/dixfonts.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.5 2005/04/20 13:33:54 daniels Exp $ */
/* $XdotOrg: xserver/xorg/dix/dixfonts.c,v 1.8 2005/07/03 08:53:38 daniels Exp $ */
/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.28 2003/11/08 02:02:03 dawes Exp $ */
/************************************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@ -92,7 +92,7 @@ extern FontPtr defaultFont;
static FontPathElementPtr *font_path_elements = (FontPathElementPtr *) 0;
static int num_fpes = 0;
FPEFunctions *fpe_functions = (FPEFunctions *) 0;
_X_EXPORT FPEFunctions *fpe_functions = (FPEFunctions *) 0;
static int num_fpe_types = 0;
static unsigned char *font_path_string;
@ -102,7 +102,7 @@ static int size_slept_fpes = 0;
static FontPathElementPtr *slept_fpes = (FontPathElementPtr *) 0;
static FontPatternCachePtr patternCache;
int
_X_EXPORT int
FontToXError(err)
int err;
{
@ -467,7 +467,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontna
*
* \param value must conform to DeleteType
*/
int
_X_EXPORT int
CloseFont(pointer value, XID fid)
{
int nscr;
@ -1867,7 +1867,7 @@ GetFontPath(int *count, int *length)
return font_path_string;
}
int
_X_EXPORT int
LoadGlyphs(ClientPtr client, FontPtr pfont, unsigned nchars, int item_size, unsigned char *data)
{
if (fpe_functions[pfont->fpe->type].load_glyphs)

32
dix/dixutils.c
View File

@ -107,7 +107,7 @@ Author: Adobe Systems Incorporated
* argument is less than, equal to or greater than the second argument.
*/
int
_X_EXPORT int
CompareTimeStamps(TimeStamp a, TimeStamp b)
{
if (a.months < b.months)
@ -126,7 +126,7 @@ CompareTimeStamps(TimeStamp a, TimeStamp b)
*/
#define HALFMONTH ((unsigned long) 1<<31)
TimeStamp
_X_EXPORT TimeStamp
ClientTimeToServerTime(CARD32 c)
{
TimeStamp ts;
@ -170,7 +170,7 @@ ISOLatin1ToLower (unsigned char source)
}
void
_X_EXPORT void
CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length)
{
register int i;
@ -209,7 +209,7 @@ CompareISOLatin1Lowered(unsigned char *s1, int s1len,
* LookupWindow and LookupDrawable, which do no access checks.
*/
WindowPtr
_X_EXPORT WindowPtr
SecurityLookupWindow(XID rid, ClientPtr client, Mask access_mode)
{
WindowPtr pWin;
@ -236,7 +236,7 @@ SecurityLookupWindow(XID rid, ClientPtr client, Mask access_mode)
}
pointer
_X_EXPORT pointer
SecurityLookupDrawable(XID rid, ClientPtr client, Mask access_mode)
{
register DrawablePtr pDraw;
@ -259,13 +259,13 @@ SecurityLookupDrawable(XID rid, ClientPtr client, Mask access_mode)
* macros because of compatibility with loadable servers.
*/
WindowPtr
_X_EXPORT WindowPtr
LookupWindow(XID rid, ClientPtr client)
{
return SecurityLookupWindow(rid, client, SecurityUnknownAccess);
}
pointer
_X_EXPORT pointer
LookupDrawable(XID rid, ClientPtr client)
{
return SecurityLookupDrawable(rid, client, SecurityUnknownAccess);
@ -315,7 +315,7 @@ LookupDrawable(XID rid, ClientPtr client)
#endif /* XCSECURITY */
ClientPtr
_X_EXPORT ClientPtr
LookupClient(XID rid, ClientPtr client)
{
pointer pRes = (pointer)SecurityLookupIDByClass(client, rid, RC_ANY,
@ -405,7 +405,7 @@ DeleteWindowFromAnySaveSet(WindowPtr pWin)
* colormaps, if someone calls install colormap, it's easier to have a dummy
* procedure to call than to check if there's a procedure
*/
void
_X_EXPORT void
NoopDDA(void)
{
}
@ -495,7 +495,7 @@ WakeupHandler(int result, pointer pReadmask)
* Reentrant with BlockHandler and WakeupHandler, except wakeup won't
* get called until next time
*/
Bool
_X_EXPORT Bool
RegisterBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
WakeupHandlerProcPtr wakeupHandler,
pointer blockData)
@ -519,7 +519,7 @@ RegisterBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
return TRUE;
}
void
_X_EXPORT void
RemoveBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
WakeupHandlerProcPtr wakeupHandler,
pointer blockData)
@ -614,7 +614,7 @@ ProcessWorkQueueZombies(void)
workQueueLast = p;
}
Bool
_X_EXPORT Bool
QueueWorkProc (
Bool (*function)(ClientPtr /* pClient */, pointer /* closure */),
ClientPtr client, pointer closure)
@ -650,7 +650,7 @@ typedef struct _SleepQueue {
static SleepQueuePtr sleepQueue = NULL;
Bool
_X_EXPORT Bool
ClientSleep (ClientPtr client, ClientSleepProcPtr function, pointer closure)
{
SleepQueuePtr q;
@ -681,7 +681,7 @@ ClientSignal (ClientPtr client)
return FALSE;
}
void
_X_EXPORT void
ClientWakeup (ClientPtr client)
{
SleepQueuePtr q, *prev;
@ -913,7 +913,7 @@ CreateCallbackList(CallbackListPtr *pcbl, CallbackFuncsPtr cbfuncs)
return TRUE;
}
Bool
_X_EXPORT Bool
AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
{
if (!pcbl) return FALSE;
@ -925,7 +925,7 @@ AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
return ((*(*pcbl)->funcs.AddCallback) (pcbl, callback, data));
}
Bool
_X_EXPORT Bool
DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
{
if (!pcbl || !*pcbl) return FALSE;

38
dix/events.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.16 2005/07/15 05:48:29 kem Exp $ */
/* $XdotOrg: xserver/xorg/dix/events.c,v 1.17 2005/08/25 22:11:04 anholt Exp $ */
/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */
/************************************************************
@ -202,8 +202,8 @@ xEvent *xeviexE;
#define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
CallbackListPtr EventCallback;
CallbackListPtr DeviceEventCallback;
_X_EXPORT CallbackListPtr EventCallback;
_X_EXPORT CallbackListPtr DeviceEventCallback;
#define DNPMCOUNT 8
@ -213,7 +213,7 @@ static int DontPropagateRefCnts[DNPMCOUNT];
#ifdef DEBUG
static debug_events = 0;
#endif
InputInfo inputInfo;
_X_EXPORT InputInfo inputInfo;
static struct {
QdEventPtr pending, *pendtail;
@ -254,8 +254,8 @@ static struct {
} sprite; /* info about the cursor sprite */
#ifdef XEVIE
WindowPtr xeviewin;
HotSpot xeviehot;
_X_EXPORT WindowPtr xeviewin;
_X_EXPORT HotSpot xeviehot;
#endif
static void DoEnterLeaveEvents(
@ -692,7 +692,7 @@ SetMaskForEvent(Mask mask, int event)
filters[event] = mask;
}
void
_X_EXPORT void
SetCriticalEvent(int event)
{
if (event >= 128)
@ -908,7 +908,7 @@ ConfineCursorToWindow(WindowPtr pWin, Bool generateEvents, Bool confineToScreen)
}
}
Bool
_X_EXPORT Bool
PointerConfinedToScreen()
{
return sprite.confined;
@ -977,25 +977,25 @@ PostNewCursor(void)
}
}
WindowPtr
_X_EXPORT WindowPtr
GetCurrentRootWindow()
{
return ROOT;
}
WindowPtr
_X_EXPORT WindowPtr
GetSpriteWindow()
{
return sprite.win;
}
CursorPtr
_X_EXPORT CursorPtr
GetSpriteCursor()
{
return sprite.current;
}
void
_X_EXPORT void
GetSpritePosition(int *px, int *py)
{
*px = sprite.hotPhys.x;
@ -1003,7 +1003,7 @@ GetSpritePosition(int *px, int *py)
}
#ifdef PANORAMIX
int
_X_EXPORT int
XineramaGetCursorScreen()
{
if(!noPanoramiXExtension) {
@ -1575,7 +1575,7 @@ ReleaseActiveGrabs(ClientPtr client)
* The following procedures deal with delivering events *
**************************************************************************/
int
_X_EXPORT int
TryClientEvents (ClientPtr client, xEvent *pEvents, int count, Mask mask,
Mask filter, GrabPtr grab)
{
@ -1928,7 +1928,7 @@ DeliverDeviceEvents(register WindowPtr pWin, register xEvent *xE, GrabPtr grab,
}
/* not useful for events that propagate up the tree or extension events */
int
_X_EXPORT int
DeliverEvents(register WindowPtr pWin, register xEvent *xE, int count,
register WindowPtr otherParent)
{
@ -2126,7 +2126,7 @@ CheckMotion(xEvent *xE)
return TRUE;
}
void
_X_EXPORT void
WindowsRestructured()
{
(void) CheckMotion((xEvent *)NULL);
@ -2230,7 +2230,7 @@ WindowHasNewCursor(WindowPtr pWin)
PostNewCursor();
}
void
_X_EXPORT void
NewCurrentScreen(ScreenPtr newScreen, int x, int y)
{
sprite.hotPhys.x = x;
@ -4520,7 +4520,7 @@ DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources)
/**
* Call this whenever some window at or below pWin has changed geometry
*/
void
_X_EXPORT void
CheckCursorConfinement(WindowPtr pWin)
{
GrabPtr grab = inputInfo.pointer->grab;
@ -4595,7 +4595,7 @@ ProcRecolorCursor(ClientPtr client)
return (Success);
}
void
_X_EXPORT void
WriteEventsToClient(ClientPtr pClient, int count, xEvent *events)
{
#ifdef PANORAMIX

12
dix/extension.c
View File

@ -82,7 +82,7 @@ int lastEvent = EXTENSION_EVENT_BASE;
static int lastError = FirstExtensionError;
static unsigned int NumExtensions = 0;
ExtensionEntry *
_X_EXPORT ExtensionEntry *
AddExtension(char *name, int NumEvents, int NumErrors,
int (*MainProc)(ClientPtr c1),
int (*SwappedMainProc)(ClientPtr c2),
@ -160,7 +160,7 @@ AddExtension(char *name, int NumEvents, int NumErrors,
return(ext);
}
Bool AddExtensionAlias(char *alias, ExtensionEntry *ext)
_X_EXPORT Bool AddExtensionAlias(char *alias, ExtensionEntry *ext)
{
char *name;
char **aliases;
@ -208,7 +208,7 @@ FindExtension(char *extname, int len)
* CheckExtension returns the extensions[] entry for the requested
* extension name. Maybe this could just return a Bool instead?
*/
ExtensionEntry *
_X_EXPORT ExtensionEntry *
CheckExtension(const char *extname)
{
int n;
@ -220,7 +220,7 @@ CheckExtension(const char *extname)
return NULL;
}
void
_X_EXPORT void
DeclareExtensionSecurity(char *extname, Bool secure)
{
#ifdef XCSECURITY
@ -246,13 +246,13 @@ DeclareExtensionSecurity(char *extname, Bool secure)
#endif
}
unsigned short
_X_EXPORT unsigned short
StandardMinorOpcode(ClientPtr client)
{
return ((xReq *)client->requestBuffer)->data;
}
unsigned short
_X_EXPORT unsigned short
MinorOpcodeOfRequest(ClientPtr client)
{
unsigned char major;

26
dix/gc.c
View File

@ -73,7 +73,7 @@ static Bool CreateDefaultTile(GCPtr pGC);
unsigned char DefaultDash[2] = {4, 4};
void
_X_EXPORT void
ValidateGC(DrawablePtr pDraw, GC *pGC)
{
(*pGC->funcs->ValidateGC) (pGC, pGC->stateChanges, pDraw);
@ -145,7 +145,7 @@ ValidateGC(DrawablePtr pDraw, GC *pGC)
#define NEXT_PTR(_type, _var) { \
assert(pUnion); _var = (_type)pUnion->ptr; pUnion++; }
int
_X_EXPORT int
dixChangeGC(ClientPtr client, register GC *pGC, register BITS32 mask, CARD32 *pC32, ChangeGCValPtr pUnion)
{
register BITS32 index2;
@ -523,7 +523,7 @@ dixChangeGC(ClientPtr client, register GC *pGC, register BITS32 mask, CARD32 *pC
/* Publically defined entry to ChangeGC. Just calls dixChangeGC and tells
* it that all of the entries are constants or IDs */
int
_X_EXPORT int
ChangeGC(register GC *pGC, register BITS32 mask, XID *pval)
{
return (dixChangeGC(NullClient, pGC, mask, pval, NULL));
@ -549,7 +549,7 @@ NOTE:
all values sent over the protocol for ChangeGC requests are
32 bits long
*/
int
_X_EXPORT int
DoChangeGC(register GC *pGC, register BITS32 mask, XID *pval, int fPointer)
{
if (fPointer)
@ -601,7 +601,7 @@ AllocateGC(ScreenPtr pScreen)
return pGC;
}
GCPtr
_X_EXPORT GCPtr
CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus)
{
register GCPtr pGC;
@ -725,7 +725,7 @@ CreateDefaultTile (GCPtr pGC)
return TRUE;
}
int
_X_EXPORT int
CopyGC(register GC *pgcSrc, register GC *pgcDst, register BITS32 mask)
{
register BITS32 index2;
@ -889,7 +889,7 @@ CopyGC(register GC *pgcSrc, register GC *pgcDst, register BITS32 mask)
*
* \param value must conform to DeleteType
*/
int
_X_EXPORT int
FreeGC(pointer value, XID gid)
{
GCPtr pGC = (GCPtr)value;
@ -933,7 +933,7 @@ is what fills the default tile. (maybe this comment should
go with CreateGC() or ChangeGC().)
*/
GCPtr
_X_EXPORT GCPtr
CreateScratchGC(ScreenPtr pScreen, unsigned depth)
{
register GCPtr pGC;
@ -1078,7 +1078,7 @@ FreeDefaultStipple(int screenNum)
(*pScreen->DestroyPixmap)(pScreen->PixmapPerDepth[0]);
}
int
_X_EXPORT int
SetDashes(register GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash)
{
register long i;
@ -1134,7 +1134,7 @@ SetDashes(register GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pd
return Success;
}
int
_X_EXPORT int
VerifyRectOrder(int nrects, xRectangle *prects, int ordering)
{
register xRectangle *prectP, *prectN;
@ -1184,7 +1184,7 @@ VerifyRectOrder(int nrects, xRectangle *prects, int ordering)
return -1;
}
int
_X_EXPORT int
SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects,
xRectangle *prects, int ordering)
{
@ -1221,7 +1221,7 @@ SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects,
if we can't, create one out of whole cloth (The Velveteen GC -- if
you use it often enough it will become real.)
*/
GCPtr
_X_EXPORT GCPtr
GetScratchGC(register unsigned depth, register ScreenPtr pScreen)
{
register int i;
@ -1270,7 +1270,7 @@ GetScratchGC(register unsigned depth, register ScreenPtr pScreen)
mark it as available.
if not, free it for real
*/
void
_X_EXPORT void
FreeScratchGC(register GCPtr pGC)
{
register ScreenPtr pScreen = pGC->pScreen;

58
dix/globals.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/globals.c,v 1.4 2005/04/20 12:25:19 daniels Exp $ */
/* $XdotOrg: xserver/xorg/dix/globals.c,v 1.7 2005/07/03 08:53:38 daniels Exp $ */
/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12tsi Exp $ */
/************************************************************
@ -64,7 +64,7 @@ SOFTWARE.
#include "dixstruct.h"
#include "os.h"
ScreenInfo screenInfo;
_X_EXPORT ScreenInfo screenInfo;
KeybdCtrl defaultKeyboardControl = {
DEFAULT_KEYBOARD_CLICK,
DEFAULT_BELL,
@ -81,20 +81,20 @@ PtrCtrl defaultPointerControl = {
DEFAULT_PTR_THRESHOLD,
0};
ClientPtr *clients;
ClientPtr serverClient;
int currentMaxClients; /* current size of clients array */
long maxBigRequestSize = MAX_BIG_REQUEST_SIZE;
_X_EXPORT ClientPtr *clients;
_X_EXPORT ClientPtr serverClient;
_X_EXPORT int currentMaxClients; /* current size of clients array */
_X_EXPORT long maxBigRequestSize = MAX_BIG_REQUEST_SIZE;
WindowPtr *WindowTable;
_X_EXPORT WindowPtr *WindowTable;
unsigned long globalSerialNumber = 0;
unsigned long serverGeneration = 0;
_X_EXPORT unsigned long globalSerialNumber = 0;
_X_EXPORT unsigned long serverGeneration = 0;
/* these next four are initialized in main.c */
CARD32 ScreenSaverTime;
_X_EXPORT CARD32 ScreenSaverTime;
CARD32 ScreenSaverInterval;
int ScreenSaverBlanking;
_X_EXPORT int ScreenSaverBlanking;
int ScreenSaverAllowExposures;
#ifdef DPMSExtension
@ -113,15 +113,15 @@ int ScreenSaverAllowExposures;
CARD32 defaultDPMSStandbyTime = DEFAULT_STANDBY_TIME;
CARD32 defaultDPMSSuspendTime = DEFAULT_SUSPEND_TIME;
CARD32 defaultDPMSOffTime = DEFAULT_OFF_TIME;
CARD16 DPMSPowerLevel = 0;
Bool defaultDPMSEnabled = DEFAULT_DPMS_ENABLED;
Bool DPMSEnabledSwitch = FALSE; /* these denote the DPMS command line */
Bool DPMSDisabledSwitch = FALSE; /* switch states */
Bool DPMSCapableFlag = FALSE;
CARD32 DPMSStandbyTime;
CARD32 DPMSSuspendTime;
CARD32 DPMSOffTime;
Bool DPMSEnabled;
_X_EXPORT CARD16 DPMSPowerLevel = 0;
_X_EXPORT Bool defaultDPMSEnabled = DEFAULT_DPMS_ENABLED;
_X_EXPORT Bool DPMSEnabledSwitch = FALSE; /* these denote the DPMS command */
_X_EXPORT Bool DPMSDisabledSwitch = FALSE; /* lind switch states */
_X_EXPORT Bool DPMSCapableFlag = FALSE;
_X_EXPORT CARD32 DPMSStandbyTime;
_X_EXPORT CARD32 DPMSSuspendTime;
_X_EXPORT CARD32 DPMSOffTime;
_X_EXPORT Bool DPMSEnabled;
#endif
CARD32 defaultScreenSaverTime = DEFAULT_SCREEN_SAVER_TIME;
@ -144,17 +144,19 @@ CursorPtr rootCursor;
Bool blackRoot=FALSE;
ClientPtr requestingClient; /* XXX this should be obsolete now, remove? */
TimeStamp currentTime;
TimeStamp lastDeviceEventTime;
_X_EXPORT TimeStamp currentTime;
_X_EXPORT TimeStamp lastDeviceEventTime;
Bool permitOldBugs = FALSE; /* turn off some error checking, to permit certain
* old broken clients (like R2/R3 xterms) to work
*/
/*
* turn off some error checking, to permit old broken clients (like R2/R3
* xterms) to work
*/
_X_EXPORT Bool permitOldBugs = FALSE;
int defaultColorVisualClass = -1;
int monitorResolution = 0;
_X_EXPORT int defaultColorVisualClass = -1;
_X_EXPORT int monitorResolution = 0;
char *display;
_X_EXPORT char *display;
CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND;
int argcGlobal;

6
dix/main.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.11 2005/05/22 01:12:49 alanc Exp $ */
/* $XdotOrg: xserver/xorg/dix/main.c,v 1.14 2005/07/03 08:53:38 daniels Exp $ */
/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */
/***********************************************************
@ -140,13 +140,13 @@ Bool CreateConnectionBlock(void);
static void FreeScreen(ScreenPtr);
PaddingInfo PixmapWidthPaddingInfo[33];
_X_EXPORT PaddingInfo PixmapWidthPaddingInfo[33];
int connBlockScreenStart;
static int restart = 0;
void
_X_EXPORT void
NotImplemented(xEvent *from, xEvent *to)
{
FatalError("Not implemented");

6
dix/pixmap.c
View File

@ -51,7 +51,7 @@ from The Open Group.
/* callable by ddx */
PixmapPtr
_X_EXPORT PixmapPtr
GetScratchPixmapHeader(ScreenPtr pScreen, int width, int height, int depth,
int bitsPerPixel, int devKind, pointer pPixData)
{
@ -74,7 +74,7 @@ GetScratchPixmapHeader(ScreenPtr pScreen, int width, int height, int depth,
/* callable by ddx */
void
_X_EXPORT void
FreeScratchPixmapHeader(PixmapPtr pPixmap)
{
if (pPixmap)
@ -107,7 +107,7 @@ FreeScratchPixmapsForScreen(int scrnum)
/* callable by ddx */
PixmapPtr
_X_EXPORT PixmapPtr
AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
{
PixmapPtr pPixmap;

26
dix/privates.c
View File

@ -1,5 +1,5 @@
/* $Xorg: privates.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
/* $XdotOrg: xc/programs/Xserver/dix/privates.c,v 1.6 2005/05/22 01:12:49 alanc Exp $ */
/* $XdotOrg: xserver/xorg/dix/privates.c,v 1.10 2005/09/05 07:40:50 daniels Exp $ */
/*
Copyright 1993, 1998 The Open Group
@ -72,13 +72,13 @@ ResetClientPrivates()
((sizeof(ClientRec) + sizeof(long) - 1) / sizeof(long)) * sizeof(long);
}
int
_X_EXPORT int
AllocateClientPrivateIndex()
{
return clientPrivateCount++;
}
Bool
_X_EXPORT Bool
AllocateClientPrivate(int index2, unsigned amount)
{
unsigned oldamount;
@ -124,7 +124,7 @@ ResetScreenPrivates()
/* this can be called after some screens have been created,
* so we have to worry about resizing existing devPrivates
*/
int
_X_EXPORT int
AllocateScreenPrivateIndex()
{
int idx;
@ -163,13 +163,13 @@ ResetWindowPrivates()
windowPrivateCount = 0;
}
int
_X_EXPORT int
AllocateWindowPrivateIndex()
{
return windowPrivateCount++;
}
Bool
_X_EXPORT Bool
AllocateWindowPrivate(register ScreenPtr pScreen, int index2, unsigned amount)
{
unsigned oldamount;
@ -213,13 +213,13 @@ ResetGCPrivates()
gcPrivateCount = 0;
}
int
_X_EXPORT int
AllocateGCPrivateIndex()
{
return gcPrivateCount++;
}
Bool
_X_EXPORT Bool
AllocateGCPrivate(register ScreenPtr pScreen, int index2, unsigned amount)
{
unsigned oldamount;
@ -263,13 +263,13 @@ ResetPixmapPrivates()
pixmapPrivateCount = 0;
}
int
_X_EXPORT int
AllocatePixmapPrivateIndex()
{
return pixmapPrivateCount++;
}
Bool
_X_EXPORT Bool
AllocatePixmapPrivate(register ScreenPtr pScreen, int index2, unsigned amount)
{
unsigned oldamount;
@ -316,7 +316,7 @@ ResetColormapPrivates()
}
int
_X_EXPORT int
AllocateColormapPrivateIndex (InitCmapPrivFunc initPrivFunc)
{
int index;
@ -370,13 +370,13 @@ AllocateColormapPrivateIndex (InitCmapPrivFunc initPrivFunc)
static int devicePrivateIndex = 0;
int
_X_EXPORT int
AllocateDevicePrivateIndex()
{
return devicePrivateIndex++;
}
Bool
_X_EXPORT Bool
AllocateDevicePrivate(DeviceIntPtr device, int index)
{
if (device->nPrivates < ++index) {

2
dix/property.c
View File

@ -274,7 +274,7 @@ ProcChangeProperty(ClientPtr client)
return client->noClientException;
}
int
_X_EXPORT int
ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
int mode, unsigned long len, pointer value,
Bool sendevent)

42
dix/resource.c
View File

@ -74,7 +74,7 @@ Equipment Corporation.
******************************************************************/
/* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
/* $XdotOrg: xc/programs/Xserver/dix/resource.c,v 1.5 2005/04/20 12:25:19 daniels Exp $ */
/* $XdotOrg: xserver/xorg/dix/resource.c,v 1.8 2005/07/03 08:53:38 daniels Exp $ */
/* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */
/* Routines to manage various kinds of resources:
@ -153,24 +153,24 @@ typedef struct _ClientResource {
XID expectID;
} ClientResourceRec;
RESTYPE lastResourceType;
_X_EXPORT RESTYPE lastResourceType;
static RESTYPE lastResourceClass;
RESTYPE TypeMask;
_X_EXPORT RESTYPE TypeMask;
static DeleteType *DeleteFuncs = (DeleteType *)NULL;
#ifdef XResExtension
Atom * ResourceNames = NULL;
_X_EXPORT Atom * ResourceNames = NULL;
void RegisterResourceName (RESTYPE type, char *name)
_X_EXPORT void RegisterResourceName (RESTYPE type, char *name)
{
ResourceNames[type & TypeMask] = MakeAtom(name, strlen(name), TRUE);
}
#endif
RESTYPE
_X_EXPORT RESTYPE
CreateNewResourceType(DeleteType deleteFunc)
{
RESTYPE next = lastResourceType + 1;
@ -200,7 +200,7 @@ CreateNewResourceType(DeleteType deleteFunc)
return next;
}
RESTYPE
_X_EXPORT RESTYPE
CreateNewResourceClass()
{
RESTYPE next = lastResourceClass >> 1;
@ -323,7 +323,7 @@ AvailableID(
return 0;
}
void
_X_EXPORT void
GetXIDRange(int client, Bool server, XID *minp, XID *maxp)
{
register XID id, maxid;
@ -374,7 +374,7 @@ GetXIDRange(int client, Bool server, XID *minp, XID *maxp)
* invented, but this will be used so rarely that this should suffice.
*/
unsigned int
_X_EXPORT unsigned int
GetXIDList(ClientPtr pClient, unsigned count, XID *pids)
{
unsigned int found = 0;
@ -401,7 +401,7 @@ GetXIDList(ClientPtr pClient, unsigned count, XID *pids)
* over-running another client.
*/
XID
_X_EXPORT XID
FakeClientID(register int client)
{
XID id, maxid;
@ -422,7 +422,7 @@ FakeClientID(register int client)
return id;
}
Bool
_X_EXPORT Bool
AddResource(XID id, RESTYPE type, pointer value)
{
int client;
@ -507,7 +507,7 @@ RebuildTable(int client)
clientTable[client].resources = resources;
}
void
_X_EXPORT void
FreeResource(XID id, RESTYPE skipDeleteFuncType)
{
int cid;
@ -554,7 +554,7 @@ FreeResource(XID id, RESTYPE skipDeleteFuncType)
}
void
_X_EXPORT void
FreeResourceByType(XID id, RESTYPE type, Bool skipFree)
{
int cid;
@ -594,7 +594,7 @@ FreeResourceByType(XID id, RESTYPE type, Bool skipFree)
* data
*/
Bool
_X_EXPORT Bool
ChangeResourceValue (XID id, RESTYPE rtype, pointer value)
{
int cid;
@ -622,7 +622,7 @@ ChangeResourceValue (XID id, RESTYPE rtype, pointer value)
* add and delete an equal number of resources!
*/
void
_X_EXPORT void
FindClientResourcesByType(
ClientPtr client,
RESTYPE type,
@ -654,7 +654,7 @@ FindClientResourcesByType(
}
}
void
_X_EXPORT void
FindAllClientResources(
ClientPtr client,
FindAllRes func,
@ -801,7 +801,7 @@ FreeAllResources()
}
}
Bool
_X_EXPORT Bool
LegalNewID(XID id, register ClientPtr client)
{
@ -831,7 +831,7 @@ LegalNewID(XID id, register ClientPtr client)
* else NULL is returned.
*/
pointer
_X_EXPORT pointer
SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype, Mask mode)
{
int cid;
@ -860,7 +860,7 @@ SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype, Mask mode)
}
pointer
_X_EXPORT pointer
SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes, Mask mode)
{
int cid;
@ -892,14 +892,14 @@ SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes, Mask mode)
* macros because of compatibility with loadable servers.
*/
pointer
_X_EXPORT pointer
LookupIDByType(XID id, RESTYPE rtype)
{
return SecurityLookupIDByType(NullClient, id, rtype,
SecurityUnknownAccess);
}
pointer
_X_EXPORT pointer
LookupIDByClass(XID id, RESTYPE classes)
{
return SecurityLookupIDByClass(NullClient, id, classes,

8
dix/swaprep.c
View File

@ -76,7 +76,7 @@ static void SwapFont(xQueryFontReply *pr, Bool hasGlyphs);
*
* \param size size in bytes
*/
void
_X_EXPORT void
Swap32Write(ClientPtr pClient, int size, register CARD32 *pbuf)
{
register int i;
@ -96,7 +96,7 @@ Swap32Write(ClientPtr pClient, int size, register CARD32 *pbuf)
*
* \param size size in bytes
*/
void
_X_EXPORT void
CopySwap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
{
int bufsize = size;
@ -1169,7 +1169,7 @@ SKeymapNotifyEvent(xEvent *from, xEvent *to)
*to = *from;
}
void
_X_EXPORT void
SwapConnSetupInfo(
char *pInfo,
char *pInfoT
@ -1289,7 +1289,7 @@ SwapVisual(xVisualType *pVis, xVisualType *pVisT)
cpswapl(pVis->blueMask, pVisT->blueMask);
}
void
_X_EXPORT void
SwapConnSetupPrefix(xConnSetupPrefix *pcspFrom, xConnSetupPrefix *pcspTo)
{
pcspTo->success = pcspFrom->success;

8
dix/swapreq.c
View File

@ -64,8 +64,7 @@ SOFTWARE.
/* Thanks to Jack Palevich for testing and subsequently rewriting all this */
/* Byte swap a list of longs */
void
_X_EXPORT void
SwapLongs (register CARD32 *list, register unsigned long count)
{
register char n;
@ -91,8 +90,7 @@ SwapLongs (register CARD32 *list, register unsigned long count)
}
/* Byte swap a list of shorts */
void
_X_EXPORT void
SwapShorts (register short *list, register unsigned long count)
{
register char n;
@ -857,7 +855,7 @@ SProcFreeColors(register ClientPtr client)
}
void
_X_EXPORT void
SwapColorItem(xColorItem *pItem)
{
register char n;

6
dix/tables.c
View File

@ -77,7 +77,7 @@ int (* InitialVector[3]) (
ProcEstablishConnection
};
int (* ProcVector[256]) (
_X_EXPORT int (* ProcVector[256]) (
ClientPtr /* client */
) =
{
@ -345,7 +345,7 @@ int (* SwappedProcVector[256]) (
SProcNoOperation
};
EventSwapPtr EventSwapVector[128] =
_X_EXPORT EventSwapPtr EventSwapVector[128] =
{
(EventSwapPtr)SErrorEvent,
NotImplemented,
@ -385,7 +385,7 @@ EventSwapPtr EventSwapVector[128] =
};
ReplySwapPtr ReplySwapVector[256] =
_X_EXPORT ReplySwapPtr ReplySwapVector[256] =
{
ReplyNotSwappd,
ReplyNotSwappd,

46
dix/window.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.9 2005/06/10 04:01:14 ajax Exp $ */
/* $XdotOrg: xserver/xorg/dix/window.c,v 1.13 2006/01/12 22:14:56 sandmann Exp $ */
/* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
/*
@ -125,9 +125,9 @@ Equipment Corporation.
static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11};
static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88};
int screenIsSaved = SCREEN_SAVER_OFF;
_X_EXPORT int screenIsSaved = SCREEN_SAVER_OFF;
ScreenSaverStuffRec savedScreenInfo[MAXSCREENS];
_X_EXPORT ScreenSaverStuffRec savedScreenInfo[MAXSCREENS];
#if 0
extern void DeleteWindowFromAnyEvents();
@ -160,8 +160,8 @@ static Bool TileScreenSaver(int i, int kind);
#define SubStrSend(pWin,pParent) (StrSend(pWin) || SubSend(pParent))
int numSaveUndersViewable = 0;
int deltaSaveUndersViewable = 0;
_X_EXPORT int numSaveUndersViewable = 0;
_X_EXPORT int deltaSaveUndersViewable = 0;
#ifdef DEBUG
/******
@ -202,7 +202,7 @@ PrintWindowTree()
}
#endif
int
_X_EXPORT int
TraverseTree(register WindowPtr pWin, VisitWindowProcPtr func, pointer data)
{
register int result;
@ -237,7 +237,7 @@ TraverseTree(register WindowPtr pWin, VisitWindowProcPtr func, pointer data)
* exit WalkTree. Does depth-first traverse.
*****/
int
_X_EXPORT int
WalkTree(ScreenPtr pScreen, VisitWindowProcPtr func, pointer data)
{
return(TraverseTree(WindowTable[pScreen->myNum], func, data));
@ -551,7 +551,7 @@ RealChildHead(register WindowPtr pWin)
* Makes a window in response to client request
*****/
WindowPtr
_X_EXPORT WindowPtr
CreateWindow(Window wid, register WindowPtr pParent, int x, int y, unsigned w,
unsigned h, unsigned bw, unsigned class, register Mask vmask, XID *vlist,
int depth, ClientPtr client, VisualID visual, int *error)
@ -938,7 +938,7 @@ DestroySubwindows(register WindowPtr pWin, ClientPtr client)
* to most significant bit in the mask.
*****/
int
_X_EXPORT int
ChangeWindowAttributes(register WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
{
register Mask index2;
@ -1514,7 +1514,7 @@ GetWindowAttributes(register WindowPtr pWin, ClientPtr client, xGetWindowAttribu
}
WindowPtr
_X_EXPORT WindowPtr
MoveWindowInStack(register WindowPtr pWin, register WindowPtr pNextSib)
{
register WindowPtr pParent = pWin->parent;
@ -1598,7 +1598,7 @@ MoveWindowInStack(register WindowPtr pWin, register WindowPtr pNextSib)
return( pFirstChange );
}
RegionPtr
_X_EXPORT RegionPtr
CreateUnclippedWinSize (register WindowPtr pWin)
{
RegionPtr pRgn;
@ -1625,7 +1625,7 @@ CreateUnclippedWinSize (register WindowPtr pWin)
return pRgn;
}
void
_X_EXPORT void
SetWinSize (register WindowPtr pWin)
{
#ifdef COMPOSITE
@ -1663,7 +1663,7 @@ SetWinSize (register WindowPtr pWin)
#endif
}
void
_X_EXPORT void
SetBorderSize (register WindowPtr pWin)
{
int bw;
@ -1714,7 +1714,7 @@ SetBorderSize (register WindowPtr pWin)
* \param destx,desty position relative to gravity
*/
void
_X_EXPORT void
GravityTranslate (register int x, register int y, int oldx, int oldy,
int dw, int dh, unsigned gravity,
register int *destx, register int *desty)
@ -1764,7 +1764,7 @@ GravityTranslate (register int x, register int y, int oldx, int oldy,
}
/* XXX need to retile border on each window with ParentRelative origin */
void
_X_EXPORT void
ResizeChildrenWinSize(register WindowPtr pWin, int dx, int dy, int dw, int dh)
{
register ScreenPtr pScreen;
@ -2666,7 +2666,7 @@ RealizeTree(WindowPtr pWin)
* MapNotify event is generated.
*****/
int
_X_EXPORT int
MapWindow(register WindowPtr pWin, ClientPtr client)
{
register ScreenPtr pScreen;
@ -2971,7 +2971,7 @@ UnrealizeTree(
* generated. Cannot unmap a root window.
*****/
int
_X_EXPORT int
UnmapWindow(register WindowPtr pWin, Bool fromConfigure)
{
register WindowPtr pParent;
@ -3200,7 +3200,7 @@ PointInWindowIsVisible(register WindowPtr pWin, int x, int y)
}
RegionPtr
_X_EXPORT RegionPtr
NotClippedByChildren(register WindowPtr pWin)
{
register ScreenPtr pScreen;
@ -3217,7 +3217,7 @@ NotClippedByChildren(register WindowPtr pWin)
return(pReg);
}
void
_X_EXPORT void
SendVisibilityNotify(WindowPtr pWin)
{
xEvent event;
@ -3317,7 +3317,7 @@ static void DrawLogo(
);
#endif
void
_X_EXPORT void
SaveScreens(int on, int mode)
{
int i;
@ -3548,7 +3548,7 @@ TileScreenSaver(int i, int kind)
* contain the structure.
*/
WindowPtr
_X_EXPORT WindowPtr
FindWindowWithOptional (register WindowPtr w)
{
do
@ -3565,7 +3565,7 @@ FindWindowWithOptional (register WindowPtr w)
* release the optional record
*/
void
_X_EXPORT void
CheckWindowOptionalNeed (register WindowPtr w)
{
register WindowOptPtr optional;
@ -3619,7 +3619,7 @@ CheckWindowOptionalNeed (register WindowPtr w)
* values.
*/
Bool
_X_EXPORT Bool
MakeWindowOptional (register WindowPtr pWin)
{
register WindowOptPtr optional;

6
hw/xfree86/common/xf86DGA.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.3 2005/04/20 12:25:21 daniels Exp $ */
/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86DGA.c,v 1.7 2005/11/08 03:12:43 alanc Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.46 2002/12/03 18:17:40 tsi Exp $ */
/*
* Copyright (c) 1998-2002 by The XFree86 Project, Inc.
@ -64,9 +64,9 @@ DGACopyModeInfo(
);
#if defined(XFree86LOADER) || !defined(XFreeXDGA)
int *XDGAEventBase = NULL;
_X_EXPORT int *XDGAEventBase = NULL;
#else
int *XDGAEventBase = &DGAEventBase;
_X_EXPORT int *XDGAEventBase = &DGAEventBase;
#endif
#define DGA_GET_SCREEN_PRIV(pScreen) \

5
hw/xfree86/common/xf86xvmc.c
View File

@ -48,10 +48,11 @@
#include "xf86xvpriv.h"
#include "xf86xvmc.h"
typedef int (*XvMCScreenInitProcPtr)(ScreenPtr, int, XvMCAdaptorPtr);
#ifdef XFree86LOADER
int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr) = NULL;
_X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = NULL;
#else
int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr) = XvMCScreenInit;
_X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = XvMCScreenInit;
#endif

2
hw/xfree86/dummylib/fatalerror.c
View File

@ -13,7 +13,7 @@
* Utility functions required by libxf86_os.
*/
void
_X_EXPORT void
FatalError(const char *f, ...)
{
va_list args;

2
hw/xfree86/dummylib/logvwrite.c
View File

@ -13,7 +13,7 @@
* Utility functions required by libxf86_os.
*/
void
_X_EXPORT void
LogVWrite(int verb, const char *format, va_list ap)
{
if (xf86Verbose >= verb)

2
hw/xfree86/dummylib/verrorf.c
View File

@ -13,7 +13,7 @@
* Utility functions required by libxf86_os.
*/
void
_X_EXPORT void
VErrorF(const char *f, va_list args)
{
vfprintf(stderr, f, args);

16
hw/xfree86/dummylib/xalloc.c
View File

@ -13,7 +13,7 @@
* Utility functions required by libxf86_os.
*/
pointer
_X_EXPORT pointer
Xalloc(unsigned long n)
{
if (!n)
@ -21,7 +21,7 @@ Xalloc(unsigned long n)
return malloc(n);
}
pointer
_X_EXPORT pointer
Xrealloc(pointer p, unsigned long n)
{
if (!n)
@ -29,7 +29,7 @@ Xrealloc(pointer p, unsigned long n)
return realloc(p, n);
}
pointer
_X_EXPORT pointer
Xcalloc(unsigned long n)
{
pointer r;
@ -39,7 +39,7 @@ Xcalloc(unsigned long n)
return r;
}
pointer
_X_EXPORT pointer
XNFalloc(unsigned long n)
{
pointer r;
@ -51,7 +51,7 @@ XNFalloc(unsigned long n)
}
pointer
_X_EXPORT pointer
XNFrealloc(pointer p, unsigned long n)
{
pointer r;
@ -63,7 +63,7 @@ XNFrealloc(pointer p, unsigned long n)
}
pointer
_X_EXPORT pointer
XNFcalloc(unsigned long n)
{
pointer r;
@ -75,13 +75,13 @@ XNFcalloc(unsigned long n)
}
void
_X_EXPORT void
Xfree(pointer p)
{
free(p);
}
char *
_X_EXPORT char *
Xstrdup(const char *s)
{
char *sd;

2
hw/xfree86/dummylib/xf86errorf.c
View File

@ -23,7 +23,7 @@ xf86ErrorF(const char *format, ...)
va_end(ap);
}
void
_X_EXPORT void
ErrorF(const char *format, ...)
{
va_list ap;

4
hw/xfree86/parser/cpconfig.c
View File

@ -106,13 +106,13 @@ main (int argc, char *argv[])
/* Functions that the parser requires */
void
_X_EXPORT void
VErrorF(const char *f, va_list args)
{
vfprintf(stderr, f, args);
}
void
_X_EXPORT void
ErrorF(const char *f, ...)
{
va_list args;

8
os/WaitFor.c
View File

@ -460,7 +460,7 @@ DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev)
TimerSet(timer, 0, newTime, timer->callback, timer->arg);
}
OsTimerPtr
_X_EXPORT OsTimerPtr
TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
OsTimerCallback func, pointer arg)
{
@ -526,7 +526,7 @@ TimerForce(OsTimerPtr timer)
}
void
_X_EXPORT void
TimerCancel(OsTimerPtr timer)
{
OsTimerPtr *prev;
@ -543,7 +543,7 @@ TimerCancel(OsTimerPtr timer)
}
}
void
_X_EXPORT void
TimerFree(OsTimerPtr timer)
{
if (!timer)
@ -685,7 +685,7 @@ FreeDPMSTimers(void)
}
}
void
_X_EXPORT void
SetDPMSTimers(void)
{
if (!DPMSEnabled)

4
os/access.c
View File

@ -1,5 +1,5 @@
/* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
/* $XdotOrg: xserver/xorg/os/access.c,v 1.13 2005/11/08 06:33:30 jkj Exp $ */
/* $XdotOrg: xserver/xorg/os/access.c,v 1.14 2006/01/07 00:45:17 ajax Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@ -1376,7 +1376,7 @@ ResetHosts (char *display)
}
/* Is client on the local host */
Bool LocalClient(ClientPtr client)
_X_EXPORT Bool LocalClient(ClientPtr client)
{
int alen, family, notused;
Xtransaddr *from = NULL;

14
os/connection.c
View File

@ -199,7 +199,7 @@ static fd_set GrabImperviousClients;
static fd_set SavedAllClients;
static fd_set SavedAllSockets;
static fd_set SavedClientsWithInput;
int GrabInProgress = 0;
_X_EXPORT int GrabInProgress = 0;
#if !defined(WIN32)
int *ConnectionTranslation = NULL;
@ -1181,7 +1181,7 @@ CloseDownConnection(ClientPtr client)
AuditF("client %d disconnected\n", client->index);
}
void
_X_EXPORT void
AddEnabledDevice(int fd)
{
FD_SET(fd, &EnabledDevices);
@ -1190,7 +1190,7 @@ AddEnabledDevice(int fd)
FD_SET(fd, &SavedAllSockets);
}
void
_X_EXPORT void
RemoveEnabledDevice(int fd)
{
FD_CLR(fd, &EnabledDevices);
@ -1259,7 +1259,7 @@ ListenToAllClients(void)
* Must have cooresponding call to AttendClient.
****************/
void
_X_EXPORT void
IgnoreClient (ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
@ -1303,7 +1303,7 @@ IgnoreClient (ClientPtr client)
* Adds one client back into the input masks.
****************/
void
_X_EXPORT void
AttendClient (ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
@ -1336,7 +1336,7 @@ AttendClient (ClientPtr client)
/* make client impervious to grabs; assume only executing client calls this */
void
_X_EXPORT void
MakeClientGrabImpervious(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
@ -1355,7 +1355,7 @@ MakeClientGrabImpervious(ClientPtr client)
/* make client pervious to grabs; assume only executing client calls this */
void
_X_EXPORT void
MakeClientGrabPervious(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;

12
os/io.c
View File

@ -91,8 +91,8 @@ SOFTWARE.
#include "lbxserve.h"
#endif
CallbackListPtr ReplyCallback;
CallbackListPtr FlushCallback;
_X_EXPORT CallbackListPtr ReplyCallback;
_X_EXPORT CallbackListPtr FlushCallback;
/* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
* systems are broken and return EWOULDBLOCK when they should return EAGAIN
@ -602,7 +602,7 @@ InsertFakeRequest(ClientPtr client, char *data, int count)
*
**********************/
void
_X_EXPORT void
ResetCurrentRequest(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr)client->osPrivate;
@ -745,7 +745,7 @@ PeekNextRequest(
*
**********************/
CallbackListPtr SkippedRequestsCallback = NULL;
_X_EXPORT CallbackListPtr SkippedRequestsCallback = NULL;
void
SkipRequests(
@ -897,7 +897,7 @@ FlushIfCriticalOutputPending(void)
FlushAllOutput();
}
void
_X_EXPORT void
SetCriticalOutputPending(void)
{
CriticalOutputPending = TRUE;
@ -914,7 +914,7 @@ SetCriticalOutputPending(void)
* this routine as int.
*****************/
int
_X_EXPORT int
WriteToClient (ClientPtr who, int count, char *buf)
{
OsCommPtr oc = (OsCommPtr)who->osPrivate;

18
os/log.c
View File

@ -252,7 +252,7 @@ LogSetParameter(LogParameter param, int value)
/* This function does the actual log message writes. */
void
_X_EXPORT void
LogVWrite(int verb, const char *f, va_list args)
{
static char tmpBuffer[1024];
@ -301,7 +301,7 @@ LogVWrite(int verb, const char *f, va_list args)
}
}
void
_X_EXPORT void
LogWrite(int verb, const char *f, ...)
{
va_list args;
@ -311,7 +311,7 @@ LogWrite(int verb, const char *f, ...)
va_end(args);
}
void
_X_EXPORT void
LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
{
const char *s = X_UNKNOWN_STRING;
@ -376,7 +376,7 @@ LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
}
/* Log message with verbosity level specified. */
void
_X_EXPORT void
LogMessageVerb(MessageType type, int verb, const char *format, ...)
{
va_list ap;
@ -387,7 +387,7 @@ LogMessageVerb(MessageType type, int verb, const char *format, ...)
}
/* Log a message with the standard verbosity level of 1. */
void
_X_EXPORT void
LogMessage(MessageType type, const char *format, ...)
{
va_list ap;
@ -527,7 +527,7 @@ VAuditF(const char *f, va_list args)
free(prefix);
}
void
_X_EXPORT void
FatalError(const char *f, ...)
{
va_list args;
@ -557,7 +557,7 @@ FatalError(const char *f, ...)
/*NOTREACHED*/
}
void
_X_EXPORT void
VErrorF(const char *f, va_list args)
{
#ifdef DDXOSVERRORF
@ -570,7 +570,7 @@ VErrorF(const char *f, va_list args)
#endif
}
void
_X_EXPORT void
ErrorF(const char * f, ...)
{
va_list args;
@ -597,7 +597,7 @@ extern int sys_nerr;
((n) >= 0 && (n) < sys_nerr) ? sys_errlist[(n)] : "unknown error"
#endif
void
_X_EXPORT void
Error(char *str)
{
char *err = NULL;

92
os/utils.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.17 2005/06/09 02:29:42 ajax Exp $ */
/* $XdotOrg: xserver/xorg/os/utils.c,v 1.22 2006/01/08 23:43:54 ajax Exp $ */
/* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */
/*
@ -131,111 +131,111 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include "DiPrint.h"
#endif
Bool noTestExtensions;
_X_EXPORT Bool noTestExtensions;
#ifdef BIGREQS
Bool noBigReqExtension = FALSE;
_X_EXPORT Bool noBigReqExtension = FALSE;
#endif
#ifdef COMPOSITE
/* COMPOSITE is disabled by default for now until the
* interface is stable */
Bool noCompositeExtension = TRUE;
_X_EXPORT Bool noCompositeExtension = TRUE;
#endif
#ifdef DAMAGE
Bool noDamageExtension = FALSE;
_X_EXPORT Bool noDamageExtension = FALSE;
#endif
#ifdef DBE
Bool noDbeExtension = FALSE;
_X_EXPORT Bool noDbeExtension = FALSE;
#endif
#ifdef DPMSExtension
Bool noDPMSExtension = FALSE;
_X_EXPORT Bool noDPMSExtension = FALSE;
#endif
#ifdef EVI
Bool noEVIExtension = FALSE;
_X_EXPORT Bool noEVIExtension = FALSE;
#endif
#ifdef FONTCACHE
Bool noFontCacheExtension = FALSE;
_X_EXPORT Bool noFontCacheExtension = FALSE;
#endif
#ifdef GLXEXT
Bool noGlxExtension = FALSE;
_X_EXPORT Bool noGlxExtension = FALSE;
#endif
#ifdef LBX
Bool noLbxExtension = FALSE;
_X_EXPORT Bool noLbxExtension = FALSE;
#endif
#ifdef SCREENSAVER
Bool noScreenSaverExtension = FALSE;
_X_EXPORT Bool noScreenSaverExtension = FALSE;
#endif
#ifdef MITSHM
Bool noMITShmExtension = FALSE;
_X_EXPORT Bool noMITShmExtension = FALSE;
#endif
#ifdef MITMISC
Bool noMITMiscExtension = FALSE;
_X_EXPORT Bool noMITMiscExtension = FALSE;
#endif
#ifdef MULTIBUFFER
Bool noMultibufferExtension = FALSE;
_X_EXPORT Bool noMultibufferExtension = FALSE;
#endif
#ifdef RANDR
Bool noRRExtension = FALSE;
_X_EXPORT Bool noRRExtension = FALSE;
#endif
#ifdef RENDER
Bool noRenderExtension = FALSE;
_X_EXPORT Bool noRenderExtension = FALSE;
#endif
#ifdef SHAPE
Bool noShapeExtension = FALSE;
_X_EXPORT Bool noShapeExtension = FALSE;
#endif
#ifdef XCSECURITY
Bool noSecurityExtension = FALSE;
_X_EXPORT Bool noSecurityExtension = FALSE;
#endif
#ifdef XSYNC
Bool noSyncExtension = FALSE;
_X_EXPORT Bool noSyncExtension = FALSE;
#endif
#ifdef TOGCUP
Bool noXcupExtension = FALSE;
_X_EXPORT Bool noXcupExtension = FALSE;
#endif
#ifdef RES
Bool noResExtension = FALSE;
_X_EXPORT Bool noResExtension = FALSE;
#endif
#ifdef XAPPGROUP
Bool noXagExtension = FALSE;
_X_EXPORT Bool noXagExtension = FALSE;
#endif
#ifdef XCMISC
Bool noXCMiscExtension = FALSE;
_X_EXPORT Bool noXCMiscExtension = FALSE;
#endif
#ifdef XEVIE
/* Xevie is disabled by default for now until the
* interface is stable */
Bool noXevieExtension = TRUE;
_X_EXPORT Bool noXevieExtension = TRUE;
#endif
#ifdef XF86BIGFONT
Bool noXFree86BigfontExtension = FALSE;
_X_EXPORT Bool noXFree86BigfontExtension = FALSE;
#endif
#ifdef XFreeXDGA
Bool noXFree86DGAExtension = FALSE;
_X_EXPORT Bool noXFree86DGAExtension = FALSE;
#endif
#ifdef XF86DRI
Bool noXFree86DRIExtension = FALSE;
_X_EXPORT Bool noXFree86DRIExtension = FALSE;
#endif
#ifdef XF86MISC
Bool noXFree86MiscExtension = FALSE;
_X_EXPORT Bool noXFree86MiscExtension = FALSE;
#endif
#ifdef XF86VIDMODE
Bool noXFree86VidModeExtension = FALSE;
_X_EXPORT Bool noXFree86VidModeExtension = FALSE;
#endif
#ifdef XFIXES
Bool noXFixesExtension = FALSE;
_X_EXPORT Bool noXFixesExtension = FALSE;
#endif
/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */
#ifdef PANORAMIX
/* Xinerama is disabled by default unless enabled via +xinerama */
Bool noPanoramiXExtension = TRUE;
_X_EXPORT Bool noPanoramiXExtension = TRUE;
#endif
#ifdef XINPUT
Bool noXInputExtension = FALSE;
_X_EXPORT Bool noXInputExtension = FALSE;
#endif
#ifdef XIDLE
Bool noXIdleExtension = FALSE;
_X_EXPORT Bool noXIdleExtension = FALSE;
#endif
#ifdef XV
Bool noXvExtension = FALSE;
_X_EXPORT Bool noXvExtension = FALSE;
#endif
#define X_INCLUDE_NETDB_H
@ -255,7 +255,7 @@ Bool PanoramiXExtensionDisabledHack = FALSE;
int auditTrailLevel = 1;
Bool Must_have_memory = FALSE;
_X_EXPORT Bool Must_have_memory = FALSE;
#ifdef AIXV3
int SyncOn = 0;
@ -535,7 +535,7 @@ AutoResetServer (int sig)
/* Force connections to close and then exit on SIGTERM, SIGINT */
/*ARGSUSED*/
SIGVAL
_X_EXPORT SIGVAL
GiveUp(int sig)
{
int olderrno = errno;
@ -560,7 +560,7 @@ GetTimeInMillis(void)
}
#endif
void
_X_EXPORT void
AdjustWaitForDelay (pointer waitTime, unsigned long newdelay)
{
static struct timeval delay_val;
@ -1349,7 +1349,7 @@ set_font_authorizations(char **authorizations, int *authlen, pointer client)
#ifndef INTERNAL_MALLOC
void *
_X_EXPORT void *
Xalloc(unsigned long amount)
{
register pointer ptr;
@ -1377,7 +1377,7 @@ Xalloc(unsigned long amount)
* "no failure" realloc, alternate interface to Xalloc w/o Must_have_memory
*****************/
void *
_X_EXPORT void *
XNFalloc(unsigned long amount)
{
register pointer ptr;
@ -1400,7 +1400,7 @@ XNFalloc(unsigned long amount)
* Xcalloc
*****************/
void *
_X_EXPORT void *
Xcalloc(unsigned long amount)
{
unsigned long *ret;
@ -1415,7 +1415,7 @@ Xcalloc(unsigned long amount)
* XNFcalloc
*****************/
void *
_X_EXPORT void *
XNFcalloc(unsigned long amount)
{
unsigned long *ret;
@ -1432,7 +1432,7 @@ XNFcalloc(unsigned long amount)
* Xrealloc
*****************/
void *
_X_EXPORT void *
Xrealloc(pointer ptr, unsigned long amount)
{
#ifdef MEMBUG
@ -1463,7 +1463,7 @@ Xrealloc(pointer ptr, unsigned long amount)
* "no failure" realloc, alternate interface to Xrealloc w/o Must_have_memory
*****************/
void *
_X_EXPORT void *
XNFrealloc(pointer ptr, unsigned long amount)
{
if (( ptr = (pointer)Xrealloc( ptr, amount ) ) == NULL)
@ -1479,7 +1479,7 @@ XNFrealloc(pointer ptr, unsigned long amount)
* calls free
*****************/
void
_X_EXPORT void
Xfree(pointer ptr)
{
if (ptr)
@ -1517,7 +1517,7 @@ Xstrdup(const char *s)
}
char *
_X_EXPORT char *
XNFstrdup(const char *s)
{
char *sd;

14
os/xalloc.c
View File

@ -311,7 +311,7 @@ void XfreeTrap(void)
{
}
void *
_X_EXPORT void *
Xalloc (unsigned long amount)
{
register unsigned long *ptr;
@ -466,7 +466,7 @@ Xalloc (unsigned long amount)
* "no failure" realloc, alternate interface to Xalloc w/o Must_have_memory
*****************/
pointer
_X_EXPORT pointer
XNFalloc (unsigned long amount)
{
register pointer ptr;
@ -499,7 +499,7 @@ XNFalloc (unsigned long amount)
* Xcalloc
*****************/
pointer
_X_EXPORT pointer
Xcalloc (unsigned long amount)
{
pointer ret;
@ -517,7 +517,7 @@ Xcalloc (unsigned long amount)
/*****************
* XNFcalloc
*****************/
void *
_X_EXPORT void *
XNFcalloc (unsigned long amount)
{
pointer ret;
@ -536,7 +536,7 @@ XNFcalloc (unsigned long amount)
* Xrealloc
*****************/
void *
_X_EXPORT void *
Xrealloc (pointer ptr, unsigned long amount)
{
register unsigned long *new_ptr;
@ -613,7 +613,7 @@ Xrealloc (pointer ptr, unsigned long amount)
* "no failure" realloc, alternate interface to Xrealloc w/o Must_have_memory
*****************/
void *
_X_EXPORT void *
XNFrealloc (pointer ptr, unsigned long amount)
{
if (( ptr = (pointer)Xrealloc( ptr, amount ) ) == NULL)
@ -628,7 +628,7 @@ XNFrealloc (pointer ptr, unsigned long amount)
* calls free
*****************/
void
_X_EXPORT void
Xfree(pointer ptr)
{
unsigned long size;

4
render/filter.c
View File

@ -125,7 +125,7 @@ PictureFreeFilterIds (void)
filterNames = 0;
}
int
_X_EXPORT int
PictureAddFilter (ScreenPtr pScreen,
char *filter,
PictFilterValidateParamsProcPtr ValidateParams)
@ -157,7 +157,7 @@ PictureAddFilter (ScreenPtr pScreen,
return id;
}
Bool
_X_EXPORT Bool
PictureSetFilterAlias (ScreenPtr pScreen, char *filter, char *alias)
{
PictureScreenPtr ps = GetPictureScreen(pScreen);

2
render/miglyph.c
View File

@ -102,7 +102,7 @@ miGlyphExtents (int nlist,
#define NeedsComponent(f) (PICT_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0)
void
_X_EXPORT void
miGlyphs (CARD8 op,
PicturePtr pSrc,
PicturePtr pDst,

4
render/mipict.c
View File

@ -405,7 +405,7 @@ miCompositeSourceValidate (PicturePtr pPicture,
* an allocation failure, but rendering ignores those anyways.
*/
Bool
_X_EXPORT Bool
miComputeCompositeRegion (RegionPtr pRegion,
PicturePtr pSrc,
PicturePtr pMask,
@ -610,7 +610,7 @@ miRenderPixelToColor (PictFormatPtr format,
}
}
Bool
_X_EXPORT Bool
miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
{
PictureScreenPtr ps;

2
render/mirect.c
View File

@ -95,7 +95,7 @@ miColorRects (PicturePtr pDst,
FreeScratchGC (pGC);
}
void
_X_EXPORT void
miCompositeRects (CARD8 op,
PicturePtr pDst,
xRenderColor *color,

12
render/picture.c
View File

@ -42,7 +42,7 @@
#include "servermd.h"
#include "picturestr.h"
int PictureScreenPrivateIndex = -1;
_X_EXPORT int PictureScreenPrivateIndex = -1;
int PictureWindowPrivateIndex;
int PictureGeneration;
RESTYPE PictureType;
@ -504,7 +504,7 @@ PictureFinishInit (void)
return TRUE;
}
Bool
_X_EXPORT Bool
PictureSetSubpixelOrder (ScreenPtr pScreen, int subpixel)
{
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
@ -516,7 +516,7 @@ PictureSetSubpixelOrder (ScreenPtr pScreen, int subpixel)
}
int
_X_EXPORT int
PictureGetSubpixelOrder (ScreenPtr pScreen)
{
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
@ -616,7 +616,7 @@ PictureParseCmapPolicy (const char *name)
return PictureCmapPolicyInvalid;
}
Bool
_X_EXPORT Bool
PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
{
PictureScreenPtr ps;
@ -1904,7 +1904,7 @@ AddTraps (PicturePtr pPicture,
#define MAX_FIXED_48_16 ((xFixed_48_16) 0x7fffffff)
#define MIN_FIXED_48_16 (-((xFixed_48_16) 1 << 31))
Bool
_X_EXPORT Bool
PictureTransformPoint3d (PictTransformPtr transform,
PictVectorPtr vector)
{
@ -1933,7 +1933,7 @@ PictureTransformPoint3d (PictTransformPtr transform,
}
Bool
_X_EXPORT Bool
PictureTransformPoint (PictTransformPtr transform,
PictVectorPtr vector)
{

10
render/renderedge.c
View File

@ -33,7 +33,7 @@
* grid row
*/
xFixed
_X_EXPORT xFixed
RenderSampleCeilY (xFixed y, int n)
{
xFixed f = xFixedFrac(y);
@ -54,7 +54,7 @@ RenderSampleCeilY (xFixed y, int n)
* Compute the largest value no greater than y which is on a
* grid row
*/
xFixed
_X_EXPORT xFixed
RenderSampleFloorY (xFixed y, int n)
{
xFixed f = xFixedFrac(y);
@ -72,7 +72,7 @@ RenderSampleFloorY (xFixed y, int n)
/*
* Step an edge by any amount (including negative values)
*/
void
_X_EXPORT void
RenderEdgeStep (RenderEdge *e, int n)
{
xFixed_48_16 ne;
@ -127,7 +127,7 @@ _RenderEdgeMultiInit (RenderEdge *e, int n, xFixed *stepx_p, xFixed *dx_p)
* Initialize one edge structure given the line endpoints and a
* starting y value
*/
void
_X_EXPORT void
RenderEdgeInit (RenderEdge *e,
int n,
xFixed y_start,
@ -170,7 +170,7 @@ RenderEdgeInit (RenderEdge *e,
* Initialize one edge structure given a line, starting y value
* and a pixel offset for the line
*/
void
_X_EXPORT void
RenderLineFixedEdgeInit (RenderEdge *e,
int n,
xFixed y,

4
xkb/xkbAccessX.c
View File

@ -45,8 +45,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <sys/time.h>
#endif
int XkbDfltRepeatDelay= 660;
int XkbDfltRepeatInterval= 40;
_X_EXPORT int XkbDfltRepeatDelay= 660;
_X_EXPORT int XkbDfltRepeatInterval= 40;
pointer XkbLastRepeatEvent= NULL;
#define DFLT_TIMEOUT_CTRLS (XkbAX_KRGMask|XkbStickyKeysMask|XkbMouseKeysMask)

8
xkb/xkbInit.c
View File

@ -1,5 +1,5 @@
/* $Xorg: xkbInit.c,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */
/* $XdotOrg: xserver/xorg/xkb/xkbInit.c,v 1.9 2005/10/19 22:45:54 ajax Exp $ */
/* $XdotOrg: xserver/xorg/xkb/xkbInit.c,v 1.10 2005/12/26 04:23:58 daniels Exp $ */
/************************************************************
Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
@ -146,7 +146,7 @@ char * XkbOptionsUsed= NULL;
int _XkbClientMajor= XkbMajorVersion;
int _XkbClientMinor= XkbMinorVersion;
Bool noXkbExtension= XKB_DFLT_DISABLED;
_X_EXPORT Bool noXkbExtension= XKB_DFLT_DISABLED;
Bool XkbWantRulesProp= XKB_DFLT_RULES_PROP;
/***====================================================================***/
@ -254,7 +254,7 @@ XkbSetRulesUsed(XkbRF_VarDefsPtr defs)
return;
}
void
_X_EXPORT void
XkbSetRulesDflts(char *rulesFile,char *model,char *layout,
char *variant,char *options)
{
@ -608,7 +608,7 @@ XkbEventCauseRec cause;
#define XkbMaxKeyCount MAP_LENGTH
#endif
Bool
_X_EXPORT Bool
XkbInitKeyboardDeviceStruct(
DeviceIntPtr dev,
XkbComponentNamesPtr names,