diff options
| author | Luo Jie <luojie@nlsde.buaa.edu.cn> | 2007-05-24 11:01:15 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-05-24 11:20:59 -0700 |
| commit | 1f48995d66c0072caa7e5ce2845be642221dd56d (patch) | |
| tree | 5da0a5ac6f114901b275448ec36a2b8e1a2fa33b | |
| parent | 8f98be7db303bc3db650054efb86843c70114451 (diff) | |
Fix build of composite, dix, and randr when Xinerama is disabled.
| -rw-r--r-- | composite/compext.c | 2 | ||||
| -rw-r--r-- | dix/events.c | 7 | ||||
| -rw-r--r-- | randr/Makefile.am | 10 | ||||
| -rw-r--r-- | randr/randr.c | 3 |
4 files changed, 19 insertions, 3 deletions
diff --git a/composite/compext.c b/composite/compext.c index ba37e7d1f..bea8bcf23 100644 --- a/composite/compext.c +++ b/composite/compext.c @@ -696,11 +696,13 @@ CompositeExtensionInit (void) if (GetPictureScreenIfSet(pScreen) == NULL) return; } +#ifdef PANORAMIX /* Xinerama's rewriting of window drawing before Composite gets to it * breaks Composite. */ if (!noPanoramiXExtension) return; +#endif CompositeClientWindowType = CreateNewResourceType (FreeCompositeClientWindow); if (!CompositeClientWindowType) diff --git a/dix/events.c b/dix/events.c index bc6b6ae97..887cbcd68 100644 --- a/dix/events.c +++ b/dix/events.c @@ -695,6 +695,13 @@ XineramaChangeToCursor(CursorPtr cursor) } } +#else +#define SyntheticMotion(x, y) \ + PostSyntheticMotion(x, y, \ + 0, \ + syncEvents.playingEvents ? \ + syncEvents.time.milliseconds : \ + currentTime.milliseconds); #endif /* PANORAMIX */ diff --git a/randr/Makefile.am b/randr/Makefile.am index 9bf0e6531..20b0f72e0 100644 --- a/randr/Makefile.am +++ b/randr/Makefile.am @@ -2,6 +2,8 @@ noinst_LTLIBRARIES = librandr.la AM_CFLAGS = $(DIX_CFLAGS) +XINERAMA_SRCS = rrxinerama.c + if XORG sdk_HEADERS = randrstr.h endif @@ -18,5 +20,9 @@ librandr_la_SOURCES = \ rrpointer.c \ rrproperty.c \ rrscreen.c \ - rrsdispatch.c \ - rrxinerama.c + rrsdispatch.c + +if XINERAMA +librandr_la_SOURCES += ${XINERAMA_SRCS} +endif + diff --git a/randr/randr.c b/randr/randr.c index 4dd0ee5b4..958f9c192 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -358,8 +358,9 @@ RRExtensionInit (void) SRRScreenChangeNotifyEvent; EventSwapVector[RREventBase + RRNotify] = (EventSwapPtr) SRRNotifyEvent; - +#ifdef PANORAMIX RRXineramaExtensionInit(); +#endif } static int |