xserver: Branch 'master' - 2 commits

[Keith Packard]

 include/scrnintstr.h |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit abfea17342da774aa4e3a351a73c8f2af6e6fd28
Merge: 3611283... e65c3f8...
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Jan 18 15:19:34 2011 -0800

    Merge remote branch 'ajax/for-keithp'

commit e65c3f8bcc86845f21ac575e2bfb4b21b67d5ebf
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jan 5 12:04:19 2011 -0500

    dix: Add a Screen method for additional cursor confinement
    
    This just reserves the slot in the ABI. Confining cursors to CRTCs will
    come soon.
    
    v2: Just reserve the slot.
    
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 9952325..9f4fbf3 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -403,6 +403,9 @@ typedef    void (* DeviceCursorCleanupProcPtr)(
         DeviceIntPtr /* pDev */,
         ScreenPtr    /* pScreen */);
 
+typedef void (*ConstrainCursorHarderProcPtr)(
+       DeviceIntPtr, ScreenPtr, int *, int *);
+
 typedef struct _Screen {
     int			myNum;	/* index of this instance in Screens[] */
     ATOM		id;
@@ -469,6 +472,7 @@ typedef struct _Screen {
     /* Cursor Procedures */
 
     ConstrainCursorProcPtr	ConstrainCursor;
+    ConstrainCursorHarderProcPtr ConstrainCursorHarder;
     CursorLimitsProcPtr		CursorLimits;
     DisplayCursorProcPtr	DisplayCursor;
     RealizeCursorProcPtr	RealizeCursor;