Move callback definitions to their own file
Needed as the privates stuff uses the callbacks before they would have been defined in dix.h Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Jamey Sharp <jamey@minilop.net>
This commit is contained in:
Keith Packard
parent
7dde50c649
commit
998e982b77
|
|
@ -3,6 +3,7 @@ sdk_HEADERS = \
|
||||||
XIstubs.h \
|
XIstubs.h \
|
||||||
bstore.h \
|
bstore.h \
|
||||||
bstorestr.h \
|
bstorestr.h \
|
||||||
|
callback.h \
|
||||||
closestr.h \
|
closestr.h \
|
||||||
closure.h \
|
closure.h \
|
||||||
colormap.h \
|
colormap.h \
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,87 @@
|
||||||
|
/***********************************************************
|
||||||
|
|
||||||
|
Copyright 1987, 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.
|
||||||
|
|
||||||
|
|
||||||
|
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
|
||||||
|
|
||||||
|
All Rights Reserved
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and distribute this software and its
|
||||||
|
documentation for any purpose and without fee is hereby granted,
|
||||||
|
provided that the above copyright notice appear in all copies and that
|
||||||
|
both that copyright notice and this permission notice appear in
|
||||||
|
supporting documentation, and that the name of Digital not be
|
||||||
|
used in advertising or publicity pertaining to distribution of the
|
||||||
|
software without specific, written prior permission.
|
||||||
|
|
||||||
|
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
|
||||||
|
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
|
||||||
|
DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
|
||||||
|
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
|
||||||
|
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
|
||||||
|
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||||
|
SOFTWARE.
|
||||||
|
|
||||||
|
******************************************************************/
|
||||||
|
|
||||||
|
#ifndef CALLBACK_H
|
||||||
|
#define CALLBACK_H
|
||||||
|
|
||||||
|
#include <X11/X.h> /* for GContext, Mask */
|
||||||
|
#include <X11/Xdefs.h> /* for Bool */
|
||||||
|
#include <X11/Xproto.h>
|
||||||
|
#include <X11/Xfuncproto.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* callback manager stuff
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _XTYPEDEF_CALLBACKLISTPTR
|
||||||
|
typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */
|
||||||
|
#define _XTYPEDEF_CALLBACKLISTPTR
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef void (*CallbackProcPtr) (
|
||||||
|
CallbackListPtr *, pointer, pointer);
|
||||||
|
|
||||||
|
extern _X_EXPORT Bool AddCallback(
|
||||||
|
CallbackListPtr * /*pcbl*/,
|
||||||
|
CallbackProcPtr /*callback*/,
|
||||||
|
pointer /*data*/);
|
||||||
|
|
||||||
|
extern _X_EXPORT Bool DeleteCallback(
|
||||||
|
CallbackListPtr * /*pcbl*/,
|
||||||
|
CallbackProcPtr /*callback*/,
|
||||||
|
pointer /*data*/);
|
||||||
|
|
||||||
|
extern _X_EXPORT void CallCallbacks(
|
||||||
|
CallbackListPtr * /*pcbl*/,
|
||||||
|
pointer /*call_data*/);
|
||||||
|
|
||||||
|
extern _X_EXPORT void DeleteCallbackList(
|
||||||
|
CallbackListPtr * /*pcbl*/);
|
||||||
|
|
||||||
|
extern _X_EXPORT void InitCallbackManager(void);
|
||||||
|
|
||||||
|
#endif /* CALLBACK_H */
|
||||||
|
|
@ -48,6 +48,7 @@ SOFTWARE.
|
||||||
#ifndef DIX_H
|
#ifndef DIX_H
|
||||||
#define DIX_H
|
#define DIX_H
|
||||||
|
|
||||||
|
#include "callback.h"
|
||||||
#include "gc.h"
|
#include "gc.h"
|
||||||
#include "window.h"
|
#include "window.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
|
|
@ -512,36 +513,6 @@ ScreenRestructured (ScreenPtr pScreen);
|
||||||
|
|
||||||
extern _X_EXPORT int ffs(int i);
|
extern _X_EXPORT int ffs(int i);
|
||||||
|
|
||||||
/*
|
|
||||||
* callback manager stuff
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _XTYPEDEF_CALLBACKLISTPTR
|
|
||||||
typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */
|
|
||||||
#define _XTYPEDEF_CALLBACKLISTPTR
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef void (*CallbackProcPtr) (
|
|
||||||
CallbackListPtr *, pointer, pointer);
|
|
||||||
|
|
||||||
extern _X_EXPORT Bool AddCallback(
|
|
||||||
CallbackListPtr * /*pcbl*/,
|
|
||||||
CallbackProcPtr /*callback*/,
|
|
||||||
pointer /*data*/);
|
|
||||||
|
|
||||||
extern _X_EXPORT Bool DeleteCallback(
|
|
||||||
CallbackListPtr * /*pcbl*/,
|
|
||||||
CallbackProcPtr /*callback*/,
|
|
||||||
pointer /*data*/);
|
|
||||||
|
|
||||||
extern _X_EXPORT void CallCallbacks(
|
|
||||||
CallbackListPtr * /*pcbl*/,
|
|
||||||
pointer /*call_data*/);
|
|
||||||
|
|
||||||
extern _X_EXPORT void DeleteCallbackList(
|
|
||||||
CallbackListPtr * /*pcbl*/);
|
|
||||||
|
|
||||||
extern _X_EXPORT void InitCallbackManager(void);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ServerGrabCallback stuff
|
* ServerGrabCallback stuff
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue