diff options
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/colormap.c | 102 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/devices.c | 9 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/dispatch.c | 66 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/dixfonts.c | 7 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/events.c | 176 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/extension.c | 17 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/property.c | 43 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/swaprep.c | 6 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/window.c | 68 |
9 files changed, 2 insertions, 492 deletions
diff --git a/nx-X11/programs/Xserver/dix/colormap.c b/nx-X11/programs/Xserver/dix/colormap.c index cd5e1dc49..4acfdc1bb 100644 --- a/nx-X11/programs/Xserver/dix/colormap.c +++ b/nx-X11/programs/Xserver/dix/colormap.c @@ -63,9 +63,6 @@ SOFTWARE. #include "scrnintstr.h" #include "resource.h" #include "windowstr.h" -#ifdef LBX -#include "lbxserve.h" -#endif extern XID clientErrorValue; extern int colormapPrivateCount; @@ -1508,65 +1505,17 @@ FreePixels(register ColormapPtr pmap, register int client) register Pixel *ppix, *ppixStart; register int n; int class; -#ifdef LBX - Bool grabbed; - Bool zeroRefCount; - Bool anyRefCountReachedZero = 0; -#endif class = pmap->class; ppixStart = pmap->clientPixelsRed[client]; if (class & DynamicClass) { n = pmap->numPixelsRed[client]; -#ifdef LBX - grabbed = LbxCheckCmapGrabbed (pmap); - if (grabbed) - { - /* - * If the colormap is grabbed by a proxy, the server must - * notify the proxy of all cells that are freed (the refcount - * has reached zero on these cells). - */ - - LbxBeginFreeCellsEvent (pmap); - LbxSortPixelList (ppixStart, n); - } -#endif for (ppix = ppixStart; --n >= 0; ) { FreeCell(pmap, *ppix, REDMAP); -#ifdef LBX - /* - * Only PSEUDO colormaps are grabbed by LBX proxies. - * Check if the ref count reached zero on this pixel. - */ - - zeroRefCount = pmap->red[*ppix].refcnt == 0; - if (zeroRefCount) - anyRefCountReachedZero = 1; - - if (grabbed && zeroRefCount) - LbxAddFreeCellToEvent (pmap, *ppix); -#endif ppix++; } -#ifdef LBX - if (grabbed) - LbxEndFreeCellsEvent (pmap); - else if (anyRefCountReachedZero) - { - /* - * We only send LbxFreeCell events to a proxy that has the colormap - * grabbed. If the colormap is not grabbed, the proxy that last - * had the colormap grabbed will not be able to do a smart grab - * in the future. A smart grab can only occur if the proxy is kept - * up to date on every alloc/free change in the colormap. - */ - - LbxDisableSmartGrab (pmap); - } -#endif } xfree(ppixStart); @@ -2316,11 +2265,6 @@ FreeCo (ColormapPtr pmap, int client, int color, int npixIn, Pixel *ppixIn, Pixe int n, zapped; int errVal = Success; int offset, numents; -#ifdef LBX - Bool grabbed; - Bool zeroRefCount; - Bool anyRefCountReachedZero = 0; -#endif if (npixIn == 0) return (errVal); @@ -2365,22 +2309,6 @@ FreeCo (ColormapPtr pmap, int client, int color, int npixIn, Pixel *ppixIn, Pixe break; } -#ifdef LBX - grabbed = LbxCheckCmapGrabbed (pmap); - - if (grabbed) - { - /* - * If the colormap is grabbed by a proxy, the server must - * notify the proxy of all cells that are freed (the refcount - * has reached zero on these cells). - */ - - LbxBeginFreeCellsEvent (pmap); - LbxSortPixelList (ppixIn, npixIn); - } -#endif - /* zap all pixels which match */ while (1) { @@ -2405,19 +2333,6 @@ FreeCo (ColormapPtr pmap, int client, int color, int npixIn, Pixel *ppixIn, Pixe if (pmap->class & DynamicClass) { FreeCell(pmap, pixTest, color); -#ifdef LBX - /* - * Only PSEUDO colormaps are grabbed by LBX proxies. - * Check if the ref count reached zero on this pixel. - */ - - zeroRefCount = pmap->red[pixTest].refcnt == 0; - if (zeroRefCount) - anyRefCountReachedZero = 1; - - if (grabbed && zeroRefCount) - LbxAddFreeCellToEvent (pmap, pixTest); -#endif } *cptr = ~((Pixel)0); zapped++; @@ -2429,23 +2344,6 @@ FreeCo (ColormapPtr pmap, int client, int color, int npixIn, Pixel *ppixIn, Pixe GetNextBitsOrBreak(bits, mask, base); } -#ifdef LBX - if (grabbed) - LbxEndFreeCellsEvent (pmap); - else if (anyRefCountReachedZero) - { - /* - * We only send LbxFreeCell events to a proxy that has the colormap - * grabbed. If the colormap is not grabbed, the proxy that last - * had the colormap grabbed will not be able to do a smart grab - * in the future. A smart grab can only occur if the proxy is kept - * up to date on every alloc/free change in the colormap. - */ - - LbxDisableSmartGrab (pmap); - } -#endif - /* delete freed pixels from client pixel list */ if (zapped) { diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index 91a92644c..49ab80529 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -74,9 +74,6 @@ SOFTWARE. #define _SECURITY_SERVER #include <nx-X11/extensions/security.h> #endif -#ifdef LBX -#include "lbxserve.h" -#endif #include "dispatch.h" #include "swaprep.h" @@ -961,9 +958,6 @@ ProcSetModifierMapping(ClientPtr client) return BadAccess; #endif -#ifdef LBX - LbxFlushModifierMapTag(); -#endif rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; @@ -1088,9 +1082,6 @@ ProcChangeKeyboardMapping(ClientPtr client) keysyms.map = (KeySym *)&stuff[1]; if (!SetKeySymsMap(curKeySyms, &keysyms)) return BadAlloc; -#ifdef LBX - LbxFlushKeyboardMapTag(); -#endif SendMappingNotify(MappingKeyboard, stuff->firstKeyCode, stuff->keyCodes, client); return client->noClientException; diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 009e1ac08..a76c0723c 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -104,24 +104,18 @@ int ProcInitialConnection(); #include "swaprep.h" #include "swapreq.h" #ifdef PANORAMIX -#include "panoramiX.h" -#include "panoramiXsrv.h" +#include "../Xext/panoramiX.h" +#include "../Xext/panoramiXsrv.h" #endif #ifdef XCSECURITY #define _SECURITY_SERVER #include <nx-X11/extensions/security.h> #endif -#ifdef XAPPGROUP -#include <nx-X11/extensions/Xagsrv.h> -#endif #ifdef XKB #define XKB_IN_SERVER #include "inputstr.h" #include <nx-X11/extensions/XKBsrv.h> #endif -#ifdef LBX -#include "lbxserve.h" -#endif #define mskcnt ((MAXCLIENTS + 31) / 32) #define BITMASK(i) (1U << ((i) & 31)) @@ -2617,15 +2611,6 @@ ProcAllocColor (register ClientPtr client) RT_COLORMAP, SecurityWriteAccess); if (pmap) { -#ifdef LBX - /* - * If the colormap is grabbed by a proxy, the server will have - * to regain control over the colormap. This AllocColor request - * will be handled after the server gets back the colormap control. - */ - if (LbxCheckColorRequest (client, pmap, (xReq *) stuff)) - return Success; -#endif acr.type = X_Reply; acr.length = 0; acr.sequenceNumber = client->sequence; @@ -2670,15 +2655,6 @@ ProcAllocNamedColor (register ClientPtr client) xAllocNamedColorReply ancr; -#ifdef LBX - /* - * If the colormap is grabbed by a proxy, the server will have - * to regain control over the colormap. This AllocNamedColor request - * will be handled after the server gets back the colormap control. - */ - if (LbxCheckColorRequest (client, pcmp, (xReq *) stuff)) - return Success; -#endif ancr.type = X_Reply; ancr.length = 0; ancr.sequenceNumber = client->sequence; @@ -2732,15 +2708,6 @@ ProcAllocColorCells (register ClientPtr client) long length; Pixel *ppixels, *pmasks; -#ifdef LBX - /* - * If the colormap is grabbed by a proxy, the server will have - * to regain control over the colormap. This AllocColorCells request - * will be handled after the server gets back the colormap control. - */ - if (LbxCheckColorRequest (client, pcmp, (xReq *) stuff)) - return Success; -#endif npixels = stuff->colors; if (!npixels) { @@ -2807,15 +2774,6 @@ ProcAllocColorPlanes(register ClientPtr client) long length; Pixel *ppixels; -#ifdef LBX - /* - * If the colormap is grabbed by a proxy, the server will have - * to regain control over the colormap. This AllocColorPlanes request - * will be handled after the server gets back the colormap control. - */ - if (LbxCheckColorRequest (client, pcmp, (xReq *) stuff)) - return Success; -#endif npixels = stuff->colors; if (!npixels) { @@ -3589,9 +3547,6 @@ CloseDownClient(register ClientPtr client) if (ClientIsAsleep(client)) ClientSignal (client); ProcessWorkQueueZombies(); -#ifdef LBX - ProcessQTagZombies(); -#endif CloseDownConnection(client); /* If the client made it to the Running stage, nClients has @@ -3709,17 +3664,11 @@ void InitClient(ClientPtr client, int i, void * ospriv) } #endif client->replyBytesRemaining = 0; -#ifdef LBX - client->readRequest = StandardReadRequestFromClient; -#endif #ifdef XCSECURITY client->trustLevel = XSecurityClientTrusted; client->CheckAccess = NULL; client->authId = 0; #endif -#ifdef XAPPGROUP - client->appgroup = NULL; -#endif client->fontResFunc = NULL; #ifdef SMART_SCHEDULE client->smart_priority = 0; @@ -3845,14 +3794,6 @@ ProcInitialConnection(register ClientPtr client) return (client->noClientException); } -#ifdef LBX -void -IncrementClientCount() -{ - nClients++; -} -#endif - int SendConnSetup(register ClientPtr client, char *reason) { @@ -3892,9 +3833,6 @@ SendConnSetup(register ClientPtr client, char *reason) client->requestVector = client->swapped ? SwappedProcVector : ProcVector; client->sequence = 0; -#ifdef XAPPGROUP - XagConnectionInfo (client, &lconnSetupPrefix, &lConnectionInfo, &numScreens); -#endif ((xConnSetup *)lConnectionInfo)->ridBase = client->clientAsMask; ((xConnSetup *)lConnectionInfo)->ridMask = RESOURCE_ID_MASK; #ifdef MATCH_CLIENT_ENDIAN diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index 1f92ff824..ffa69c009 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -133,10 +133,6 @@ _NXGetFontPathError: #include "panoramiX.h" #endif -#ifdef LBX -#include "lbxserve.h" -#endif - #ifdef XF86BIGFONT #define _XF86BIGFONT_SERVER_ #include <nx-X11/extensions/xf86bigfont.h> @@ -557,9 +553,6 @@ CloseFont(void * value, XID fid) } if (pfont == defaultFont) defaultFont = NULL; -#ifdef LBX - LbxFreeFontTag(pfont); -#endif #ifdef XF86BIGFONT XF86BigfontFreeFontShm(pfont); #endif diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c index 3163270f4..9005cd226 100644 --- a/nx-X11/programs/Xserver/dix/events.c +++ b/nx-X11/programs/Xserver/dix/events.c @@ -143,20 +143,6 @@ extern Bool XkbFilterEvents(ClientPtr, int, xEvent *); #include <nx-X11/extensions/security.h> #endif -#ifdef XEVIE -extern WindowPtr *WindowTable; -extern int xevieFlag; -extern int xevieClientIndex; -extern DeviceIntPtr xeviemouse; -extern DeviceIntPtr xeviekb; -extern Mask xevieMask; -extern Mask xevieFilters[128]; -extern int xevieEventSent; -extern int xevieKBEventSent; -int xeviegrabState = 0; -xEvent *xeviexE; -#endif - #include <nx-X11/extensions/XIproto.h> #include "exevents.h" #include "extnsionst.h" @@ -253,11 +239,6 @@ static struct { #endif } sprite; /* info about the cursor sprite */ -#ifdef XEVIE -WindowPtr xeviewin; -HotSpot xeviehot; -#endif - static void DoEnterLeaveEvents( WindowPtr fromWin, WindowPtr toWin, @@ -462,13 +443,7 @@ XineramaCheckVirtualMotion( if (qe) { sprite.hot.pScreen = qe->pScreen; /* should always be Screen 0 */ -#ifdef XEVIE - xeviehot.x = -#endif sprite.hot.x = qe->event->u.keyButtonPointer.rootX; -#ifdef XEVIE - xeviehot.y = -#endif sprite.hot.y = qe->event->u.keyButtonPointer.rootY; pWin = inputInfo.pointer->grab ? inputInfo.pointer->grab->confineTo : NullWindow; @@ -505,24 +480,12 @@ XineramaCheckVirtualMotion( lims = *RegionExtents(&sprite.Reg2); if (sprite.hot.x < lims.x1) -#ifdef XEVIE - xeviehot.x = -#endif sprite.hot.x = lims.x1; else if (sprite.hot.x >= lims.x2) -#ifdef XEVIE - xeviehot.x = -#endif sprite.hot.x = lims.x2 - 1; if (sprite.hot.y < lims.y1) -#ifdef XEVIE - xeviehot.y = -#endif sprite.hot.y = lims.y1; else if (sprite.hot.y >= lims.y2) -#ifdef XEVIE - xeviehot.y = -#endif sprite.hot.y = lims.y2 - 1; if (RegionNumRects(&sprite.Reg2) > 1) @@ -552,33 +515,15 @@ XineramaCheckMotion(xEvent *xE) panoramiXdataPtr[0].x; XE_KBPTR.rootY += panoramiXdataPtr[sprite.screen->myNum].y - panoramiXdataPtr[0].y; -#ifdef XEVIE - xeviehot.x = -#endif sprite.hot.x = XE_KBPTR.rootX; -#ifdef XEVIE - xeviehot.y = -#endif sprite.hot.y = XE_KBPTR.rootY; if (sprite.hot.x < sprite.physLimits.x1) -#ifdef XEVIE - xeviehot.x = -#endif sprite.hot.x = sprite.physLimits.x1; else if (sprite.hot.x >= sprite.physLimits.x2) -#ifdef XEVIE - xeviehot.x = -#endif sprite.hot.x = sprite.physLimits.x2 - 1; if (sprite.hot.y < sprite.physLimits.y1) -#ifdef XEVIE - xeviehot.y = -#endif sprite.hot.y = sprite.physLimits.y1; else if (sprite.hot.y >= sprite.physLimits.y2) -#ifdef XEVIE - xeviehot.y = -#endif sprite.hot.y = sprite.physLimits.y2 - 1; if (sprite.hotShape) @@ -595,9 +540,6 @@ XineramaCheckMotion(xEvent *xE) XE_KBPTR.rootY = sprite.hot.y; } -#ifdef XEVIE - xeviewin = -#endif sprite.win = XYToWindow(sprite.hot.x, sprite.hot.y); if (sprite.win != prevSpriteWin) @@ -821,13 +763,7 @@ CheckVirtualMotion( if (qe) { sprite.hot.pScreen = qe->pScreen; -#ifdef XEVIE - xeviehot.x = -#endif sprite.hot.x = qe->event->u.keyButtonPointer.rootX; -#ifdef XEVIE - xeviehot.y = -#endif sprite.hot.y = qe->event->u.keyButtonPointer.rootY; pWin = inputInfo.pointer->grab ? inputInfo.pointer->grab->confineTo : NullWindow; @@ -839,31 +775,16 @@ CheckVirtualMotion( if (sprite.hot.pScreen != pWin->drawable.pScreen) { sprite.hot.pScreen = pWin->drawable.pScreen; -#ifdef XEVIE - xeviehot.x = xeviehot.y = 0; -#endif sprite.hot.x = sprite.hot.y = 0; } lims = *RegionExtents(&pWin->borderSize); if (sprite.hot.x < lims.x1) -#ifdef XEVIE - xeviehot.x = -#endif sprite.hot.x = lims.x1; else if (sprite.hot.x >= lims.x2) -#ifdef XEVIE - xeviehot.x = -#endif sprite.hot.x = lims.x2 - 1; if (sprite.hot.y < lims.y1) -#ifdef XEVIE - xeviehot.y = -#endif sprite.hot.y = lims.y1; else if (sprite.hot.y >= lims.y2) -#ifdef XEVIE - xeviehot.y = -#endif sprite.hot.y = lims.y2 - 1; #ifdef SHAPE if (wBoundingShape(pWin)) @@ -2057,33 +1978,15 @@ CheckMotion(xEvent *xE) sprite.hot.pScreen = sprite.hotPhys.pScreen; ROOT = WindowTable[sprite.hot.pScreen->myNum]; } -#ifdef XEVIE - xeviehot.x = -#endif sprite.hot.x = XE_KBPTR.rootX; -#ifdef XEVIE - xeviehot.y = -#endif sprite.hot.y = XE_KBPTR.rootY; if (sprite.hot.x < sprite.physLimits.x1) -#ifdef XEVIE - xeviehot.x = -#endif sprite.hot.x = sprite.physLimits.x1; else if (sprite.hot.x >= sprite.physLimits.x2) -#ifdef XEVIE - xeviehot.x = -#endif sprite.hot.x = sprite.physLimits.x2 - 1; if (sprite.hot.y < sprite.physLimits.y1) -#ifdef XEVIE - xeviehot.y = -#endif sprite.hot.y = sprite.physLimits.y1; else if (sprite.hot.y >= sprite.physLimits.y2) -#ifdef XEVIE - xeviehot.y = -#endif sprite.hot.y = sprite.physLimits.y2 - 1; #ifdef SHAPE if (sprite.hotShape) @@ -2101,9 +2004,6 @@ CheckMotion(xEvent *xE) XE_KBPTR.rootY = sprite.hot.y; } -#ifdef XEVIE - xeviewin = -#endif sprite.win = XYToWindow(sprite.hot.x, sprite.hot.y); #ifdef notyet if (!(sprite.win->deliverableEvents & @@ -2183,9 +2083,6 @@ DefineInitialRootWindow(register WindowPtr win) sprite.hot = sprite.hotPhys; sprite.hotLimits.x2 = pScreen->width; sprite.hotLimits.y2 = pScreen->height; -#ifdef XEVIE - xeviewin = -#endif sprite.win = win; sprite.current = wCursor (win); sprite.current->refcnt++; @@ -2764,45 +2661,6 @@ ProcessKeyboardEvent (register xEvent *xE, register DeviceIntPtr keybd, int coun GrabPtr grab = keybd->grab; Bool deactivateGrab = FALSE; register KeyClassPtr keyc = keybd->key; -#ifdef XEVIE - static Window rootWin = 0; - - if(!xeviegrabState && xevieFlag && clients[xevieClientIndex] && - (xevieMask & xevieFilters[xE->u.u.type])) { - key = xE->u.u.detail; - kptr = &keyc->down[key >> 3]; - bit = 1 << (key & 7); - if((xE->u.u.type == KeyPress && (*kptr & bit)) || - (xE->u.u.type == KeyRelease && !(*kptr & bit))) - {} else { -#ifdef XKB - if(!noXkbExtension) - xevieKBEventSent = 1; -#endif - if(!xevieKBEventSent) - { - xeviekb = keybd; - if(!rootWin) { - rootWin = GetCurrentRootWindow()->drawable.id; - } - xE->u.keyButtonPointer.event = xeviewin->drawable.id; - xE->u.keyButtonPointer.root = rootWin; - xE->u.keyButtonPointer.child = (xeviewin->firstChild) ? xeviewin->firstChild-> -drawable.id:0; - xE->u.keyButtonPointer.rootX = xeviehot.x; - xE->u.keyButtonPointer.rootY = xeviehot.y; - xE->u.keyButtonPointer.state = keyc->state; - WriteToClient(clients[xevieClientIndex], sizeof(xEvent), (char *)xE); -#ifdef XKB - if(noXkbExtension) -#endif - return; - } else { - xevieKBEventSent = 0; - } - } - } -#endif if (!syncEvents.playingEvents) { @@ -2815,15 +2673,6 @@ drawable.id:0; CallCallbacks(&DeviceEventCallback, (void *)&eventinfo); } } -#ifdef XEVIE - /* fix for bug5094030: don't change the state bit if the event is from XEvIE client */ - if(!(!xeviegrabState && xevieFlag && clients[xevieClientIndex] && - (xevieMask & xevieFilters[xE->u.u.type] -#ifdef XKB - && !noXkbExtension -#endif - ))) -#endif XE_KBPTR.state = (keyc->state | inputInfo.pointer->button->state); XE_KBPTR.rootX = sprite.hot.x; XE_KBPTR.rootY = sprite.hot.y; @@ -2831,16 +2680,6 @@ drawable.id:0; kptr = &keyc->down[key >> 3]; bit = 1 << (key & 7); modifiers = keyc->modifierMap[key]; -#if defined(XKB) && defined(XEVIE) - if(!noXkbExtension && !xeviegrabState && - xevieFlag && clients[xevieClientIndex] && - (xevieMask & xevieFilters[xE->u.u.type])) { - switch(xE->u.u.type) { - case KeyPress: *kptr &= ~bit; break; - case KeyRelease: *kptr |= bit; break; - } - } -#endif #ifdef DEBUG if ((xkbDebugFlags&0x4)&& @@ -2963,18 +2802,6 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count #ifdef XKB XkbSrvInfoPtr xkbi= inputInfo.keyboard->key->xkbInfo; #endif -#ifdef XEVIE - if(xevieFlag && clients[xevieClientIndex] && !xeviegrabState && - (xevieMask & xevieFilters[xE->u.u.type])) { - if(xevieEventSent) - xevieEventSent = 0; - else { - xeviemouse = mouse; - WriteToClient(clients[xevieClientIndex], sizeof(xEvent), (char *)xE); - return; - } - } -#endif if (!syncEvents.playingEvents) NoticeTime(xE) @@ -4104,9 +3931,6 @@ InitEvents() spriteTraceGood = 0; lastEventMask = OwnerGrabButtonMask; filters[MotionNotify] = PointerMotionMask; -#ifdef XEVIE - xeviewin = -#endif sprite.win = NullWindow; sprite.current = NullCursor; sprite.hotLimits.x1 = 0; diff --git a/nx-X11/programs/Xserver/dix/extension.c b/nx-X11/programs/Xserver/dix/extension.c index dd6de9c63..5b6caaafb 100644 --- a/nx-X11/programs/Xserver/dix/extension.c +++ b/nx-X11/programs/Xserver/dix/extension.c @@ -65,9 +65,6 @@ SOFTWARE. #define _SECURITY_SERVER #include <nx-X11/extensions/security.h> #endif -#ifdef LBX -#include "lbxserve.h" -#endif #define EXTENSION_BASE 128 #define EXTENSION_EVENT_BASE 64 @@ -154,9 +151,6 @@ AddExtension(char *name, int NumEvents, int NumErrors, ext->secure = FALSE; #endif -#ifdef LBX - (void) LbxAddExtension(name, ext->base, ext->eventBase, ext->errorBase); -#endif return(ext); } @@ -176,11 +170,7 @@ Bool AddExtensionAlias(char *alias, ExtensionEntry *ext) strcpy(name, alias); ext->aliases[ext->num_aliases] = name; ext->num_aliases++; -#ifdef LBX - return LbxAddExtensionAlias(ext->index, alias); -#else return TRUE; -#endif } static int @@ -241,9 +231,6 @@ DeclareExtensionSecurity(char *extname, Bool secure) } } #endif -#ifdef LBX - LbxDeclareExtensionSecurity(extname, secure); -#endif } unsigned short @@ -271,10 +258,6 @@ CloseDownExtensions() { register int i,j; -#ifdef LBX - LbxCloseDownExtensions(); -#endif - for (i = NumExtensions - 1; i >= 0; i--) { (* extensions[i]->CloseDown)(extensions[i]); diff --git a/nx-X11/programs/Xserver/dix/property.c b/nx-X11/programs/Xserver/dix/property.c index 51cbc1a0d..6041595ce 100644 --- a/nx-X11/programs/Xserver/dix/property.c +++ b/nx-X11/programs/Xserver/dix/property.c @@ -64,19 +64,6 @@ SOFTWARE. #define _SECURITY_SERVER #include <nx-X11/extensions/security.h> #endif -#ifdef LBX -#include "lbxserve.h" -#include "lbxtags.h" -#endif - -#if defined(LBX) || defined(LBX_COMPAT) -#if 0 /* no header in X11 environment, not used in X11 environment */ -int fWriteToClient(ClientPtr client, int len, char *buf) -{ - return WriteToClient(client, len, buf); -} -#endif -#endif /***************************************************************** * Property Stuff @@ -261,13 +248,8 @@ ProcChangeProperty(ClientPtr client) } #endif -#ifdef LBX - err = LbxChangeWindowProperty(client, pWin, stuff->property, stuff->type, - (int)format, (int)mode, len, TRUE, (void *)&stuff[1], TRUE, NULL); -#else err = ChangeWindowProperty(pWin, stuff->property, stuff->type, (int)format, (int)mode, len, (void *)&stuff[1], TRUE); -#endif if (err != Success) return err; else @@ -279,11 +261,6 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, int mode, unsigned long len, void * value, Bool sendevent) { -#ifdef LBX - return LbxChangeWindowProperty(NULL, pWin, property, type, - format, mode, len, TRUE, value, - sendevent, NULL); -#else PropertyPtr pProp; xEvent event; int sizeInBytes; @@ -390,7 +367,6 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, DeliverEvents(pWin, &event, 1, (WindowPtr)NULL); } return(Success); -#endif } int @@ -420,10 +396,6 @@ DeleteProperty(WindowPtr pWin, Atom propName) { prevProp->next = pProp->next; } -#ifdef LBX - if (pProp->tag_id) - TagDeleteTag(pProp->tag_id); -#endif event.u.u.type = PropertyNotify; event.u.property.window = pWin->drawable.id; event.u.property.state = PropertyDelete; @@ -445,10 +417,6 @@ DeleteAllWindowProperties(WindowPtr pWin) pProp = wUserProps (pWin); while (pProp) { -#ifdef LBX - if (pProp->tag_id) - TagDeleteTag(pProp->tag_id); -#endif event.u.u.type = PropertyNotify; event.u.property.window = pWin->drawable.id; event.u.property.state = PropertyDelete; @@ -570,13 +538,6 @@ ProcGetProperty(ClientPtr client) WriteReplyToClient(client, sizeof(xGenericReply), &reply); return(Success); } -#ifdef LBX - /* make sure we have the current value */ - if (pProp->tag_id && pProp->owner_pid) { - LbxStallPropRequest(client, pProp); - return client->noClientException; - } -#endif /* * Return type, format, value to client @@ -627,10 +588,6 @@ ProcGetProperty(ClientPtr client) if (stuff->delete && (reply.bytesAfter == 0)) { /* delete the Property */ -#ifdef LBX - if (pProp->tag_id) - TagDeleteTag(pProp->tag_id); -#endif if (prevProp == (PropertyPtr)NULL) /* takes care of head */ { if (!(pWin->optional->userProps = pProp->next)) diff --git a/nx-X11/programs/Xserver/dix/swaprep.c b/nx-X11/programs/Xserver/dix/swaprep.c index b8f245408..31c823b3a 100644 --- a/nx-X11/programs/Xserver/dix/swaprep.c +++ b/nx-X11/programs/Xserver/dix/swaprep.c @@ -65,11 +65,9 @@ SOFTWARE. static void SwapFontInfo(xQueryFontReply *pr); -#ifndef LBX static void SwapCharInfo(xCharInfo *pInfo); static void SwapFont(xQueryFontReply *pr, Bool hasGlyphs); -#endif /** * Thanks to Jack Palevich for testing and subsequently rewriting all this @@ -391,9 +389,7 @@ SQueryKeymapReply(ClientPtr pClient, int size, xQueryKeymapReply *pRep) (void)WriteToClient(pClient, size, (char *) pRep); } -#ifndef LBX static -#endif void SwapCharInfo(xCharInfo *pInfo) { @@ -423,9 +419,7 @@ SwapFontInfo(xQueryFontReply *pr) swapl(&pr->nCharInfos, n); } -#ifndef LBX static -#endif void SwapFont(xQueryFontReply *pr, Bool hasGlyphs) { diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c index c3d901fb9..6221af4d1 100644 --- a/nx-X11/programs/Xserver/dix/window.c +++ b/nx-X11/programs/Xserver/dix/window.c @@ -104,9 +104,6 @@ Equipment Corporation. #include "dixevents.h" #include "globals.h" -#ifdef XAPPGROUP -#include <nx-X11/extensions/Xagsrv.h> -#endif #ifdef XCSECURITY #define _SECURITY_SERVER #include <nx-X11/extensions/security.h> @@ -607,14 +604,6 @@ CreateWindow(Window wid, register WindowPtr pParent, int x, int y, unsigned w, if (!ancwopt) ancwopt = FindWindowWithOptional(pParent)->optional; if (visual == CopyFromParent) { -#ifdef XAPPGROUP - VisualID ag_visual; - - if (client->appgroup && !pParent->parent && - (ag_visual = XagRootVisual (client))) - visual = ag_visual; - else -#endif visual = ancwopt->visual; } @@ -1276,22 +1265,6 @@ ChangeWindowAttributes(register WindowPtr pWin, Mask vmask, XID *vlist, ClientPt pVlist++; if (cmap == CopyFromParent) { -#ifdef XAPPGROUP - Colormap ag_colormap; - ClientPtr win_owner; - - /* - * win_owner == client for CreateWindow, other clients - * can ChangeWindowAttributes - */ - win_owner = clients[CLIENT_ID(pWin->drawable.id)]; - - if ( win_owner && win_owner->appgroup && - !pWin->parent->parent && - (ag_colormap = XagDefaultColormap (win_owner))) - cmap = ag_colormap; - else -#endif if (pWin->parent && (!pWin->optional || pWin->optional->visual == wVisual (pWin->parent))) @@ -2208,10 +2181,6 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP h = pWin->drawable.height, bw = pWin->borderWidth; int action, smode = Above; -#ifdef XAPPGROUP - ClientPtr win_owner; - ClientPtr ag_leader = NULL; -#endif xEvent event; if ((pWin->drawable.class == InputOnly) && (mask & IllegalInputOnlyConfigureMask)) @@ -2308,17 +2277,8 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP else pSib = pWin->nextSib; -#ifdef XAPPGROUP - win_owner = clients[CLIENT_ID(pWin->drawable.id)]; - ag_leader = XagLeader (win_owner); -#endif - if ((!pWin->overrideRedirect) && (RedirectSend(pParent) -#ifdef XAPPGROUP - || (win_owner->appgroup && ag_leader && - XagIsControlledRoot (client, pParent)) -#endif )) { memset(&event, 0, sizeof(xEvent)); @@ -2344,16 +2304,6 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP event.u.configureRequest.height = h; event.u.configureRequest.borderWidth = bw; event.u.configureRequest.valueMask = mask; -#ifdef XAPPGROUP - /* make sure if the ag_leader maps the window it goes to the wm */ - if (ag_leader && ag_leader != client && - XagIsControlledRoot (client, pParent)) { - event.u.configureRequest.parent = XagId (win_owner); - (void) TryClientEvents (ag_leader, &event, 1, - NoEventMask, NoEventMask, NullGrab); - return Success; - } -#endif event.u.configureRequest.parent = pParent->drawable.id; if (MaybeDeliverEventsToClient(pParent, &event, 1, SubstructureRedirectMask, client) == 1) @@ -2714,32 +2664,14 @@ MapWindow(register WindowPtr pWin, ClientPtr client) { xEvent event; Bool anyMarked; -#ifdef XAPPGROUP - ClientPtr win_owner = clients[CLIENT_ID(pWin->drawable.id)]; - ClientPtr ag_leader = XagLeader (win_owner); -#endif if ((!pWin->overrideRedirect) && (RedirectSend(pParent) -#ifdef XAPPGROUP - || (win_owner->appgroup && ag_leader && - XagIsControlledRoot (client, pParent)) -#endif )) { memset(&event, 0, sizeof(xEvent)); event.u.u.type = MapRequest; event.u.mapRequest.window = pWin->drawable.id; -#ifdef XAPPGROUP - /* make sure if the ag_leader maps the window it goes to the wm */ - if (ag_leader && ag_leader != client && - XagIsControlledRoot (client, pParent)) { - event.u.mapRequest.parent = XagId (win_owner); - (void) TryClientEvents (ag_leader, &event, 1, - NoEventMask, NoEventMask, NullGrab); - return Success; - } -#endif event.u.mapRequest.parent = pParent->drawable.id; if (MaybeDeliverEventsToClient(pParent, &event, 1, |