Fix build of composite, dix, and randr when Xinerama is disabled.
This commit is contained in:
parent
8f98be7db3
commit
1f48995d66
|
@ -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)
|
||||
|
|
|
@ -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 */
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -358,8 +358,9 @@ RRExtensionInit (void)
|
|||
SRRScreenChangeNotifyEvent;
|
||||
EventSwapVector[RREventBase + RRNotify] = (EventSwapPtr)
|
||||
SRRNotifyEvent;
|
||||
|
||||
#ifdef PANORAMIX
|
||||
RRXineramaExtensionInit();
|
||||
#endif
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
Loading…
Reference in New Issue