xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Mon Oct 6 12:32:21 PDT 2008
Xi/extinit.c | 2 +-
dix/dispatch.c | 2 +-
dix/events.c | 2 +-
dix/gc.c | 4 ++--
dix/globals.c | 4 +---
dix/resource.c | 4 ++--
dix/tables.c | 4 ++--
dix/window.c | 10 +++++-----
hw/xfree86/loader/dixsym.c | 17 -----------------
include/cursor.h | 2 --
10 files changed, 15 insertions(+), 36 deletions(-)
New commits:
commit c6d6d3e87a472b641d883a6c000f96e5bdf48532
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Oct 6 16:18:21 2008 -0400
Loader: Unexport a handful of consumerless symbols from dixsym.
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 9d0ca78..8b21bd9 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -1007,7 +1007,7 @@ DeviceIsPointerType(DeviceIntPtr dev)
*
*/
-_X_EXPORT void
+void
AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name)
{
dev->type = type;
diff --git a/dix/dispatch.c b/dix/dispatch.c
index d14f8dc..3909dc8 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -197,7 +197,7 @@ XID clientErrorValue; /* XXX this is a kludge */
#define SAME_SCREENS(a, b) (\
(a.pScreen == b.pScreen))
-_X_EXPORT void
+void
SetInputCheck(HWEventQueuePtr c0, HWEventQueuePtr c1)
{
checkForInput[0] = c0;
diff --git a/dix/events.c b/dix/events.c
index 7a43e66..0157368 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2767,7 +2767,7 @@ CheckMotion(xEvent *xE, DeviceIntPtr pDev)
* Windows have restructured, we need to update the sprite position and the
* sprite's cursor.
*/
-_X_EXPORT void
+void
WindowsRestructured(void)
{
DeviceIntPtr pDev = inputInfo.devices;
diff --git a/dix/gc.c b/dix/gc.c
index 83f48d4..b925694 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -1049,7 +1049,7 @@ FreeDefaultStipple(int screenNum)
(*pScreen->DestroyPixmap)(pScreen->PixmapPerDepth[0]);
}
-_X_EXPORT int
+int
SetDashes(GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash)
{
long i;
@@ -1155,7 +1155,7 @@ VerifyRectOrder(int nrects, xRectangle *prects, int ordering)
return -1;
}
-_X_EXPORT int
+int
SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects,
xRectangle *prects, int ordering)
{
diff --git a/dix/globals.c b/dix/globals.c
index 60fd9a9..abb8146 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -111,7 +111,7 @@ CARD32 defaultDPMSStandbyTime = DEFAULT_STANDBY_TIME;
CARD32 defaultDPMSSuspendTime = DEFAULT_SUSPEND_TIME;
CARD32 defaultDPMSOffTime = DEFAULT_OFF_TIME;
_X_EXPORT CARD16 DPMSPowerLevel = 0;
-_X_EXPORT Bool defaultDPMSEnabled = DEFAULT_DPMS_ENABLED;
+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;
@@ -142,8 +142,6 @@ CursorPtr rootCursor;
Bool party_like_its_1989 = FALSE;
Bool whiteRoot = FALSE;
-_X_EXPORT int cursorScreenDevPriv[MAXSCREENS];
-
_X_EXPORT TimeStamp currentTime;
_X_EXPORT TimeStamp lastDeviceEventTime;
diff --git a/dix/resource.c b/dix/resource.c
index 81b2e95..7b0441e 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -339,7 +339,7 @@ AvailableID(
return 0;
}
-_X_EXPORT void
+void
GetXIDRange(int client, Bool server, XID *minp, XID *maxp)
{
XID id, maxid;
@@ -390,7 +390,7 @@ GetXIDRange(int client, Bool server, XID *minp, XID *maxp)
* invented, but this will be used so rarely that this should suffice.
*/
-_X_EXPORT unsigned int
+unsigned int
GetXIDList(ClientPtr pClient, unsigned count, XID *pids)
{
unsigned int found = 0;
diff --git a/dix/tables.c b/dix/tables.c
index 2200e3c..e4f9366 100644
--- a/dix/tables.c
+++ b/dix/tables.c
@@ -70,7 +70,7 @@ int (* InitialVector[3]) (
ProcEstablishConnection
};
-_X_EXPORT int (* ProcVector[256]) (
+int (* ProcVector[256]) (
ClientPtr /* client */
) =
{
@@ -378,7 +378,7 @@ _X_EXPORT EventSwapPtr EventSwapVector[128] =
};
-_X_EXPORT ReplySwapPtr ReplySwapVector[256] =
+ReplySwapPtr ReplySwapVector[256] =
{
ReplyNotSwappd,
ReplyNotSwappd,
diff --git a/dix/window.c b/dix/window.c
index 8f6384b..e9aad52 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -1518,7 +1518,7 @@ GetWindowAttributes(WindowPtr pWin, ClientPtr client, xGetWindowAttributesReply
}
-_X_EXPORT WindowPtr
+WindowPtr
MoveWindowInStack(WindowPtr pWin, WindowPtr pNextSib)
{
WindowPtr pParent = pWin->parent;
@@ -1628,7 +1628,7 @@ CreateUnclippedWinSize (WindowPtr pWin)
return pRgn;
}
-_X_EXPORT void
+void
SetWinSize (WindowPtr pWin)
{
#ifdef COMPOSITE
@@ -1669,7 +1669,7 @@ SetWinSize (WindowPtr pWin)
}
}
-_X_EXPORT void
+void
SetBorderSize (WindowPtr pWin)
{
int bw;
@@ -1773,7 +1773,7 @@ GravityTranslate (int x, int y, int oldx, int oldy,
}
/* XXX need to retile border on each window with ParentRelative origin */
-_X_EXPORT void
+void
ResizeChildrenWinSize(WindowPtr pWin, int dx, int dy, int dw, int dh)
{
ScreenPtr pScreen;
@@ -3089,7 +3089,7 @@ NotClippedByChildren(WindowPtr pWin)
return(pReg);
}
-_X_EXPORT void
+void
SendVisibilityNotify(WindowPtr pWin)
{
xEvent event;
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index aaecd88..683c166 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -112,7 +112,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(QueryColors)
/* cursor.c */
SYMFUNC(FreeCursor)
- SYMVAR(cursorScreenDevPriv)
/* deprecated.c */
SYMFUNC(LookupClient)
SYMFUNC(LookupDrawable)
@@ -139,7 +138,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(SendMappingNotify)
SYMFUNC(InitPointerDeviceStruct)
/* dispatch.c */
- SYMFUNC(SetInputCheck)
SYMFUNC(SendErrorToClient)
SYMFUNC(UpdateCurrentTime)
SYMFUNC(UpdateCurrentTimeIf)
@@ -175,7 +173,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(GetSpritePosition)
SYMFUNC(GetSpriteWindow)
SYMFUNC(GetSpriteCursor)
- SYMFUNC(WindowsRestructured)
SYMVAR(DeviceEventCallback)
SYMVAR(EventCallback)
SYMVAR(inputInfo)
@@ -210,10 +207,8 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(FreeGC)
SYMFUNC(FreeScratchGC)
SYMFUNC(GetScratchGC)
- SYMFUNC(SetClipRects)
SYMFUNC(ValidateGC)
SYMFUNC(VerifyRectOrder)
- SYMFUNC(SetDashes)
/* globals.c */
SYMVAR(ScreenSaverTime)
#ifdef DPMSExtension
@@ -225,7 +220,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMVAR(DPMSSuspendTime)
SYMVAR(DPMSEnabledSwitch)
SYMVAR(DPMSDisabledSwitch)
- SYMVAR(defaultDPMSEnabled)
#endif
#ifdef XV
/* XXX These are exported from the DDX, not DIX. */
@@ -274,8 +268,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(FakeClientID)
SYMFUNC(FreeResource)
SYMFUNC(FreeResourceByType)
- SYMFUNC(GetXIDList)
- SYMFUNC(GetXIDRange)
SYMFUNC(LegalNewID)
SYMFUNC(FindClientResourcesByType)
SYMFUNC(FindAllClientResources)
@@ -302,8 +294,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(SwapColorItem)
/* tables.c */
SYMVAR(EventSwapVector)
- SYMVAR(ReplySwapVector)
- SYMVAR(ProcVector)
/* window.c */
SYMFUNC(ChangeWindowAttributes)
SYMFUNC(CheckWindowOptionalNeed)
@@ -313,14 +303,9 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(GravityTranslate)
SYMFUNC(MakeWindowOptional)
SYMFUNC(MapWindow)
- SYMFUNC(MoveWindowInStack)
SYMFUNC(NotClippedByChildren)
- SYMFUNC(ResizeChildrenWinSize)
SYMFUNC(SaveScreens)
SYMFUNC(dixSaveScreens)
- SYMFUNC(SendVisibilityNotify)
- SYMFUNC(SetWinSize)
- SYMFUNC(SetBorderSize)
SYMFUNC(TraverseTree)
SYMFUNC(UnmapWindow)
SYMFUNC(WalkTree)
@@ -455,8 +440,6 @@ _X_HIDDEN void *dixLookupTab[] = {
/* exevents.c */
SYMFUNC(InitValuatorAxisStruct)
SYMFUNC(InitProximityClassDeviceStruct)
- /* extinit.c */
- SYMFUNC(AssignTypeAndName)
/* xf86DGA.c */
/* XXX This is exported from the DDX, not DIX. */
diff --git a/include/cursor.h b/include/cursor.h
index 93e264d..f86d94c 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -65,8 +65,6 @@ typedef struct _Cursor *CursorPtr;
typedef struct _CursorMetric *CursorMetricPtr;
extern CursorPtr rootCursor;
-extern int cursorScreenDevPriv[MAXSCREENS];
-#define CursorScreenKey(pScreen) (cursorScreenDevPriv + (pScreen)->myNum)
extern int FreeCursor(
pointer /*pCurs*/,
More information about the xorg-commit
mailing list