Mercurial > sdl-ios-xcode
diff src/video/Xext/XME/xme.c @ 1575:3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Wed, 22 Mar 2006 05:00:59 +0000 |
parents | 6fd39b50dd91 |
children | ecba4bbaf9c2 |
line wrap: on
line diff
--- a/src/video/Xext/XME/xme.c Wed Mar 22 04:51:44 2006 +0000 +++ b/src/video/Xext/XME/xme.c Wed Mar 22 05:00:59 2006 +0000 @@ -236,7 +236,7 @@ xXiGMiscQueryVersionReply rep; XExtDisplayInfo *info = XiGMiscFindDisplay(dpy); - if (!pXQueryExtension(dpy, XIGMISC_PROTOCOL_NAME, &opcode, &event, &error)) + if (!XQueryExtension(dpy, XIGMISC_PROTOCOL_NAME, &opcode, &event, &error)) return xFalse; XiGMiscCheckExtension(dpy, info, xFalse); @@ -247,7 +247,7 @@ req->major = XIGMISC_MAJOR_VERSION; req->minor = XIGMISC_MINOR_VERSION; - if (!p_XReply (dpy, (xReply *)&rep, 0, xTrue)) { + if (!_XReply (dpy, (xReply *)&rep, 0, xTrue)) { UnlockDisplay(dpy); SyncHandle(); return xFalse; @@ -274,7 +274,7 @@ XiGMiscGetReq (XiGMiscQueryViews, req, info); req->screen = screen; - if (!p_XReply (dpy, (xReply *)&rep, 0, xFalse)) { + if (!_XReply (dpy, (xReply *)&rep, 0, xFalse)) { UnlockDisplay(dpy); SyncHandle(); return 0; @@ -286,13 +286,13 @@ size = sizeof(XiGMiscViewInfo) * n; views = (XiGMiscViewInfo*)Xmalloc(size); if (!views) { - p_XEatData(dpy, (unsigned long)size); + _XEatData(dpy, (unsigned long)size); UnlockDisplay(dpy); SyncHandle(); return 0; } - p_XReadPad(dpy, (void*)views, size); + _XReadPad(dpy, (void*)views, size); *pviews = views; } @@ -317,7 +317,7 @@ req->screen = screen; req->view = view; - if (!p_XReply (dpy, (xReply *)&rep, 0, xFalse)) { + if (!_XReply (dpy, (xReply *)&rep, 0, xFalse)) { UnlockDisplay(dpy); SyncHandle(); return 0; @@ -329,13 +329,13 @@ size = sizeof(XiGMiscResolutionInfo) * n; resolutions = (XiGMiscResolutionInfo*)Xmalloc(size); if (!resolutions) { - p_XEatData(dpy, (unsigned long)size); + _XEatData(dpy, (unsigned long)size); UnlockDisplay(dpy); SyncHandle(); return 0; } - p_XReadPad(dpy, (void*)resolutions, size); + _XReadPad(dpy, (void*)resolutions, size); *presolutions = resolutions; *pactive = rep.active; @@ -383,7 +383,7 @@ req->window = window; req->cmap = cmap; - if (!p_XReply (dpy, (xReply *)&rep, 0, xTrue)) { + if (!_XReply (dpy, (xReply *)&rep, 0, xTrue)) { UnlockDisplay(dpy); SyncHandle(); return xFalse;