49f77fff14
Save in a few special cases, _X_EXPORT should not be used in C source files. Instead, it should be used in headers, and the proper C source include that header. Some special cases are symbols that need to be shared between modules, but not expected to be used by external drivers, and symbols that are accessible via LoaderSymbol/dlopen. This patch also adds conditionally some new sdk header files, depending on extensions enabled. These files were added to match pattern for other extensions/modules, that is, have the headers "deciding" symbol visibility in the sdk. These headers are: o Xext/panoramiXsrv.h, Xext/panoramiX.h o fbpict.h (unconditionally) o vidmodeproc.h o mioverlay.h (unconditionally, used only by xaa) o xfixes.h (unconditionally, symbols required by dri2) LoaderSymbol and similar functions now don't have different prototypes, in loaderProcs.h and xf86Module.h, so that both headers can be included, without the need of defining IN_LOADER. xf86NewInputDevice() device prototype readded to xf86Xinput.h, but not exported (and with a comment about it).
152 lines
3.4 KiB
C
152 lines
3.4 KiB
C
|
|
#ifdef HAVE_XORG_CONFIG_H
|
|
#include <xorg-config.h>
|
|
#endif
|
|
|
|
#include "misc.h"
|
|
#include "xf86.h"
|
|
#include "xf86_OSproc.h"
|
|
|
|
#include <X11/X.h>
|
|
#include "scrnintstr.h"
|
|
#include "miline.h"
|
|
#include "xf86str.h"
|
|
#include "xaa.h"
|
|
#include "xaalocal.h"
|
|
|
|
|
|
void
|
|
XAASolidHorVertLineAsRects(
|
|
ScrnInfoPtr pScrn,
|
|
int x, int y, int len, int dir
|
|
){
|
|
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
|
|
|
|
if(dir == DEGREES_0)
|
|
(*infoRec->SubsequentSolidFillRect)(pScrn, x, y, len, 1);
|
|
else
|
|
(*infoRec->SubsequentSolidFillRect)(pScrn, x, y, 1, len);
|
|
}
|
|
|
|
|
|
void
|
|
XAASolidHorVertLineAsTwoPoint(
|
|
ScrnInfoPtr pScrn,
|
|
int x, int y, int len, int dir
|
|
){
|
|
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
|
|
|
|
len--;
|
|
|
|
if(dir == DEGREES_0)
|
|
(*infoRec->SubsequentSolidTwoPointLine)(pScrn, x, y, x + len, y, 0);
|
|
else
|
|
(*infoRec->SubsequentSolidTwoPointLine)(pScrn, x, y, x, y + len, 0);
|
|
}
|
|
|
|
void
|
|
XAASolidHorVertLineAsBresenham(
|
|
ScrnInfoPtr pScrn,
|
|
int x, int y, int len, int dir
|
|
){
|
|
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
|
|
|
|
if(dir == DEGREES_0)
|
|
(*infoRec->SubsequentSolidBresenhamLine)(
|
|
pScrn, x, y, len << 1, 0, -len, len, 0);
|
|
else
|
|
(*infoRec->SubsequentSolidBresenhamLine)(
|
|
pScrn, x, y, len << 1, 0, -len, len, YMAJOR);
|
|
}
|
|
|
|
|
|
void
|
|
XAAComputeDash(GCPtr pGC)
|
|
{
|
|
XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
|
|
XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&pGC->devPrivates,
|
|
XAAGetGCKey());
|
|
Bool EvenDash = (pGC->numInDashList & 0x01) ? FALSE : TRUE;
|
|
int PatternLength = 0;
|
|
unsigned char* DashPtr = (unsigned char*)pGC->dash;
|
|
CARD32 *ptr;
|
|
int count = pGC->numInDashList;
|
|
int shift, value, direction;
|
|
Bool set;
|
|
|
|
if(pGCPriv->DashPattern)
|
|
xfree(pGCPriv->DashPattern);
|
|
|
|
pGCPriv->DashPattern = NULL;
|
|
pGCPriv->DashLength = 0;
|
|
|
|
while(count--)
|
|
PatternLength += *(DashPtr++);
|
|
|
|
if(!EvenDash)
|
|
PatternLength <<= 1;
|
|
|
|
if(PatternLength > infoRec->DashPatternMaxLength)
|
|
return;
|
|
|
|
if((infoRec->DashedLineFlags & LINE_PATTERN_POWER_OF_2_ONLY) &&
|
|
(PatternLength & (PatternLength - 1)))
|
|
return;
|
|
|
|
pGCPriv->DashPattern = xcalloc((PatternLength + 31) >> 5, 4);
|
|
if(!pGCPriv->DashPattern) return;
|
|
pGCPriv->DashLength = PatternLength;
|
|
|
|
if(infoRec->DashedLineFlags & (LINE_PATTERN_LSBFIRST_MSBJUSTIFIED |
|
|
LINE_PATTERN_LSBFIRST_LSBJUSTIFIED)) {
|
|
direction = 1;
|
|
set = TRUE;
|
|
DashPtr = (unsigned char*)pGC->dash;
|
|
} else {
|
|
direction = -1;
|
|
set = FALSE;
|
|
DashPtr = (unsigned char*)pGC->dash + pGC->numInDashList - 1;
|
|
}
|
|
|
|
if(infoRec->DashedLineFlags & (LINE_PATTERN_LSBFIRST_MSBJUSTIFIED |
|
|
LINE_PATTERN_MSBFIRST_MSBJUSTIFIED))
|
|
shift = 32 - (PatternLength & 31);
|
|
else
|
|
shift = 0;
|
|
|
|
ptr = (CARD32*)(pGCPriv->DashPattern);
|
|
|
|
CONCATENATE:
|
|
|
|
count = pGC->numInDashList;
|
|
|
|
while(count--) {
|
|
value = *DashPtr;
|
|
DashPtr += direction;
|
|
while(value) {
|
|
if(value < (32 - shift)) {
|
|
if(set) *ptr |= XAAShiftMasks[value] << shift;
|
|
shift += value;
|
|
break;
|
|
} else {
|
|
if(set) *ptr |= ~0L << shift;
|
|
value -= (32 - shift);
|
|
shift = 0;
|
|
ptr++;
|
|
}
|
|
}
|
|
if(set) set = FALSE;
|
|
else set = TRUE;
|
|
}
|
|
|
|
if(!EvenDash) {
|
|
EvenDash = TRUE;
|
|
if(infoRec->DashedLineFlags & (LINE_PATTERN_LSBFIRST_MSBJUSTIFIED |
|
|
LINE_PATTERN_LSBFIRST_LSBJUSTIFIED))
|
|
DashPtr = (unsigned char*)pGC->dash;
|
|
else
|
|
DashPtr = (unsigned char*)pGC->dash + pGC->numInDashList;
|
|
goto CONCATENATE;
|
|
}
|
|
}
|