Integration of XEVIE branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=947 Modified Files: cursorstr.h input.h inputstr.h windowstr.h
This commit is contained in:
parent
82a6a65924
commit
71164d118c
|
@ -91,4 +91,8 @@ typedef struct {
|
|||
int x, y;
|
||||
ScreenPtr pScreen;
|
||||
} HotSpot;
|
||||
|
||||
#ifdef XEVIE
|
||||
extern HotSpot xeviehot;
|
||||
#endif
|
||||
#endif /* CURSORSTRUCT_H */
|
||||
|
|
|
@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|||
SOFTWARE.
|
||||
|
||||
********************************************************/
|
||||
/* $XFree86: xc/programs/Xserver/include/input.h,v 3.7 2001/12/14 19:59:54 dawes Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */
|
||||
|
||||
#ifndef INPUT_H
|
||||
#define INPUT_H
|
||||
|
@ -92,6 +92,17 @@ typedef void (*ProcessInputProc)(
|
|||
DeviceIntPtr /*device*/,
|
||||
int /*count*/);
|
||||
|
||||
typedef Bool (*DeviceHandleProc)(
|
||||
DeviceIntPtr /*device*/,
|
||||
void* /*data*/
|
||||
);
|
||||
|
||||
typedef void (*DeviceUnwrapProc)(
|
||||
DeviceIntPtr /*device*/,
|
||||
DeviceHandleProc /*proc*/,
|
||||
void* /*data*/
|
||||
);
|
||||
|
||||
typedef struct _DeviceRec {
|
||||
pointer devicePrivate;
|
||||
ProcessInputProc processInputProc; /* current */
|
||||
|
@ -145,6 +156,10 @@ typedef struct {
|
|||
unsigned char id;
|
||||
} LedCtrl;
|
||||
|
||||
extern int AllocateDevicePrivateIndex(void);
|
||||
extern Bool AllocateDevicePrivate(DeviceIntPtr device, int index);
|
||||
extern void ResetDevicePrivateIndex(void);
|
||||
|
||||
extern KeybdCtrl defaultKeyboardControl;
|
||||
extern PtrCtrl defaultPointerControl;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
|
||||
/************************************************************
|
||||
|
||||
Copyright 1987, 1998 The Open Group
|
||||
|
@ -285,6 +285,9 @@ typedef struct _DeviceIntRec {
|
|||
#ifdef XKB
|
||||
struct _XkbInterest * xkb_interest;
|
||||
#endif
|
||||
DevUnion *devPrivates;
|
||||
int nPrivates;
|
||||
DeviceUnwrapProc unwrapProc;
|
||||
} DeviceIntRec;
|
||||
|
||||
typedef struct {
|
||||
|
|
|
@ -222,4 +222,8 @@ extern ScreenSaverStuffRec savedScreenInfo[MAXSCREENS];
|
|||
extern int numSaveUndersViewable;
|
||||
extern int deltaSaveUndersViewable;
|
||||
|
||||
#ifdef XEVIE
|
||||
extern WindowPtr xeviewin;
|
||||
#endif
|
||||
|
||||
#endif /* WINDOWSTRUCT_H */
|
||||
|
|
Loading…
Reference in New Issue
Block a user