diff options
Diffstat (limited to 'mi')
-rw-r--r-- | mi/miexpose.c | 16 | ||||
-rw-r--r-- | mi/miinitext.c | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/mi/miexpose.c b/mi/miexpose.c index 96dd97d1d..fc0969864 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/mi/miexpose.c,v 1.1.4.3 2003/12/18 19:29:15 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.10 2003/11/10 18:22:49 tsi Exp $ */ /*********************************************************** @@ -69,8 +69,8 @@ SOFTWARE. #include "globals.h" #ifdef XINERAMA -#include "xinerama.h" -#include "xineramaSrv.h" +#include "panoramiX.h" +#include "panoramiXsrv.h" #endif /* @@ -427,19 +427,19 @@ miSendExposures(pWin, pRgn, dx, dy) } #ifdef XINERAMA - if(!noXineramaExtension) { + if(!noPanoramiXExtension) { int scrnum = pWin->drawable.pScreen->myNum; int x = 0, y = 0; XID realWin = 0; if(!pWin->parent) { - x = xineramaDataPtr[scrnum].x; - y = xineramaDataPtr[scrnum].y; + x = panoramiXdataPtr[scrnum].x; + y = panoramiXdataPtr[scrnum].y; pWin = WindowTable[0]; realWin = pWin->drawable.id; } else if (scrnum) { - XineramaRes *win; - win = XineramaFindIDByScrnum(XRT_WINDOW, + PanoramiXRes *win; + win = PanoramiXFindIDByScrnum(XRT_WINDOW, pWin->drawable.id, scrnum); if(!win) { DEALLOCATE_LOCAL(pEvent); diff --git a/mi/miinitext.c b/mi/miinitext.c index bc2dee641..764ec7901 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.1.4.2 2003/12/18 19:29:15 kaleb Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.68 2003/01/15 02:34:14 torrey Exp $ */ /*********************************************************** @@ -63,7 +63,7 @@ SOFTWARE. #endif #ifdef XINERAMA -extern Bool noXineramaExtension; +extern Bool noPanoramiXExtension; #endif extern Bool noTestExtensions; #ifdef XKB @@ -104,7 +104,7 @@ typedef void (*InitExtension)(INITARGS); #include "securstr.h" #endif #ifdef XINERAMA -#include "xineramaProto.h" +#include "panoramiXproto.h" #endif #ifdef XF86BIGFONT #include "xf86bigfstr.h" @@ -136,7 +136,7 @@ extern void PexExtensionInit(INITARGS); extern void MultibufferExtensionInit(INITARGS); #endif #ifdef XINERAMA -extern void XineramaExtensionInit(INITARGS); +extern void PanoramiXExtensionInit(INITARGS); #endif #ifdef XINPUT extern void XInputExtensionInit(INITARGS); @@ -249,7 +249,7 @@ InitExtensions(argc, argv) { #ifdef XINERAMA # if !defined(PRINT_ONLY_SERVER) && !defined(NO_XINERAMA) - if (!noXineramaExtension) XineramaExtensionInit(); + if (!noPanoramiXExtension) PanoramiXExtensionInit(); # endif #endif #ifdef BEZIER @@ -438,7 +438,7 @@ ExtensionModule extension[] = { NULL, "TOG-CUP", NULL, NULL }, { NULL, "Extended-Visual-Information", NULL, NULL }, #ifdef XINERAMA - { NULL, "XINERAMA", &noXineramaExtension, NULL }, + { NULL, "XINERAMA", &noPanoramiXExtension, NULL }, #else { NULL, "NOXINERAMA", NULL, NULL }, #endif @@ -489,7 +489,7 @@ static ExtensionModule staticExtensions[] = { { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL }, #endif #ifdef XINERAMA - { XineramaExtensionInit, XINERAMA_PROTOCOL_NAME, &noXineramaExtension, NULL, NULL }, + { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL }, #endif #ifdef XF86BIGFONT { XFree86BigfontExtensionInit, XF86BIGFONTNAME, NULL, NULL, NULL }, |