Un-K&R shm extension.
This commit is contained in:
parent
9171206db3
commit
dba5455f06
100
Xext/shm.c
100
Xext/shm.c
|
@ -188,13 +188,12 @@ static ShmFuncs fbFuncs = {fbShmCreatePixmap, fbShmPutImage};
|
||||||
static Bool badSysCall = FALSE;
|
static Bool badSysCall = FALSE;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
SigSysHandler(signo)
|
SigSysHandler(int signo)
|
||||||
int signo;
|
|
||||||
{
|
{
|
||||||
badSysCall = TRUE;
|
badSysCall = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Bool CheckForShmSyscall()
|
static Bool CheckForShmSyscall(void)
|
||||||
{
|
{
|
||||||
void (*oldHandler)();
|
void (*oldHandler)();
|
||||||
int shmid = -1;
|
int shmid = -1;
|
||||||
|
@ -278,8 +277,7 @@ ShmExtensionInit(INITARGS)
|
||||||
|
|
||||||
/*ARGSUSED*/
|
/*ARGSUSED*/
|
||||||
static void
|
static void
|
||||||
ShmResetProc (extEntry)
|
ShmResetProc(ExtensionEntry *extEntry)
|
||||||
ExtensionEntry *extEntry;
|
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -291,17 +289,13 @@ ExtensionEntry *extEntry;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ShmRegisterFuncs(
|
ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs)
|
||||||
ScreenPtr pScreen,
|
|
||||||
ShmFuncsPtr funcs)
|
|
||||||
{
|
{
|
||||||
shmFuncs[pScreen->myNum] = funcs;
|
shmFuncs[pScreen->myNum] = funcs;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ShmSetPixmapFormat(
|
ShmSetPixmapFormat(ScreenPtr pScreen, int format)
|
||||||
ScreenPtr pScreen,
|
|
||||||
int format)
|
|
||||||
{
|
{
|
||||||
shmPixFormat[pScreen->myNum] = format;
|
shmPixFormat[pScreen->myNum] = format;
|
||||||
}
|
}
|
||||||
|
@ -328,15 +322,13 @@ ShmDestroyPixmap (PixmapPtr pPixmap)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ShmRegisterFbFuncs(pScreen)
|
ShmRegisterFbFuncs(ScreenPtr pScreen)
|
||||||
ScreenPtr pScreen;
|
|
||||||
{
|
{
|
||||||
shmFuncs[pScreen->myNum] = &fbFuncs;
|
shmFuncs[pScreen->myNum] = &fbFuncs;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ProcShmQueryVersion(client)
|
ProcShmQueryVersion(ClientPtr client)
|
||||||
ClientPtr client;
|
|
||||||
{
|
{
|
||||||
xShmQueryVersionReply rep;
|
xShmQueryVersionReply rep;
|
||||||
int n;
|
int n;
|
||||||
|
@ -430,8 +422,7 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ProcShmAttach(client)
|
ProcShmAttach(ClientPtr client)
|
||||||
ClientPtr client;
|
|
||||||
{
|
{
|
||||||
SHMSTAT_TYPE buf;
|
SHMSTAT_TYPE buf;
|
||||||
ShmDescPtr shmdesc;
|
ShmDescPtr shmdesc;
|
||||||
|
@ -492,9 +483,8 @@ ProcShmAttach(client)
|
||||||
|
|
||||||
/*ARGSUSED*/
|
/*ARGSUSED*/
|
||||||
static int
|
static int
|
||||||
ShmDetachSegment(value, shmseg)
|
ShmDetachSegment(pointer value, /* must conform to DeleteType */
|
||||||
pointer value; /* must conform to DeleteType */
|
XID shmseg)
|
||||||
XID shmseg;
|
|
||||||
{
|
{
|
||||||
ShmDescPtr shmdesc = (ShmDescPtr)value;
|
ShmDescPtr shmdesc = (ShmDescPtr)value;
|
||||||
ShmDescPtr *prev;
|
ShmDescPtr *prev;
|
||||||
|
@ -510,8 +500,7 @@ ShmDetachSegment(value, shmseg)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ProcShmDetach(client)
|
ProcShmDetach(ClientPtr client)
|
||||||
ClientPtr client;
|
|
||||||
{
|
{
|
||||||
ShmDescPtr shmdesc;
|
ShmDescPtr shmdesc;
|
||||||
REQUEST(xShmDetachReq);
|
REQUEST(xShmDetachReq);
|
||||||
|
@ -523,12 +512,10 @@ ProcShmDetach(client)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
|
miShmPutImage(DrawablePtr dst, GCPtr pGC,
|
||||||
DrawablePtr dst;
|
int depth, unsigned int format,
|
||||||
GCPtr pGC;
|
int w, int h, int sx, int sy, int sw, int sh, int dx, int dy,
|
||||||
int depth, w, h, sx, sy, sw, sh, dx, dy;
|
char *data)
|
||||||
unsigned int format;
|
|
||||||
char *data;
|
|
||||||
{
|
{
|
||||||
PixmapPtr pmap;
|
PixmapPtr pmap;
|
||||||
GCPtr putGC;
|
GCPtr putGC;
|
||||||
|
@ -557,12 +544,10 @@ miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
_X_EXPORT void
|
_X_EXPORT void
|
||||||
fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
|
fbShmPutImage(DrawablePtr dst, GCPtr pGC,
|
||||||
DrawablePtr dst;
|
int depth, unsigned int format,
|
||||||
GCPtr pGC;
|
int w, int h, int sx, int sy, int sw, int sh, int dx, int dy,
|
||||||
int depth, w, h, sx, sy, sw, sh, dx, dy;
|
char *data)
|
||||||
unsigned int format;
|
|
||||||
char *data;
|
|
||||||
{
|
{
|
||||||
if ((format == ZPixmap) || (depth == 1))
|
if ((format == ZPixmap) || (depth == 1))
|
||||||
{
|
{
|
||||||
|
@ -747,8 +732,7 @@ ProcPanoramiXShmGetImage(ClientPtr client)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ProcPanoramiXShmCreatePixmap(
|
ProcPanoramiXShmCreatePixmap(ClientPtr client)
|
||||||
ClientPtr client)
|
|
||||||
{
|
{
|
||||||
ScreenPtr pScreen = NULL;
|
ScreenPtr pScreen = NULL;
|
||||||
PixmapPtr pMap = NULL;
|
PixmapPtr pMap = NULL;
|
||||||
|
@ -855,8 +839,7 @@ CreatePmap:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ProcShmPutImage(client)
|
ProcShmPutImage(ClientPtr client)
|
||||||
ClientPtr client;
|
|
||||||
{
|
{
|
||||||
GCPtr pGC;
|
GCPtr pGC;
|
||||||
DrawablePtr pDraw;
|
DrawablePtr pDraw;
|
||||||
|
@ -968,8 +951,7 @@ ProcShmPutImage(client)
|
||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ProcShmGetImage(client)
|
ProcShmGetImage(ClientPtr client)
|
||||||
ClientPtr client;
|
|
||||||
{
|
{
|
||||||
DrawablePtr pDraw;
|
DrawablePtr pDraw;
|
||||||
long lenPer = 0, length;
|
long lenPer = 0, length;
|
||||||
|
@ -1081,12 +1063,8 @@ ProcShmGetImage(client)
|
||||||
}
|
}
|
||||||
|
|
||||||
static PixmapPtr
|
static PixmapPtr
|
||||||
fbShmCreatePixmap (pScreen, width, height, depth, addr)
|
fbShmCreatePixmap (ScreenPtr pScreen,
|
||||||
ScreenPtr pScreen;
|
int width, int height, int depth, char *addr)
|
||||||
int width;
|
|
||||||
int height;
|
|
||||||
int depth;
|
|
||||||
char *addr;
|
|
||||||
{
|
{
|
||||||
PixmapPtr pPixmap;
|
PixmapPtr pPixmap;
|
||||||
|
|
||||||
|
@ -1103,8 +1081,7 @@ fbShmCreatePixmap (pScreen, width, height, depth, addr)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ProcShmCreatePixmap(client)
|
ProcShmCreatePixmap(ClientPtr client)
|
||||||
ClientPtr client;
|
|
||||||
{
|
{
|
||||||
PixmapPtr pMap;
|
PixmapPtr pMap;
|
||||||
DrawablePtr pDraw;
|
DrawablePtr pDraw;
|
||||||
|
@ -1185,8 +1162,7 @@ CreatePmap:
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
ProcShmDispatch (client)
|
ProcShmDispatch (ClientPtr client)
|
||||||
ClientPtr client;
|
|
||||||
{
|
{
|
||||||
REQUEST(xReq);
|
REQUEST(xReq);
|
||||||
switch (stuff->data)
|
switch (stuff->data)
|
||||||
|
@ -1221,8 +1197,7 @@ ProcShmDispatch (client)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
SShmCompletionEvent(from, to)
|
SShmCompletionEvent(xShmCompletionEvent *from, xShmCompletionEvent *to)
|
||||||
xShmCompletionEvent *from, *to;
|
|
||||||
{
|
{
|
||||||
to->type = from->type;
|
to->type = from->type;
|
||||||
cpswaps(from->sequenceNumber, to->sequenceNumber);
|
cpswaps(from->sequenceNumber, to->sequenceNumber);
|
||||||
|
@ -1234,8 +1209,7 @@ SShmCompletionEvent(from, to)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
SProcShmQueryVersion(client)
|
SProcShmQueryVersion(ClientPtr client)
|
||||||
ClientPtr client;
|
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
REQUEST(xShmQueryVersionReq);
|
REQUEST(xShmQueryVersionReq);
|
||||||
|
@ -1245,8 +1219,7 @@ SProcShmQueryVersion(client)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
SProcShmAttach(client)
|
SProcShmAttach(ClientPtr client)
|
||||||
ClientPtr client;
|
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
REQUEST(xShmAttachReq);
|
REQUEST(xShmAttachReq);
|
||||||
|
@ -1258,8 +1231,7 @@ SProcShmAttach(client)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
SProcShmDetach(client)
|
SProcShmDetach(ClientPtr client)
|
||||||
ClientPtr client;
|
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
REQUEST(xShmDetachReq);
|
REQUEST(xShmDetachReq);
|
||||||
|
@ -1270,8 +1242,7 @@ SProcShmDetach(client)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
SProcShmPutImage(client)
|
SProcShmPutImage(ClientPtr client)
|
||||||
ClientPtr client;
|
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
REQUEST(xShmPutImageReq);
|
REQUEST(xShmPutImageReq);
|
||||||
|
@ -1293,8 +1264,7 @@ SProcShmPutImage(client)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
SProcShmGetImage(client)
|
SProcShmGetImage(ClientPtr client)
|
||||||
ClientPtr client;
|
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
REQUEST(xShmGetImageReq);
|
REQUEST(xShmGetImageReq);
|
||||||
|
@ -1312,8 +1282,7 @@ SProcShmGetImage(client)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
SProcShmCreatePixmap(client)
|
SProcShmCreatePixmap(ClientPtr client)
|
||||||
ClientPtr client;
|
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
REQUEST(xShmCreatePixmapReq);
|
REQUEST(xShmCreatePixmapReq);
|
||||||
|
@ -1329,8 +1298,7 @@ SProcShmCreatePixmap(client)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
SProcShmDispatch (client)
|
SProcShmDispatch (ClientPtr client)
|
||||||
ClientPtr client;
|
|
||||||
{
|
{
|
||||||
REQUEST(xReq);
|
REQUEST(xReq);
|
||||||
switch (stuff->data)
|
switch (stuff->data)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user