Commit eafaf40f authored by Adam Jackson's avatar Adam Jackson

Death to APPGROUP.

parent f6617b41
......@@ -105,12 +105,6 @@ if XPRINT
BUILTIN_SRCS += $(XPRINT_SRCS)
endif
# AppGroup
APPGROUP_SRCS = appgroup.c appgroup.h
if APPGROUP
BUILTIN_SRCS += $(APPGROUP_SRCS)
endif
# Colormap Utilization Protocol: Less flashing when switching between
# PsuedoColor apps and better sharing of limited colormap slots
CUP_SRCS = cup.c
......@@ -164,7 +158,6 @@ EXTRA_DIST = \
$(XINERAMA_SRCS) \
$(XEVIE_SRCS) \
$(XPRINT_SRCS) \
$(APPGROUP_SRCS) \
$(CUP_SRCS) \
$(MULTIBUFFER_SRCS) \
$(EXTRA_MULTIBUFFER_SRCS) \
......
This diff is collapsed.
/*
Copyright 1996, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from The Open Group.
*/
#ifndef _APPGROUP_SRV_H_
#define _APPGROUP_SRV_H_
#include <X11/Xfuncproto.h>
_XFUNCPROTOBEGIN
extern void XagConnectionInfo(
ClientPtr /* client */,
xConnSetupPrefix** /* conn_prefix */,
char** /* conn_info */,
int* /* num_screens */
);
extern VisualID XagRootVisual(
ClientPtr /* client */
);
extern Colormap XagDefaultColormap(
ClientPtr /* client */
);
extern ClientPtr XagLeader(
ClientPtr /* client */
);
extern Bool XagIsControlledRoot (
ClientPtr /* client */,
WindowPtr /* pParent */
);
extern XID XagId (
ClientPtr /* client */
);
_XFUNCPROTOEND
#endif /* _APPGROUP_SRV_H_ */
......@@ -38,9 +38,6 @@ in this Software without prior written authorization from The Open Group.
#include "xacestr.h"
#include "securitysrv.h"
#include <X11/extensions/securstr.h>
#ifdef XAPPGROUP
#include "appgroup.h"
#endif
#include "modinit.h"
/* Extension stuff */
......@@ -833,11 +830,6 @@ SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
if (SecurityDoCheck(subj, obj, requested, allowed) == Success)
return;
#ifdef XAPPGROUP
if (rec->id == XagDefaultColormap(rec->client))
return;
#endif
SecurityAudit("Security: denied client %d access %x to resource 0x%x "
"of client %d on request %s\n", rec->client->index,
requested, rec->id, cid,
......
......@@ -136,9 +136,6 @@ int ProcInitialConnection();
#endif
#include "privates.h"
#include "xace.h"
#ifdef XAPPGROUP
#include "appgroup.h"
#endif
#ifdef XKB
#ifndef XKB_IN_SERVER
#define XKB_IN_SERVER
......@@ -3516,9 +3513,6 @@ void InitClient(ClientPtr client, int i, pointer ospriv)
}
#endif
client->replyBytesRemaining = 0;
#ifdef XAPPGROUP
client->appgroup = NULL;
#endif
client->fontResFunc = NULL;
#ifdef SMART_SCHEDULE
client->smart_priority = 0;
......@@ -3643,9 +3637,6 @@ SendConnSetup(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
......
......@@ -123,9 +123,6 @@ Equipment Corporation.
#include "dixevents.h"
#include "globals.h"
#ifdef XAPPGROUP
#include "appgroup.h"
#endif
#include "privates.h"
#include "xace.h"
......@@ -603,14 +600,6 @@ CreateWindow(Window wid, 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;
}
......@@ -1290,22 +1279,6 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
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)))
......@@ -2234,10 +2207,6 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
h = pWin->drawable.height,
bw = pWin->borderWidth;
int rc, action, smode = Above;
#ifdef XAPPGROUP
ClientPtr win_owner;
ClientPtr ag_leader = NULL;
#endif
xEvent event;
if ((pWin->drawable.class == InputOnly) && (mask & IllegalInputOnlyConfigureMask))
......@@ -2333,17 +2302,9 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
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
))
{
event.u.u.type = ConfigureRequest;
......@@ -2368,16 +2329,6 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
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)
......@@ -2754,31 +2705,13 @@ MapWindow(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
))
{
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,
......
......@@ -1350,7 +1350,6 @@ int dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
* RTContext
* TagResType
* StalledResType
* RT_APPGROUP
* SecurityAuthorizationResType
* RTEventClient
* __glXContextRes
......
......@@ -128,14 +128,6 @@ extern void SELinuxExtensionInit(INITARGS);
extern void SecurityExtensionInit(INITARGS);
#endif
#if 1
extern void XagExtensionInit(INITARGS);
#endif
#if 1
extern void XpExtensionInit(INITARGS);
#endif
#if 1
extern void PanoramiXExtensionInit(int argc, char *argv[]);
#endif
......
......@@ -397,9 +397,6 @@ _X_HIDDEN void *dixLookupTab[] = {
#ifdef RES
SYMVAR(noResExtension)
#endif
#ifdef XAPPGROUP
SYMVAR(noXagExtension)
#endif
#ifdef XCMISC
SYMVAR(noXCMiscExtension)
#endif
......
......@@ -416,9 +416,6 @@
/* Support Xv extension */
#undef XV
/* Build APPGROUP extension */
#undef XAPPGROUP
/* Build TOG-CUP extension */
#undef TOGCUP
......
......@@ -125,9 +125,7 @@ typedef struct _Client {
int requestLogIndex;
#endif
unsigned long replyBytesRemaining;
#ifdef XAPPGROUP
struct _AppGroupRec* appgroup;
#endif
void *appgroup; /* Can't remove, ABI */
struct _FontResolution * (*fontResFunc) ( /* no need for font.h */
ClientPtr /* pClient */,
int * /* num */);
......
......@@ -118,10 +118,6 @@ extern Bool noXcupExtension;
extern Bool noResExtension;
#endif
#ifdef XAPPGROUP
extern Bool noXagExtension;
#endif
#ifdef XCMISC
extern Bool noXCMiscExtension;
#endif
......
......@@ -169,9 +169,6 @@ extern Bool noXcupExtension;
#ifdef RES
extern Bool noResExtension;
#endif
#ifdef XAPPGROUP
extern Bool noXagExtension;
#endif
#ifdef XCMISC
extern Bool noXCMiscExtension;
#endif
......@@ -240,10 +237,6 @@ typedef void (*InitExtension)(INITARGS);
#ifdef XPRINT
#include <X11/extensions/Print.h>
#endif
#ifdef XAPPGROUP
#define _XAG_SERVER_
#include <X11/extensions/Xagstr.h>
#endif
#ifdef XCSECURITY
#include "securitysrv.h"
#include <X11/extensions/securstr.h>
......@@ -314,9 +307,6 @@ extern void RecordExtensionInit(INITARGS);
#ifdef DBE
extern void DbeExtensionInit(INITARGS);
#endif
#ifdef XAPPGROUP
extern void XagExtensionInit(INITARGS);
#endif
#ifdef XCSECURITY
extern void SecurityExtensionInit(INITARGS);
#endif
......@@ -446,9 +436,6 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef RES
{ "X-Resource", &noResExtension },
#endif
#ifdef XAPPGROUP
{ "XC-APPGROUP", &noXagExtension },
#endif
#ifdef XCMISC
{ "XC-MISC", &noXCMiscExtension },
#endif
......@@ -584,9 +571,6 @@ InitExtensions(argc, argv)
#ifdef DBE
if (!noDbeExtension) DbeExtensionInit();
#endif
#ifdef XAPPGROUP
if (!noXagExtension) XagExtensionInit();
#endif
#ifdef XCSECURITY
if (!noSecurityExtension) SecurityExtensionInit();
#endif
......@@ -678,9 +662,6 @@ static ExtensionModule staticExtensions[] = {
#ifdef XKB
{ XkbExtensionInit, XkbName, &noXkbExtension, NULL, NULL },
#endif
#ifdef XAPPGROUP
{ XagExtensionInit, XAGNAME, &noXagExtension, NULL, NULL },
#endif
#ifdef XCSECURITY
{ SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
#endif
......
......@@ -139,9 +139,6 @@ SOFTWARE.
#include <X11/Xpoll.h>
#include "opaque.h"
#include "dixstruct.h"
#ifdef XAPPGROUP
#include "appgroup.h"
#endif
#include "xace.h"
#ifdef X_NOT_POSIX
......
......@@ -189,9 +189,6 @@ _X_EXPORT Bool noXcupExtension = FALSE;
#ifdef RES
_X_EXPORT Bool noResExtension = FALSE;
#endif
#ifdef XAPPGROUP
_X_EXPORT Bool noXagExtension = FALSE;
#endif
#ifdef XCMISC
_X_EXPORT Bool noXCMiscExtension = FALSE;
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment