diff options
| author | Eric Anholt <eric@anholt.net> | 2006-11-27 15:43:15 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-11-27 15:43:15 -0800 |
| commit | b4b0d901d98371a8aa7b17d195e18e83e2a6a618 (patch) | |
| tree | ee12953f0708194e3d77c0831fd0fe0e336bceb0 /include | |
| parent | 64de3baf85f6df274f71f736016f0848567cd9f6 (diff) | |
| parent | d6cd0313c7f23f32c9c7dda00ff739e772bf7db3 (diff) | |
Merge branch 'randr-1.2'
Conflicts:
dix/events.c
dix/getevents.c
hw/xfree86/common/xf86Mode.c
hw/xfree86/dri/Makefile.am
hw/xfree86/os-support/drm/xf86drm.c
hw/xfree86/os-support/xf86drm.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/dix-config.h.in | 3 | ||||
| -rw-r--r-- | include/dixevents.h | 4 | ||||
| -rw-r--r-- | include/input.h | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 1120337e8..7aabae2ec 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -127,6 +127,9 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have version 2.2 (or newer) of the drm library */ +#undef HAVE_LIBDRM_2_2 + /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM diff --git a/include/dixevents.h b/include/dixevents.h index 2a9458f08..c78fb0e85 100644 --- a/include/dixevents.h +++ b/include/dixevents.h @@ -102,4 +102,8 @@ extern int ProcUngrabButton(ClientPtr /* client */); extern int ProcRecolorCursor(ClientPtr /* client */); +#ifdef PANORAMIX +extern void PostSyntheticMotion(int x, int y, ScreenPtr pScreen, unsigned long time); +#endif + #endif /* DIXEVENTS_H */ diff --git a/include/input.h b/include/input.h index e7017cb27..ebb0915c4 100644 --- a/include/input.h +++ b/include/input.h @@ -421,7 +421,7 @@ extern int GetProximityEvents( extern void PostSyntheticMotion( int x, int y, - int screenNum, + ScreenPtr pScreen, unsigned long time); extern int GetMotionHistorySize( |