[Xquartz-changes] xserver: Branch 'master' - 6 commits
Jeremy Huddleston
jeremyhu at freedesktop.org
Tue Oct 27 00:42:41 PDT 2009
configure.ac | 4 ++--
dix/colormap.c | 3 +++
dix/devices.c | 8 +++-----
hw/dmx/dmx.c | 3 ++-
hw/xfree86/common/xf86Xinput.c | 12 +++++++++---
hw/xfree86/common/xf86cmap.c | 2 ++
hw/xfree86/dri2/dri2ext.c | 2 +-
7 files changed, 22 insertions(+), 12 deletions(-)
New commits:
commit 50a5c32430a5267f2a05656d2417f9a8a44d8b97
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Fri Oct 23 19:32:42 2009 +0100
dmx: Correctly compute DMXGetScreenAttributes reply length
Correctly allow for excess length of DMXGetScreenAttributes reply
over standard 32 byte reply in addition to the displayName string
when computing the length of reply
http://bugs.freedesktop.org/show_bug.cgi?id=24685
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Julien Cristau <jcristau at debian.org>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index b8fbf02..a1afe76 100644
--- a/hw/dmx/dmx.c
+++ b/hw/dmx/dmx.c
@@ -362,7 +362,8 @@ static int ProcDMXGetScreenAttributes(ClientPtr client)
paddedLength = pad_to_int32(length);
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
- rep.length = bytes_to_int32(paddedLength);
+ rep.length = bytes_to_int32((sizeof(xDMXGetScreenAttributesReply) - sizeof(xGenericReply))
+ + paddedLength);
rep.displayNameLength = length;
if (client->swapped) {
commit 9a2f6135bfb0f12ec28f304c97917d2f7c64db05
Author: Keith Packard <keithp at keithp.com>
Date: Fri Oct 23 10:04:57 2009 +0900
DRI2: Report the correct extension minor version
Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 6c14578..dc07b47 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -81,7 +81,7 @@ ProcDRI2QueryVersion(ClientPtr client)
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.majorVersion = SERVER_DRI2_MAJOR_VERSION;
- rep.minorVersion = SERVER_DRI2_MAJOR_VERSION;
+ rep.minorVersion = SERVER_DRI2_MINOR_VERSION;
if (client->swapped) {
swaps(&rep.sequenceNumber, n);
commit d886008c96cd16f735f54dace070cb00b23c6f44
Author: Marcin Baczyński <marbacz at gmail.com>
Date: Thu Oct 22 14:43:25 2009 +0200
Kill compilation warnings.
Signed-off-by: Marcin Baczyński <marbacz at gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index fd07c2a..6887f55 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -726,12 +726,15 @@ xf86PostMotionEventP(DeviceIntPtr device,
int *valuators)
{
int i = 0, nevents = 0;
- int dx = 0, dy = 0;
Bool drag = xf86SendDragEvents(device);
DeviceEvent *event;
- int index;
int flags = 0;
+#if XFreeXDGA
+ int index;
+ int dx = 0, dy = 0;
+#endif
+
XI_VERIFY_VALUATORS(num_valuators);
if (is_absolute)
@@ -856,9 +859,12 @@ xf86PostButtonEventP(DeviceIntPtr device,
int *valuators)
{
int i = 0, nevents = 0;
- int index;
int flags = 0;
+#if XFreeXDGA
+ int index;
+#endif
+
XI_VERIFY_VALUATORS(num_valuators);
if (is_absolute)
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index 36e6f96..08f557c 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -115,7 +115,9 @@ static void CMapDestroyColormap (ColormapPtr);
static Bool CMapEnterVT(int, int);
static Bool CMapSwitchMode(int, DisplayModePtr, int);
+#ifdef XFreeXDGA
static int CMapSetDGAMode(int, int, DGADevicePtr);
+#endif
static int CMapChangeGamma(int, Gamma);
static void ComputeGamma(CMapScreenPtr);
commit 15b30fde179cba3877182cd51b0f870ef29ffaee
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Oct 22 17:29:01 2009 -0400
dix: Fix up colormap fixup.
FindClientResourcesByType() will walk all colormaps on all screens; we
only want to fix up the current screen. Otherwise, screens > 0 will
have the visual pointers for their colormaps pointing off into space.
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/dix/colormap.c b/dix/colormap.c
index d702b02..bf97941 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -2705,6 +2705,9 @@ static void _colormap_find_resource(pointer value, XID id,
ColormapPtr cmap = value;
int j;
+ if (pScreen != cmap->pScreen)
+ return;
+
j = cmap->pVisual - pScreen->visuals;
cmap->pVisual = &visuals[j];
}
commit 3785475a78636eb6547ef9e46be9e009c7cf7800
Author: Keith Packard <keithp at keithp.com>
Date: Fri Oct 23 09:03:39 2009 +0900
Bump to 1.7.99.2 (unreleased)
diff --git a/configure.ac b/configure.ac
index 463b710..d85b8eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.7.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2009-10-22)"
+AC_INIT([xorg-server], 1.7.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="(unreleased)"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit 909df9beb3ddd02632f36ae682537280a6a8e5b4
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Tue Oct 20 12:57:05 2009 +0100
Resolve an inconsistency between libX11 and Xserver over GetModifierMapping
libX11 ModMap.c believes that GetModifierMapping can never return an error
Xserver devices.c believes that GetModifierMapping can return an error if
the ModMap couldn't be generated
According to the protocol document I have, libX11 is right, so adjust the
server to send back an empty modmap if one couldn't be made...
http://bugs.freedesktop.org/show_bug.cgi?id=24621
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/dix/devices.c b/dix/devices.c
index 6a79073..7486827 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1520,14 +1520,12 @@ int
ProcGetModifierMapping(ClientPtr client)
{
xGetModifierMappingReply rep;
- int ret, max_keys_per_mod = 0;
+ int max_keys_per_mod = 0;
KeyCode *modkeymap = NULL;
REQUEST_SIZE_MATCH(xReq);
- ret = generate_modkeymap(client, PickKeyboard(client), &modkeymap,
- &max_keys_per_mod);
- if (ret != Success)
- return ret;
+ generate_modkeymap(client, PickKeyboard(client), &modkeymap,
+ &max_keys_per_mod);
memset(&rep, 0, sizeof(xGetModifierMappingReply));
rep.type = X_Reply;
More information about the Xquartz-changes
mailing list