hw/nxagent: Drop code referring to the following removed Xserver extensions: XAPPGROUP, LBX, XEVIE.

nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c

@@ -1280,9 +1280,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

nx-X11/programs/Xserver/hw/nxagent/NXevents.c

@@ -393,33 +393,15 @@ XYToWindow(int x, int y)
 // 	    sprite.hot.pScreen = sprite.hotPhys.pScreen;
 // 	    ROOT = sprite.hot.pScreen->root;
 // 	}
-#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)
@@ -446,9 +428,6 @@ XYToWindow(int x, int y)
 // 	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 &
@@ -486,9 +465,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++;

nx-X11/programs/Xserver/hw/nxagent/NXproperty.c

@@ -163,13 +163,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
@@ -197,11 +192,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;
@@ -321,7 +311,6 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
 	DeliverEvents(pWin, &event, 1, (WindowPtr)NULL);
     }
     return(Success);
-#endif
 }
 
 /*****************
@@ -475,13 +464,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
@@ -532,10 +514,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))
@@ -651,10 +629,6 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete,
 
     if (delete && (*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))

nx-X11/programs/Xserver/hw/nxagent/NXwindow.c

@@ -441,10 +441,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))
@@ -563,17 +559,9 @@ 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));
@@ -599,16 +587,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)
@@ -875,32 +853,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,