hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-22 01:20:26 +00:00
Code Issues Projects Releases Wiki Activity

Death to APPGROUP.

Browse source
This commit is contained in:
Adam Jackson 2008-04-18 18:50:05 -04:00
commit eafaf40fb3
15 changed files with 1 additions and 980 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dix/dispatch.c
View file

@ -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

67
dix/window.c
View file

@ -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,