andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xace: add new argument to property hook for property structure itself.

Browse Source
This commit is contained in:
Eamon Walsh 2007-03-22 13:06:50 -04:00 committed by Eamon Walsh
parent 5486be4898
commit 1b58304ac8
4 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Xext/security.c
View File

@ -28,14 +28,8 @@ in this Software without prior written authorization from The Open Group.
#include <dix-config.h>
#endif
#include "dixstruct.h"
#include "extnsionst.h"
#include "windowstr.h"
#include "inputstr.h"
#include "scrnintstr.h"
#include "gcstruct.h"
#include "colormapst.h"
#include "propertyst.h"
#include "xacestr.h"
#include "securitysrv.h"
#include <X11/extensions/securstr.h>

3
Xext/xace.c
View File

@ -22,9 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
#include <stdarg.h>
#include "windowstr.h"
#include "scrnintstr.h"
#include "gcstruct.h"
#include "xacestr.h"
#include "modinit.h"
@ -97,6 +95,7 @@ int XaceHook(int hook, ...)
XacePropertyAccessRec rec = {
va_arg(ap, ClientPtr),
va_arg(ap, WindowPtr),
va_arg(ap, PropertyPtr),
va_arg(ap, Atom),
va_arg(ap, Mask),
XaceAllowOperation /* default allow */

2
Xext/xacestr.h
View File

@ -27,6 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "gcstruct.h"
#include "windowstr.h"
#include "inputstr.h"
#include "propertyst.h"
#include "selection.h"
#include "xace.h"
@ -59,6 +60,7 @@ typedef struct {
typedef struct {
ClientPtr client;
WindowPtr pWin;
PropertyPtr pProp;
Atom propertyName;
Mask access_mode;
int rval;

67
dix/property.c
View File

@ -91,6 +91,19 @@ PrintPropertys(WindowPtr pWin)
}
#endif
static _X_INLINE PropertyPtr
FindProperty(WindowPtr pWin, Atom propertyName)
{
PropertyPtr pProp = wUserProps(pWin);
while (pProp)
{
if (pProp->propertyName == propertyName)
break;
pProp = pProp->next;
}
return pProp;
}
int
ProcRotateProperties(ClientPtr client)
{
@ -115,35 +128,33 @@ ProcRotateProperties(ClientPtr client)
return(BadAlloc);
for (i = 0; i < stuff->nAtoms; i++)
{
char action = XaceHook(XACE_PROPERTY_ACCESS, client, pWin, atoms[i],
DixReadAccess|DixWriteAccess);
if (!ValidAtom(atoms[i]) || (XaceErrorOperation == action)) {
if (!ValidAtom(atoms[i])) {
DEALLOCATE_LOCAL(props);
client->errorValue = atoms[i];
return BadAtom;
}
if (XaceIgnoreOperation == action) {
DEALLOCATE_LOCAL(props);
return Success;
}
for (j = i + 1; j < stuff->nAtoms; j++)
if (atoms[j] == atoms[i])
{
DEALLOCATE_LOCAL(props);
return BadMatch;
}
pProp = wUserProps (pWin);
while (pProp)
{
if (pProp->propertyName == atoms[i])
goto found;
pProp = pProp->next;
}
DEALLOCATE_LOCAL(props);
return BadMatch;
found:
pProp = FindProperty(pWin, atoms[i]);
if (!pProp) {
DEALLOCATE_LOCAL(props);
return BadMatch;
}
switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, atoms[i],
DixReadAccess|DixWriteAccess))
{
case XaceErrorOperation:
DEALLOCATE_LOCAL(props);
client->errorValue = atoms[i];
return BadAtom;
case XaceIgnoreOperation:
DEALLOCATE_LOCAL(props);
return Success;
}
props[i] = pProp;
}
delta = stuff->nPositions;
@ -219,7 +230,8 @@ ProcChangeProperty(ClientPtr client)
return(BadAtom);
}
switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, stuff->property,
switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin,
FindProperty(pWin, stuff->property), stuff->property,
DixWriteAccess))
{
case XaceErrorOperation:
@ -252,14 +264,8 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
totalSize = len * sizeInBytes;
/* first see if property already exists */
pProp = FindProperty(pWin, property);
pProp = wUserProps (pWin);
while (pProp)
{
if (pProp->propertyName == property)
break;
pProp = pProp->next;
}
if (!pProp) /* just add to list */
{
if (!pWin->optional && !MakeWindowOptional (pWin))
@ -490,8 +496,8 @@ ProcGetProperty(ClientPtr client)
if (stuff->delete)
access_mode |= DixDestroyAccess;
switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, stuff->property,
access_mode))
switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp,
stuff->property, access_mode))
{
case XaceErrorOperation:
client->errorValue = stuff->property;
@ -643,7 +649,8 @@ ProcDeleteProperty(register ClientPtr client)
return (BadAtom);
}
switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, stuff->property,
switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin,
FindProperty(pWin, stuff->property), stuff->property,
DixDestroyAccess))
{
case XaceErrorOperation: