diff --git a/mi/mipointer.c b/mi/mipointer.c index 7f95cdbad..caa7a9f93 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -65,6 +65,18 @@ in this Software without prior written authorization from The Open Group. #include "inpututils.h" #include "eventstr.h" +typedef struct { + ScreenPtr pScreen; /* current screen */ + ScreenPtr pSpriteScreen; /* screen containing current sprite */ + CursorPtr pCursor; /* current cursor */ + CursorPtr pSpriteCursor; /* cursor on screen */ + BoxRec limits; /* current constraints */ + Bool confined; /* pointer can't change screens */ + int x, y; /* hot spot location */ + int devx, devy; /* sprite position */ + Bool generateEvent; /* generate an event during warping? */ +} miPointerRec, *miPointerPtr; + DevPrivateKeyRec miPointerScreenKeyRec; #define GetScreenPrivate(s) ((miPointerScreenPtr) \ diff --git a/mi/mipointrst.h b/mi/mipointrst.h index 104e45cfa..4319b12c6 100644 --- a/mi/mipointrst.h +++ b/mi/mipointrst.h @@ -34,18 +34,6 @@ in this Software without prior written authorization from The Open Group. #include "mipointer.h" #include "scrnintstr.h" -typedef struct { - ScreenPtr pScreen; /* current screen */ - ScreenPtr pSpriteScreen; /* screen containing current sprite */ - CursorPtr pCursor; /* current cursor */ - CursorPtr pSpriteCursor; /* cursor on screen */ - BoxRec limits; /* current constraints */ - Bool confined; /* pointer can't change screens */ - int x, y; /* hot spot location */ - int devx, devy; /* sprite position */ - Bool generateEvent; /* generate an event during warping? */ -} miPointerRec, *miPointerPtr; - typedef struct { miPointerSpriteFuncPtr spriteFuncs; /* sprite-specific methods */ miPointerScreenFuncPtr screenFuncs; /* screen-specific methods */