frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xace: drop XACE_WINDOW_INIT hook, it has been superseded by ResourceStateCallback.

This commit is contained in:
Eamon Walsh 2007-03-19 17:09:10 -04:00 committed by Eamon Walsh
parent 78c962da76
commit 2945deba1d
4 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Xext/xace.c
View File

@ -182,14 +182,6 @@ int XaceHook(int hook, ...)
calldata = &rec; calldata = &rec;
break; break;
} }
case XACE_WINDOW_INIT: {
XaceWindowRec rec = {
va_arg(ap, ClientPtr),
va_arg(ap, WindowPtr)
};
calldata = &rec;
break;
}
case XACE_AUDIT_BEGIN: { case XACE_AUDIT_BEGIN: {
XaceAuditRec rec = { XaceAuditRec rec = {
va_arg(ap, ClientPtr), va_arg(ap, ClientPtr),

7
Xext/xace.h
View File

@ -54,10 +54,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define XACE_DECLARE_EXT_SECURE 11 #define XACE_DECLARE_EXT_SECURE 11
#define XACE_AUTH_AVAIL 12 #define XACE_AUTH_AVAIL 12
#define XACE_KEY_AVAIL 13 #define XACE_KEY_AVAIL 13
#define XACE_WINDOW_INIT 14 #define XACE_AUDIT_BEGIN 14
#define XACE_AUDIT_BEGIN 15 #define XACE_AUDIT_END 15
#define XACE_AUDIT_END 16 #define XACE_NUM_HOOKS 16
#define XACE_NUM_HOOKS 17
extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS]; extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS];

6
Xext/xacestr.h
View File

@ -119,12 +119,6 @@ typedef struct {
int count; int count;
} XaceKeyAvailRec; } XaceKeyAvailRec;
/* XACE_WINDOW_INIT */
typedef struct {
ClientPtr client;
WindowPtr pWin;
} XaceWindowRec;
/* XACE_AUDIT_BEGIN */ /* XACE_AUDIT_BEGIN */
/* XACE_AUDIT_END */ /* XACE_AUDIT_END */
typedef struct { typedef struct {

4
dix/window.c
View File

@ -529,8 +529,6 @@ InitRootWindow(WindowPtr pWin)
/* We SHOULD check for an error value here XXX */ /* We SHOULD check for an error value here XXX */
(*pScreen->ChangeWindowAttributes)(pWin, backFlag); (*pScreen->ChangeWindowAttributes)(pWin, backFlag);
XaceHook(XACE_WINDOW_INIT, serverClient, pWin);
MapWindow(pWin, serverClient); MapWindow(pWin, serverClient);
} }
@ -763,8 +761,6 @@ CreateWindow(Window wid, register WindowPtr pParent, int x, int y, unsigned w,
REGION_NULL(pScreen, &pWin->winSize); REGION_NULL(pScreen, &pWin->winSize);
REGION_NULL(pScreen, &pWin->borderSize); REGION_NULL(pScreen, &pWin->borderSize);
XaceHook(XACE_WINDOW_INIT, client, pWin);
pHead = RealChildHead(pParent); pHead = RealChildHead(pParent);
if (pHead) if (pHead)
{ {