d6cbd4511e
This is the biggest "visibility" patch. Instead of doing a "export" symbol on demand, export everything in the sdk, so that if some module fails due to an unresolved symbol, it is because it is using a symbol not in the sdk. Most exported symbols shouldn't really be made visible, neither advertised in the sdk, as they are only used by a single shared object. Symbols in the sdk (or referenced in sdk macros), but not defined anywhere include: XkbBuildCoreState() XkbInitialMap XkbXIUnsupported XkbCheckActionVMods() XkbSendCompatNotify() XkbDDXFakePointerButton() XkbDDXApplyConfig() _XkbStrCaseCmp() _XkbErrMessages[] _XkbErrCode _XkbErrLocation _XkbErrData XkbAccessXDetailText() XkbNKNDetailMaskText() XkbLookupGroupAndLevel() XkbInitAtoms() XkbGetOrderedDrawables() XkbFreeOrderedDrawables() XkbConvertXkbComponents() XkbWriteXKBSemantics() XkbWriteXKBLayout() XkbWriteXKBKeymap() XkbWriteXKBFile() XkbWriteCFile() XkbWriteXKMFile() XkbWriteToServer() XkbMergeFile() XkmFindTOCEntry() XkmReadFileSection() XkmReadFileSectionName() InitExtInput() xf86CheckButton() xf86SwitchCoreDevice() RamDacSetGamma() RamDacRestoreDACValues() xf86Bpp xf86ConfigPix24 xf86MouseCflags[] xf86SupportedMouseTypes[] xf86NumMouseTypes xf86ChangeBusIndex() xf86EntityEnter() xf86EntityLeave() xf86WrapperInit() xf86RingBell() xf86findOptionBoolean() xf86debugListOptions() LoadSubModuleLocal() LoaderSymbolLocal() getInt10Rec() xf86CurrentScreen xf86ReallocatePciResources() xf86NewSerialNumber() xf86RandRSetInitialMode() fbCompositeSolidMask_nx1xn fbCompositeSolidMask_nx8888x0565C fbCompositeSolidMask_nx8888x8888C fbCompositeSolidMask_nx8x0565 fbCompositeSolidMask_nx8x0888 fbCompositeSolidMask_nx8x8888 fbCompositeSrc_0565x0565 fbCompositeSrc_8888x0565 fbCompositeSrc_8888x0888 fbCompositeSrc_8888x8888 fbCompositeSrcAdd_1000x1000 fbCompositeSrcAdd_8000x8000 fbCompositeSrcAdd_8888x8888 fbGeneration fbIn fbOver fbOver24 fbOverlayGeneration fbRasterizeEdges fbRestoreAreas fbSaveAreas composeFunctions VBEBuildVbeModeList() VBECalcVbeModeIndex() TIramdac3030CalculateMNPForClock() shadowBufPtr shadowFindBuf() miRRGetScreenInfo() RRSetScreenConfig() RRModePruneUnused() PixmanImageFromPicture() extern int miPointerGetMotionEvents() miClipPicture() miRasterizeTriangle() fbPush1toN() fbInitializeBackingStore() ddxBeforeReset() SetupSprite() InitSprite() DGADeliverEvent() SPECIAL CASES o defined as _X_INTERNAL xf86NewInputDevice() o defined as static fbGCPrivateKey fbOverlayScreenPrivateKey fbScreenPrivateKey fbWinPrivateKey o defined in libXfont.so, but declared in xorg/dixfont.h GetGlyphs() QueryGlyphExtents() QueryTextExtents() ParseGlyphCachingMode() InitGlyphCaching() SetGlyphCachingMode()
442 lines
12 KiB
C
442 lines
12 KiB
C
/*
|
|
*
|
|
* Copyright © 2002 Keith Packard, member of The XFree86 Project, 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 Keith Packard not be used in
|
|
* advertising or publicity pertaining to distribution of the software without
|
|
* specific, written prior permission. Keith Packard makes no
|
|
* representations about the suitability of this software for any purpose. It
|
|
* is provided "as is" without express or implied warranty.
|
|
*
|
|
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
* EVENT SHALL KEITH PACKARD 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.
|
|
*/
|
|
|
|
/*
|
|
* Animated cursors for X. Not specific to Render in any way, but
|
|
* stuck there because Render has the other cool cursor extension.
|
|
* Besides, everyone has Render.
|
|
*
|
|
* Implemented as a simple layer over the core cursor code; it
|
|
* creates composite cursors out of a set of static cursors and
|
|
* delta times between each image.
|
|
*/
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#include <X11/X.h>
|
|
#include <X11/Xmd.h>
|
|
#include "servermd.h"
|
|
#include "scrnintstr.h"
|
|
#include "dixstruct.h"
|
|
#include "cursorstr.h"
|
|
#include "dixfontstr.h"
|
|
#include "opaque.h"
|
|
#include "picturestr.h"
|
|
#include "inputstr.h"
|
|
#include "xace.h"
|
|
|
|
typedef struct _AnimCurElt {
|
|
CursorPtr pCursor; /* cursor to show */
|
|
CARD32 delay; /* in ms */
|
|
} AnimCurElt;
|
|
|
|
typedef struct _AnimCur {
|
|
int nelt; /* number of elements in the elts array */
|
|
AnimCurElt *elts; /* actually allocated right after the structure */
|
|
} AnimCurRec, *AnimCurPtr;
|
|
|
|
typedef struct _AnimScrPriv {
|
|
CursorPtr pCursor;
|
|
int elt;
|
|
CARD32 time;
|
|
|
|
CloseScreenProcPtr CloseScreen;
|
|
|
|
ScreenBlockHandlerProcPtr BlockHandler;
|
|
|
|
CursorLimitsProcPtr CursorLimits;
|
|
DisplayCursorProcPtr DisplayCursor;
|
|
SetCursorPositionProcPtr SetCursorPosition;
|
|
RealizeCursorProcPtr RealizeCursor;
|
|
UnrealizeCursorProcPtr UnrealizeCursor;
|
|
RecolorCursorProcPtr RecolorCursor;
|
|
} AnimCurScreenRec, *AnimCurScreenPtr;
|
|
|
|
typedef struct _AnimCurState {
|
|
CursorPtr pCursor;
|
|
ScreenPtr pScreen;
|
|
int elt;
|
|
CARD32 time;
|
|
} AnimCurStateRec, *AnimCurStatePtr;
|
|
|
|
/* What a waste. But we need an API change to alloc it per device only. */
|
|
static AnimCurStateRec animCurState[MAXDEVICES];
|
|
|
|
static unsigned char empty[4];
|
|
|
|
static CursorBits animCursorBits = {
|
|
empty, empty, 2, 1, 1, 0, 0, 1
|
|
};
|
|
|
|
static int AnimCurGeneration;
|
|
|
|
static int AnimCurScreenPrivateKeyIndex;
|
|
static DevPrivateKey AnimCurScreenPrivateKey = &AnimCurScreenPrivateKeyIndex;
|
|
|
|
#define IsAnimCur(c) ((c) && ((c)->bits == &animCursorBits))
|
|
#define GetAnimCur(c) ((AnimCurPtr) ((c) + 1))
|
|
#define GetAnimCurScreen(s) ((AnimCurScreenPtr)dixLookupPrivate(&(s)->devPrivates, AnimCurScreenPrivateKey))
|
|
#define GetAnimCurScreenIfSet(s) GetAnimCurScreen(s)
|
|
#define SetAnimCurScreen(s,p) dixSetPrivate(&(s)->devPrivates, AnimCurScreenPrivateKey, p)
|
|
|
|
#define Wrap(as,s,elt,func) (((as)->elt = (s)->elt), (s)->elt = func)
|
|
#define Unwrap(as,s,elt) ((s)->elt = (as)->elt)
|
|
|
|
static Bool
|
|
AnimCurDisplayCursor (DeviceIntPtr pDev,
|
|
ScreenPtr pScreen,
|
|
CursorPtr pCursor);
|
|
|
|
static Bool
|
|
AnimCurSetCursorPosition (DeviceIntPtr pDev,
|
|
ScreenPtr pScreen,
|
|
int x,
|
|
int y,
|
|
Bool generateEvent);
|
|
|
|
static Bool
|
|
AnimCurCloseScreen (int index, ScreenPtr pScreen)
|
|
{
|
|
AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
|
|
Bool ret;
|
|
|
|
Unwrap(as, pScreen, CloseScreen);
|
|
|
|
Unwrap(as, pScreen, BlockHandler);
|
|
|
|
Unwrap(as, pScreen, CursorLimits);
|
|
Unwrap(as, pScreen, DisplayCursor);
|
|
Unwrap(as, pScreen, SetCursorPosition);
|
|
Unwrap(as, pScreen, RealizeCursor);
|
|
Unwrap(as, pScreen, UnrealizeCursor);
|
|
Unwrap(as, pScreen, RecolorCursor);
|
|
SetAnimCurScreen(pScreen,0);
|
|
ret = (*pScreen->CloseScreen) (index, pScreen);
|
|
xfree (as);
|
|
return ret;
|
|
}
|
|
|
|
static void
|
|
AnimCurCursorLimits (DeviceIntPtr pDev,
|
|
ScreenPtr pScreen,
|
|
CursorPtr pCursor,
|
|
BoxPtr pHotBox,
|
|
BoxPtr pTopLeftBox)
|
|
{
|
|
AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
|
|
|
|
Unwrap (as, pScreen, CursorLimits);
|
|
if (IsAnimCur(pCursor))
|
|
{
|
|
AnimCurPtr ac = GetAnimCur(pCursor);
|
|
|
|
(*pScreen->CursorLimits) (pDev, pScreen, ac->elts[0].pCursor,
|
|
pHotBox, pTopLeftBox);
|
|
}
|
|
else
|
|
{
|
|
(*pScreen->CursorLimits) (inputInfo.pointer, pScreen, pCursor,
|
|
pHotBox, pTopLeftBox);
|
|
}
|
|
Wrap (as, pScreen, CursorLimits, AnimCurCursorLimits);
|
|
}
|
|
|
|
/*
|
|
* This has to be a screen block handler instead of a generic
|
|
* block handler so that it is well ordered with respect to the DRI
|
|
* block handler responsible for releasing the hardware to DRI clients
|
|
*/
|
|
|
|
static void
|
|
AnimCurScreenBlockHandler (int screenNum,
|
|
pointer blockData,
|
|
pointer pTimeout,
|
|
pointer pReadmask)
|
|
{
|
|
ScreenPtr pScreen = screenInfo.screens[screenNum];
|
|
AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
|
|
DeviceIntPtr dev;
|
|
CARD32 now = 0,
|
|
soonest = ~0; /* earliest time to wakeup again */
|
|
|
|
for (dev = inputInfo.devices; dev; dev = dev->next)
|
|
{
|
|
if (IsPointerDevice(dev) && pScreen == animCurState[dev->id].pScreen)
|
|
{
|
|
if (!now) now = GetTimeInMillis ();
|
|
|
|
if ((INT32) (now - animCurState[dev->id].time) >= 0)
|
|
{
|
|
AnimCurPtr ac = GetAnimCur(animCurState[dev->id].pCursor);
|
|
int elt = (animCurState[dev->id].elt + 1) % ac->nelt;
|
|
DisplayCursorProcPtr DisplayCursor;
|
|
|
|
/*
|
|
* Not a simple Unwrap/Wrap as this
|
|
* isn't called along the DisplayCursor
|
|
* wrapper chain.
|
|
*/
|
|
DisplayCursor = pScreen->DisplayCursor;
|
|
pScreen->DisplayCursor = as->DisplayCursor;
|
|
(void) (*pScreen->DisplayCursor) (dev,
|
|
pScreen,
|
|
ac->elts[elt].pCursor);
|
|
as->DisplayCursor = pScreen->DisplayCursor;
|
|
pScreen->DisplayCursor = DisplayCursor;
|
|
|
|
animCurState[dev->id].elt = elt;
|
|
animCurState[dev->id].time = now + ac->elts[elt].delay;
|
|
}
|
|
|
|
if (soonest > animCurState[dev->id].time)
|
|
soonest = animCurState[dev->id].time;
|
|
}
|
|
}
|
|
|
|
if (now)
|
|
AdjustWaitForDelay (pTimeout, soonest - now);
|
|
|
|
Unwrap (as, pScreen, BlockHandler);
|
|
(*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask);
|
|
Wrap (as, pScreen, BlockHandler, AnimCurScreenBlockHandler);
|
|
}
|
|
|
|
static Bool
|
|
AnimCurDisplayCursor (DeviceIntPtr pDev,
|
|
ScreenPtr pScreen,
|
|
CursorPtr pCursor)
|
|
{
|
|
AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
|
|
Bool ret;
|
|
|
|
Unwrap (as, pScreen, DisplayCursor);
|
|
if (IsAnimCur(pCursor))
|
|
{
|
|
if (pCursor != animCurState[pDev->id].pCursor)
|
|
{
|
|
AnimCurPtr ac = GetAnimCur(pCursor);
|
|
|
|
ret = (*pScreen->DisplayCursor)
|
|
(pDev, pScreen, ac->elts[0].pCursor);
|
|
if (ret)
|
|
{
|
|
animCurState[pDev->id].elt = 0;
|
|
animCurState[pDev->id].time = GetTimeInMillis () + ac->elts[0].delay;
|
|
animCurState[pDev->id].pCursor = pCursor;
|
|
animCurState[pDev->id].pScreen = pScreen;
|
|
}
|
|
}
|
|
else
|
|
ret = TRUE;
|
|
}
|
|
else
|
|
{
|
|
animCurState[pDev->id].pCursor = 0;
|
|
animCurState[pDev->id].pScreen = 0;
|
|
ret = (*pScreen->DisplayCursor) (pDev, pScreen, pCursor);
|
|
}
|
|
Wrap (as, pScreen, DisplayCursor, AnimCurDisplayCursor);
|
|
return ret;
|
|
}
|
|
|
|
static Bool
|
|
AnimCurSetCursorPosition (DeviceIntPtr pDev,
|
|
ScreenPtr pScreen,
|
|
int x,
|
|
int y,
|
|
Bool generateEvent)
|
|
{
|
|
AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
|
|
Bool ret;
|
|
|
|
Unwrap (as, pScreen, SetCursorPosition);
|
|
if (animCurState[pDev->id].pCursor)
|
|
animCurState[pDev->id].pScreen = pScreen;
|
|
ret = (*pScreen->SetCursorPosition) (pDev, pScreen, x, y, generateEvent);
|
|
Wrap (as, pScreen, SetCursorPosition, AnimCurSetCursorPosition);
|
|
return ret;
|
|
}
|
|
|
|
static Bool
|
|
AnimCurRealizeCursor (DeviceIntPtr pDev,
|
|
ScreenPtr pScreen,
|
|
CursorPtr pCursor)
|
|
{
|
|
AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
|
|
Bool ret;
|
|
|
|
Unwrap (as, pScreen, RealizeCursor);
|
|
if (IsAnimCur(pCursor))
|
|
ret = TRUE;
|
|
else
|
|
ret = (*pScreen->RealizeCursor) (pDev, pScreen, pCursor);
|
|
Wrap (as, pScreen, RealizeCursor, AnimCurRealizeCursor);
|
|
return ret;
|
|
}
|
|
|
|
static Bool
|
|
AnimCurUnrealizeCursor (DeviceIntPtr pDev,
|
|
ScreenPtr pScreen,
|
|
CursorPtr pCursor)
|
|
{
|
|
AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
|
|
Bool ret;
|
|
|
|
Unwrap (as, pScreen, UnrealizeCursor);
|
|
if (IsAnimCur(pCursor))
|
|
{
|
|
AnimCurPtr ac = GetAnimCur(pCursor);
|
|
int i;
|
|
|
|
if (pScreen->myNum == 0)
|
|
for (i = 0; i < ac->nelt; i++)
|
|
FreeCursor (ac->elts[i].pCursor, 0);
|
|
ret = TRUE;
|
|
}
|
|
else
|
|
ret = (*pScreen->UnrealizeCursor) (pDev, pScreen, pCursor);
|
|
Wrap (as, pScreen, UnrealizeCursor, AnimCurUnrealizeCursor);
|
|
return ret;
|
|
}
|
|
|
|
static void
|
|
AnimCurRecolorCursor (DeviceIntPtr pDev,
|
|
ScreenPtr pScreen,
|
|
CursorPtr pCursor,
|
|
Bool displayed)
|
|
{
|
|
AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
|
|
|
|
Unwrap (as, pScreen, RecolorCursor);
|
|
if (IsAnimCur(pCursor))
|
|
{
|
|
AnimCurPtr ac = GetAnimCur(pCursor);
|
|
int i;
|
|
|
|
for (i = 0; i < ac->nelt; i++)
|
|
(*pScreen->RecolorCursor) (pDev, pScreen, ac->elts[i].pCursor,
|
|
displayed &&
|
|
animCurState[pDev->id].elt == i);
|
|
}
|
|
else
|
|
(*pScreen->RecolorCursor) (pDev, pScreen, pCursor, displayed);
|
|
Wrap (as, pScreen, RecolorCursor, AnimCurRecolorCursor);
|
|
}
|
|
|
|
_X_EXPORT Bool
|
|
AnimCurInit (ScreenPtr pScreen)
|
|
{
|
|
AnimCurScreenPtr as;
|
|
|
|
if (AnimCurGeneration != serverGeneration)
|
|
{
|
|
int i;
|
|
AnimCurGeneration = serverGeneration;
|
|
for (i = 0; i < MAXDEVICES; i++) {
|
|
animCurState[i].pCursor = 0;
|
|
animCurState[i].pScreen = 0;
|
|
animCurState[i].elt = 0;
|
|
animCurState[i].time = 0;
|
|
}
|
|
}
|
|
as = (AnimCurScreenPtr) xalloc (sizeof (AnimCurScreenRec));
|
|
if (!as)
|
|
return FALSE;
|
|
Wrap(as, pScreen, CloseScreen, AnimCurCloseScreen);
|
|
|
|
Wrap(as, pScreen, BlockHandler, AnimCurScreenBlockHandler);
|
|
|
|
Wrap(as, pScreen, CursorLimits, AnimCurCursorLimits);
|
|
Wrap(as, pScreen, DisplayCursor, AnimCurDisplayCursor);
|
|
Wrap(as, pScreen, SetCursorPosition, AnimCurSetCursorPosition);
|
|
Wrap(as, pScreen, RealizeCursor, AnimCurRealizeCursor);
|
|
Wrap(as, pScreen, UnrealizeCursor, AnimCurUnrealizeCursor);
|
|
Wrap(as, pScreen, RecolorCursor, AnimCurRecolorCursor);
|
|
SetAnimCurScreen(pScreen,as);
|
|
return TRUE;
|
|
}
|
|
|
|
_X_EXPORT int
|
|
AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *ppCursor, ClientPtr client, XID cid)
|
|
{
|
|
CursorPtr pCursor;
|
|
int rc, i;
|
|
AnimCurPtr ac;
|
|
|
|
for (i = 0; i < screenInfo.numScreens; i++)
|
|
if (!GetAnimCurScreenIfSet (screenInfo.screens[i]))
|
|
return BadImplementation;
|
|
|
|
for (i = 0; i < ncursor; i++)
|
|
if (IsAnimCur (cursors[i]))
|
|
return BadMatch;
|
|
|
|
pCursor = (CursorPtr) xalloc (sizeof (CursorRec) +
|
|
sizeof (AnimCurRec) +
|
|
ncursor * sizeof (AnimCurElt));
|
|
if (!pCursor)
|
|
return BadAlloc;
|
|
pCursor->bits = &animCursorBits;
|
|
pCursor->refcnt = 1;
|
|
|
|
pCursor->foreRed = cursors[0]->foreRed;
|
|
pCursor->foreGreen = cursors[0]->foreGreen;
|
|
pCursor->foreBlue = cursors[0]->foreBlue;
|
|
|
|
pCursor->backRed = cursors[0]->backRed;
|
|
pCursor->backGreen = cursors[0]->backGreen;
|
|
pCursor->backBlue = cursors[0]->backBlue;
|
|
|
|
pCursor->id = cid;
|
|
pCursor->devPrivates = NULL;
|
|
|
|
/* security creation/labeling check */
|
|
rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR, pCursor,
|
|
RT_NONE, NULL, DixCreateAccess);
|
|
if (rc != Success) {
|
|
dixFreePrivates(pCursor->devPrivates);
|
|
xfree(pCursor);
|
|
return rc;
|
|
}
|
|
|
|
/*
|
|
* Fill in the AnimCurRec
|
|
*/
|
|
animCursorBits.refcnt++;
|
|
ac = GetAnimCur (pCursor);
|
|
ac->nelt = ncursor;
|
|
ac->elts = (AnimCurElt *) (ac + 1);
|
|
|
|
for (i = 0; i < ncursor; i++)
|
|
{
|
|
cursors[i]->refcnt++;
|
|
ac->elts[i].pCursor = cursors[i];
|
|
ac->elts[i].delay = deltas[i];
|
|
}
|
|
|
|
*ppCursor = pCursor;
|
|
return Success;
|
|
}
|