9838b7032e
This is strictly the application of the script 'x-indent-all.sh' from util/modular. Compared to the patch that Daniel posted in January, I've added a few indent flags: -bap -psl -T PrivatePtr -T pmWait -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT The typedefs were needed to make the output of sdksyms.sh match the previous output, otherwise, the code is formatted badly enough that sdksyms.sh generates incorrect output. The generated code was compared with the previous version and found to be essentially identical -- "assert" line numbers and BUILD_TIME were the only differences found. The comparison was done with this script: dir1=$1 dir2=$2 for dir in $dir1 $dir2; do (cd $dir && find . -name '*.o' | while read file; do dir=`dirname $file` base=`basename $file .o` dump=$dir/$base.dump objdump -d $file > $dump done) done find $dir1 -name '*.dump' | while read dump; do otherdump=`echo $dump | sed "s;$dir1;$dir2;"` diff -u $dump $otherdump done Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
148 lines
3.2 KiB
C
148 lines
3.2 KiB
C
/************************************************************
|
|
|
|
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
|
|
|
|
Permission to use, copy, modify, distribute, and sell this software and its
|
|
documentation for any purpose is hereby granted without fee, provided that
|
|
this permission notice appear in supporting documentation. 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
|
|
AUTHOR 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.
|
|
|
|
********************************************************/
|
|
|
|
#ifndef _XACESTR_H
|
|
#define _XACESTR_H
|
|
|
|
#include "dix.h"
|
|
#include "resource.h"
|
|
#include "extnsionst.h"
|
|
#include "window.h"
|
|
#include "input.h"
|
|
#include "property.h"
|
|
#include "selection.h"
|
|
#include "xace.h"
|
|
|
|
/* XACE_CORE_DISPATCH */
|
|
typedef struct {
|
|
ClientPtr client;
|
|
int status;
|
|
} XaceCoreDispatchRec;
|
|
|
|
/* XACE_RESOURCE_ACCESS */
|
|
typedef struct {
|
|
ClientPtr client;
|
|
XID id;
|
|
RESTYPE rtype;
|
|
pointer res;
|
|
RESTYPE ptype;
|
|
pointer parent;
|
|
Mask access_mode;
|
|
int status;
|
|
} XaceResourceAccessRec;
|
|
|
|
/* XACE_DEVICE_ACCESS */
|
|
typedef struct {
|
|
ClientPtr client;
|
|
DeviceIntPtr dev;
|
|
Mask access_mode;
|
|
int status;
|
|
} XaceDeviceAccessRec;
|
|
|
|
/* XACE_PROPERTY_ACCESS */
|
|
typedef struct {
|
|
ClientPtr client;
|
|
WindowPtr pWin;
|
|
PropertyPtr *ppProp;
|
|
Mask access_mode;
|
|
int status;
|
|
} XacePropertyAccessRec;
|
|
|
|
/* XACE_SEND_ACCESS */
|
|
typedef struct {
|
|
ClientPtr client;
|
|
DeviceIntPtr dev;
|
|
WindowPtr pWin;
|
|
xEventPtr events;
|
|
int count;
|
|
int status;
|
|
} XaceSendAccessRec;
|
|
|
|
/* XACE_RECEIVE_ACCESS */
|
|
typedef struct {
|
|
ClientPtr client;
|
|
WindowPtr pWin;
|
|
xEventPtr events;
|
|
int count;
|
|
int status;
|
|
} XaceReceiveAccessRec;
|
|
|
|
/* XACE_CLIENT_ACCESS */
|
|
typedef struct {
|
|
ClientPtr client;
|
|
ClientPtr target;
|
|
Mask access_mode;
|
|
int status;
|
|
} XaceClientAccessRec;
|
|
|
|
/* XACE_EXT_DISPATCH */
|
|
/* XACE_EXT_ACCESS */
|
|
typedef struct {
|
|
ClientPtr client;
|
|
ExtensionEntry *ext;
|
|
Mask access_mode;
|
|
int status;
|
|
} XaceExtAccessRec;
|
|
|
|
/* XACE_SERVER_ACCESS */
|
|
typedef struct {
|
|
ClientPtr client;
|
|
Mask access_mode;
|
|
int status;
|
|
} XaceServerAccessRec;
|
|
|
|
/* XACE_SELECTION_ACCESS */
|
|
typedef struct {
|
|
ClientPtr client;
|
|
Selection **ppSel;
|
|
Mask access_mode;
|
|
int status;
|
|
} XaceSelectionAccessRec;
|
|
|
|
/* XACE_SCREEN_ACCESS */
|
|
/* XACE_SCREENSAVER_ACCESS */
|
|
typedef struct {
|
|
ClientPtr client;
|
|
ScreenPtr screen;
|
|
Mask access_mode;
|
|
int status;
|
|
} XaceScreenAccessRec;
|
|
|
|
/* XACE_AUTH_AVAIL */
|
|
typedef struct {
|
|
ClientPtr client;
|
|
XID authId;
|
|
} XaceAuthAvailRec;
|
|
|
|
/* XACE_KEY_AVAIL */
|
|
typedef struct {
|
|
xEventPtr event;
|
|
DeviceIntPtr keybd;
|
|
int count;
|
|
} XaceKeyAvailRec;
|
|
|
|
/* XACE_AUDIT_BEGIN */
|
|
/* XACE_AUDIT_END */
|
|
typedef struct {
|
|
ClientPtr client;
|
|
int requestResult;
|
|
} XaceAuditRec;
|
|
|
|
#endif /* _XACESTR_H */
|