Merge branch 'server-1.4-branch' into xorg-server-1.4-apple
This commit is contained in:
commit
632ea62166
|
@ -200,12 +200,15 @@ static int
|
|||
ProcDPMSEnable(client)
|
||||
register ClientPtr client;
|
||||
{
|
||||
/* REQUEST(xDPMSEnableReq); */
|
||||
Bool was_enabled = DPMSEnabled;
|
||||
|
||||
REQUEST_SIZE_MATCH(xDPMSEnableReq);
|
||||
|
||||
if (DPMSCapableFlag)
|
||||
if (DPMSCapableFlag) {
|
||||
DPMSEnabled = TRUE;
|
||||
if (!was_enabled)
|
||||
SetScreenSaverTimer();
|
||||
}
|
||||
|
||||
return(client->noClientException);
|
||||
}
|
||||
|
|
|
@ -146,7 +146,7 @@ compCheckRedirect (WindowPtr pWin)
|
|||
Bool should;
|
||||
|
||||
should = pWin->realized && (pWin->drawable.class != InputOnly) &&
|
||||
(cw != NULL);
|
||||
(cw != NULL) && (pWin->parent != NULL);
|
||||
|
||||
/* Never redirect the overlay window */
|
||||
if (cs->pOverlayWin != NULL) {
|
||||
|
|
|
@ -63,7 +63,7 @@ remove_device(DeviceIntPtr dev)
|
|||
static void
|
||||
device_removed(LibHalContext *ctx, const char *udi)
|
||||
{
|
||||
DeviceIntPtr dev;
|
||||
DeviceIntPtr dev, next;
|
||||
char *value;
|
||||
|
||||
value = xalloc(strlen(udi) + 5); /* "hal:" + NULL */
|
||||
|
@ -71,11 +71,13 @@ device_removed(LibHalContext *ctx, const char *udi)
|
|||
return;
|
||||
sprintf(value, "hal:%s", udi);
|
||||
|
||||
for (dev = inputInfo.devices; dev; dev = dev->next) {
|
||||
for (dev = inputInfo.devices; dev; dev = next) {
|
||||
next = dev->next;
|
||||
if (dev->config_info && strcmp(dev->config_info, value) == 0)
|
||||
remove_device(dev);
|
||||
}
|
||||
for (dev = inputInfo.off_devices; dev; dev = dev->next) {
|
||||
for (dev = inputInfo.off_devices; dev; dev = next) {
|
||||
next = dev->next;
|
||||
if (dev->config_info && strcmp(dev->config_info, value) == 0)
|
||||
remove_device(dev);
|
||||
}
|
||||
|
|
|
@ -1856,7 +1856,7 @@ if test "$KDRIVE" = yes; then
|
|||
XSDL_INCS="`sdl-config --cflags` $XSERVER_CFLAGS"
|
||||
fi
|
||||
|
||||
PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"])
|
||||
PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp $PIXMAN, [xephyr="yes"], [xephyr="no"])
|
||||
if test "x$XEPHYR" = xauto; then
|
||||
XEPHYR=$xephyr
|
||||
fi
|
||||
|
|
|
@ -253,7 +253,7 @@ exaCreatePixmap(ScreenPtr pScreen, int w, int h, int depth)
|
|||
pExaScr->info->pixmapPitchAlign);
|
||||
pExaPixmap->fb_size = pExaPixmap->fb_pitch * h;
|
||||
|
||||
if (pExaPixmap->fb_pitch > 32767) {
|
||||
if (pExaPixmap->fb_pitch > 131071) {
|
||||
fbDestroyPixmap(pPixmap);
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
@ -1184,6 +1184,7 @@ exaGlyphs (CARD8 op,
|
|||
y1 = y - glyph->info.y;
|
||||
|
||||
if (x1 >= pCmpDrw->width || y1 >= pCmpDrw->height ||
|
||||
glyph->info.width == 0 || glyph->info.height == 0 ||
|
||||
(x1 + glyph->info.width) <= 0 || (y1 + glyph->info.height) <= 0)
|
||||
goto nextglyph;
|
||||
|
||||
|
|
|
@ -87,6 +87,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
|
|||
$(GLX_LIBS) \
|
||||
input/libdmxinput.a \
|
||||
config/libdmxconfig.a \
|
||||
@XSERVER_LIBS@ \
|
||||
@DMXMODULES_LIBS@
|
||||
|
||||
# Man page
|
||||
|
|
|
@ -105,3 +105,14 @@ void dmxUpdateWindowInfo(DMXUpdateType type, WindowPtr pWindow)
|
|||
if (!dmxInput->detached && dmxInput->updateWindowInfo)
|
||||
dmxInput->updateWindowInfo(dmxInput, type, pWindow);
|
||||
}
|
||||
|
||||
int
|
||||
NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev)
|
||||
{
|
||||
return BadRequest;
|
||||
}
|
||||
|
||||
void
|
||||
DeleteInputDeviceRequest(DeviceIntPtr pDev)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -28,6 +28,7 @@ Xephyr_LDADD = \
|
|||
libxephyr-hostx.a \
|
||||
../../../exa/libexa.la \
|
||||
@KDRIVE_LIBS@ \
|
||||
@XSERVER_LIBS@ \
|
||||
@XEPHYR_LIBS@
|
||||
|
||||
Xephyr_DEPENDENCIES = \
|
||||
|
|
|
@ -160,12 +160,17 @@ videoPtrToDriverName(pciVideoPtr info)
|
|||
{
|
||||
/*
|
||||
* things not handled yet:
|
||||
* amd/cyrix/nsc
|
||||
* xgi
|
||||
* cyrix/nsc. should be merged into geode anyway.
|
||||
* xgi.
|
||||
*/
|
||||
|
||||
switch (info->vendor)
|
||||
{
|
||||
case 0x1022:
|
||||
if (info->chipType == 0x2081)
|
||||
return "amd";
|
||||
else
|
||||
return NULL;
|
||||
case 0x1142: return "apm";
|
||||
case 0xedd8: return "ark";
|
||||
case 0x1a03: return "ast";
|
||||
|
|
|
@ -119,7 +119,7 @@ extern RootWinPropPtr *xf86RegisteredPropertiesTable;
|
|||
#define DEFAULT_LOG_VERBOSE 3
|
||||
#endif
|
||||
#ifndef DEFAULT_DPI
|
||||
#define DEFAULT_DPI 75
|
||||
#define DEFAULT_DPI 96
|
||||
#endif
|
||||
|
||||
#define DEFAULT_UNRESOLVED TRUE
|
||||
|
|
|
@ -137,7 +137,8 @@ cursor_bitpos (int flags, int x, Bool mask)
|
|||
mask = !mask;
|
||||
if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED)
|
||||
x = (x & ~3) | (3 - (x & 3));
|
||||
if (flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST)
|
||||
if (((flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) == 0) ==
|
||||
(X_BYTE_ORDER == X_BIG_ENDIAN))
|
||||
x = (x & ~7) | (7 - (x & 7));
|
||||
if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1)
|
||||
x = (x << 1) + mask;
|
||||
|
|
|
@ -12,7 +12,7 @@ Xprt_LDFLAGS = -L$(top_srcdir)
|
|||
Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \
|
||||
pcl/libpcl.la pcl-mono/libpcl.la $(top_builddir)/fb/libfb.la \
|
||||
$(top_builddir)/render/librender.la $(top_builddir)/mi/libmi.la \
|
||||
$(top_builddir)/Xext/libXext.la @FREETYPE_LIBS@
|
||||
$(top_builddir)/Xext/libXext.la @FREETYPE_LIBS@ @XSERVER_LIBS@
|
||||
|
||||
miinitext-wrapper.c:
|
||||
echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
|
||||
|
|
|
@ -310,6 +310,17 @@ ChangeDeviceControl (
|
|||
return BadMatch;
|
||||
}
|
||||
|
||||
int
|
||||
NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev)
|
||||
{
|
||||
return BadValue;
|
||||
}
|
||||
|
||||
void
|
||||
DeleteInputDeviceRequest(DeviceIntPtr dev)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
OpenInputDevice (
|
||||
DeviceIntPtr dev,
|
||||
|
|
|
@ -1707,9 +1707,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
else {
|
||||
if (dst->geom->sz_shapes) {
|
||||
xfree(dst->geom->shapes);
|
||||
dst->geom->shapes = NULL;
|
||||
}
|
||||
|
||||
dst->geom->shapes = NULL;
|
||||
dst->geom->num_shapes = 0;
|
||||
dst->geom->sz_shapes = 0;
|
||||
}
|
||||
|
@ -1758,6 +1757,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
}
|
||||
|
||||
dst->geom->num_sections = 0;
|
||||
dst->geom->sections = NULL;
|
||||
}
|
||||
|
||||
if (src->geom->num_sections) {
|
||||
|
@ -1769,6 +1769,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
tmp = xalloc(src->geom->num_sections * sizeof(XkbSectionRec));
|
||||
if (!tmp)
|
||||
return FALSE;
|
||||
memset(tmp, 0, src->geom->num_sections * sizeof(XkbSectionRec));
|
||||
dst->geom->sections = tmp;
|
||||
dst->geom->num_sections = src->geom->num_sections;
|
||||
|
||||
|
@ -1804,6 +1805,10 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
return FALSE;
|
||||
dsection->doodads = tmp;
|
||||
}
|
||||
else {
|
||||
dsection->doodads = NULL;
|
||||
}
|
||||
|
||||
for (k = 0,
|
||||
sdoodad = ssection->doodads,
|
||||
ddoodad = dsection->doodads;
|
||||
|
@ -1831,9 +1836,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
else {
|
||||
if (dst->geom->sz_sections) {
|
||||
xfree(dst->geom->sections);
|
||||
dst->geom->sections = NULL;
|
||||
}
|
||||
|
||||
dst->geom->sections = NULL;
|
||||
dst->geom->num_sections = 0;
|
||||
dst->geom->sz_sections = 0;
|
||||
}
|
||||
|
@ -1862,6 +1867,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
}
|
||||
}
|
||||
}
|
||||
dst->geom->num_doodads = 0;
|
||||
dst->geom->doodads = NULL;
|
||||
}
|
||||
|
||||
if (src->geom->num_doodads) {
|
||||
|
@ -1874,7 +1881,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
sizeof(XkbDoodadRec));
|
||||
if (!tmp)
|
||||
return FALSE;
|
||||
bzero(tmp, src->geom->num_doodads * sizeof(XkbDoodadRec));
|
||||
memset(tmp, 0, src->geom->num_doodads * sizeof(XkbDoodadRec));
|
||||
dst->geom->doodads = tmp;
|
||||
|
||||
dst->geom->sz_doodads = src->geom->num_doodads;
|
||||
|
@ -1903,9 +1910,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
else {
|
||||
if (dst->geom->sz_doodads) {
|
||||
xfree(dst->geom->doodads);
|
||||
dst->geom->doodads = NULL;
|
||||
}
|
||||
|
||||
dst->geom->doodads = NULL;
|
||||
dst->geom->num_doodads = 0;
|
||||
dst->geom->sz_doodads = 0;
|
||||
}
|
||||
|
@ -1933,10 +1940,10 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
dst->geom->num_key_aliases = dst->geom->sz_key_aliases;
|
||||
}
|
||||
else {
|
||||
if (dst->geom->sz_key_aliases && dst->geom->key_aliases) {
|
||||
if (dst->geom->key_aliases) {
|
||||
xfree(dst->geom->key_aliases);
|
||||
dst->geom->key_aliases = NULL;
|
||||
}
|
||||
dst->geom->key_aliases = NULL;
|
||||
dst->geom->num_key_aliases = 0;
|
||||
dst->geom->sz_key_aliases = 0;
|
||||
}
|
||||
|
@ -1967,8 +1974,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
|
|||
else {
|
||||
if (dst->geom->label_font) {
|
||||
xfree(dst->geom->label_font);
|
||||
dst->geom->label_font = NULL;
|
||||
}
|
||||
dst->geom->label_font = NULL;
|
||||
dst->geom->label_color = NULL;
|
||||
dst->geom->base_color = NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user