diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/include/cursor.h | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/include/cursor.h')
| -rw-r--r-- | xorg-server/include/cursor.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/xorg-server/include/cursor.h b/xorg-server/include/cursor.h index 8635cf1a2..f7c16e3f9 100644 --- a/xorg-server/include/cursor.h +++ b/xorg-server/include/cursor.h @@ -59,9 +59,14 @@ SOFTWARE. #define ARGB_CURSOR #endif +struct _DeviceIntRec; + typedef struct _Cursor *CursorPtr; typedef struct _CursorMetric *CursorMetricPtr; +extern int cursorScreenDevPriv[MAXSCREENS]; +#define CursorScreenKey(pScreen) (cursorScreenDevPriv + (pScreen)->myNum) + extern CursorPtr rootCursor; extern int FreeCursor( @@ -105,7 +110,7 @@ extern CursorPtr CreateRootCursor( extern int ServerBitsFromGlyph( FontPtr /*pfont*/, unsigned int /*ch*/, - register CursorMetricPtr /*cm*/, + CursorMetricPtr /*cm*/, unsigned char ** /*ppbits*/); extern Bool CursorMetricsFromGlyph( @@ -117,18 +122,20 @@ extern void CheckCursorConfinement( WindowPtr /*pWin*/); extern void NewCurrentScreen( + struct _DeviceIntRec* /*pDev*/, ScreenPtr /*newScreen*/, int /*x*/, int /*y*/); -extern Bool PointerConfinedToScreen(void); +extern Bool PointerConfinedToScreen(struct _DeviceIntRec* /* pDev */); extern void GetSpritePosition( + struct _DeviceIntRec* /* pDev */, int * /*px*/, int * /*py*/); #ifdef PANORAMIX -extern int XineramaGetCursorScreen(void); +extern int XineramaGetCursorScreen(struct _DeviceIntRec* pDev); #endif /* PANORAMIX */ #endif /* CURSOR_H */ |