xorg-server: Changes to 'upstream-experimental'

[Emilio Pozuelo Monfort]

 0 files changed

New commits:
commit 8b312db7d1d98be67f0283d982428545cf948a66
Author: Adam Jackson 
Date:   Tue Jul 19 13:27:08 2016 -0400

xserver 1.18.4

Signed-off-by: Adam Jackson 

diff --git a/configure.ac b/configure.ac
index cfffcd8..868e859 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.18.3, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2016-04-04"
-RELEASE_NAME="Halloumi"
+AC_INIT([xorg-server], 1.18.4, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2016-07-19"
+RELEASE_NAME="Skordalia"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])

commit 42a74080ffe93502904ede7555652f01ab11d12d
Author: Michel Dänzer 
Date:   Wed Mar 30 18:23:04 2016 +0900

os: Use strtok instead of xstrtokenize in ComputeLocalClient

Fixes leaking the memory pointed to by the members of the array returned
by xstrtokenize.

Reviewed-by: Adam Jackson 
(cherry picked from commit e156c0ccb530897d3a428255bd5585f7ea7b9b41)

diff --git a/os/access.c b/os/access.c
index 08c4fd0..dac6f49 100644
--- a/os/access.c
+++ b/os/access.c
@@ -1132,19 +1132,20 @@ ComputeLocalClient(ClientPtr client)
  * is forwarded from another host via SSH
  */
 if (cmdname) {
-char **cmd;
+char *cmd = strdup(cmdname);
 Bool ret;
 
 /* Cut off any colon and whatever comes after it, see
  * 
https://lists.freedesktop.org/archives/xorg-devel/2015-December/048164.html
  */
-cmd = xstrtokenize(cmdname, ":");
+cmd = strtok(cmd, ":");
 
 #if !defined(WIN32) || defined(__CYGWIN__)
-cmd[0] = basename(cmd[0]);
+ret = strcmp(basename(cmd), "ssh") != 0;
+#else
+ret = strcmp(cmd, "ssh") != 0;
 #endif
 
-ret = strcmp(cmd[0], "ssh") != 0;
 free(cmd);
 
 return ret;

commit 3c4cead499f10dabac20ab87728746ec41dae799
Author: Adam Jackson 
Date:   Mon Mar 28 18:11:09 2016 +0900

os: Treat ssh as a non-local client (v4)

By the time we get to ComputeLocalClient, we've already done
NextAvailableClient → ReserveClientIds → DetermineClientCmd (assuming
we're built with #define CLIENTIDS), so we can look up the name of the
client process and refuse to treat ssh's X forwarding as if it were
local.

v2: (Michel Dänzer)
* Only match "ssh" itself, not other executable names starting with
  that prefix.
* Ignore executable path for the match.
v3: (Michel Dänzer)
* Use GetClientCmdName (Mark Kettenis)
* Perform check on Windows as well, but only ignore path on Cygwin
  (Martin Peres, Emil Velikov, Jon Turney)
v4: (Michel Dänzer)
* Cut of any colon and whatever comes after it. (Adam Jackson)
* Add bugzilla reference.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93261

Signed-off-by: Adam Jackson 
Signed-off-by: Michel Dänzer 
(cherry picked from commit adefbaee499b9679c6cac21f52ec6545af2b36b5)

diff --git a/os/access.c b/os/access.c
index 2499a9f..08c4fd0 100644
--- a/os/access.c
+++ b/os/access.c
@@ -173,6 +173,10 @@ SOFTWARE.
 
 #endif  /* WIN32 */
 
+#if !defined(WIN32) || defined(__CYGWIN__)
+#include 
+#endif
+
 #define X_INCLUDE_NETDB_H
 #include 
 
@@ -1081,9 +1085,8 @@ ResetHosts(const char *display)
 }
 }
 
-/* Is client on the local host */
-Bool
-ComputeLocalClient(ClientPtr client)
+static Bool
+xtransLocalClient(ClientPtr client)
 {
 int alen, family, notused;
 Xtransaddr *from = NULL;
@@ -1116,6 +1119,40 @@ ComputeLocalClient(ClientPtr client)
 return FALSE;
 }
 
+/* Is client on the local host */
+Bool
+ComputeLocalClient(ClientPtr client)
+{
+const char *cmdname = GetClientCmdName(client);
+
+if (!xtransLocalClient(client))
+return FALSE;
+
+/* If the executable name is "ssh", assume that this client connection
+ * is forwarded from another host via SSH
+ */
+if (cmdname) {
+char **cmd;
+Bool ret;
+
+/* Cut off any colon and whatever comes after it, see
+ * 
https://lists.freedesktop.org/archives/xorg-devel/2015-December/048164.html
+ */
+cmd = xstrtokenize(cmdname, ":");
+
+#if !defined(WIN32) || defined(__CYGWIN__)
+cmd[0] = basename(cmd[0]);
+#endif
+
+ret = strcmp(cmd[0], "ssh") != 0;
+free(cmd);
+
+return ret;
+}
+
+return TRUE;
+}
+
 /*
  * Return the uid and all gids of a connected local client
  * Allocates a LocalClientCredRec - caller must call FreeLocalClientCreds

commit aebfc6ad9be5bd33b7e0a813d424c81d6214ab07

xorg-server: Changes to 'upstream-experimental'

[Andreas Boll]

 configure.ac   |6 +++---
 dix/dispatch.c |2 +-
 hw/xfree86/dri2/pci_ids/i965_pci_ids.h |   32 +---
 hw/xwayland/xwayland-shm.c |   10 ++
 include/dixstruct.h|2 +-
 5 files changed, 32 insertions(+), 20 deletions(-)

New commits:
commit 7e5c9bdf73e4185ac4cf7f044da0793a5cc3e62c
Author: Keith Packard 
Date:   Tue Nov 15 08:12:05 2016 -0800

Bump version to 1.19.0

Signed-off-by: Keith Packard 

diff --git a/configure.ac b/configure.ac
index 395df80..f7ab48c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.18.99.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2016-10-28"
-RELEASE_NAME="Shigoku"
+AC_INIT([xorg-server], 1.19.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2016-11-15"
+RELEASE_NAME="Cioppino"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])

commit ea8efb3a997e15d27d362762e6c85d59487f9864
Author: Keith Packard 
Date:   Wed Nov 2 13:25:33 2016 -0700

dix: Make sure client is not in output_pending chain after closed (RH 
1382444)

I think it is possible that output could get queued to a client during
CloseDownClient. After it is removed from the pending queue, active
grabs are released, the client is awoken if sleeping and any work
queue entries related to the client are processed.

To fix this, move the call removing it from the output_pending chain
until after clientGone has been set and then check clientGone in
output_pending_mark.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1382444
Signed-off-by: Keith Packard 
Reviewed-by: Hans de Goede 

diff --git a/dix/dispatch.c b/dix/dispatch.c
index e111377..3d0fe26 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3406,7 +3406,6 @@ CloseDownClient(ClientPtr client)
 UngrabServer(client);
 }
 mark_client_not_ready(client);
-xorg_list_del(>output_pending);
 BITCLEAR(grabWaiters, client->index);
 DeleteClientFromAnySelections(client);
 ReleaseActiveGrabs(client);
@@ -3435,6 +3434,7 @@ CloseDownClient(ClientPtr client)
 if (ClientIsAsleep(client))
 ClientSignal(client);
 ProcessWorkQueueZombies();
+output_pending_clear(client);
 CloseDownConnection(client);
 
 /* If the client made it to the Running stage, nClients has
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 3b578f8..d71b0ac 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -159,7 +159,7 @@ extern struct xorg_list output_pending_clients;
 static inline void
 output_pending_mark(ClientPtr client)
 {
-if (xorg_list_is_empty(>output_pending))
+if (!client->clientGone && xorg_list_is_empty(>output_pending))
 xorg_list_append(>output_pending, _pending_clients);
 }
 

commit 7513da40a656317ad3aa101651d29373de99c798
Author: Timo Aaltonen 
Date:   Wed Nov 2 17:18:11 2016 +0200

dri2: Sync i965_pci_ids.h from mesa

Import changes from these mesa commits:
85ea8deb26da420 i965: Removing PCI IDs that are no longer listed as 
Kabylake.
bdff2e554735ed9 i956: Add more Kabylake PCI IDs.
f1fa8b4a1ca73fa i965/bxt: Add 2x6 variant
d1ab544bb883d04 i965/chv: Display proper branding
20e8ee36627f874 i965/skl: Update Skylake renderer strings
644c8a515192d28 i965/skl: Add two missing device IDs

Reviewed-by: Adam Jackson 
Signed-off-by: Timo Aaltonen 

diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h 
b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
index 5139e27..1566afd 100644
--- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
+++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
@@ -112,6 +112,7 @@ CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3")
 CHIPSET(0x1902, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
 CHIPSET(0x1906, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
 CHIPSET(0x190A, skl_gt1, "Intel(R) Skylake GT1")
+CHIPSET(0x190B, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
 CHIPSET(0x190E, skl_gt1, "Intel(R) Skylake GT1")
 CHIPSET(0x1912, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
 CHIPSET(0x1913, skl_gt2, "Intel(R) Skylake GT2f")
@@ -122,19 +123,21 @@ CHIPSET(0x191A, skl_gt2, "Intel(R) Skylake GT2")
 CHIPSET(0x191B, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
 CHIPSET(0x191D, skl_gt2, "Intel(R) HD Graphics P530 (Skylake GT2)")
 CHIPSET(0x191E, skl_gt2, "Intel(R) HD Graphics 515 (Skylake GT2)")
-CHIPSET(0x1921, skl_gt2, "Intel(R) Skylake GT2")
-CHIPSET(0x1923, skl_gt3, "Intel(R) Iris 

xorg-server: Changes to 'upstream-experimental'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:
commit fc1c358b955258ce675e49490de7c3b8ddee2b76
Author: Keith Packard 
Date:   Mon Sep 19 09:02:57 2016 -0700

Bump to 1.18.99.901 (1.19 RC1)

Signed-off-by: Keith Packard 

diff --git a/configure.ac b/configure.ac
index 190e473..c09b854 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.18.99.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2016-09-16"
-RELEASE_NAME="Marionberry Pie"
+AC_INIT([xorg-server], 1.18.99.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2016-09-19"
+RELEASE_NAME="Brown Turkey Fig"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])

commit 5998da7855750dd947288349a0b14e65db1e3c8c
Author: Jonas Ådahl 
Date:   Tue Sep 13 15:16:56 2016 +0800

dix: Incroduce CursorConfinedTo vfunc in Screen

This function will be called when a pointer is grabbed non-root window
set as the 'confineTo'. This will enable the ddx to handle the
confinement their own way.

Signed-off-by: Jonas Ådahl 
Reviewed-by: Peter Hutterer 
Signed-off-by: Keith Packard 

diff --git a/dix/events.c b/dix/events.c
index 87f080e..cc26ba5 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -882,6 +882,8 @@ ConfineCursorToWindow(DeviceIntPtr pDev, WindowPtr pWin, 
Bool generateEvents,
 SyntheticMotion(pDev, pSprite->hot.x, pSprite->hot.y);
 }
 else {
+ScreenPtr pScreen = pWin->drawable.pScreen;
+
 #ifdef PANORAMIX
 if (!noPanoramiXExtension) {
 XineramaConfineCursorToWindow(pDev, pWin, generateEvents);
@@ -893,6 +895,9 @@ ConfineCursorToWindow(DeviceIntPtr pDev, WindowPtr pWin, 
Bool generateEvents,
 : NullRegion;
 CheckPhysLimits(pDev, pSprite->current, generateEvents,
 confineToScreen, pWin->drawable.pScreen);
+
+if (*pScreen->CursorConfinedTo)
+(*pScreen->CursorConfinedTo) (pDev, pScreen, pWin);
 }
 }
 
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index faf9f8d..f898392 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -241,6 +241,10 @@ typedef void (*CursorWarpedToProcPtr) (DeviceIntPtr /* 
pDev */ ,
int /*x */ ,
int /*y */ );
 
+typedef void (*CurserConfinedToProcPtr) (DeviceIntPtr /* pDev */ ,
+ ScreenPtr /*pScreen */ ,
+ WindowPtr /*pWindow */ );
+
 typedef Bool (*CreateGCProcPtr) (GCPtr /*pGC */ );
 
 typedef Bool (*CreateColormapProcPtr) (ColormapPtr /*pColormap */ );
@@ -563,6 +567,7 @@ typedef struct _Screen {
 RecolorCursorProcPtr RecolorCursor;
 SetCursorPositionProcPtr SetCursorPosition;
 CursorWarpedToProcPtr CursorWarpedTo;
+CurserConfinedToProcPtr CursorConfinedTo;
 
 /* GC procedures */
 

commit daf48a3aba7d5c42d7156f0d0e2b1d8aae423303
Author: Jonas Ådahl 
Date:   Tue Sep 13 15:16:55 2016 +0800

dix: Introduce CursorWarpedTo vfunc in Screen

This new vfunc will be called, if set, after a client has issued a
WarpPointer request. This is necessary for implementing pointer warp
emulation in Xwayland.

Signed-off-by: Jonas Ådahl 
Reviewed-by: Peter Hutterer 
Signed-off-by: Keith Packard 

diff --git a/dix/events.c b/dix/events.c
index 6610b91..87f080e 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3609,6 +3609,9 @@ ProcWarpPointer(ClientPtr client)
 else if (!PointerConfinedToScreen(dev)) {
 NewCurrentScreen(dev, newScreen, x, y);
 }
+if (*newScreen->CursorWarpedTo)
+(*newScreen->CursorWarpedTo) (dev, newScreen, client,
+  dest, pSprite, x, y);
 return Success;
 }
 
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 52e8382..faf9f8d 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -233,6 +233,14 @@ typedef Bool (*SetCursorPositionProcPtr) (DeviceIntPtr /* 
pDev */ ,
   int /*y */ ,
   Bool /*generateEvent */ );
 
+typedef void (*CursorWarpedToProcPtr) (DeviceIntPtr /* pDev */ ,
+   ScreenPtr /*pScreen */ ,
+   ClientPtr /*pClient */ ,
+   WindowPtr /*pWindow */ ,
+   SpritePtr /*pSprite */ ,
+   int /*x */ ,
+   int /*y */ );
+
 typedef Bool 

xorg-server: Changes to 'upstream-experimental'

[Maarten Bernardus Lankhorst]

Rebased ref, commits from common ancestor:
commit 3b0d1ba2266d2780bfc111bab74885b90458eca4
Author: Keith Packard kei...@keithp.com
Date:   Tue Feb 10 14:43:34 2015 -0800

Release 1.17.1

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index 2b46552..4e47bbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.17.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2015-02-02
-RELEASE_NAME=Côte de veau
+AC_INIT([xorg-server], 1.17.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2015-02-10
+RELEASE_NAME=lambic
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])

commit f160e722672dbb2b5215870b47bcc51461d96ff1
Author: Olivier Fourdan ofour...@redhat.com
Date:   Fri Jan 16 08:44:45 2015 +0100

xkb: Check strings length against request size

Ensure that the given strings length in an XkbSetGeometry request remain
within the limits of the size of the request.

Signed-off-by: Olivier Fourdan ofour...@redhat.com
Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit 20079c36cf7d377938ca5478447d8b9045cb7d43)

diff --git a/xkb/xkb.c b/xkb/xkb.c
index b9a3ac4..f3988f9 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -4957,25 +4957,29 @@ ProcXkbGetGeometry(ClientPtr client)
 
 /******/
 
-static char *
-_GetCountedString(char **wire_inout, Bool swap)
+static Status
+_GetCountedString(char **wire_inout, ClientPtr client, char **str)
 {
-char *wire, *str;
+char *wire, *next;
 CARD16 len;
 
 wire = *wire_inout;
 len = *(CARD16 *) wire;
-if (swap) {
+if (client-swapped) {
 swaps(len);
 }
-str = malloc(len + 1);
-if (str) {
-memcpy(str, wire[2], len);
-str[len] = '\0';
-}
-wire += XkbPaddedSize(len + 2);
-*wire_inout = wire;
-return str;
+next = wire + XkbPaddedSize(len + 2);
+/* Check we're still within the size of the request */
+if (client-req_len 
+bytes_to_int32(next - (char *) client-requestBuffer))
+return BadValue;
+*str = malloc(len + 1);
+if (!*str)
+return BadAlloc;
+memcpy(*str, wire[2], len);
+*(*str + len) = '\0';
+*wire_inout = next;
+return Success;
 }
 
 static Status
@@ -4987,6 +4991,7 @@ _CheckSetDoodad(char **wire_inout,
 xkbAnyDoodadWireDesc any;
 xkbTextDoodadWireDesc text;
 XkbDoodadPtr doodad;
+Status status;
 
 dWire = (xkbDoodadWireDesc *) (*wire_inout);
 any = dWire-any;
@@ -5036,8 +5041,14 @@ _CheckSetDoodad(char **wire_inout,
 doodad-text.width = text.width;
 doodad-text.height = text.height;
 doodad-text.color_ndx = dWire-text.colorNdx;
-doodad-text.text = _GetCountedString(wire, client-swapped);
-doodad-text.font = _GetCountedString(wire, client-swapped);
+status = _GetCountedString(wire, client, doodad-text.text);
+if (status != Success)
+return status;
+status = _GetCountedString(wire, client, doodad-text.font);
+if (status != Success) {
+free (doodad-text.text);
+return status;
+}
 break;
 case XkbIndicatorDoodad:
 if (dWire-indicator.onColorNdx = geom-num_colors) {
@@ -5072,7 +5083,9 @@ _CheckSetDoodad(char **wire_inout,
 }
 doodad-logo.color_ndx = dWire-logo.colorNdx;
 doodad-logo.shape_ndx = dWire-logo.shapeNdx;
-doodad-logo.logo_name = _GetCountedString(wire, client-swapped);
+status = _GetCountedString(wire, client, doodad-logo.logo_name);
+if (status != Success)
+return status;
 break;
 default:
 client-errorValue = _XkbErrCode2(0x4F, dWire-any.type);
@@ -5304,18 +5317,20 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * 
req, ClientPtr client)
 char *wire;
 
 wire = (char *) req[1];
-geom-label_font = _GetCountedString(wire, client-swapped);
+status = _GetCountedString(wire, client, geom-label_font);
+if (status != Success)
+return status;
 
 for (i = 0; i  req-nProperties; i++) {
 char *name, *val;
 
-name = _GetCountedString(wire, client-swapped);
-if (!name)
-return BadAlloc;
-val = _GetCountedString(wire, client-swapped);
-if (!val) {
+status = _GetCountedString(wire, client, name);
+if (status != Success)
+return status;
+status = _GetCountedString(wire, client, val);
+if (status != Success) {
 free(name);
-return BadAlloc;
+return status;
 }
 if 

xorg-server: Changes to 'upstream-experimental'

[Maarten Bernardus Lankhorst]

 COPYING  |   24 
 Xext/dpms.c  |   10 
 Xext/dpmsstubs.c |   10 
 Xext/panoramiX.c |2 
 Xext/panoramiX.h |2 
 Xext/panoramiXprocs.c|   16 
 Xext/saver.c |   16 
 Xext/security.c  |5 
 Xext/shm.c   |   21 
 Xext/sync.c  |2 
 Xext/syncsrv.h   |8 
 Xext/xcmisc.c|1 
 Xext/xres.c  |   12 
 Xext/xvdisp.c|  126 -
 Xext/xvdix.h |   45 
 Xext/xvmain.c|  164 +-
 Xi/chgdctl.c |8 
 Xi/chgfctl.c |2 
 Xi/sendexev.c|3 
 Xi/xiallowev.c   |2 
 Xi/xichangecursor.c  |2 
 Xi/xichangehierarchy.c   |   35 
 Xi/xigetclientpointer.c  |1 
 Xi/xigrabdev.c   |9 
 Xi/xipassivegrab.c   |   12 
 Xi/xiproperty.c  |   14 
 Xi/xiquerydevice.c   |1 
 Xi/xiquerypointer.c  |2 
 Xi/xiselectev.c  |8 
 Xi/xisetclientpointer.c  |3 
 Xi/xisetdevfocus.c   |4 
 Xi/xiwarppointer.c   |2 
 composite/compalloc.c|8 
 composite/compext.c  |7 
 composite/compinit.c |   25 
 composite/compint.h  |3 
 composite/compoverlay.c  |4 
 composite/compwindow.c   |7 
 config/config.c  |  129 -
 config/udev.c|   17 
 configure.ac |  124 -
 dbe/dbe.c|   33 
 dbe/dbestruct.h  |   12 
 dbe/midbe.c  |   14 
 dbe/midbe.h  |8 
 dix/atom.c   |8 
 dix/colormap.c   |   34 
 dix/cursor.c |8 
 dix/devices.c|   63 
 dix/dispatch.c   |   75 -
 dix/dispatch.h   |2 
 dix/dixfonts.c   |6 
 dix/dixutils.c   |   12 
 dix/extension.c  |   10 
 dix/gc.c |   25 
 dix/getevents.c  |   22 
 dix/globals.c|8 
 dix/glyphcurs.c  |8 
 dix/grabs.c  |   16 
 dix/inpututils.c |2 
 dix/main.c   |   10 
 dix/pixmap.c |   18 
 dix/property.c   |8 
 dix/protocol.txt |   30 
 dix/region.c |   42 
 dix/registry.c   |   94 -
 dix/resource.c   |   18 
 dix/selection.c  |   10 
 dix/swaprep.c|8 
 dix/swapreq.c|8 
 dix/tables.c |8 
 dix/window.c |  111 -
 doc/Xserver-spec.xml |6 
 dri3/dri3.c  |   10 
 dri3/dri3.h  |2 
 dri3/dri3_request.c  |6 
 exa/exa.c|2 
 exa/exa.h|8 
 exa/exa_accel.c  |   20 
 exa/exa_glyphs.c |8 
 exa/exa_priv.h   |   19 
 exa/exa_render.c |4 
 exa/exa_unaccel.c|   13 
 fb/Makefile.am   |2 
 fb/fb.h  |  342 
 fb/fb24_32.c |2 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 .gitignore   |1 
 Xext/xres.c  |4 
 Xext/xselinux_hooks.c|4 
 Xi/exevents.c|   20 
 composite/compwindow.c   |1 
 config/10-quirks.conf|   16 
 config/config.c  |6 
 config/dbus-core.c   |4 
 configure.ac |   16 
 dix/devices.c|   12 
 dix/dixfonts.c   |2 
 dix/dixutils.c   |   25 
 dix/events.c |8 
 fb/fbpict.c  |2 
 fb/fbscreen.c|2 
 glamor/Makefile.am   |6 
 glamor/glamor.c  |   25 
 glamor/glamor.h  |3 
 glamor/glamor_context.h  |9 
 glamor/glamor_copyarea.c |   18 
 glamor/glamor_core.c |   11 
 glamor/glamor_egl.c  |   61 -
 glamor/glamor_fbo.c  |   42 
 glamor/glamor_fill.c |   13 
 glamor/glamor_font.c |7 
 glamor/glamor_getimage.c |   96 -
 glamor/glamor_glx.c  |   26 
 glamor/glamor_glyphblt.c |   10 
 glamor/glamor_glyphs.c   |3 
 glamor/glamor_gradient.c |   24 
 glamor/glamor_image.c|  180 +++
 glamor/glamor_pixmap.c   |   22 
 glamor/glamor_points.c   |5 
 glamor/glamor_priv.h |   31 
 glamor/glamor_putimage.c |  161 --
 glamor/glamor_rects.c|4 
 glamor/glamor_render.c   |   64 -
 glamor/glamor_segment.c  |   11 
 glamor/glamor_spans.c|   10 
 glamor/glamor_text.c |   46 
 glamor/glamor_tile.c |   13 
 glamor/glamor_transfer.c |6 
 glamor/glamor_trapezoid.c|   20 
 glamor/glamor_utils.h|   13 
 glamor/glamor_vbo.c  |   17 
 glamor/glamor_xv.c   |7 
 glx/glxcmds.c|   22 
 glx/glxdri2.c|  124 +-
 glx/glxdriswrast.c   |   10 
 glx/glxext.c |   48 
 glx/glxserver.h  |1 
 hw/dmx/config/xdmxconfig.c   |3 
 hw/dmx/dmxfont.c |2 
 hw/dmx/glxProxy/glxcmds.c|2 
 hw/kdrive/linux/linux.c  |7 
 hw/kdrive/src/kdrive.c   |9 
 hw/xfree86/.gitignore|1 
 hw/xfree86/common/compiler.h |   10 
 hw/xfree86/common/xf86Bus.c  |4 
 hw/xfree86/common/xf86Config.c   |   36 
 hw/xfree86/common/xf86Module.h   |2 
 hw/xfree86/common/xf86Xinput.c   |9 
 hw/xfree86/common/xf86platformBus.c  |3 
 hw/xfree86/dri/dri.c |   14 
 hw/xfree86/dri2/dri2.c   |   29 
 hw/xfree86/int10/stub.c  |2 
 hw/xfree86/int10/xf86x86emu.c|1 
 hw/xfree86/loader/loadmod.c  |6 
 hw/xfree86/man/Makefile.am   |2 
 hw/xfree86/man/Xorg.wrap.man |4 
 hw/xfree86/man/Xwrapper.config.man   |2 
 hw/xfree86/man/xorg.conf.man |   24 
 hw/xfree86/modes/xf86Crtc.h  |8 
 hw/xfree86/modes/xf86Cursors.c   |   56 
 hw/xfree86/modes/xf86RandR12.c   |7 
 hw/xfree86/os-support/linux/lnx_platform.c   |2 
 hw/xfree86/os-support/linux/lnx_video.c  |4 
 hw/xfree86/os-support/linux/systemd-logind.c |7 
 hw/xfree86/parser/Device.c   |6 
 hw/xfree86/parser/Layout.c   |6 
 hw/xfree86/parser/Screen.c   |6 
 hw/xfree86/parser/xf86Parser.h   |3 
 hw/xfree86/parser/xf86tokens.h   |1 
 hw/xfree86/ramdac/IBM.c  |4 
 hw/xfree86/ramdac/TI.c   |2 
 hw/xfree86/ramdac/xf86Cursor.h   |   36 
 hw/xfree86/ramdac/xf86HWCurs.c   |   14 
 hw/xfree86/shadowfb/shadow.c | 1592 +--
 hw/xfree86/xorg-wrapper.c|   75 -
 hw/xfree86/xorgconf.cpp  |2 
 hw/xquartz/X11Controller.m   |5 
 hw/xquartz/bundle/Info.plist.cpp 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Makefile.am  |   14 
 Xext/Makefile.am |4 
 Xext/dpmsproc.h  |4 
 Xext/geext.c |2 
 Xext/hashtable.c |   14 
 Xext/hashtable.h |8 
 Xext/panoramiX.c |   20 
 Xext/panoramiXprocs.c|  164 +-
 Xext/panoramiXsrv.h  |2 
 Xext/saver.c |   74 -
 Xext/security.c  |   34 
 Xext/shape.c |   46 
 Xext/shm.c   |   36 
 Xext/sleepuntil.c|   36 
 Xext/sleepuntil.h|4 
 Xext/sync.c  |   57 
 Xext/syncsrv.h   |6 
 Xext/xace.c  |6 
 Xext/xacestr.h   |4 
 Xext/xres.c  |   36 
 Xext/xselinux_ext.c  |8 
 Xext/xselinux_hooks.c|   32 
 Xext/xtest.c |2 
 Xext/xvdisp.c|   32 
 Xext/xvdix.h |2 
 Xext/xvmain.c|   28 
 Xext/xvmc.c  |   24 
 Xext/xvmcext.h   |   12 
 Xi/Makefile.am   |5 
 Xi/devbell.c |6 
 Xi/exevents.c|   36 
 Xi/extinit.c |2 
 Xi/grabdev.c |2 
 Xi/listdev.c |4 
 Xi/xibarriers.c  |4 
 Xi/xichangecursor.c  |2 
 Xi/xichangehierarchy.c   |4 
 Xi/xipassivegrab.c   |6 
 Xi/xiproperty.c  |8 
 composite/compalloc.c|2 
 composite/compext.c  |   39 
 composite/compinit.c |   26 
 composite/compint.h  |9 
 composite/compositeext.h |4 
 composite/compoverlay.c  |4 
 composite/compwindow.c   |   29 
 config/Makefile.am   |   26 
 config/config-backends.h |   35 
 config/config.c  |  130 +
 config/dbus-core.c   |   40 
 config/dbus.c|  407 -
 config/hal.c |   23 
 config/non-seat0.conf.multi-seat |   18 
 config/udev.c|   84 -
 config/xorg-server.conf  |   13 
 configure.ac |  223 ++-
 damageext/damageext.c|6 
 damageext/damageextint.h |2 
 dbe/dbe.c|   12 
 dbe/midbe.c  |4 
 dix/colormap.c   |   26 
 dix/cursor.c |   10 
 dix/devices.c|   45 
 dix/dispatch.c   |   90 -
 dix/dixfonts.c   |   90 -
 dix/dixutils.c   |   41 
 dix/events.c |   75 -
 dix/extension.c  |   14 
 dix/gc.c |   16 
 dix/getevents.c  |   13 
 dix/globals.c|   11 
 dix/glyphcurs.c  |2 
 dix/grabs.c  |   17 
 dix/inpututils.c |3 
 dix/main.c   |6 
 dix/pixmap.c |2 
 dix/privates.c   |6 
 dix/property.c   |4 
 dix/protocol.txt |   11 
 dix/resource.c   |   42 
 dix/touch.c  |2 
 dix/window.c |   34 
 dri3/dri3.h  |   14 
 dri3/dri3_event.c|6 
 dri3/dri3_request.c  |   42 
 dri3/dri3_screen.c   |   16 
 exa/exa.c|   14 
 exa/exa.h|6 
 exa/exa_accel.c  |1 
 exa/exa_classic.c|2 
 exa/exa_driver.c |4 
 exa/exa_glyphs.c |8 
 

xorg-server: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 Xext/sync.c |2 
 configure.ac|   37 
 exa/Makefile.am |4 -
 glx/glxdri2.c   |4 +
 hw/kdrive/ephyr/ephyr.c |9 +++-
 hw/kdrive/ephyr/hostx.c |4 -
 hw/kdrive/src/kdrive.c  |3 -
 hw/kdrive/src/kdrive.h  |1 
 hw/kdrive/src/kinput.c  |   10 ++--
 hw/xfree86/Makefile.am  |   11 
 hw/xfree86/modes/xf86Crtc.c |3 +
 hw/xnest/GCOps.c|1 
 include/input.h |   12 ++---
 mi/mieq.c   |2 
 miext/sync/Makefile.am  |3 -
 miext/sync/misync.h |2 
 miext/sync/misyncfd.c   |   99 
 miext/sync/misyncfd.h   |   45 
 miext/sync/misyncshm.c  |   21 ++---
 miext/sync/misyncshm.h  |2 
 present/present.c   |   52 +++
 present/present_event.c |2 
 present/present_fake.c  |2 
 present/present_fence.c |   29 
 present/present_priv.h  |   17 ++-
 present/present_screen.c|2 
 test/Makefile.am|4 -
 27 files changed, 304 insertions(+), 79 deletions(-)

New commits:
commit 80481267662c8687e73081237913fa561e7a6561
Author: Keith Packard kei...@keithp.com
Date:   Sat Nov 23 22:22:37 2013 -0800

Bump release to 1.14.99.903 (1.15 RC3)

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index 2f4edee..6c4a609 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.14.99.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2013-11-14
-RELEASE_NAME=English Breakfast
+AC_INIT([xorg-server], 1.14.99.903, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2013-11-23
+RELEASE_NAME=Apple Pie
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AC_USE_SYSTEM_EXTENSIONS

commit f1604002a32b7f098c2a16b4a8649c694af570c8
Author: Keith Packard kei...@keithp.com
Date:   Mon Nov 18 22:36:17 2013 -0800

miext: Ensure xshmfence is only called when driver supports it

This provides a place for drivers to insert their own FD-based
SyncFence implementations, and prevents applications from using DRI3
SyncFence creation functions unless the driver has some support for
them.

Signed-off-by: Keith Packard kei...@keithp.com
Tested-by: Fredrik Höglund fred...@kde.org

diff --git a/miext/sync/Makefile.am b/miext/sync/Makefile.am
index ac13c52..34961d5 100644
--- a/miext/sync/Makefile.am
+++ b/miext/sync/Makefile.am
@@ -5,7 +5,7 @@ AM_CFLAGS = $(DIX_CFLAGS)
 AM_CPPFLAGS = 
 
 if XORG
-sdk_HEADERS = misync.h misyncstr.h misyncshm.h
+sdk_HEADERS = misync.h misyncstr.h misyncshm.h misyncfd.h
 endif
 
 XSHMFENCE_SRCS = misyncshm.c
@@ -13,6 +13,7 @@ XSHMFENCE_SRCS = misyncshm.c
 libsync_la_SOURCES =   \
misync.c\
misync.h\
+   misyncfd.c  \
misyncstr.h
 
 if XSHMFENCE
diff --git a/miext/sync/misync.h b/miext/sync/misync.h
index f63ec2b..dc78c5f 100644
--- a/miext/sync/misync.h
+++ b/miext/sync/misync.h
@@ -42,8 +42,8 @@ typedef struct _syncScreenFuncs {
 SyncScreenDestroyFenceFunc DestroyFence;
 } SyncScreenFuncsRec, *SyncScreenFuncsPtr;
 
-extern _X_EXPORT void
 
+extern _X_EXPORT void
 miSyncScreenCreateFence(ScreenPtr pScreen, SyncFence * pFence,
 Bool initially_triggered);
 extern _X_EXPORT void
diff --git a/miext/sync/misyncfd.c b/miext/sync/misyncfd.c
new file mode 100644
index 000..93ff85f
--- /dev/null
+++ b/miext/sync/misyncfd.c
@@ -0,0 +1,99 @@
+/*
+ * Copyright © 2013 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided as
+ * is without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit 8db4121a3c7104548fd4a138ac1d1bdea5fd22d9
Author: Keith Packard kei...@keithp.com
Date:   Fri Oct 18 17:31:01 2013 -0700

Update to version 1.14.99.3

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index 67ef3c2..7b4e70f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.14.99.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2013-10-04
-RELEASE_NAME=Chicory Coffee
+AC_INIT([xorg-server], 1.14.99.3, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2013-10-18
+RELEASE_NAME=Bundaberg
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 

commit 2523a445a09a75a8baf642608d099a5e12d5437f
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Thu Oct 17 12:02:27 2013 +1000

sync: split updating and triggering a counter up

Now that the brackets are always the nearest change points (regardless of
transition) we need to update the counters whenever we check for any 
updates.

Otherwise we end up with a situation where counter-value is out of date and
an alarm doesn't trigger because we're still using the value from last time
something actually triggered.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Adam Jackson a...@redhat.com
Reviewed-by: Keith Packard kei...@keithp.com

diff --git a/Xext/sync.c b/Xext/sync.c
index ad3dec2..b2ee92e 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -699,6 +699,14 @@ SyncAwaitTriggerFired(SyncTrigger * pTrigger)
 FreeResource(pAwaitUnion-header.delete_id, RT_NONE);
 }
 
+static CARD64
+SyncUpdateCounter(SyncCounter *pCounter, CARD64 newval)
+{
+CARD64 oldval = pCounter-value;
+pCounter-value = newval;
+return oldval;
+}
+
 /*  This function should always be used to change a counter's value so that
  *  any triggers depending on the counter will be checked.
  */
@@ -708,8 +716,7 @@ SyncChangeCounter(SyncCounter * pCounter, CARD64 newval)
 SyncTriggerList *ptl, *pnext;
 CARD64 oldval;
 
-oldval = pCounter-value;
-pCounter-value = newval;
+oldval = SyncUpdateCounter(pCounter, newval);
 
 /* run through triggers to see if any become true */
 for (ptl = pCounter-sync.pTriglist; ptl; ptl = pnext) {
@@ -2712,6 +2719,8 @@ IdleTimeCheckBrackets(SyncCounter *counter, XSyncValue 
idle, XSyncValue *less, X
 (less  XSyncValueLessOrEqual(idle, *less))) {
 SyncChangeCounter(counter, idle);
 }
+else
+SyncUpdateCounter(counter, idle);
 }
 
 static void

commit e57ec99b03b2ad840c384a97ab2766ce9da0f5cc
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed Oct 16 16:31:15 2013 +1000

sync: always set the brackets (#59644)

The current code sets bracket_greater to the first trigger after the current
value, and bracket_less to the last trigger before the current value.

For example, the idle timer with three negative and three positive 
transitions
would set this:

 nt1   nt2 nt3
||--|--|--- idle --|---|--|- t
   pt1pt2pt3
bracket_less == nt2
bracket_greater == pt2

This is an optimization so we can skip code paths in the block/wakeup 
handlers
if the current value doesn't meet any of the trigger requirements. Those
handlers largely do a
   if (bracket_less is less than current value 
   bracket_greater is greater than current value)
return, nothing to do

However, unless the bracket values are updated at the correct time, the
following may happen:

  nt
|--|-- idle --| t
   pt

In this case, neither bracket is set, we're past the pos transition and not
yet at the neg transition. idle may now go past nt, but the brackets are not
updated. If idle is then reset to 0, no alarm is triggered for nt. Likewise,
idle may now go past pt and no alarm is triggered.

Changing an alarm or triggering an alarm will re-calculate the brackets, so
this bug is somewhat random. If any other client triggers an alarm when the
brackets are wrongly NULL, the recalculation will set them this bug may not
appear.

This patch changes the behavior, so that the brackets are always the nearest
positive or negative transitions to the current counter value. In the 
example
above, nt will trigger a wakeup and a re-calculation of the brackets, so 
that
going past it in the negative direction will then cause the proper alarm
triggers.

Or, in Keith's words:

  Timer currently past a positive trigger
  No bracket 

xorg-server: Changes to 'upstream-experimental'

[Michele Cane]

 Xi/xiqueryversion.c|   53 ++--
 configure.ac   |6 +--
 dix/getevents.c|2 -
 dix/touch.c|3 -
 hw/kdrive/src/kinput.c |2 -
 include/inputstr.h |2 -
 test/xi2/protocol-xiqueryversion.c |   60 ++---
 7 files changed, 74 insertions(+), 54 deletions(-)

New commits:
commit 9acb64f54ee9dd2fe41afda159b919280850ad8e
Author: Matt Dew mar...@osource.org
Date:   Thu Sep 12 21:17:40 2013 -0600

bump version from 1.14.2.902 to 1.14.3

diff --git a/configure.ac b/configure.ac
index 68484db..9bc7c73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.14.2.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2013-08-22
-RELEASE_NAME=Act semi-normal-rc2
+AC_INIT([xorg-server], 1.14.3, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2013-09-12
+RELEASE_NAME=September Rain
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 

commit af1c57152e10cfa55843e6330cffc6a3c8c517d3
Author: Chris Clayton chris2...@googlemail.com
Date:   Wed Sep 4 15:42:04 2013 +1000

kdrive: fix build error on gcc 4.8 for out-of-bounds array access

I'm getting a error building xorg-server-1.14.1.902 with thelatest snapshot
of gcc-4.8:

input.c:225:43: error: array subscript is above array bounds
[-Werror=array-bounds]

This is because kdNumInputFds can become equal to KD_MAX_INPUT_FDS in
KdRegisterFd(). This means that in KdUnregisterFd(), kdInputFds[j + 1] can
be beyond the end of the array.

Signed-off-by: Chris Clayton chris2...@googlemail.com
Reviewed-by: Keith Packard kei...@keithp.com
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index b1068bb..09aae44 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -221,7 +221,7 @@ KdUnregisterFd(void *closure, int fd, Bool do_close)
 if (do_close)
 close(kdInputFds[i].fd);
 kdNumInputFds--;
-for (j = i; j  kdNumInputFds; j++)
+for (j = i; j  (kdNumInputFds - 1); j++)
 kdInputFds[j] = kdInputFds[j + 1];
 break;
 }

commit 0e37fefea5e91dfdcd18ffd941daa7d05cc3180d
Author: Matt Dew mar...@osource.org
Date:   Thu Aug 22 17:43:51 2013 -0600

bump rev number from 1.14.2.901 to 1.14.2.902

diff --git a/configure.ac b/configure.ac
index 271e49d..68484db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.14.2.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2013-07-25
-RELEASE_NAME=Act semi-normal-rc1
+AC_INIT([xorg-server], 1.14.2.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2013-08-22
+RELEASE_NAME=Act semi-normal-rc2
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 

commit 917c11ff97eb302d3c2d0565c8dd6d93101d6466
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date:   Tue Jul 30 15:31:24 2013 +0200

test/xi2: fix protocol-xiqueryversion test

The old code was broken and allowed setting client version = XIVersion,
this was fixed in the previous patch, but updating the value for XIVersion
broke the tests, so fix the tests too.

Signed-off-by: Maarten Lankhorst maarten.lankho...@canonical.com
Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit b6e5c4669e0db391966deb397e8c975ec7f0124d)

diff --git a/test/xi2/protocol-xiqueryversion.c 
b/test/xi2/protocol-xiqueryversion.c
index aff0237..ed75c89 100644
--- a/test/xi2/protocol-xiqueryversion.c
+++ b/test/xi2/protocol-xiqueryversion.c
@@ -44,8 +44,8 @@
 #include extinit.h/* for XInputExtensionInit */
 #include scrnintstr.h
 #include xiqueryversion.h
-
 #include protocol-common.h
+#include exglobals.h
 
 extern XExtensionVersion XIVersion;
 
@@ -54,8 +54,8 @@ struct test_data {
 int minor_client;
 int major_server;
 int minor_server;
-int major_cached;
-int minor_cached;
+int major_expected;
+int minor_expected;
 };
 
 static void
@@ -93,13 +93,8 @@ reply_XIQueryVersion_multiple(ClientPtr client, int len, 
char *data, void *closu
 reply_check_defaults(rep, len, XIQueryVersion);
 assert(rep-length == 0);
 
-if (versions-major_cached == -1) {
-versions-major_cached = rep-major_version;
-versions-minor_cached = rep-minor_version;
-}
-
-assert(versions-major_cached == rep-major_version);
-  

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Xext/saver.c|8 -
 Xi/exevents.c   |  155 +++-
 Xi/ungrdevb.c   |2 
 Xi/ungrdevk.c   |2 
 Xi/xipassivegrab.c  |2 
 configure.ac|6 -
 dix/cursor.c|   29 ++
 dix/devices.c   |4 
 dix/dispatch.c  |3 
 dix/events.c|  101 ---
 dix/grabs.c |   21 ++--
 dix/main.c  |3 
 dix/pixmap.c|2 
 dix/touch.c |  114 ++
 dix/window.c|   15 +--
 fb/fbpixmap.c   |1 
 glx/glxdri.c|2 
 hw/xfree86/common/xf86platformBus.c |8 +
 hw/xfree86/modes/xf86Crtc.c |   34 +--
 hw/xfree86/modes/xf86Cursors.c  |4 
 hw/xfree86/ramdac/xf86Cursor.c  |   28 +++---
 include/cursor.h|4 
 include/dixgrabs.h  |2 
 include/eventstr.h  |1 
 include/input.h |2 
 include/inputstr.h  |2 
 render/animcur.c|3 
 xfixes/cursor.c |6 -
 28 files changed, 359 insertions(+), 205 deletions(-)

New commits:
commit 4ebd618bc5ef71507e708e7191091828eca3a7e8
Author: Matt Dew mar...@osource.org
Date:   Thu Jul 25 22:24:00 2013 -0600

Bah, bad rev number. Fixed:  changed 1.14.3-rc1 to 1.14.2.901

diff --git a/configure.ac b/configure.ac
index 8738813..271e49d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.14.3-rc1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.14.2.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 RELEASE_DATE=2013-07-25
 RELEASE_NAME=Act semi-normal-rc1
 AC_CONFIG_SRCDIR([Makefile.am])

commit fef66ffe7a7e899a9126a1e431b94d881163b00d
Author: Matt Dew mar...@osource.org
Date:   Thu Jul 25 22:02:26 2013 -0600

bump rev from 1.14.2 to 1.14.3-rc1

diff --git a/configure.ac b/configure.ac
index 99e3cd6..8738813 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.14.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2013-06-25
-RELEASE_NAME=Act Abnormal
+AC_INIT([xorg-server], 1.14.3-rc1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2013-07-25
+RELEASE_NAME=Act semi-normal-rc1
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 

commit 2cd62dc02b67c70d2417b2ccd307ead9596a2967
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Mar 1 08:43:58 2013 +1000

Xi: return !Success from DeliverTouchEmulatedEvent if we didn't deliver

All callers currently ignore the new value, so this patch has no effect.
Inverse call graph:

DeliverTouchEmulatedEvent
DeliverEmulatedMotionEvent  Ignores value
DeliverTouchBeginEvent
DeliverTouchEvent
DeliverTouchEvents  Ignores value
DeliverTouchEndEvent
DeliverTouchEvent
DeliverTouchEvents  Ignores value

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Keith Packard kei...@keithp.com
(cherry picked from commit 9978b57b8d94f061d72a67b99a02b0ba16a11429)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 91281ae..067e6b3 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1373,7 +1373,7 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, 
TouchPointInfoPtr ti,
 
 /* We don't deliver pointer events to non-owners */
 if (!TouchResourceIsOwner(ti, listener-listener))
-return Success;
+return !Success;
 
 nevents = TouchConvertToPointerEvent(ev, motion, button);
 BUG_RETURN_VAL(nevents == 0, BadValue);
@@ -1395,7 +1395,7 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, 
TouchPointInfoPtr ti,
 /* 'grab' is the passive grab, but if the grab isn't active,
  * don't deliver */
 if (!dev-deviceGrab.grab)
-return Success;
+return !Success;
 
 if (grab-ownerEvents) {
 WindowPtr focus = NullWindow;

commit c203568905bcbb65fb1e079b626d2c1e90ecb72d
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon May 13 15:22:12 2013 +1000

Xi: fix warning - remove unused 'rc'

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit fd5ea0237db6d725a48f76b706135df9d3246b82)

diff 

xorg-server: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 Xi/devbell.c   |3 
 Xi/exevents.c  |   42 +-
 Xi/extinit.c   |   36 -
 Xi/xigrabdev.c |   15 +++
 configure.ac   |   14 ++-
 dix/devices.c  |7 +
 dix/eventconvert.c |   23 ++---
 dix/getevents.c|   15 ++-
 dix/touch.c|4 -
 glx/glxdri.c   |2 
 glx/glxdri2.c  |2 
 hw/kdrive/ephyr/ephyr.c|6 -
 hw/kdrive/ephyr/hostx.c|6 +
 hw/kdrive/ephyr/hostx.h|3 
 hw/xfree86/common/xf86.h   |1 
 hw/xfree86/common/xf86Events.c |   17 
 hw/xfree86/common/xf86Init.c   |2 
 hw/xfree86/common/xf86Xinput.c |2 
 hw/xfree86/common/xf86platformBus.c|   19 
 hw/xfree86/common/xf86platformBus.h|4 +
 hw/xfree86/modes/xf86Crtc.c|5 -
 hw/xfree86/os-support/linux/lnx_platform.c |   48 ++--
 hw/xfree86/os-support/solaris/sun_init.c   |2 
 hw/xfree86/os-support/xf86_OSproc.h|3 
 include/dixstruct.h|2 
 include/eventstr.h |1 
 include/hotplug.h  |1 
 os/io.c|1 
 os/log.c   |  115 ++---
 test/signal-logging.c  |   95 +--
 xkb/xkbInit.c  |3 
 31 files changed, 393 insertions(+), 106 deletions(-)

New commits:
commit 2767d9a17d62aede7cabac589c3388078bdb6022
Author: Matt Dew mar...@osource.org
Date:   Tue Jun 25 09:49:08 2013 -0600

Bump rev from  1.14.1.902  to 1.14.2

diff --git a/configure.ac b/configure.ac
index b977b54..99e3cd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.14.1.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2013-06-13
-RELEASE_NAME=Act rc2-Normal
+AC_INIT([xorg-server], 1.14.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2013-06-25
+RELEASE_NAME=Act Abnormal
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 

commit 7dec1d38799d82923e3241f73c83aa1ad357f72b
Author: Matt Dew mar...@osource.org
Date:   Fri Jun 21 10:24:16 2013 -0600

Revert dix: pre-scale x by the screen:device:resolution ratio

This reverts commit 14d89b9a466b521b985bc95fc4994637367362a8.

diff --git a/dix/getevents.c b/dix/getevents.c
index 51d4fd4..dfe4652 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -770,29 +770,6 @@ add_to_scroll_valuator(DeviceIntPtr dev, ValuatorMask 
*mask, int valuator, doubl
 }
 
 
-static void
-scale_for_device_resolution(DeviceIntPtr dev, ValuatorMask *mask)
-{
-double x;
-ValuatorClassPtr v = dev-valuator;
-int xrange = v-axes[0].max_value - v-axes[0].min_value + 1;
-int yrange = v-axes[1].max_value - v-axes[1].min_value + 1;
-
-double screen_ratio = 1.0 * screenInfo.width/screenInfo.height;
-double device_ratio = 1.0 * xrange/yrange;
-double resolution_ratio = 1.0;
-double ratio;
-
-if (!valuator_mask_fetch_double(mask, 0, x))
-return;
-
-if (v-axes[0].resolution != 0  v-axes[1].resolution != 0)
-resolution_ratio = 1.0 * v-axes[0].resolution/v-axes[1].resolution;
-
-ratio = device_ratio/resolution_ratio/screen_ratio;
-valuator_mask_set_double(mask, 0, x * ratio);
-}
-
 /**
  * Move the device's pointer by the values given in @valuators.
  *
@@ -804,14 +781,27 @@ moveRelative(DeviceIntPtr dev, int flags, ValuatorMask 
*mask)
 {
 int i;
 Bool clip_xy = IsMaster(dev) || !IsFloating(dev);
-ValuatorClassPtr v = dev-valuator;
 
 /* for abs devices in relative mode, we've just scaled wrong, since we
mapped the device's shape into the screen shape. Undo this. */
-if ((flags  POINTER_ABSOLUTE) == 0  v  v-numAxes  1 
-v-axes[0].min_value  v-axes[0].max_value 
-v-axes[1].min_value  v-axes[1].max_value) {
-scale_for_device_resolution(dev, mask);
+if ((flags  POINTER_ABSOLUTE) == 0  dev-valuator 
+dev-valuator-axes[0].min_value  dev-valuator-axes[0].max_value) {
+
+double ratio = 1.0 * screenInfo.width/screenInfo.height;
+
+if (ratio  1.0) {
+double y;
+if (valuator_mask_fetch_double(mask, 1, y)) {
+y *= ratio;
+valuator_mask_set_double(mask, 1, y);
+}
+} else {
+double x;
+if (valuator_mask_fetch_double(mask, 0, x)) {
+x *= ratio;
+ 

xorg-server: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Xi/exevents.c|1 +
 configure.ac |8 
 dix/touch.c  |3 ++-
 hw/xfree86/os-support/shared/posix_tty.c |3 ++-
 include/list.h   |2 +-
 xfixes/xfixesint.h   |2 ++
 6 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit f5796f98dadccf67c04f601178966614dd51a1b4
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed Apr 17 16:12:00 2013 +1000

xserver 1.14.1

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 44982b3..4289863 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.14.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2013-03-05
-RELEASE_NAME=Keemun Mao Feng
+AC_INIT([xorg-server], 1.14.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2013-04-17
+RELEASE_NAME=Act Normal
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 

commit aac2d9d09c73fa2b9d02d8446718aa6ccd7e894a
Author: Dave Airlie airl...@gmail.com
Date:   Wed Apr 10 16:09:01 2013 +1000

xf86: fix flush input to work with Linux evdev devices.

So when we VT switch back and attempt to flush the input devices,
we don't succeed because evdev won't return part of an event,
since we were only asking for 4 bytes, we'd only get -EINVAL back.

This could later cause events to be flushed that we shouldn't have
gotten.

This is a fix for CVE-2013-1940.

Signed-off-by: Dave Airlie airl...@redhat.com
Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f)

diff --git a/hw/xfree86/os-support/shared/posix_tty.c 
b/hw/xfree86/os-support/shared/posix_tty.c
index ab3757a..4d08c1e 100644
--- a/hw/xfree86/os-support/shared/posix_tty.c
+++ b/hw/xfree86/os-support/shared/posix_tty.c
@@ -421,7 +421,8 @@ xf86FlushInput(int fd)
 {
 fd_set fds;
 struct timeval timeout;
-char c[4];
+/* this needs to be big enough to flush an evdev event. */
+char c[256];
 
 DebugF(FlushingSerial\n);
 if (tcflush(fd, TCIFLUSH) == 0)

commit 2eec013569f6daa952482ac5d9db8acc71fe01aa
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Feb 25 11:13:52 2013 +1000

dix: fix a comment

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Keith Packard kei...@keithp.com
(cherry picked from commit 11bead1fa205a1353e6a33c6024c7e8ace80be7c)

diff --git a/dix/touch.c b/dix/touch.c
index 0db842c..891cc78 100644
--- a/dix/touch.c
+++ b/dix/touch.c
@@ -902,7 +902,8 @@ TouchSetupListeners(DeviceIntPtr dev, TouchPointInfoPtr ti, 
InternalEvent *ev)
 }
 
 /**
- * Remove the touch pointer grab from the device. Called from AllowSome()
+ * Remove the touch pointer grab from the device. Called from
+ * DeactivatePointerGrab()
  */
 void
 TouchRemovePointerGrab(DeviceIntPtr dev)

commit bce06afc99ce1d948f9002e0c5c7bc29d66425da
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Thu Feb 28 10:43:05 2013 +1000

Xi: add a comment to make a condition a bit clearer

The commit message to 676447190190d8546165e21be242cf16dd69f5ae explains it,
but that doesn't stop the WTF moment when reading the code.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Keith Packard kei...@keithp.com
(cherry picked from commit 2967391c6d35f03121afa8003e0fb94b62495129)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 609b126..f05e03d 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1896,6 +1896,7 @@ DeliverTouchEndEvent(DeviceIntPtr dev, TouchPointInfoPtr 
ti, InternalEvent *ev,
 goto out;
 }
 
+/* A client is waiting for the begin, don't give it a TouchEnd */
 if (listener-state == LISTENER_AWAITING_BEGIN) {
 listener-state = LISTENER_HAS_END;
 goto out;

commit 8e16c2e3038c1c17cae73d8d9681dccce0fd402a
Author: Robert Morell rmor...@nvidia.com
Date:   Tue Mar 12 09:40:16 2013 -0700

list.h: Make xorg_list_init inline

Otherwise this file is emitted in every unit that includes it.

Signed-off-by: Robert Morell rmor...@nvidia.com
Reviewed-by: Jamey Sharp ja...@minilop.net
Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit 7050aae69c2a55dfdbb5c6af7882307e90ba4275)

diff --git a/include/list.h b/include/list.h
index 067c679..11de7c5 100644
--- a/include/list.h
+++ b/include/list.h
@@ -119,7 +119,7 @@ struct xorg_list {
  *
  * @param The list to initialized.
  */
-static void
+static inline void
 xorg_list_init(struct 

xorg-server: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 Xi/xibarriers.c |9 ---
 configure.ac|6 ++--
 hw/xfree86/common/xf86DPMS.c|   45 
 hw/xfree86/common/xf86platformBus.c |7 -
 hw/xfree86/modes/xf86Crtc.c |   18 --
 hw/xfree86/modes/xf86RandR12.c  |   22 +
 hw/xquartz/GL/capabilities.c|4 +++
 m4/xorg-tls.m4  |2 -
 os/log.c|3 ++
 os/strndup.c|4 +++
 randr/randrstr.h|6 
 randr/rrprovider.c  |2 +
 test/signal-logging.c   |8 ++
 13 files changed, 102 insertions(+), 34 deletions(-)

New commits:
commit 103b77c59e3638a45179bf6d7908f5c738d2d872
Author: Keith Packard kei...@keithp.com
Date:   Tue Mar 5 22:31:17 2013 -0800

Version bumped to 1.14

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index 53335b1..6e1ff65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.13.99.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2013-02-12
-RELEASE_NAME=Ginger Beer
+AC_INIT([xorg-server], 1.14.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2013-03-05
+RELEASE_NAME=Keemun Mao Feng
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 

commit 6238bd68bd71323f8b4f1808f34dabe2ae447fe3
Author: Aaron Plattner aplatt...@nvidia.com
Date:   Tue Mar 5 13:04:46 2013 -0800

DPMS: include GPU screens in DPMS code

Otherwise, displays driven by GPU screens remain on all the time.

Signed-off-by: Aaron Plattner aplatt...@nvidia.com
Reviewed-by: Alex Deucher alexander.deuc...@amd.com
Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index ef4a2c1..3f1e142 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -130,6 +130,19 @@ DPMSClose(ScreenPtr pScreen)
 return pScreen-CloseScreen(pScreen);
 }
 
+static void
+DPMSSetScreen(ScrnInfoPtr pScrn, int level)
+{
+ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
+DPMSPtr pDPMS = dixLookupPrivate(pScreen-devPrivates, DPMSKey);
+
+if (pDPMS  pScrn-DPMSSet  pDPMS-Enabled  pScrn-vtSema) {
+xf86VGAarbiterLock(pScrn);
+pScrn-DPMSSet(pScrn, level, 0);
+xf86VGAarbiterUnlock(pScrn);
+}
+}
+
 /*
  * DPMSSet --
  * Device dependent DPMS mode setting hook.  This is called whenever
@@ -139,8 +152,6 @@ int
 DPMSSet(ClientPtr client, int level)
 {
 int rc, i;
-DPMSPtr pDPMS;
-ScrnInfoPtr pScrn;
 
 DPMSPowerLevel = level;
 
@@ -155,17 +166,23 @@ DPMSSet(ClientPtr client, int level)
 
 /* For each screen, set the DPMS level */
 for (i = 0; i  xf86NumScreens; i++) {
-pScrn = xf86Screens[i];
-pDPMS = dixLookupPrivate(screenInfo.screens[i]-devPrivates, DPMSKey);
-if (pDPMS  pScrn-DPMSSet  pDPMS-Enabled  pScrn-vtSema) {
-xf86VGAarbiterLock(pScrn);
-pScrn-DPMSSet(pScrn, level, 0);
-xf86VGAarbiterUnlock(pScrn);
-}
+DPMSSetScreen(xf86Screens[i], level);
+}
+for (i = 0; i  xf86NumGPUScreens; i++) {
+DPMSSetScreen(xf86GPUScreens[i], level);
 }
 return Success;
 }
 
+static Bool
+DPMSSupportedOnScreen(ScrnInfoPtr pScrn)
+{
+ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
+DPMSPtr pDPMS = dixLookupPrivate(pScreen-devPrivates, DPMSKey);
+
+return pDPMS  pScrn-DPMSSet;
+}
+
 /*
  * DPMSSupported --
  * Return TRUE if any screen supports DPMS.
@@ -174,8 +191,6 @@ Bool
 DPMSSupported(void)
 {
 int i;
-DPMSPtr pDPMS;
-ScrnInfoPtr pScrn;
 
 if (DPMSKey == NULL) {
 return FALSE;
@@ -183,9 +198,11 @@ DPMSSupported(void)
 
 /* For each screen, check if DPMS is supported */
 for (i = 0; i  xf86NumScreens; i++) {
-pScrn = xf86Screens[i];
-pDPMS = dixLookupPrivate(screenInfo.screens[i]-devPrivates, DPMSKey);
-if (pDPMS  pScrn-DPMSSet)
+if (DPMSSupportedOnScreen(xf86Screens[i]))
+return TRUE;
+}
+for (i = 0; i  xf86NumGPUScreens; i++) {
+if (DPMSSupportedOnScreen(xf86GPUScreens[i]))
 return TRUE;
 }
 return FALSE;

commit dd4ab8b572956f9457616869d6e383c8ed964c73
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue Mar 5 10:14:29 2013 +1000

Xi: force dtime to 0 on the first BarrierHit

dtime to the previous event is 0 on the first BarrierHit event.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Jasper St. Pierre jstpie...@mecheye.net
Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index 

xorg-server: Changes to 'upstream-experimental'

[Timo Aaltonen]

 Xext/xtest.c   |   17 +-
 Xi/exevents.c  |2 
 configure.ac   |6 
 dix/devices.c  |   46 ++-
 dix/events.c   |6 
 dix/getevents.c|   75 ++--
 dix/ptrveloc.c |   38 +++---
 hw/dmx/config/xdmxconfig.c |3 
 hw/xfree86/common/xf86Events.c |4 
 hw/xfree86/common/xf86Module.h |2 
 hw/xfree86/common/xf86pciBus.c |   64 +-
 hw/xfree86/man/xorg.conf.man   |   11 -
 hw/xfree86/os-support/linux/lnx_acpi.c |9 -
 include/input.h|3 
 include/inputstr.h |8 -
 include/list.h |2 
 include/misc.h |1 
 include/protocol-versions.h|2 
 os/log.c   |   21 ++-
 os/utils.c |   32 +
 randr/randrstr.h   |2 
 randr/rrcrtc.c |5 
 test/signal-logging.c  |  200 -
 xkb/xkbActions.c   |  147 ++--
 24 files changed, 468 insertions(+), 238 deletions(-)

New commits:
commit 955d434f4d755d00a24ae4068b9957765989d672
Author: Keith Packard kei...@keithp.com
Date:   Wed Feb 13 21:39:37 2013 -0800

Update to version 1.3.99.902 (1.14 RC2)

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index 435a38f..53335b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.13.99.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2012-12-19
-RELEASE_NAME=Egg Nog
+AC_INIT([xorg-server], 1.13.99.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2013-02-12
+RELEASE_NAME=Ginger Beer
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 

commit 7115f6c709898a5124b67e19c61dc01334471358
Author: Aaron Plattner aplatt...@nvidia.com
Date:   Wed Jan 23 16:58:47 2013 -0800

randr: unref the provider shared pixmap the appropriate number of times

When an RandR shared pixmap is created in rrCreateSharedPixmap, it has a 
refcnt
of 1.  Then, PixmapShareToSlave bumps the refcnt to 2.  However, there's no
corresponding PixmapUnshareFromSlave where the refcnt can be decreased 
again,
and there's no convenient common place where the refcnt can be decremented 
when
the slave pixmap is destroyed.

Fix this by just unreffing the pixmap twice in RRCrtcDetachScanoutPixmap.

Signed-off-by: Aaron Plattner aplatt...@nvidia.com
Reviewed-by: Dave Airlie airl...@redhat.com
Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index e82d050..6e2eca5 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -372,6 +372,11 @@ RRCrtcDetachScanoutPixmap(RRCrtcPtr crtc)
 ret = pScrPriv-rrCrtcSetScanoutPixmap(crtc, NULL);
 if (crtc-scanout_pixmap) {
 master-StopPixmapTracking(mscreenpix, crtc-scanout_pixmap);
+/*
+ * Unref the pixmap twice: once for the original reference, and once
+ * for the reference implicitly added by PixmapShareToSlave.
+ */
+master-DestroyPixmap(crtc-scanout_pixmap-master_pixmap);
 master-DestroyPixmap(crtc-scanout_pixmap-master_pixmap);
 crtc-pScreen-DestroyPixmap(crtc-scanout_pixmap);
 }

commit da92690107d90061205340d4cdc98b73b59db9b2
Author: Aaron Plattner aplatt...@nvidia.com
Date:   Mon Feb 11 14:31:56 2013 -0800

xf86: use nt_list_for_each_entry_safe to walk InputHandlers in xf86Wakeup

This is necessary when the input handler deletes itself from the
list. Bug found by Maarten Lankhorst, this patch uses the list macros
instead of open-coding the fix.

Signed-off-by: Keith Packard kei...@keithp.com
Reviewed-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 377e936..d92174e 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -272,9 +272,9 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask)
 }
 
 if (err = 0) { /* we don't want the handlers called if 
select() */
-IHPtr ih;   /* returned with an error condition, do we?
  */
+IHPtr ih, ih_tmp;   /* returned with an error condition, do we?
  */
 
-for (ih = InputHandlers; ih; ih = ih-next) {
+nt_list_for_each_entry_safe(ih, ih_tmp, InputHandlers, next) {
 if (ih-enabled  ih-fd = 0  ih-ihproc 
 (FD_ISSET(ih-fd, ((fd_set *) pReadmask)) != 0)) {
 

xorg-server: Changes to 'upstream-experimental'

[Maarten Lankhorst]

Rebased ref, commits from common ancestor:
commit 6703a7c7cf1a349c137e247a0c8eb462ff7b07be
Author: Keith Packard kei...@keithp.com
Date:   Tue Jan 8 20:24:32 2013 -0800

hw/xfree86: Require only one working CRTC to start the server.

Instead of requiring every mode set to complete successfully, start up
as long as at least one CRTC is working. This avoids failures when one
or more CRTCs can't start due to mode setting conflicts.

Signed-off-by: Keith Packard kei...@keithp.com
Reviewed-by: Dave Airlie airl...@redhat.com

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 13251cf..b3ded5a 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2605,6 +2605,7 @@ xf86SetDesiredModes(ScrnInfoPtr scrn)
 xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
 xf86CrtcPtr crtc = config-crtc[0];
 int c;
+int enabled = 0;
 
 /* A driver with this hook will take care of this */
 if (!crtc-funcs-set_mode_major) {
@@ -2655,14 +2656,20 @@ xf86SetDesiredModes(ScrnInfoPtr scrn)
 transform = crtc-desiredTransform;
 else
 transform = NULL;
-if (!xf86CrtcSetModeTransform
+if (xf86CrtcSetModeTransform
 (crtc, crtc-desiredMode, crtc-desiredRotation, transform,
- crtc-desiredX, crtc-desiredY))
-return FALSE;
+ crtc-desiredX, crtc-desiredY)) {
+++enabled;
+} else {
+for (o = 0; o  config-num_output; o++)
+if (config-output[o]-crtc == crtc)
+config-output[o]-crtc = NULL;
+crtc-enabled = FALSE;
+   }
 }
 
 xf86DisableUnusedFunctions(scrn);
-return TRUE;
+return enabled != 0;
 }
 
 /**

commit 8b328d4ee3873bc0a7a34f2cb9d301827244b98c
Author: Aaron Plattner aplatt...@nvidia.com
Date:   Fri Dec 21 07:37:33 2012 -0800

dix: Make small bitfields that store enums unsigned

Commit 31bf81772e146af79b0c456aae2159eba8b0280f changed the clientState 
field
from a signed int to a signed int 2-bit bitfield.  The ClientState enum 
that is
expected to be assigned to this field has four values: ClientStateInitial 
(0),
ClientStateRunning (1), ClientStateRetained (2), and ClientStateGone (3).
However, because this bitfield is signed, ClientStateRetained becomes -2 
when
assigned, and ClientStateGone becomes -1.  This causes warnings:

 test.c:54:10: error: case label value exceeds maximum value for type 
[-Werror]
 test.c:55:10: error: case label value exceeds maximum value for type 
[-Werror]

The code here is a switch statement:

 53 switch (client-clientState) {
 54 case ClientStateGone:
 55 case ClientStateRetained:
 56 [...]
 57 break;
 58
 59 default:
 60 [...]
 61 break;
 62 }

It also causes bizarre problems like this:

 client-clientState = ClientStateGone;
 assert(client-clientState == ClientStateGone); // this assert fails

Also change the signedness of nearby bitfields to match.

Signed-off-by: Aaron Plattner aplatt...@nvidia.com
Reviewed-by: Alex Deucher alexander.deuc...@amd.com
Reviewed-by:  Colin Harrison colin.harrison at virgin.net
Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/include/dixstruct.h b/include/dixstruct.h
index c1236f5..6784819 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -90,12 +90,12 @@ typedef struct _Client {
 Mask clientAsMask;
 short index;
 unsigned char majorOp, minorOp;
-int swapped:1;
-int local:1;
-int big_requests:1;  /* supports large requests */
-int clientGone:1;
-int closeDownMode:2;
-int clientState:2;
+unsigned int swapped:1;
+unsigned int local:1;
+unsigned int big_requests:1; /* supports large requests */
+unsigned int clientGone:1;
+unsigned int closeDownMode:2;
+unsigned int clientState:2;
 char smart_priority;
 short noClientException;  /* this client died or needs to be killed */
 int priority;

commit bd91b05b631f13afd1f7a9d6cbc4f0c5408b523a
Author: Keith Packard kei...@keithp.com
Date:   Wed Dec 19 12:47:35 2012 -0800

Update to version 1.13.99.901 (1.14 RC1)

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index ee0fa78..435a38f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.13.99.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2012-10-04
-RELEASE_NAME=Horchata
+AC_INIT([xorg-server], 1.13.99.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2012-12-19
+RELEASE_NAME=Egg Nog
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign 

xorg-server: Changes to 'upstream-experimental'

[Timo Aaltonen]

 configure.ac   |6 +++---
 glx/glxdri2.c  |2 +-
 hw/vfb/InitOutput.c|   19 +++
 hw/xquartz/darwin.c|   16 +---
 hw/xquartz/xpr/dri.c   |6 ++
 hw/xquartz/xpr/xprFrame.c  |   28 
 hw/xquartz/xpr/xprScreen.c |5 +
 mi/miinitext.c |9 ++---
 8 files changed, 77 insertions(+), 14 deletions(-)

New commits:
commit 3a8c618a731aced34ddc8c69a1798e2cfd967fbd
Author: Matt Dew mar...@osource.org
Date:   Thu Jan 3 23:36:00 2013 -0700

version bump for 1.13.1.901 (rc1)

diff --git a/configure.ac b/configure.ac
index 67b1eb4..649092b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.13.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2012-12-13
-RELEASE_NAME=Chrysanthemum Tea
+AC_INIT([xorg-server], 1.13.1.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2013-01-03
+RELEASE_NAME=
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 95780608df676473f501a6cd73248da9f7be82a0
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date:   Tue Dec 18 00:41:08 2012 -0800

EnableDisableExtensionError: Use ARRAY_SIZE rather than sentinel

d785368e0e converted the other miinitext functions to use ARRAY_SIZE,
and removed the sentinel, but missed EnableDisableExtensionError so
passing an invalid extension name could cause the server to walk off
the end off the list looking for a sentinel that wasn't there.

Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
Reviewed-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/mi/miinitext.c b/mi/miinitext.c
index d175440..a15e219 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -212,10 +212,12 @@ EnableDisableExtension(const char *name, Bool enable)
 void
 EnableDisableExtensionError(const char *name, Bool enable)
 {
-ExtensionToggle *ext = ExtensionToggleList[0];
+ExtensionToggle *ext;
+int i;
 Bool found = FALSE;
 
-for (ext = ExtensionToggleList[0]; ext-name != NULL; ext++) {
+for (i = 0; i  ARRAY_SIZE(ExtensionToggleList); i++) {
+ext = ExtensionToggleList[i];
 if ((strcmp(name, ext-name) == 0)  (ext-disablePtr == NULL)) {
 ErrorF([mi] Extension \%s\ can not be disabled\n, name);
 found = TRUE;
@@ -226,7 +228,8 @@ EnableDisableExtensionError(const char *name, Bool enable)
 ErrorF([mi] Extension \%s\ is not recognized\n, name);
 ErrorF([mi] Only the following extensions can be run-time %s:\n,
enable ? enabled : disabled);
-for (ext = ExtensionToggleList[0]; ext-name != NULL; ext++) {
+for (i = 0; i  ARRAY_SIZE(ExtensionToggleList); i++) {
+ext = ExtensionToggleList[i];
 if (ext-disablePtr != NULL) {
 ErrorF([mi]%s\n, ext-name);
 }

commit a6d89f30dde50cbd1117e8639dfb99cc852cfd6a
Author: Dave Airlie airl...@redhat.com
Date:   Mon Dec 17 15:40:17 2012 +1000

glx/dri2: initialise api to avoid indirect rendering failing randomly

Running glxinfo under indirect rendering would randomly fail against the
intel driver, as it would create a context with no attribs, and then the
api value would be passed to the driver uninitialised.

Signed-off-by: Dave Airlie airl...@redhat.com
Reviewed-by: Keith Packard kei...@keithp.com
Reviewed-by: Ian Romanick ian.d.roman...@intel.com
Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index bce1bfa..b26e501 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -514,7 +514,7 @@ create_driver_context(__GLXDRIcontext * context,
 unsigned minor_ver;
 uint32_t flags;
 int reset;
-int api;
+int api = __DRI_API_OPENGL;
 
 if (num_attribs != 0) {
 if (!dri2_convert_glx_attribs(screen, num_attribs, attribs,

commit 65642ccb78aa2d4c4e17b9ac42e4ef625c4a6e8b
Author: Raphael Kubo da Costa raphael.kubo.da.co...@intel.com
Date:   Fri Nov 16 19:51:58 2012 +0200

vfb: Initialize the GLX extension again.

This should fix a regression in the 1.13.0 release: commit
5f5bbbe543f65c48ecbb5cce80116a86ca3fbe86 removed a code path used by Xvfb
and made it use the default one when initializing extensions. However, this
meant the GLX extension was not initialized anymore since it is not part of
the `staticExtensions' array.

Since it is not possible to just add it to that array after commit
aad428b8e21c77397c623b78706eb64b1fea77c9, adopt an approach similar to
xwin's and xquartz's and initialize the extension from vfb's `InitOutput'.

Signed-off-by: Raphael Kubo da Costa raphael.kubo.da.co...@intel.com
Reviewed-by: Daniel 

xorg-server: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 Xext/saver.c|2 ++
 Xi/xipassivegrab.c  |8 +++-
 configure.ac|6 +++---
 dix/window.c|2 ++
 hw/dmx/dmxcursor.c  |2 ++
 hw/xfree86/modes/xf86Crtc.c |7 ++-
 include/xkbsrv.h|1 +
 randr/randr.c   |2 ++
 xfixes/cursor.c |   12 ++--
 xkb/xkbAccessX.c|6 --
 10 files changed, 35 insertions(+), 13 deletions(-)

New commits:
commit ede07c1af35926c77c4e766cc02c00333b498460
Author: Matt Dew mar...@osource.org
Date:   Thu Dec 6 22:46:46 2012 -0700

Bump version

diff --git a/configure.ac b/configure.ac
index 590b773..ffd8a97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.13.0.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2012-11-22
-RELEASE_NAME=Puer Tea
+AC_INIT([xorg-server], 1.13.0.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2012-12-06
+RELEASE_NAME=Jasmine Tea
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 79220f4390127d9971cbcf378530bf36172ef35a
Author: Daniel Martin consume.no...@gmail.com
Date:   Wed Nov 7 11:31:01 2012 +0100

Xi: Fix modifier swapping in XIPassiveGrabDevice

XIPassiveGrabDevice uses a list of uint32_t as modifier sets.

The ModifierInfo struct represents the current modifier states and is
therefor used in XIQueryPointer and various events.

Signed-off-by: Daniel Martin consume.no...@gmail.com
Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit aa9a9ad08b8a6e7e95de7c2bf45d93dd50f9ca87)

diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index ddab53d..62a3a46 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -50,7 +50,7 @@ int
 SProcXIPassiveGrabDevice(ClientPtr client)
 {
 int i;
-xXIModifierInfo *mods;
+uint32_t *mods;
 
 REQUEST(xXIPassiveGrabDeviceReq);
 
@@ -63,12 +63,10 @@ SProcXIPassiveGrabDevice(ClientPtr client)
 swaps(stuff-mask_len);
 swaps(stuff-num_modifiers);
 
-mods = (xXIModifierInfo *) stuff[1];
+mods = (uint32_t *) stuff[1];
 
 for (i = 0; i  stuff-num_modifiers; i++, mods++) {
-swapl(mods-base_mods);
-swapl(mods-latched_mods);
-swapl(mods-locked_mods);
+swapl(mods);
 }
 
 return ProcXIPassiveGrabDevice(client);

commit 521f3fb566e67330a486874928a21ce201dba02b
Author: Sybren van Elderen sowmes...@msn.com
Date:   Tue Nov 27 19:27:10 2012 +0100

hw/dmx: add update_desktop_dimensions() call

The Xdmx server did not update the desktop dimensions when computing screen
origins.

Signed-off-by: Sybren van Elderen sowmes...@msn.com
Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit 6e18599d691036eca6ff082c17727d9ffb926984)

diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c
index 1a77c7d..35aca81 100644
--- a/hw/dmx/dmxcursor.c
+++ b/hw/dmx/dmxcursor.c
@@ -346,6 +346,8 @@ dmxComputeScreenOrigins(void)
 screenInfo.screens[i]-y -= minY;
 }
 }
+
+update_desktop_dimensions();
 }
 
 /** Recompute origin information in the #dmxScreens list.  This is

commit 73bd33b4d4e3df4a8097826695a8dbdc2fb5c920
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue Jun 26 10:30:35 2012 +1000

xkb: fill in keycode and event type for slow keys enablement

eventType is set for the type that triggered a XkbControlsNotify event.
Technically, SlowKeys is triggered by a timer which doesn't have a matching
core event type. So we used to use 0 here.

Practically, the timer is triggered by a key press + hold and cancelled when
the key is released before the timeout expires. So we might as well set
KeyPress (keycode) in the ControlsNotify to give clients a chance to differ
between timer-triggered SlowKeys and client-triggered ones.

This is a chance in behaviour, though I suspect with little impact.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Acked-by: Daniel Stone dan...@fooishbar.org
(cherry picked from commit 2c4388a00ec308bc2d48ba751ff510cd5c1b2384)

diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index d584785..78b8f5a 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -171,6 +171,7 @@ typedef struct _XkbSrvInfo {
 KeyCode mouseKey;
 KeyCode inactiveKey;
 KeyCode slowKey;
+KeyCode slowKeyEnableKey;
 KeyCode repeatKey;
 CARD8 krgTimerActive;
 CARD8 beepType;
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index c1af32e..21df85d 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -291,8 +291,8 @@ 

xorg-server: Changes to 'upstream-experimental'

[Timo Aaltonen]

 config/udev.c|8 +
 configure.ac |7 -
 dix/dispatch.c   |4 
 dix/getevents.c  |   18 +++
 hw/xfree86/common/xf86Events.c   |   11 ++
 hw/xfree86/modes/xf86Crtc.c  |2 
 hw/xquartz/bundle/Info.plist.cpp |4 
 include/dix-config.h.in  |3 
 include/hotplug.h|2 
 include/list.h   |   21 +++
 include/misc.h   |1 
 mi/mipointer.c   |2 
 os/log.c |   50 ++---
 os/utils.c   |   14 ++
 test/list.c  |4 
 test/os.c|2 
 test/signal-logging.c|  210 +--
 17 files changed, 322 insertions(+), 41 deletions(-)

New commits:
commit f0bad69edd57facd6cffde8cb0863d1a735e2492
Author: Keith Packard kei...@keithp.com
Date:   Wed Sep 5 14:45:08 2012 -0700

Version bumped to 1.13

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index ab89027..ac3bf26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.12.99.905, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2012-08-21
-RELEASE_NAME=Splashing Orca
+AC_INIT([xorg-server], 1.13.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2012-09-05
+RELEASE_NAME=Iced Tea
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 0db936a5b7125d9b73633733cb34e5e4b72f01e8
Author: Dave Airlie airl...@redhat.com
Date:   Mon Sep 3 15:09:36 2012 +1000

xf86: call enter/leave VT for gpu screens as well

Otherwise we can't do fast user switch properly for multiple GPUs.

Reviewed-by: Alex Deucher alexander.deuc...@amd.com
Signed-off-by: Dave Airlie airl...@redhat.com

diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 47429ec..3ad34b5 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -460,6 +460,8 @@ xf86VTSwitch(void)
 OsBlockSIGIO();
 for (i = 0; i  xf86NumScreens; i++)
 xf86Screens[i]-LeaveVT(xf86Screens[i]);
+for (i = 0; i  xf86NumGPUScreens; i++)
+xf86GPUScreens[i]-LeaveVT(xf86GPUScreens[i]);
 
 xf86AccessLeave();  /* We need this here, otherwise */
 
@@ -474,6 +476,10 @@ xf86VTSwitch(void)
 if (!xf86Screens[i]-EnterVT(xf86Screens[i]))
 FatalError(EnterVT failed for screen %d\n, i);
 }
+for (i = 0; i  xf86NumGPUScreens; i++) {
+if (!xf86GPUScreens[i]-EnterVT(xf86GPUScreens[i]))
+FatalError(EnterVT failed for gpu screen %d\n, i);
+}
 if (!(dispatchException  DE_TERMINATE)) {
 for (i = 0; i  xf86NumScreens; i++) {
 if (xf86Screens[i]-EnableDisableFBAccess)
@@ -530,6 +536,11 @@ xf86VTSwitch(void)
 if (!xf86Screens[i]-EnterVT(xf86Screens[i]))
 FatalError(EnterVT failed for screen %d\n, i);
 }
+for (i = 0; i  xf86NumGPUScreens; i++) {
+xf86GPUScreens[i]-vtSema = TRUE;
+if (!xf86GPUScreens[i]-EnterVT(xf86GPUScreens[i]))
+FatalError(EnterVT failed for gpu screen %d\n, i);
+}
 for (i = 0; i  xf86NumScreens; i++) {
 if (xf86Screens[i]-EnableDisableFBAccess)
 (*xf86Screens[i]-EnableDisableFBAccess) (xf86Screens[i], 
TRUE);

commit 18deac48db0d2387242461025904eb28a0f71fac
Author: Dave Airlie airl...@redhat.com
Date:   Mon Aug 27 15:17:21 2012 +1000

config/udev: respect seat for hotplugged video devices.

This respects the seat tag for hotplugged video devices at X start.

Reviewed-by: Keith Packard kei...@keithp.com
Signed-off-by: Dave Airlie airl...@redhat.com

diff --git a/config/udev.c b/config/udev.c
index 5a8f481..c2d00bb 100644
--- a/config/udev.c
+++ b/config/udev.c
@@ -454,6 +454,10 @@ config_udev_odev_probe(config_odev_probe_proc_ptr 
probe_callback)
 
 udev_enumerate_add_match_subsystem(enumerate, drm);
 udev_enumerate_add_match_sysname(enumerate, card[0-9]*);
+#ifdef HAVE_UDEV_ENUMERATE_ADD_MATCH_TAG
+if (ServerIsNotSeat0())
+udev_enumerate_add_match_tag(enumerate, SeatId);
+#endif
 udev_enumerate_scan_devices(enumerate);
 devices = udev_enumerate_get_list_entry(enumerate);
 udev_list_entry_foreach(device, devices) {

commit ec740cffeba59216f4293fba829097654cde3b11
Author: Dave Airlie airl...@redhat.com
Date:   Mon Aug 27 15:15:19 2012 +1000

config/udev: add wrapper around check if server is not seat 0

this is a simple clean-up that is useful to stop further propogation
of this construct.

xorg-server: Changes to 'upstream-experimental'

[Robert Hooker]

 configure.ac  |6 +--
 dix/main.c|   18 -
 fb/fbseg.c|   18 -
 glx/glxscreens.c  |3 +
 hw/xfree86/common/xf86Module.h|2 -
 hw/xfree86/modes/xf86Crtc.c   |   11 +++---
 hw/xquartz/X11Controller.m|   62 --
 hw/xquartz/console_redirect.c |   28 +--
 hw/xquartz/mach-startup/bundle-main.c |   17 +
 hw/xquartz/quartz.c   |1 
 render/filter.c   |5 ++
 11 files changed, 131 insertions(+), 40 deletions(-)

New commits:
commit 6619f5c0e1086b57888ff7146e8ed5897b50d440
Author: Keith Packard kei...@keithp.com
Date:   Tue Aug 21 13:46:34 2012 -0700

Relase 1.12.99.905

RC with updated ABI version numbers.

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index e126355..abfe727 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.12.99.904, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2012-08-07
-RELEASE_NAME=Sweating Aardvark
+AC_INIT([xorg-server], 1.12.99.905, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2012-08-21
+RELEASE_NAME=Splashing Orca
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 3e091e1075dc29120e54ab2ef110b04ce7383ffd
Author: Aaron Plattner aplatt...@nvidia.com
Date:   Fri Aug 17 11:26:05 2012 -0700

xfree86: Bump extension ABI to 7.0

Commit 9d457f9c55f12106ba44c1c9db59d14f978f0ae8 added an array of
DevPrivateSetRec structures in the middle of the ScreenRec, which throws off
extension modules trying to call things like pScreen-DestroyPixmap.

Signed-off-by: Aaron Plattner aplatt...@nvidia.com
Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index d93405e..83f9790 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -82,7 +82,7 @@ typedef enum {
 #define ABI_ANSIC_VERSION  SET_ABI_VERSION(0, 4)
 #define ABI_VIDEODRV_VERSION   SET_ABI_VERSION(13, 0)
 #define ABI_XINPUT_VERSION SET_ABI_VERSION(18, 0)
-#define ABI_EXTENSION_VERSION  SET_ABI_VERSION(6, 0)
+#define ABI_EXTENSION_VERSION  SET_ABI_VERSION(7, 0)
 #define ABI_FONT_VERSION   SET_ABI_VERSION(0, 6)
 
 #define MODINFOSTRING1 0xef23fdc5

commit ac616d8ed5a634c6b32775eb7b071a13c575fd97
Author: Jeremy Huddleston Sequoia jerem...@apple.com
Date:   Thu Aug 16 19:09:42 2012 -0700

XQuartz: Use asl_log_descriptor for children as well

This change is #if'd out due to a bug in asl_log_descriptor, but
it is left here as reference to be enabled in the future.

Signed-off-by: Jeremy Huddleston Sequoia jerem...@apple.com

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 393bc1a..737db42 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -53,6 +53,11 @@
 #include fcntl.h
 #include sys/types.h
 #include sys/wait.h
+#include asl.h
+#include stdlib.h
+
+extern aslclient aslc;
+extern char *bundle_id_prefix;
 
 @implementation X11Controller
 
@@ -342,9 +347,12 @@
 const char *newargv[4];
 char buf[128];
 char *s;
+#if 0  MAC_OS_X_VERSION_MAX_ALLOWED = 1080
+int stdout_pipe[2];
+int stderr_pipe[2];
+#endif
 
-newargv[0] =
-[X11App prefs_get_string:@PREFS_LOGIN_SHELL default:/bin/sh];
+newargv[0] = [X11App prefs_get_string:@PREFS_LOGIN_SHELL 
default:/bin/sh];
 newargv[1] = -c;
 newargv[2] = [filename UTF8String];
 newargv[3] = NULL;
@@ -355,6 +363,40 @@
 setenv(DISPLAY, buf, TRUE);
 }
 
+#if 0  MAC_OS_X_VERSION_MAX_ALLOWED = 1080
+if (asl_log_descriptor) {
+char *asl_sender;
+aslmsg amsg = asl_new(ASL_TYPE_MSG);
+assert(amsg);
+
+asprintf(asl_sender, %s.%s, bundle_id_prefix, newargv[2]);
+assert(asl_sender);
+for(s = asl_sender + strlen(bundle_id_prefix) + 1; *s; s++) {
+if(! ((*s = 'a'  *s = 'z') ||
+  (*s = 'A'  *s = 'Z') ||
+  (*s = '0'  *s = '9'))) {
+*s = '_';
+}
+}
+
+(void)asl_set(amsg, ASL_KEY_SENDER, asl_sender);
+free(asl_sender);
+
+assert(0 == pipe(stdout_pipe));
+fcntl(stdout_pipe[0], F_SETFD, FD_CLOEXEC);
+fcntl(stdout_pipe[0], F_SETFL, O_NONBLOCK);
+
+assert(0 == pipe(stderr_pipe));
+fcntl(stderr_pipe[0], F_SETFD, FD_CLOEXEC);
+fcntl(stderr_pipe[0], F_SETFL, O_NONBLOCK);
+
+asl_log_descriptor(aslc, amsg, ASL_LEVEL_INFO, stdout_pipe[0], 
ASL_LOG_DESCRIPTOR_READ);
+asl_log_descriptor(aslc, amsg, 

xorg-server: Changes to 'upstream-experimental'

[Maarten Lankhorst]

 Xext/panoramiX.c   |5 -
 Xext/sync.c|4 -
 Xext/xvmc.c|8 +-
 configure.ac   |4 -
 dix/devices.c  |   10 +-
 glx/glxdri2.c  |   23 +++---
 glx/glxext.c   |3 
 glx/glxserver.h|2 
 hw/xfree86/common/xf86.h   |2 
 hw/xfree86/common/xf86AutoConfig.c |1 
 hw/xfree86/common/xf86Extensions.h |8 +-
 hw/xfree86/dri2/dri2.c |   15 +++
 hw/xfree86/dri2/dri2.h |7 +
 hw/xfree86/dri2/dri2ext.c  |9 +-
 hw/xfree86/modes/xf86Crtc.c|6 -
 hw/xfree86/modes/xf86Modes.c   |   15 +++
 hw/xfree86/modes/xf86RandR12.c |2 
 hw/xfree86/sdksyms.sh  |2 
 hw/xquartz/pseudoramiX.c   |4 -
 hw/xquartz/xpr/dri.h   |3 
 hw/xwin/InitOutput.c   |   23 +-
 hw/xwin/Makefile.am|1 
 hw/xwin/README |  141 -
 hw/xwin/man/XWin.man   |   26 +++---
 hw/xwin/win.h  |2 
 hw/xwin/winblock.c |2 
 hw/xwin/winclipboard.h |7 -
 hw/xwin/winclipboardinit.c |2 
 hw/xwin/winclipboardthread.c   |8 --
 hw/xwin/winclipboardunicode.c  |   65 -
 hw/xwin/winclipboardwndproc.c  |7 -
 hw/xwin/winclipboardwrappers.c |   10 --
 hw/xwin/winclipboardxevents.c  |   14 ---
 hw/xwin/wincreatewnd.c |   93 +++-
 hw/xwin/windialogs.c   |8 +-
 hw/xwin/winerror.c |4 -
 hw/xwin/winkeyhook.c   |   18 
 hw/xwin/winmonitors.c  |5 +
 hw/xwin/winmonitors.h  |   29 +++
 hw/xwin/winmultiwindowwm.c |   79 ++--
 hw/xwin/winprocarg.c   |   18 ++--
 hw/xwin/winscrinit.c   |4 -
 hw/xwin/winwndproc.c   |7 +
 include/extinit.h  |   32 
 include/os.h   |   10 +-
 os/utils.c |   73 +++
 randr/rrprovider.c |   47 ++--
 randr/rrproviderproperty.c |   78 +++-
 randr/rrscreen.c   |   21 ++---
 test/xtest.c   |3 
 xkb/ddxList.c  |6 -
 xkb/ddxLoad.c  |   75 ---
 52 files changed, 475 insertions(+), 576 deletions(-)

New commits:
commit 77de2994774e7be24a0bad521180628feb1027c6
Author: Keith Packard kei...@keithp.com
Date:   Tue Jul 17 15:47:39 2012 -0700

Bump to version 1.12.99.902

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index 6456192..bf6868e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.12.99.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2012-07-10
+AC_INIT([xorg-server], 1.12.99.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2012-07-17
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 75966a4186955f3a4625e93796145036c5986d2e
Author: Keith Packard kei...@keithp.com
Date:   Fri Jul 13 14:36:25 2012 -0700

xwin: Clean up os wrappers for System, Popen and Pclose on Windows

Popen and Pclose are never used on Windows, so don't bother to even
try to define them.

System(s) was defined as system(s), but the two users of that
function are in xkb, which carefully redefines that as
Win32System. Move Win32System and Win32TempDir to os/utils.c, renaming
Win32System to be just System, which simplifies the xkb code

Signed-off-by: Keith Packard kei...@keithp.com
Reviewed-by: Jon TURNEY jon.tur...@dronecode.org.uk

diff --git a/include/os.h b/include/os.h
index 7701c39..9e323f3 100644
--- a/include/os.h
+++ b/include/os.h
@@ -359,9 +359,13 @@ Fopen(const char *, const char *);
 extern _X_EXPORT int
 Fclose(pointer);
 #else
-#define System(a) system(a)
-#define Popen(a,b) popen(a,b)
-#define Pclose(a) pclose(a)
+
+extern const char *
+Win32TempDir(void);
+
+extern int
+System(const char *cmdline);
+
 #define Fopen(a,b) fopen(a,b)
 #define Fclose(a) fclose(a)
 #endif
diff --git a/os/utils.c b/os/utils.c
index a6f6ef5..d902523 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1561,6 +1561,79 @@ Fclose(pointer iop)
 
 #endif  /* !WIN32 */
 
+#ifdef WIN32
+
+#include X11/Xwindows.h
+
+const char *
+Win32TempDir()
+{
+static char buffer[PATH_MAX];
+
+if (GetTempPath(sizeof(buffer), buffer)) {
+int len;
+
+buffer[sizeof(buffer) - 1] = 0;
+len = strlen(buffer);
+if 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 Xi/exevents.c  |  190 
 Xi/xiallowev.c |   81 
 configure.ac   |6 
 dix/events.c   |   57 
 dix/getevents.c|   21 
 dix/inpututils.c   |3 
 dix/touch.c|   73 
 hw/xfree86/common/xf86Xinput.c |   10 
 hw/xfree86/dri2/dri2.c |   20 
 hw/xfree86/os-support/xf86_OSlib.h |2 
 hw/xfree86/parser/InputClass.c |   76 
 hw/xfree86/parser/xf86Parser.h |   20 
 hw/xquartz/GL/capabilities.c   |7 
 hw/xquartz/X11Application.m|   29 
 hw/xquartz/X11Controller.m |7 
 hw/xquartz/bundle/Makefile.am  |   82 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib   | 7549 
--
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/ca.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/ca.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/ca.lproj/locversion.plist  |   14 
 hw/xquartz/bundle/Resources/ca.lproj/main.nib/designable.nib   | 3640 
 hw/xquartz/bundle/Resources/ca.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/cs.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/cs.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/cs.lproj/locversion.plist  |   14 
 hw/xquartz/bundle/Resources/cs.lproj/main.nib/designable.nib   | 3617 
 hw/xquartz/bundle/Resources/cs.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/el.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/el.lproj/main.nib/designable.nib   | 7047 -
 hw/xquartz/bundle/Resources/el.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib   |   18 
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/he.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/he.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/he.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/he.lproj/main.nib/designable.nib   | 7312 +
 hw/xquartz/bundle/Resources/he.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/hr.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/hr.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/hr.lproj/locversion.plist  |   14 
 hw/xquartz/bundle/Resources/hr.lproj/main.nib/designable.nib   | 3533 
 hw/xquartz/bundle/Resources/hr.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/hu.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/hu.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/hu.lproj/locversion.plist  |   14 
 hw/xquartz/bundle/Resources/hu.lproj/main.nib/designable.nib   | 3642 
 hw/xquartz/bundle/Resources/hu.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/no.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib   | 7482 -
 hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/ro.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/ro.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/ro.lproj/locversion.plist  |   14 
 hw/xquartz/bundle/Resources/ro.lproj/main.nib/designable.nib   | 3485 
 hw/xquartz/bundle/Resources/ro.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/sk.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/sk.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/sk.lproj/main.nib/designable.nib   | 7022 -
 hw/xquartz/bundle/Resources/sk.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/th.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/th.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/th.lproj/locversion.plist  |   14 
 hw/xquartz/bundle/Resources/th.lproj/main.nib/designable.nib   | 3758 
 hw/xquartz/bundle/Resources/th.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/tr.lproj/InfoPlist.strings |binary
 hw/xquartz/bundle/Resources/tr.lproj/Localizable.strings   |binary
 hw/xquartz/bundle/Resources/tr.lproj/locversion.plist  |   14 
 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 Xext/shm.c |2 
 Xext/xace.c|4 +
 Xi/exevents.c  |   20 ++---
 Xi/xiproperty.c|2 
 configure.ac   |   15 ++--
 dix/dispatch.c |   14 ++-
 dix/dixutils.c |   17 +++-
 dix/enterleave.c   |9 +-
 dix/eventconvert.c |4 +
 dix/events.c   |5 -
 dix/getevents.c|   19 +++--
 dix/grabs.c|3 
 dix/property.c |2 
 glx/glxscreens.c   |9 --
 hw/xfree86/Makefile.am |2 
 hw/xfree86/common/compiler.h   |   19 -
 hw/xfree86/common/xf86Xinput.c |   11 +-
 hw/xfree86/ddc/ddcProperty.c   |   47 +---
 hw/xfree86/dixmods/Makefile.am |1 
 hw/xfree86/int10/helper_exec.c |2 
 hw/xfree86/loader/loadmod.c|3 
 hw/xfree86/man/xorg.conf.man   |8 +-
 hw/xfree86/os-support/linux/lnx_init.c |   19 +++--
 hw/xfree86/sdksyms.sh  |1 
 hw/xfree86/vgahw/vgaHW.h   |8 +-
 hw/xfree86/xaa/Makefile.am |4 +
 hw/xquartz/GL/indirect.c   |3 
 hw/xquartz/bundle/Info.plist.cpp   |8 +-
 hw/xwin/InitInput.c|6 -
 hw/xwin/InitOutput.c   |   31 +++-
 hw/xwin/Makefile.am|3 
 hw/xwin/man/XWin.man   |3 
 hw/xwin/win.h  |2 
 hw/xwin/winclipboard.h |3 
 hw/xwin/winclipboardthread.c   |   95 +
 hw/xwin/winclipboardunicode.c  |4 -
 hw/xwin/winclipboardwndproc.c  |   23 +-
 hw/xwin/winclipboardwrappers.c |  122 -
 hw/xwin/winengine.c|   21 -
 hw/xwin/winglobals.c   |2 
 hw/xwin/winkeybd.c |   95 +++--
 hw/xwin/winkeybd.h |6 +
 hw/xwin/winkeynames.h  |2 
 hw/xwin/winmouse.c |5 -
 hw/xwin/winmultiwindowclass.h  |   10 ++
 hw/xwin/winmultiwindowwindow.c |2 
 hw/xwin/winmultiwindowwm.c |   84 --
 hw/xwin/winmultiwindowwndproc.c|   25 +-
 hw/xwin/winnativegdi.c |7 +
 hw/xwin/winpfbdd.c |6 -
 hw/xwin/winprefs.c |   74 +++-
 hw/xwin/winprefslex.l  |   10 +-
 hw/xwin/winprocarg.c   |   15 +++-
 hw/xwin/winrandr.c |2 
 hw/xwin/winshadgdi.c   |1 
 hw/xwin/winwin32rootless.c |4 -
 hw/xwin/winwin32rootlesswindow.c   |3 
 hw/xwin/winwindow.h|   11 +-
 hw/xwin/winwndproc.c   |   12 ++-
 include/exevents.h |2 
 include/inputstr.h |2 
 include/misc.h |3 
 mi/mibitblt.c  |2 
 os/backtrace.c |   14 ++-
 os/client.c|   43 +++
 os/connection.c|2 
 os/io.c|2 
 os/osdep.h |4 -
 render/animcur.c   |3 
 test/Makefile.am   |   57 ++-
 test/ddxstubs.c|   91 
 xkb/xkbActions.c   |2 
 72 files changed, 716 insertions(+), 461 deletions(-)

New commits:
commit 052ca3f22eadd0aa60dd24ac7d5d76137273926f
Author: Keith Packard kei...@keithp.com
Date:   Fri Jan 27 22:08:08 2012 -0800

Bump version to 1.11.99.902 (1.12 RC2)

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index b0bb9bb..6241119 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.11.99.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2011-12-27
+AC_INIT([xorg-server], 1.11.99.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2012-01-27
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit bafedb7e9bcff31e2963eeb54669b2492214fae7
Author: Jeremy Huddleston jerem...@apple.com
Date:   Wed Jan 18 11:52:04 2012 -0800

XQuartz: Bump bundle version to 2.7.2

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index a4b8e19..4b6d9d1 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 Xi/exevents.c   |  951 +
 Xi/extinit.c|   26 
 Xi/xiallowev.c  |   53 
 Xi/xipassivegrab.c  |   27 
 Xi/xiquerydevice.c  |   39 
 Xi/xiquerydevice.h  |1 
 Xi/xiselectev.c |   48 
 configure.ac|   14 
 dix/Makefile.am |1 
 dix/devices.c   |   87 
 dix/eventconvert.c  |   63 
 dix/events.c|   69 
 dix/getevents.c |  352 
 dix/grabs.c |3 
 dix/inpututils.c|7 
 dix/touch.c |  982 +
 dix/window.c|9 
 glx/Makefile.am |3 
 glx/clientinfo.c|   48 
 glx/createcontext.c |   38 
 glx/dispatch.h  |16553 
 glx/glapi.c |6 
 glx/glapi_gentable.c| 5265 ++
 glx/glapioffsets.h  | 1174 --
 glx/glapitable.h|  883 +
 glx/glprocs.h   | 2841 +++--
 glx/glxdri2.c   |2 
 glx/glxext.h|2 
 glx/indirect_dispatch.c |   76 
 glx/indirect_dispatch.h | 2035 +--
 glx/indirect_dispatch_swap.c|   82 
 glx/indirect_program.c  |1 
 glx/indirect_reqsize.c  |   16 
 glx/indirect_reqsize.h  |  169 
 glx/indirect_size.h |   87 
 glx/indirect_size_get.c |  145 
 glx/indirect_size_get.h |  113 
 glx/indirect_table.c|  215 
 glx/swap_interval.c |1 
 hw/dmx/examples/Makefile.am |   56 
 hw/kdrive/linux/keyboard.c  |6 
 hw/kdrive/linux/ms.c|4 
 hw/kdrive/linux/ps2.c   |4 
 hw/xfree86/common/xf86Module.h  |2 
 hw/xfree86/common/xf86Xinput.c  |   24 
 hw/xfree86/common/xf86Xinput.h  |3 
 hw/xfree86/dri2/dri2.c  |   36 
 hw/xfree86/dri2/dri2.h  |3 
 hw/xfree86/dri2/dri2ext.c   |4 
 hw/xfree86/man/xorg.conf.man|2 
 hw/xquartz/mach-startup/Makefile.am |7 
 include/dix.h   |7 
 include/events.h|1 
 include/eventstr.h  |   30 
 include/exevents.h  |   12 
 include/input.h |   87 
 include/inputstr.h  |   55 
 include/misc.h  |4 
 include/protocol-versions.h |2 
 mi/mieq.c   |   37 
 os/client.c |   69 
 test/Makefile.am|3 
 test/input.c|   17 
 test/touch.c|  270 
 test/xi2/protocol-eventconvert.c|  104 
 test/xi2/protocol-xipassivegrabdevice.c |2 
 test/xi2/protocol-xiselectevents.c  |   38 
 67 files changed, 23733 insertions(+), 9643 deletions(-)

New commits:
commit 98cde254acb9b98337ddecf64c138d38c14ec2bf
Author: Keith Packard kei...@keithp.com
Date:   Tue Dec 27 13:42:21 2011 -0800

Bump version to 1.11.99.901 (1.12 RC1)

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index 261af5f..6de92b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.11.99.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2011-12-17
+AC_INIT([xorg-server], 1.11.99.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2011-12-27
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 5037c9af78da6652189de7202e70e1b833395af5
Author: Keith Packard kei...@keithp.com
Date:   Tue Dec 27 14:02:01 2011 -0800

glx/glapioffsets.h is no longer part of the build, remove it

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/glx/Makefile.am b/glx/Makefile.am
index f61a408..ced78b7 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -43,7 +43,6 @@ glapi_sources =   \
glapi.c \
glapi.h \
glapi_gentable.c\
-   glapioffsets.h  \
glprocs.h   \
glthread.c  \
glthread.h

commit 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 Xext/saver.c|3 
 Xext/security.c |   13 
 Xext/shm.c  |2 
 Xext/sync.c |4 
 Xext/syncsrv.h  |4 
 Xext/xres.c |4 
 Xext/xselinux_hooks.c   |4 
 Xext/xtest.c|9 
 Xext/xvdisp.c   |4 
 Xext/xvmc.c |6 
 Xi/exevents.c   |  262 ---
 Xi/extinit.c|8 
 Xi/grabdev.c|2 
 Xi/grabdevb.c   |4 
 Xi/grabdevk.c   |4 
 Xi/ungrdev.c|2 
 Xi/ungrdevb.c   |   32 
 Xi/ungrdevk.c   |   31 
 Xi/xichangehierarchy.c  |   15 
 Xi/xigrabdev.c  |   19 
 Xi/xipassivegrab.c  |   92 +-
 Xi/xiproperty.c |4 
 Xi/xiselectev.c |5 
 config/hal.c|1 
 configure.ac|   69 --
 dix/atom.c  |7 
 dix/cursor.c|2 
 dix/devices.c   |6 
 dix/dispatch.c  |   28 
 dix/dixutils.c  |4 
 dix/eventconvert.c  |   16 
 dix/events.c| 1085 +---
 dix/extension.c |   25 
 dix/getevents.c |   38 -
 dix/grabs.c |  166 +++-
 dix/inpututils.c|  241 +++
 dix/registry.c  |5 
 dix/resource.c  |2 
 dix/tables.c|2 
 doc/Xinput.xml  |2 
 doc/Xserver-spec.xml|4 
 doc/dtrace/Xserver-DTrace.xml   |2 
 exa/exa_render.c|6 
 glx/glxdri.c|   15 
 glx/glxdri2.c   |   14 
 glx/glxdriswrast.c  |   14 
 glx/glxscreens.c|   10 
 glx/single2.c   |4 
 hw/dmx/config/Makefile.am   |1 
 hw/dmx/config/dmxcompat.c   |4 
 hw/dmx/config/scanner.l |3 
 hw/dmx/dmxinit.c|   13 
 hw/dmx/doc/dmx.xml  |2 
 hw/dmx/doc/scaled.xml   |2 
 hw/dmx/examples/ev.c|4 
 hw/dmx/glxProxy/Makefile.am |2 
 hw/dmx/glxProxy/compsize.c  |1 
 hw/dmx/glxProxy/compsize.h  |   51 +
 hw/dmx/glxProxy/g_renderswap.c  |1 
 hw/dmx/glxProxy/glxcmds.c   |2 
 hw/dmx/glxProxy/glxcmds.h   |   37 +
 hw/dmx/glxProxy/glxcmdsswap.c   |3 
 hw/dmx/glxProxy/glxscreens.c|5 
 hw/kdrive/ephyr/ephyrhostvideo.c|9 
 hw/kdrive/ephyr/hostx.c |5 
 hw/kdrive/linux/linux.c |2 
 hw/kdrive/src/kdrive.c  |   15 
 hw/kdrive/src/kdrive.h  |8 
 hw/kdrive/src/kinput.c  |   10 
 hw/vfb/InitOutput.c |   33 
 hw/xfree86/common/Makefile.am   |2 
 hw/xfree86/common/xf86.h|3 
 hw/xfree86/common/xf86AutoConfig.c  |2 
 hw/xfree86/common/xf86Config.c  |   56 -
 hw/xfree86/common/xf86Config.h  |2 
 hw/xfree86/common/xf86Configure.c   |   72 +-
 hw/xfree86/common/xf86DGA.c |4 
 hw/xfree86/common/xf86Globals.c |2 
 hw/xfree86/common/xf86Helper.c  |   11 
 hw/xfree86/common/xf86Init.c|   78 ++
 hw/xfree86/common/xf86Mode.c|4 
 hw/xfree86/common/xf86Module.h  |2 
 hw/xfree86/common/xf86Opt.h |4 
 hw/xfree86/common/xf86Option.c  |   12 
 hw/xfree86/common/xf86PM.c  |4 
 hw/xfree86/common/xf86Priv.h|9 
 hw/xfree86/common/xf86ShowOpts.c|  130 ---
 hw/xfree86/common/xf86Xinput.c  |5 
 hw/xfree86/common/xf86Xinput.h  |2 
 hw/xfree86/common/xf86pciBus.c  |   30 
 hw/xfree86/common/xf86sbusBus.c |2 
 hw/xfree86/ddc/xf86DDC.h|5 
 hw/xfree86/doc/ddxDesign.xml|4 
 hw/xfree86/fbdevhw/fbdevhw.c|   26 
 hw/xfree86/i2c/msp3430.c|5 
 hw/xfree86/loader/loadmod.c |   13 
 hw/xfree86/modes/xf86Crtc.c |8 
 hw/xfree86/modes/xf86Crtc.h |2 
 hw/xfree86/modes/xf86EdidModes.c|2 
 hw/xfree86/modes/xf86Modes.c|4 
 hw/xfree86/modes/xf86Modes.h 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 Xext/bigreq.c  |7 
 Xext/dpms.c|   60 -
 Xext/geext.c   |   16 
 Xext/panoramiX.c   |   74 +-
 Xext/panoramiXSwap.c   |   26 
 Xext/panoramiXsrv.h|2 
 Xext/saver.c   |   68 -
 Xext/security.c|   37 -
 Xext/shape.c   |  110 +--
 Xext/shm.c |  114 +--
 Xext/sync.c|  186 +
 Xext/xcmisc.c  |   41 -
 Xext/xf86bigfont.c |   62 -
 Xext/xres.c|   64 -
 Xext/xselinux_ext.c|   67 -
 Xext/xtest.c   |   30 
 Xext/xvdisp.c  |  407 +--
 Xi/allowev.c   |6 
 Xi/chgdctl.c   |   15 
 Xi/chgfctl.c   |   52 -
 Xi/chgkbd.c|4 
 Xi/chgkmap.c   |3 
 Xi/chgprop.c   |8 
 Xi/chgptr.c|4 
 Xi/closedev.c  |4 
 Xi/devbell.c   |4 
 Xi/exevents.c  |   96 ++
 Xi/extinit.c   |  238 +++---
 Xi/getbmap.c   |   10 
 Xi/getdctl.c   |   33 
 Xi/getfctl.c   |   64 -
 Xi/getfocus.c  |   14 
 Xi/getkmap.c   |   10 
 Xi/getmmap.c   |   10 
 Xi/getprop.c   |   14 
 Xi/getselev.c  |   16 
 Xi/getvers.c   |   16 
 Xi/grabdev.c   |   16 
 Xi/grabdevb.c  |   10 
 Xi/grabdevk.c  |   10 
 Xi/gtmotion.c  |   20 
 Xi/listdev.c   |   28 
 Xi/opendev.c   |   10 
 Xi/queryst.c   |   13 
 Xi/selectev.c  |8 
 Xi/sendexev.c  |7 
 Xi/setbmap.c   |   10 
 Xi/setdval.c   |   10 
 Xi/setfocus.c  |8 
 Xi/setmmap.c   |   10 
 Xi/setmode.c   |   10 
 Xi/ungrdev.c   |6 
 Xi/ungrdevb.c  |8 
 Xi/ungrdevk.c  |8 
 Xi/xiallowev.c |8 
 Xi/xichangecursor.c|   10 
 Xi/xichangehierarchy.c |   11 
 Xi/xigetclientpointer.c|   12 
 Xi/xigrabdev.c |   28 
 Xi/xipassivegrab.c |   60 -
 Xi/xiproperty.c|  107 +--
 Xi/xiquerydevice.c |  142 ++--
 Xi/xiquerydevice.h |1 
 Xi/xiquerypointer.c|   30 
 Xi/xiqueryversion.c|   17 
 Xi/xiselectev.c|   30 
 Xi/xisetclientpointer.c|8 
 Xi/xisetdevfocus.c |   23 
 Xi/xiwarppointer.c |   24 
 composite/compalloc.c  |   11 
 composite/compext.c|   74 --
 config/Makefile.am |6 
 config/config-backends.h   |7 
 config/config.c|   20 
 config/dbus.c  |   60 -
 config/hal.c   |   44 -
 config/udev.c  |   63 +
 config/wscons.c|  268 +++
 configure.ac   |  167 ++--
 damageext/damageext.c  |   44 -
 dbe/dbe.c  |   68 -
 devbook.am |   45 -
 dix/.gitignore |1 
 dix/colormap.c |7 
 dix/cursor.c   |2 
 dix/devices.c  |   61 +
 dix/dispatch.c |   33 
 dix/dixfonts.c |   30 
 dix/enterleave.c   |   10 
 dix/eventconvert.c |   70 +-
 dix/events.c   |  313 +
 dix/getevents.c|  831 +++-
 dix/grabs.c|2 
 dix/inpututils.c   |  320 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 composite/compalloc.c |   12 +---
 configure.ac  |4 ++--
 exa/exa_mixed.c   |   23 +--
 fb/fbblt.c|9 +++--
 hw/kdrive/ephyr/ephyrdriext.c |4 
 hw/xquartz/X11Application.m   |2 +-
 hw/xquartz/bundle/Makefile.am |9 +
 hw/xquartz/darwin.c   |4 ++--
 hw/xquartz/xpr/xprFrame.c |9 ++---
 include/windowstr.h   |1 +
 mi/miexpose.c |4 
 11 files changed, 54 insertions(+), 27 deletions(-)

New commits:
commit 0caeef6146bee5fb1827ab25db191685dde9d4b4
Author: Keith Packard kei...@keithp.com
Date:   Fri Aug 26 16:46:13 2011 -0700

Version bumped to 1.11

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index 4f4bcf2..2ac1f2e 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.10.99.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2011-08-03
+AC_INIT([xorg-server], 1.11.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2011-08-26
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit e32cc0b4c85c78cd8743a6e1680dcc79054b57ce
Author: Adam Jackson a...@redhat.com
Date:   Thu Apr 21 16:37:11 2011 -0400

fb: Fix memcpy abuse

The memcpy fast path implicitly assumes that the copy walks
left-to-right.  That's not something memcpy guarantees, and newer glibc
on some processors will indeed break that assumption.  Since we walk a
line at a time, check the source and destination against the width of
the blit to determine whether we can be sloppy enough to allow memcpy.
(Having done this, we can remove the check for !reverse as well.)

On an Intel Core i7-2630QM with an NVIDIA GeForce GTX 460M running in
NoAccel, the broken code and various fixes for -copywinwin{10,100,500}
gives (edited to fit in 80 columns):

1: Disable the fastpath entirely
2: Replace memcpy with memmove
3: This fix
4: The code before this fix

  12 3 4   Operation
--   ---   ---   ---   
258000   269000 (  1.04)   544000 (  2.11)   552000 (  2.14)   Copy 10x10
 2130023000 (  1.08)43700 (  2.05)47100 (  2.21)   Copy 100x100
   960  962 (  1.00) 1990 (  2.09) 1990 (  2.07)   Copy 500x500

So it's a modest performance hit, but correctness demands it, and it's
probably worth keeping the 2x speedup from having the fast path in the
first place.

Signed-off-by: Adam Jackson a...@redhat.com
Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/fb/fbblt.c b/fb/fbblt.c
index a040298..6809404 100644
--- a/fb/fbblt.c
+++ b/fb/fbblt.c
@@ -65,6 +65,7 @@ fbBlt (FbBits   *srcLine,
 intn, nmiddle;
 BooldestInvarient;
 intstartbyte, endbyte;
+int careful;
 FbDeclareMergeRop ();
 
 if (bpp == 24  !FbCheck24Pix (pm))
@@ -74,12 +75,16 @@ fbBlt (FbBits   *srcLine,
return;
 }
 
-if (alu == GXcopy  pm == FB_ALLONES  !reverse 
+careful = !((srcLine  dstLine  srcLine + width * (bpp3)  dstLine) ||
+(dstLine  srcLine  dstLine + width * (bpp3)  srcLine)) ||
+  (bpp  7);
+
+if (alu == GXcopy  pm == FB_ALLONES  !careful 
 !(srcX  7)  !(dstX  7)  !(width  7)) {
 int i;
 CARD8 *src = (CARD8 *) srcLine;
 CARD8 *dst = (CARD8 *) dstLine;
-
+
 srcStride *= sizeof(FbBits);
 dstStride *= sizeof(FbBits);
 width = 3;

commit ac2c307f4716ebd3e955c004ceec9f4c029401a0
Author: Pelle Johansson pe...@morth.org
Date:   Sun Aug 14 17:44:40 2011 -0700

XQuartz: Initialize darwin pointer valuators

This fixes a regression introduced by: 
633b81e8ba09cc6a1ea8b43f323874fda2cf0bde

http://xquartz.macosforge.org/trac/ticket/498

Signed-off-by: Pelle Johansson pe...@morth.org
Reviewed-by: Jeremy Huddleston jerem...@apple.com

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index f19d7bf..b483000 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -322,8 +322,8 @@ static int DarwinMouseProc(DeviceIntPtr pPointer, int what) 
{
 (PtrCtrlProcPtr)NoopDDA,
 GetMotionHistorySize(), NAXES,
 axes_labels);
-//InitValuatorAxisStruct(pPointer, 0, 0, XQUARTZ_VALUATOR_LIMIT, 
1, 0, 1, Absolute);
-//InitValuatorAxisStruct(pPointer, 1, 0, XQUARTZ_VALUATOR_LIMIT, 
1, 0, 1, Absolute);
+InitValuatorAxisStruct(pPointer, 0, axes_labels[0], 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Xext/xtest.c |9 
 Xext/xvmc.c  |   11 
 Xi/exevents.c|   28 
 config/udev.c|   20 
 configure.ac |   33 
 dev/null |binary
 dix/.gitignore   |1 
 dix/Makefile.am  |6 
 dix/dixutils.c   |   10 
 dix/events.c |  113 
 dix/getevents.c  |   68 
 dix/grabs.c  |  112 
 dix/main.c   |2 
 dix/window.c |  151 
 doc/Xserver-spec.xml |4 
 doc/dtrace/Makefile.am   |2 
 docbook.am   |7 
 exa/exa.c|4 
 exa/exa_accel.c  |6 
 exa/exa_classic.c|2 
 exa/exa_driver.c |2 
 exa/exa_migration_classic.c  |4 
 exa/exa_migration_mixed.c|2 
 exa/exa_mixed.c  |2 
 exa/exa_unaccel.c|4 
 fb/fb24_32.c |4 
 fb/fbarc.c   |9 
 fb/fbfill.c  |6 
 fb/fbgc.c|4 
 fb/fbpush.c  |2 
 glx/Makefile.am  |7 
 glx/glapi.h  |3 
 glx/glapi_gentable.c | 7589 
++
 glx/glxdri2.c|9 
 glx/glxscreens.c |7 
 glx/glxscreens.h |1 
 hw/dmx/config/xdmxconfig.c   |8 
 hw/dmx/dmxinit.c |6 
 hw/dmx/dmxinput.c|1 
 hw/dmx/examples/xbell.c  |3 
 hw/dmx/glxProxy/glxscreens.h |1 
 hw/dmx/input/dmxinputinit.c  |3 
 hw/dmx/man/Xdmx.man  |   30 
 hw/kdrive/ephyr/ephyr.c  |2 
 hw/kdrive/ephyr/ephyr.h  |2 
 hw/kdrive/ephyr/ephyr_draw.c |2 
 hw/kdrive/ephyr/ephyrinit.c  |3 
 hw/kdrive/ephyr/hostx.c  |2 
 hw/kdrive/ephyr/hostx.h  |2 
 hw/kdrive/ephyr/man/Xephyr.man   |2 
 hw/kdrive/ephyr/os.c |2 
 hw/kdrive/fake/fakeinit.c|1 
 hw/kdrive/fake/kbd.c |2 
 hw/kdrive/fbdev/fbdev.c  |2 
 hw/kdrive/fbdev/fbdev.h  |2 
 hw/kdrive/fbdev/fbinit.c |3 
 hw/kdrive/linux/keyboard.c   |8 
 hw/kdrive/linux/linux.c  |2 
 hw/kdrive/linux/mouse.c  |2 
 hw/kdrive/linux/ps2.c|2 
 hw/kdrive/linux/tslib.c  |   10 
 hw/kdrive/src/kcmap.c|2 
 hw/kdrive/src/kdrive.c   |6 
 hw/kdrive/src/kdrive.h   |   

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

Rebased ref, commits from common ancestor:
commit db228d3d07a6d831f53e4c05c878327ad4d045eb
Author: Keith Packard kei...@keithp.com
Date:   Wed Jun 1 11:20:10 2011 -0700

Version bumped to 1.10.99.901 (1.11 RC1)

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index fcb8ea9..22566c9 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.10.99.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=unreleased
+AC_INIT([xorg-server], 1.10.99.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2011-06-01
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit d45f5b2493bc0a2882bf972849b5c9c50cd533ca
Author: Adam Jackson a...@redhat.com
Date:   Wed May 25 05:54:35 2011 -0400

fixes: Add support for pointer barriers

Implements pointer barriers as specified by version 5 of the XFIXES
protocol. Barriers are axis-aligned, zero-width lines that block pointer
movement for relative input devices. Barriers may block motion in either
the positive or negative direction, or both.

v3:
- Fix off-by-one in version_requests array
- Port to non-glib test harness
- Fix review notes from Søren Sandmann Pedersen, add tests to match

Co-authored-by: Peter Hutterer peter.hutte...@who-t.net
Tested-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Adam Jackson a...@redhat.com
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 655c0e4..ba1d176 100644
--- a/configure.ac
+++ b/configure.ac
@@ -810,7 +810,7 @@ dnl specific modules against it
 PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)
 REQUIRED_LIBS=$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau
 
-REQUIRED_MODULES=[fixesproto = 4.1] [damageproto = 1.1] [xcmiscproto = 
1.2.0] [xtrans = 1.2.2] [bigreqsproto = 1.1.0] $SDK_REQUIRED_MODULES
+REQUIRED_MODULES=[fixesproto = 5.0] [damageproto = 1.1] [xcmiscproto = 
1.2.0] [xtrans = 1.2.2] [bigreqsproto = 1.1.0] $SDK_REQUIRED_MODULES
 
 if test x$CONFIG_UDEV = xyes 
  { test x$CONFIG_DBUS_API = xyes || test x$CONFIG_HAL = xyes; }; then
diff --git a/include/protocol-versions.h b/include/protocol-versions.h
index 8692ded..7b7a9f5 100644
--- a/include/protocol-versions.h
+++ b/include/protocol-versions.h
@@ -122,7 +122,7 @@
 #define SERVER_XF86VIDMODE_MINOR_VERSION   2
 
 /* Fixes */
-#define SERVER_XFIXES_MAJOR_VERSION4
+#define SERVER_XFIXES_MAJOR_VERSION5
 #define SERVER_XFIXES_MINOR_VERSION0
 
 /* X Input */
diff --git a/test/Makefile.am b/test/Makefile.am
index b7ee070..5574e7d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,7 @@
 if ENABLE_UNIT_TESTS
 if HAVE_LD_WRAP
 SUBDIRS= . xi2
-noinst_PROGRAMS = xkb input xtest list misc
+noinst_PROGRAMS = xkb input xtest list misc fixes
 check_LTLIBRARIES = libxservertest.la
 
 TESTS=$(noinst_PROGRAMS)
@@ -19,6 +19,7 @@ input_LDADD=$(TEST_LDADD)
 xtest_LDADD=$(TEST_LDADD)
 list_LDADD=$(TEST_LDADD)
 misc_LDADD=$(TEST_LDADD)
+fixes_LDADD=$(TEST_LDADD)
 
 libxservertest_la_LIBADD = \
 $(XSERVER_LIBS) \
diff --git a/test/fixes.c b/test/fixes.c
new file mode 100644
index 000..8c804ba
--- /dev/null
+++ b/test/fixes.c
@@ -0,0 +1,327 @@
+/**
+ * Copyright © 2011 Red Hat, Inc.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a
+ *  copy of this software and associated documentation files (the Software),
+ *  to deal in the Software without restriction, including without limitation
+ *  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *  and/or sell copies of the Software, and to permit persons to whom the
+ *  Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice (including the next
+ *  paragraph) shall be included in all copies or substantial portions of the
+ *  Software.
+ *
+ *  THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ *  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ *  DEALINGS IN THE SOFTWARE.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include dix-config.h
+#endif
+
+#include stdio.h
+#include stdlib.h
+#include X11/X.h
+#include xfixesint.h
+#include X11/extensions/xfixeswire.h
+
+static void
+_fixes_test_direction(struct PointerBarrier *barrier, int d[4], int permitted)
+{
+BOOL blocking;
+int i, j;
+int dir = barrier_get_direction(d[0], 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 .gitignore|1 
 ChangeLog |96849 ++
 Makefile.am   |2 
 Xext/Makefile.am  |7 
 Xext/geext.c  |9 
 Xext/panoramiX.c  |   26 
 Xext/panoramiX.h  |4 
 Xext/panoramiXprocs.c |   50 
 Xext/panoramiXsrv.h   |   23 
 Xext/shm.c|6 
 Xext/xcalibrate.c |  297 
 Xext/xselinux_hooks.c |   32 
 Xext/xtest.c  |7 
 Xext/xvdisp.c |4 
 Xext/xvdix.h  |   12 
 Xext/xvmain.c |   21 
 Xext/xvmc.c   |6 
 Xi/chgdctl.c  |   72 
 Xi/exevents.c |  246 
 Xi/exglobals.h|2 
 Xi/extinit.c  |4 
 Xi/getdctl.c  |   75 
 Xi/stubs.c|   12 
 Xi/xichangehierarchy.c|8 
 Xi/xipassivegrab.c|   10 
 Xi/xiquerydevice.c|4 
 Xi/xiquerypointer.c   |2 
 Xi/xiqueryversion.c   |7 
 Xi/xiwarppointer.c|2 
 composite/compalloc.c |  173 
 composite/compext.c   |5 
 composite/compint.h   |5 
 composite/compwindow.c|   19 
 configure.ac  |  175 
 damageext/damageext.c |2 
 dbe/dbe.c |   25 
 debian/README.source  |   66 
 debian/changelog  | 2586 
 debian/compat |1 
 debian/control|  327 
 debian/copyright  | 1822 
 debian/gbp.conf   |8 
 debian/local/10-kbd.conf  |5 
 debian/local/10-mouse.conf|5 
 debian/local/64-xorg-xkb.rules|8 
 debian/local/dh_xsf_substvars |   53 
 debian/local/xsf.pm   |8 
 debian/local/xvfb-run |  191 
 debian/local/xvfb-run.1   |  282 
 debian/patches/001_fedora_extramodes.patch|   83 
 debian/patches/02_Add-libnettle-as-option-for-sha1.diff   |   84 
 debian/patches/07-xfree86-fix-build-with-xv-disabled.diff |   46 
 debian/patches/13_debian_add_xkbpath_env_variable.diff|   27 
 debian/patches/15-nouveau.diff|  100 
 debian/patches/20-workaround-36986.diff   |   14 
 debian/patches/series |8 
 debian/rules  |  356 
 debian/serverminver   |3 
 debian/watch  |2 
 debian/xdmx-tools.install |6 
 debian/xdmx.install   |2 
 debian/xnest.install  |2 
 debian/xserver-common.install |2 
 debian/xserver-xephyr.docs|1 
 debian/xserver-xephyr.install |2 
 debian/xserver-xfbdev.install |1 
 debian/xserver-xorg-core-udeb.install |7 
 debian/xserver-xorg-core.bug.script   |  146 
 debian/xserver-xorg-core.install  |   11 
 debian/xserver-xorg-core.postrm   |   14 
 debian/xserver-xorg-dev.install   |6 
 debian/xvfb.install   |4 
 devbook.am|   62 
 dix/Makefile.am   |1 
 dix/cursor.c  

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 Xi/exevents.c |   11 
 Xi/extinit.c  |2 
 Xi/xipassivegrab.c|   16 
 configure.ac  |6 
 dix/devices.c |   47 
 dix/ptrveloc.c|2 
 glx/Makefile.am   |6 
 glx/glapi.c   |  558 --
 glx/glapi.h   |   28 
 glx/glapitemp.h   | 6655 --
 glx/glxcmds.c |  109 
 glx/glxdri2.c |1 
 glx/glxdriswrast.c|8 
 glx/glxext.c  |   53 
 glx/glxserver.h   |7 
 hw/xquartz/GL/indirect.c  |9 
 hw/xquartz/X11Application.m   |2 
 hw/xquartz/applewmExt.h   |   13 
 hw/xquartz/darwinEvents.c |   28 
 hw/xquartz/mach-startup/bundle-main.c |   23 
 hw/xquartz/pbproxy/x-selection.m  |   11 
 hw/xquartz/xpr/xprAppleWM.c   |4 
 include/input.h   |5 
 include/inputstr.h|2 
 miext/rootless/rootlessScreen.c   |2 
 test/input.c  |   24 
 26 files changed, 230 insertions(+), 7402 deletions(-)

New commits:
commit 164ef01bd55a1d2c31620e9868f4cc3d032223a6
Author: Jeremy Huddleston jerem...@apple.com
Date:   Fri May 6 15:43:04 2011 -0700

configure.ac: Version bumped to 1.10.1.901

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff --git a/configure.ac b/configure.ac
index 949db90..5f85383 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.10.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2011-04-15
+AC_INIT([xorg-server], 1.10.1.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2011-05-06
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit c52a93c5398e439e6e1d9e8ee20c6c1cf28dd5de
Author: Jeremy Huddleston jerem...@apple.com
Date:   Fri Apr 29 11:06:18 2011 -0700

XQuartz: Fix incorrect typedefs with XPLUGIN_VERSION  4

Ok, this time for sure... how many brown bags can I fit over my face?

Signed-off-by: Jeremy Huddleston jerem...@apple.com
(cherry picked from commit 0fc7ec6dd504aa03e1a1b18c60942c0c8c8b701b)

diff --git a/hw/xquartz/applewmExt.h b/hw/xquartz/applewmExt.h
index 35c8f8f..c46a7bd 100644
--- a/hw/xquartz/applewmExt.h
+++ b/hw/xquartz/applewmExt.h
@@ -35,9 +35,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include Xplugin.h
 
 #if XPLUGIN_VERSION  4
-typedef xp_frame_attr int;
-typedef xp_frame_class int;
-typedef xp_frame_rect int;
+typedef int xp_frame_attr;
+typedef int xp_frame_class;
+typedef int xp_frame_rect;
 #endif
 
 typedef int (*DisableUpdateProc)(void);

commit 7688d6d317f809028394ea6c5ffa31424e853796
Author: Adam Jackson a...@redhat.com
Date:   Fri Apr 15 13:01:37 2011 -0400

glx: Make --disable-dri not disable AIGLX

Either the DRI1 or DRI2 loaders are sufficient.

Reviewed-by: Ian Romanick ian.d.roman...@intel.com
Signed-off-by: Adam Jackson a...@redhat.com
(cherry picked from commit 001b6b8b70734db1fa2f68e45c1db8337ba9f662)

diff --git a/configure.ac b/configure.ac
index 756733e..949db90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1009,7 +1009,7 @@ else
 fi
 AM_CONDITIONAL(GLX, test x$GLX = xyes)
 
-if test x$AIGLX = xyes -a x$GLX = xyes -a x$DRI = xyes; then
+if test x$AIGLX = xyes -a x$GLX = xyes -a \( x$DRI = xyes -o x$DRI2 = 
xyes \); then
AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
 else
AIGLX=no
diff --git a/glx/Makefile.am b/glx/Makefile.am
index 8c7f7a5..091c18b 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -49,10 +49,13 @@ glapi_sources = \
glthread.h
 
 libglxdri_la_SOURCES = \
-glxdri.c \
 extension_string.c \
 extension_string.h
 
+if DRI
+libglxdri_la_SOURCES += glxdri.c
+endif
+
 if DRI2_AIGLX
 libglxdri_la_SOURCES += glxdri2.c
 endif

commit e67afcdb9a6a634d6903da3f272aed7dab0e91b3
Author: Adam Jackson a...@redhat.com
Date:   Fri Apr 15 12:57:05 2011 -0400

glx: Use 0 rather than garbage for unknown INTEL_swap_event types

Otherwise the garbage you return could well be numerically identical to
one of the swap type tokens, and apps which rely on us to tell the truth
would be in trouble.

Reviewed-by: Jesse Barnes jbar...@virtuousgeek.org
Signed-off-by: Adam Jackson a...@redhat.com
(cherry picked from commit f8540b9dcc1fba886be5c4ce7ea0d74952cb48c4)

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 8d21c93..c4b7ba4 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -184,6 +184,7 @@ 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 configure.ac  |4 ++--
 dix/devices.c |   42 --
 2 files changed, 2 insertions(+), 44 deletions(-)

New commits:
commit a73311f8304193f9245fb077f173bf1e1d52e040
Author: Jeremy Huddleston jerem...@apple.com
Date:   Fri Apr 15 17:58:57 2011 -0700

configure.ac: Bump verison to 1.10.1

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff --git a/configure.ac b/configure.ac
index d5d3e3b..756733e 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.10.0.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2011-04-08
+AC_INIT([xorg-server], 1.10.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2011-04-15
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 55f85d6cc28d737314f12958aac49d61b9476657
Author: Jeremy Huddleston jerem...@apple.com
Date:   Thu Apr 14 15:24:07 2011 -0700

Revert dix: release all buttons and keys before reattaching a device 
(#34182)

This patch introduced a regression, reverting for the 1.10.1 release. See
https://bugs.freedesktop.org/show_bug.cgi?id=36146

This reverts commit 81fbb96c54f78a7cd96433294ee003c7ef6a772a.

diff --git a/dix/devices.c b/dix/devices.c
index 84284e7..55f22cb 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -2380,46 +2380,6 @@ RecalculateMasterButtons(DeviceIntPtr slave)
 }
 
 /**
- * Generate release events for all keys/button currently down on this
- * device.
- */
-static void
-ReleaseButtonsAndKeys(DeviceIntPtr dev)
-{
-EventListPtreventlist = InitEventList(GetMaximumEventsNum());
-ButtonClassPtr  b = dev-button;
-KeyClassPtr k = dev-key;
-int i, j, nevents;
-
-if (!eventlist) /* no release events for you */
-return;
-
-/* Release all buttons */
-for (i = 0; b  i  b-numButtons; i++)
-{
-if (BitIsOn(b-down, i))
-{
-nevents = GetPointerEvents(eventlist, dev, ButtonRelease, i, 0, 
NULL);
-for (j = 0; j  nevents; j++)
-mieqProcessDeviceEvent(dev, 
(InternalEvent*)(eventlist+j)-event, NULL);
-}
-}
-
-/* Release all keys */
-for (i = 0; k  i  MAP_LENGTH; i++)
-{
-if (BitIsOn(k-down, i))
-{
-nevents = GetKeyboardEvents(eventlist, dev, KeyRelease, i);
-for (j = 0; j  nevents; j++)
-mieqProcessDeviceEvent(dev, 
(InternalEvent*)(eventlist+j)-event, NULL);
-}
-}
-
-FreeEventList(eventlist, GetMaximumEventsNum());
-}
-
-/**
  * Attach device 'dev' to device 'master'.
  * Client is set to the client that issued the request, or NULL if it comes
  * from some internal automatic pairing.
@@ -2452,8 +2412,6 @@ AttachDevice(ClientPtr client, DeviceIntPtr dev, 
DeviceIntPtr master)
 free(dev-spriteInfo-sprite);
 }
 
-ReleaseButtonsAndKeys(dev);
-
 oldmaster = dev-u.master;
 dev-u.master = master;
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qc0f2-0005nq...@alioth.debian.org

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 Xext/geext.c |2 -
 Xext/xtest.c |5 --
 Xi/exevents.c|   10 +++--
 Xi/extinit.c |7 ++-
 Xi/getprop.c |2 -
 Xi/getselev.c|6 +--
 Xi/xichangehierarchy.c   |2 +
 Xi/xiquerydevice.c   |7 ++-
 configure.ac |4 +-
 dix/colormap.c   |2 +
 dix/devices.c|   42 +
 dix/dixfonts.c   |   18 +
 dix/eventconvert.c   |   23 ---
 dix/events.c |7 +--
 dix/extension.c  |5 +-
 dix/getevents.c  |4 ++
 fb/fboverlay.c   |8 +++-
 fb/fbscreen.c|4 --
 hw/xfree86/common/xf86Config.c   |   32 +++-
 hw/xfree86/common/xf86Helper.c   |1 
 hw/xfree86/common/xf86Init.c |4 +-
 hw/xfree86/common/xf86Option.c   |   77 ---
 hw/xfree86/doc/man/xorg.conf.man |   13 +-
 hw/xfree86/dri2/dri2.c   |9 +++-
 hw/xfree86/loader/loadmod.c  |6 +++
 hw/xquartz/bundle/Info.plist.cpp |4 +-
 mi/micmap.c  |2 +
 mi/midispcur.c   |   10 -
 mi/mipointer.c   |1 
 mi/mispans.c |2 +
 mi/mizerline.c   |6 ++-
 os/utils.c   |   21 +++---
 render/render.c  |   25 ++--
 xfixes/region.c  |2 -
 xkb/XKBGAlloc.c  |4 +-
 xkb/ddxList.c|4 +-
 36 files changed, 231 insertions(+), 150 deletions(-)

New commits:
commit ec6e1e45627de2bb851f135df0507a360d0d99e6
Author: Jeremy Huddleston jerem...@apple.com
Date:   Fri Apr 8 16:36:32 2011 -0700

configure.ac: Version bumped to 1.10.0.902 (1.10.1 RC2)

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff --git a/configure.ac b/configure.ac
index 4a09bba..d5d3e3b 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.10.0.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2011-03-29
+AC_INIT([xorg-server], 1.10.0.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2011-04-08
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 7379f7a7717a431ba4f8cf371aad9838aec7bec6
Author: Chase Douglas chase.doug...@canonical.com
Date:   Wed Apr 6 14:51:45 2011 -0400

Fix unset valuator handling for XI 1.x valuator events again

Set the valuator values for unset masked absolute valuators in the
internal device event. This ensures the values will always be correct in
getValuatorEvents even if the device has been removed.

Signed-off-by: Chase Douglas chase.doug...@canonical.com
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit b28a1af55cf1ad2a882cc8cd73b77341dec7ff5a)

diff --git a/dix/eventconvert.c b/dix/eventconvert.c
index edcb9dd..a73c671 100644
--- a/dix/eventconvert.c
+++ b/dix/eventconvert.c
@@ -359,12 +359,12 @@ getValuatorEvents(DeviceEvent *ev, deviceValuator *xv)
 int i;
 int state = 0;
 int first_valuator, num_valuators;
-DeviceIntPtr dev = NULL;
 
 
 num_valuators = countValuators(ev, first_valuator);
 if (num_valuators  0)
 {
+DeviceIntPtr dev = NULL;
 dixLookupDevice(dev, ev-deviceid, serverClient, DixUseAccess);
 /* State needs to be assembled BEFORE the device is updated. */
 state = (dev  dev-key) ? 
XkbStateFieldFromRec(dev-key-xkbInfo-state) : 0;
@@ -381,14 +381,10 @@ getValuatorEvents(DeviceEvent *ev, deviceValuator *xv)
 xv-deviceid = ev-deviceid;
 xv-device_state = state;
 
-for (j = 0; j  xv-num_valuators; j++) {
-if (BitIsOn(ev-valuators.mask, xv-first_valuator + j))
-valuators[j] = ev-valuators.data[xv-first_valuator + j];
-else if (dev-valuator-axes[xv-first_valuator + j].mode == 
Absolute)
-valuators[j] = dev-valuator-axisVal[xv-first_valuator + j];
-else
-valuators[j] = 0;
-}
+/* Unset valuators in masked valuator events have the proper data 
values
+ * in the case of an absolute axis in between two set valuators. */
+for (j = 0; j  xv-num_valuators; j++)
+valuators[j] = ev-valuators.data[xv-first_valuator + j];
 
 if (i + 6  num_valuators)
 xv-deviceid |= MORE_EVENTS;
diff --git a/dix/getevents.c b/dix/getevents.c
index 794df42..8355040 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -205,6 +205,8 @@ set_valuators(DeviceIntPtr dev, DeviceEvent* event, 
ValuatorMask 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 Xi/xipassivegrab.c|4 
 Xi/xiproperty.c   |4 
 config/hal.c  |6 
 config/udev.c |   10 
 configure.ac  |   14 
 dix/devices.c |   16 
 glx/glapi.c   |4 
 glx/glapi.h   |2 
 glx/glthread.h|2 
 hw/dmx/doc/.gitignore |1 
 hw/dmx/doc/Makefile.am|  208 +
 hw/dmx/doc/doxygen.conf   | 1053 --
 hw/dmx/doc/doxygen.conf.in| 1053 ++
 hw/xfree86/common/xf86Config.c|   10 
 hw/xfree86/common/xf86Xinput.c|5 
 hw/xfree86/loader/Makefile.am |   12 
 hw/xfree86/modes/xf86Crtc.c   |   21 
 hw/xfree86/vbe/vbe.c  |2 
 hw/xquartz/X11Application.h   |3 
 hw/xquartz/X11Application.m   |   29 
 hw/xquartz/bundle/Resources/English.lproj/Localizable.strings |binary
 hw/xquartz/pbproxy/x-selection.h  |2 
 hw/xquartz/quartz.c   |2 
 hw/xquartz/quartz.h   |2 
 hw/xquartz/quartzRandR.c  |   27 
 hw/xquartz/xpr/xprAppleWM.c   |2 
 hw/xquartz/xpr/xprFrame.c |4 
 hw/xquartz/xpr/xprScreen.c|   34 
 hw/xwin/glx/Makefile.am   |4 
 include/dix-config.h.in   |3 
 include/xkbsrv.h  |5 
 miext/damage/damage.c |6 
 xkb/XKBAlloc.c|   19 
 xkb/ddxLoad.c |   22 
 xkb/xkb.c |   23 
 xkb/xkbActions.c  |   11 
 36 files changed, 1445 insertions(+), 1180 deletions(-)

New commits:
commit c75637877372c74ae20fdd8f51c5fd68a629f4ac
Author: Jeremy Huddleston jerem...@apple.com
Date:   Mon Mar 28 23:32:06 2011 -0700

configure.ac: 1.10.0.901 (1.10.1 RC1)

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff --git a/configure.ac b/configure.ac
index 61224b6..4a09bba 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.10.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2011-2-25
+AC_INIT([xorg-server], 1.10.0.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2011-03-29
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit d3992dbe586f873a089fca25846ca08a85708352
Author: Jeremy Huddleston jerem...@apple.com
Date:   Mon Mar 28 23:31:18 2011 -0700

hw/dmx/doc: Update list of doxygen-generated files

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff --git a/hw/dmx/doc/Makefile.am b/hw/dmx/doc/Makefile.am
index 8e73602..f6d2b97 100644
--- a/hw/dmx/doc/Makefile.am
+++ b/hw/dmx/doc/Makefile.am
@@ -32,12 +32,21 @@ DOXYGEN_HEAD=\
 DOXYGEN_REST= \
dmx.txt \
scaled.txt \
+   html/annotated.html \
+   html/bc_s.png \
html/ChkNotMaskEv_8c.html \
html/ChkNotMaskEv_8h.html \
html/ChkNotMaskEv_8h_source.html \
html/classes.html \
+   html/closed.png \
+   html/dmx-config_8h.html \
+   html/dmx-config_8h_source.html \
+   html/dmx_8c.html \
html/dmx_8h.html \
html/dmx_8h_source.html \
+   html/dmx__glxvisuals_8c.html \
+   html/dmx__glxvisuals_8h.html \
+   html/dmx__glxvisuals_8h_source.html \
html/dmxarg_8c.html \
html/dmxarg_8h.html \
html/dmxarg_8h_source.html \
@@ -89,7 +98,6 @@ DOXYGEN_REST= \
html/dmxgcops_8c.html \
html/dmxgcops_8h.html \
html/dmxgcops_8h_source.html \
-   html/dmx__glxvisuals_8h_source.html \
html/dmxinit_8c.html \
html/dmxinit_8h.html \
html/dmxinit_8h_source.html \
@@ -138,6 +146,7 @@ DOXYGEN_REST= \
html/dmxsync_8c.html \
html/dmxsync_8h.html \
html/dmxsync_8h_source.html \
+   html/dmxtodmx_8c.html \
 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 configure.ac |6 
 exa/exa_mixed.c  |9 
 hw/dmx/glxProxy/glxcmds.c|   80 -
 hw/dmx/glxProxy/glxsingle.c  |7 
 hw/dmx/glxProxy/glxvendor.c  |6 
 hw/dmx/glxProxy/render2swap.c|   54 
 hw/xfree86/common/xf86Helper.c   |6 
 hw/xfree86/common/xf86Module.h   |2 
 hw/xfree86/common/xf86sbusBus.c  |2 
 hw/xfree86/modes/xf86Crtc.c  |  149 --
 hw/xfree86/modes/xf86Crtc.h  |  119 --
 hw/xfree86/modes/xf86Cursors.c   |4 
 hw/xfree86/modes/xf86RandR12.c   |  387 
+-
 hw/xfree86/modes/xf86Rotate.c|   44 
 hw/xfree86/os-support/bsd/bsd_init.c |6 
 hw/xfree86/os-support/xf86_OSlib.h   |8 
 hw/xquartz/bundle/Info.plist.cpp |2 
 hw/xquartz/bundle/Resources/French.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib |  441 
+--
 hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/German.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib |  360 
+-
 hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib   |  323 
+
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib |binary
 include/colormapst.h |4 
 include/protocol-versions.h  |2 
 include/scrnintstr.h |2 
 include/xorg-server.h.in |7 
 randr/Makefile.am|6 
 randr/mirrcrtc.c |  174 ---
 randr/randr.c|   15 
 randr/randrstr.h |  207 ---
 randr/rrcrtc.c   |  562 
+-
 randr/rrdispatch.c   |6 
 randr/rrinfo.c   |2 
 randr/rrpixmap.c |  154 --
 randr/rrscreen.c |   32 
 randr/rrsdispatch.c  |  132 --
 randr/rrsprite.c |  104 -
 randr/rrtransform.c  |   64 -
 randr/rrtransform.h  |   15 
 record/record.c  |6 
 44 files changed, 1200 insertions(+), 2321 deletions(-)

New commits:
commit 780a77acce1dd369549ece802b3e2c4006058dfe
Author: Keith Packard kei...@keithp.com
Date:   Thu Feb 24 20:45:46 2011 -0800

Version bumped to 1.9.99.903 (1.10 RC3)

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index 8858e86..f3b2939 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.9.99.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2011-2-18
+AC_INIT([xorg-server], 1.9.99.903, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2011-2-24
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 6178959e3dd6482a4317de6eb14eb19ca7329b9c
Author: Keith Packard kei...@keithp.com
Date:   Thu Feb 24 19:42:02 2011 -0800

xfree86: Bump video ABI to 10.0

RandR 1.4 revert changed things

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 49a98bd..581047d 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -82,7 +82,7 @@ typedef enum {
  * mask is 0x.
  */
 #define ABI_ANSIC_VERSION  SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION   SET_ABI_VERSION(9, 0)
+#define ABI_VIDEODRV_VERSION 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 dix/eventconvert.c|   16 -
 exa/exa_migration_mixed.c |   17 +
 test/input.c  |  139 ++
 3 files changed, 157 insertions(+), 15 deletions(-)

New commits:
commit 93a73993708b1345c86ec3ec06b02ed236595673
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Feb 21 15:40:40 2011 +1000

test: write some event → XI1 conversion tests.

Don't test everything, but hey, life is short and I'm trying to have one.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Keith Packard kei...@keithp.com
Reviewed-by: Daniel Stone dan...@fooishbar.org

diff --git a/test/input.c b/test/input.c
index 879e14f..e0e9e6a 100644
--- a/test/input.c
+++ b/test/input.c
@@ -36,6 +36,7 @@
 #include inputstr.h
 #include eventconvert.h
 #include exevents.h
+#include exglobals.h
 #include dixgrabs.h
 #include eventstr.h
 #include inpututils.h
@@ -285,6 +286,143 @@ static void dix_event_to_core_conversion(void)
 dix_event_to_core(ET_Motion);
 }
 
+static void
+_dix_test_xi_convert(DeviceEvent *ev, int expected_rc, int expected_count)
+{
+xEvent *xi;
+int count = 0;
+int rc;
+
+rc = EventToXI((InternalEvent*)ev, xi, count);
+g_assert(rc == expected_rc);
+g_assert(count = expected_count);
+if (count  0){
+deviceKeyButtonPointer *kbp = (deviceKeyButtonPointer*)xi;
+g_assert(kbp-type == IEventBase + ev-type);
+g_assert(kbp-detail == ev-detail.key);
+g_assert(kbp-time == ev-time);
+g_assert((kbp-deviceid  ~MORE_EVENTS) == ev-deviceid);
+g_assert(kbp-root_x == ev-root_x);
+g_assert(kbp-root_y == ev-root_y);
+g_assert(kbp-state == ev-corestate);
+g_assert(kbp-event_x == 0);
+g_assert(kbp-event_y == 0);
+g_assert(kbp-root == ev-root);
+g_assert(kbp-event == 0);
+g_assert(kbp-child == 0);
+g_assert(kbp-same_screen == FALSE);
+
+while (--count  0) {
+deviceValuator *v = (deviceValuator*)xi[count];
+g_assert(v-type == DeviceValuator);
+g_assert(v-num_valuators = 6);
+}
+
+
+free(xi);
+}
+}
+
+/**
+ * This tests for internal event → XI1 event conversion
+ * - all conversions should generate the right XI event type
+ * - right number of events generated
+ * - extra events are valuators
+ */
+static void dix_event_to_xi1_conversion(void)
+{
+DeviceEvent ev = {0};
+int time;
+int x, y;
+int state;
+int detail;
+const int ROOT_WINDOW_ID = 0x100;
+int deviceid;
+
+IEventBase = 80;
+DeviceValuator  = IEventBase - 1;
+DeviceKeyPress  = IEventBase + ET_KeyPress;
+DeviceKeyRelease= IEventBase + ET_KeyRelease;
+DeviceButtonPress   = IEventBase + ET_ButtonPress;
+DeviceButtonRelease = IEventBase + ET_ButtonRelease;
+DeviceMotionNotify  = IEventBase + ET_Motion;
+DeviceFocusIn   = IEventBase + ET_FocusIn;
+DeviceFocusOut  = IEventBase + ET_FocusOut;
+ProximityIn = IEventBase + ET_ProximityIn;
+ProximityOut= IEventBase + ET_ProximityOut;
+
+/* EventToXI callocs */
+x = 0;
+y = 0;
+time = 12345;
+state = 0;
+detail = 0;
+deviceid = 4;
+
+ev.header   = 0xFF;
+
+ev.header   = 0xFF;
+ev.length   = sizeof(DeviceEvent);
+ev.time = time;
+ev.root_y   = x;
+ev.root_x   = y;
+SetBit(ev.valuators.mask, 0);
+SetBit(ev.valuators.mask, 1);
+ev.root = ROOT_WINDOW_ID;
+ev.corestate= state;
+ev.detail.key   = detail;
+ev.deviceid = deviceid;
+
+/* test all types for bad match */
+ev.type = ET_KeyPress; _dix_test_xi_convert(ev, Success, 1);
+ev.type = ET_KeyRelease;   _dix_test_xi_convert(ev, Success, 1);
+ev.type = ET_ButtonPress;  _dix_test_xi_convert(ev, Success, 1);
+ev.type = ET_ButtonRelease;_dix_test_xi_convert(ev, Success, 1);
+ev.type = ET_Motion;   _dix_test_xi_convert(ev, Success, 1);
+ev.type = ET_ProximityIn;  _dix_test_xi_convert(ev, Success, 1);
+ev.type = ET_ProximityOut; _dix_test_xi_convert(ev, Success, 1);
+
+/* No axes */
+ClearBit(ev.valuators.mask, 0);
+ClearBit(ev.valuators.mask, 1);
+ev.type = ET_KeyPress; _dix_test_xi_convert(ev, Success, 1);
+ev.type = ET_KeyRelease;   _dix_test_xi_convert(ev, Success, 1);
+ev.type = ET_ButtonPress;  _dix_test_xi_convert(ev, Success, 1);
+ev.type = ET_ButtonRelease;_dix_test_xi_convert(ev, Success, 1);
+ev.type = ET_Motion;   _dix_test_xi_convert(ev, BadMatch, 0);
+ev.type = ET_ProximityIn;  _dix_test_xi_convert(ev, BadMatch, 0);
+ev.type = ET_ProximityOut; _dix_test_xi_convert(ev, BadMatch, 0);
+
+/* more than 6 axes → 2 valuator events */
+SetBit(ev.valuators.mask, 0);
+

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 COPYING  |2 
 Xext/geext.c |2 
 Xext/security.c  |2 
 Xext/sync.c  |  172 
 Xext/xf86bigfont.c   |   91 
 Xext/xselinux_ext.c  |6 
 Xi/exevents.c|3 
 Xi/extinit.c |1 
 Xi/xigrabdev.c   |2 
 Xi/xipassivegrab.c   |2 
 Xi/xiproperty.c  |2 
 Xi/xiquerypointer.c  |2 
 Xi/xiselectev.c  |   15 
 Xi/xiwarppointer.c   |2 
 composite/compalloc.c|   40 
 composite/compext.c  |2 
 composite/compinit.c |   64 
 composite/compint.h  |7 
 composite/compoverlay.c  |2 
 composite/compwindow.c   |   36 
 config/hal.c |   13 
 config/udev.c|   33 
 configure.ac |   40 
 cpprules.in  |   49 
 dix/Xserver-dtrace.h.in  |2 
 dix/Xserver.d|2 
 dix/deprecated.c |   30 
 dix/devices.c|   17 
 dix/dispatch.c   |2 
 dix/dixfonts.c   |6 
 dix/events.c |  137 
 dix/getevents.c  |   60 
 dix/inpututils.c |8 
 dix/property.c   |3 
 dix/resource.c   |   44 
 dix/window.c |4 
 doc/man/Makefile.am  |   16 
 doc/xml/Xserver-spec.xml |7 
 exa/exa.c|3 
 exa/exa_accel.c  |2 
 exa/exa_driver.c |2 
 exa/exa_migration_mixed.c|   17 
 exa/exa_mixed.c  |2 
 exa/exa_unaccel.c|7 
 fb/Makefile.am   |4 
 fb/fbcmap_mi.c   |2 
 glx/glxcmds.c|  188 
 glx/glxcmdsswap.c|  171 
 glx/glxdri2.c|2 
 glx/unpack.h |2 
 glx/xfont.c  |2 
 hw/dmx/Makefile.am   |   32 
 hw/dmx/Xdmx.man  |  741 -
 hw/dmx/config/Makefile.am|   21 
 hw/dmx/config/dmxtodmx.man   |   41 
 hw/dmx/config/man/Makefile.am|2 
 hw/dmx/config/man/dmxtodmx.man   |   41 
 hw/dmx/config/man/vdltodmx.man   |   95 
 hw/dmx/config/man/xdmxconfig.man |   63 
 hw/dmx/config/vdltodmx.man   |   95 
 hw/dmx/config/xdmxconfig.c   |2 
 hw/dmx/config/xdmxconfig.man |   63 
 hw/dmx/dmx.c |   10 
 hw/dmx/dmxextension.c|   32 
 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit 14983286c489ea1ec6ba4fadbeaec5c2d2ee34e1
Author: Keith Packard kei...@keithp.com
Date:   Mon Dec 6 20:45:35 2010 -0800

Version bumped to 1.9.99.901 (1.10 RC1)

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index d1fc379..b56d3e8 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.9.99.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2010-10-01
+AC_INIT([xorg-server], 1.9.99.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2010-12-06
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit d96d5f5443358e33e47d1a61f9bd2afd8064a8dd
Author: James Jones jajo...@nvidia.com
Date:   Sun Dec 5 19:42:41 2010 -0800

Bump extension ABI to 5

Commit 606e079cc4d9a9db3197652ca51683c36f74efb8 moved the visual
field in WindowOptRec, breaking the extension module ABI.

Signed-off-by: James Jones jajo...@nvidia.com
Reviewed-by: Keith Packard kei...@keithp.com
Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 72f6cf0..af7b778 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -84,7 +84,7 @@ typedef enum {
 #define ABI_ANSIC_VERSION  SET_ABI_VERSION(0, 4)
 #define ABI_VIDEODRV_VERSION   SET_ABI_VERSION(9, 0)
 #define ABI_XINPUT_VERSION SET_ABI_VERSION(12, 0)
-#define ABI_EXTENSION_VERSION  SET_ABI_VERSION(4, 0)
+#define ABI_EXTENSION_VERSION  SET_ABI_VERSION(5, 0)
 #define ABI_FONT_VERSION   SET_ABI_VERSION(0, 6)
 
 #define MODINFOSTRING1 0xef23fdc5

commit 435361bd73b9fc733f093d81af6b839953e35176
Author: Keith Packard kei...@keithp.com
Date:   Mon Dec 6 20:38:14 2010 -0800

sync: syncObject may be None in SyncInitTrigger

And often is, especially when called from ProcSyncCreateAlarm.
Crashing in this case seems unwise.

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/Xext/sync.c b/Xext/sync.c
index ce00755..ab8f20d 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -296,7 +296,7 @@ SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, 
XID syncObject,
 
 /* if system counter, ask it what the current value is */
 
-if (SYNC_COUNTER == pSync-type)
+if (pSync  SYNC_COUNTER == pSync-type)
 {
pCounter = (SyncCounter *)pSync;
 
@@ -320,7 +320,7 @@ SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, 
XID syncObject,
 if (changes  XSyncCATestType)
 {
 
-   if (SYNC_FENCE == pSync-type)
+   if (pSync  SYNC_FENCE == pSync-type)
{
pTrigger-CheckTrigger = SyncCheckTriggerFence;
}

commit 0d01b66df9081ef48843b3bad81c56bb2cd1ae69
Author: Keith Packard kei...@keithp.com
Date:   Sun Dec 5 23:35:28 2010 -0800

randr: handle RRSetCrtcConfigs request with zero configs

Need to actually return a reply in this case.

Signed-off-by: Keith Packard kei...@keithp.com
Reviewed-by: Aaron Plattner aplatt...@nvidia.com

diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 0fc8188..5fe6900 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -1750,9 +1750,6 @@ ProcRRSetCrtcConfigs (ClientPtr client)
 screen_config.mm_width = stuff-widthInMillimeters;
 screen_config.mm_height = stuff-heightInMillimeters;
 
-if (num_configs == 0)
-   return Success;
-
 output_ids = (RROutput *) (x_configs + num_configs);
 
 /*
@@ -1760,7 +1757,7 @@ ProcRRSetCrtcConfigs (ClientPtr client)
  * server crtc configurations
  */
 configs = calloc(num_configs, sizeof (RRCrtcConfigRec));
-if (!configs)
+if (num_configs  0  configs == NULL)
return BadAlloc;
 for (i = 0; i  num_configs; i++) {
rc = RRConvertCrtcConfig(client, screen, screen_config,
@@ -1773,7 +1770,8 @@ ProcRRSetCrtcConfigs (ClientPtr client)
output_ids += x_configs[i].nOutput;
 }
 
-if (!RRSetCrtcConfigs (screen, screen_config, configs, num_configs))
+if (num_configs 
+   !RRSetCrtcConfigs (screen, screen_config, configs, num_configs))
 {
rep.status = RRSetConfigFailed;
goto sendReply;

commit b0f4bd61f0caf80f3be9a176f1f7a707bc6628d8
Author: Keith Packard kei...@keithp.com
Date:   Sun Dec 5 21:53:25 2010 -0800

ProcRRSetCrtcConfigs uses 'configs' without being initialized

If the client sends invalid data for this request, the server
will jump to 'sendReply' and call RRFreeCrtcConfigs, passing it the
uninitialized 'configs' and 'num_configs' values.

Signed-off-by: Keith Packard kei...@keithp.com
Reviewed-by: Aaron Plattner aplatt...@nvidia.com

diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 97aa3d7..0fc8188 100644
--- a/randr/rrcrtc.c
+++ 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 config/udev.c|2 
 configure.ac |4 
 dix/getevents.c  |   18 
 hw/xquartz/bundle/Info.plist.cpp |4 
 hw/xquartz/bundle/Resources/Dutch.lproj/locversion.plist |4 
 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib  |  440 
 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib|binary
 hw/xquartz/bundle/Resources/German.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib |  208 
 hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/Italian.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib|  434 
 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib   |  229 
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib|  441 
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/ar.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib |  441 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/da.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib |  402 
 hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/fi.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib |  209 
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/ko.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib |  411 
 hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/no.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib |  448 
 hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/pl.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib |  418 
 hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/pt.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib |  459 
 hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/pt_PT.lproj/locversion.plist |4 
 hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/designable.nib  |  198 
 hw/xquartz/bundle/Resources/pt_PT.lproj/main.nib/keyedobjects.nib|binary
 hw/xquartz/bundle/Resources/ru.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/ru.lproj/main.nib/designable.nib |  424 
 hw/xquartz/bundle/Resources/ru.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/sv.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib |  421 
 hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/zh_CN.lproj/Localizable.strings  |binary
 hw/xquartz/bundle/Resources/zh_CN.lproj/locversion.plist |4 
 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib  | 7106 
--
 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib|binary
 hw/xquartz/bundle/Resources/zh_TW.lproj/locversion.plist |4 
 hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/designable.nib  |  447 
 hw/xquartz/bundle/Resources/zh_TW.lproj/main.nib/keyedobjects.nib|binary
 hw/xquartz/darwinEvents.c|3 
 hw/xquartz/quartz.c  |   24 
 mi/misprite.c|2 
 59 files changed, 7399 insertions(+), 5862 deletions(-)

New commits:
commit df12f4a4d9afe819fd3ae1ec8aaa5a7ec9d6567f
Author: Jeremy Huddleston jerem...@apple.com
Date:   Sun Jan 30 17:07:25 2011 -0800

xorg-server 1.9.3.902

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff --git a/configure.ac b/configure.ac
index 02320c5..a977c7a 100644
--- a/configure.ac
+++ 

xorg-server: Changes to 'upstream-experimental-1.10'

[Christopher Halse Rogers]

New branch 'upstream-experimental-1.10' available with the following commits:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pjlix-0006yt...@alioth.debian.org

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 Xext/sync.c |   35 +
 Xi/exevents.c   |6 
 configure.ac|4 
 exa/exa_accel.c |2 
 exa/exa_mixed.c |2 
 exa/exa_unaccel.c   |2 
 hw/xfree86/dri2/dri2.c  |   11 
 hw/xfree86/modes/xf86EdidModes.c|7 
 hw/xfree86/modes/xf86Modes.c|   33 -
 hw/xfree86/x86emu/ops.c |   63 +
 hw/xquartz/GL/Makefile.am   |2 
 hw/xquartz/Makefile.am  |2 
 hw/xquartz/X11Application.h |1 
 hw/xquartz/X11Application.m |2 
 hw/xquartz/X11Controller.h  |1 
 hw/xquartz/X11Controller.m  |4 
 hw/xquartz/bundle/Info.plist.cpp|4 
 hw/xquartz/bundle/Resources/English.lproj/main.nib/designable.nib   |  320 
++---
 hw/xquartz/bundle/Resources/English.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/quartz.c |   11 
 hw/xquartz/quartz.h |1 
 hw/xquartz/quartzAudio.c|  329 
--
 hw/xquartz/quartzAudio.h|   37 -
 hw/xquartz/quartzKeyboard.c |1 
 hw/xquartz/quartzStartup.c  |4 
 include/protocol-versions.h |4 
 mi/mieq.c   |8 
 os/access.c |4 
 os/utils.c  |   16 
 randr/rrscreen.c|   12 
 render/animcur.c|8 
 test/input.c|   74 +-
 32 files changed, 461 insertions(+), 549 deletions(-)

New commits:
commit 6451a3ff949ff55c9dff7399d0babb6b98201e99
Author: Jeremy Huddleston jerem...@apple.com
Date:   Fri Jan 7 15:40:25 2011 -0800

xorg-server 1.9.3.901 (1.9.4 RC1)

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff --git a/configure.ac b/configure.ac
index f861077..02320c5 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.9.3, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2010-12-13
+AC_INIT([xorg-server], 1.9.3.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2011-01-07
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit c11f9bfc081423a7f15d72c36f2f0d6518083591
Author: Jeremy Huddleston jerem...@apple.com
Date:   Fri Jan 7 15:39:14 2011 -0800

XQuartz: Update copyright dates in bundle's plist

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index 85b439a..eb193bf 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -35,9 +35,9 @@
 
stringhttp://xquartz.macosforge.org/downloads/sparkle/release.xml/string
 #endif
keyNSHumanReadableCopyright/key
-   string© 2003-2010 Apple Inc.
+   string© 2003-2011 Apple Inc.
 © 2003 XFree86 Project, Inc.
-© 2003-2010 X.org Foundation, Inc.
+© 2003-2011 X.org Foundation, Inc.
 /string
keyNSMainNibFile/key
stringmain/string

commit 3d12e6d25a79c1d78964df723731d2510bb932f8
Author: Zhao Yakui yakui.z...@intel.com
Date:   Tue Jan 4 14:08:16 2011 -0500

edid: Fix incorrect timings for VIC61

Reviewed-by: Adam Jackson a...@redhat.com
Signed-off-by: Anssi Hannula anssi.hann...@iki.fi
Signed-off-by: Zhao Yakui yakui.z...@intel.com
(cherry picked from commit 86ca434a1ab766c1519ee7146b48dbfead843524)

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index c25b707..d1d2e51 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -961,7 +961,7 @@ static const DisplayModeRec 
CEAVideoModes[CEA_VIDEO_MODES_NUM] = {
 { MODEPREFIX,   108000, 1440, 1478, 1602, 1716, 0,  480,  488,  494,  525, 
0, V_NHSYNC | V_NVSYNC | 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 Xext/panoramiXprocs.c   |2 
 Xi/extinit.c|4 
 Xi/listdev.c|4 
 composite/compalloc.c   |2 
 composite/compwindow.c  |4 
 configure.ac|   16 -
 damageext/damageext.c   |4 
 dix/Makefile.am |1 
 dix/eventconvert.c  |9 
 dix/getevents.c |   14 -
 dix/inpututils.c|   24 +-
 dix/window.c|6 
 doc/xml/dtrace/Makefile.am  |2 
 exa/exa.c   |3 
 glx/glxdri.c|4 
 hw/dmx/glxProxy/glxcmds.c   |6 
 hw/dmx/glxProxy/glxcmdsswap.c   |2 
 hw/kdrive/ephyr/ephyrdriext.c   |2 
 hw/kdrive/linux/tslib.c |   15 -
 hw/xfree86/common/xf86DGA.c |4 
 hw/xfree86/common/xf86Mode.c|   64 
+
 hw/xfree86/common/xf86Xinput.c  |2 
 hw/xfree86/ddc/ddc.c|4 
 hw/xfree86/dixmods/extmod/xf86dga2.c|   46 ++--
 hw/xfree86/dri2/dri2.c  |   11 
 hw/xfree86/modes/xf86Cursors.c  |   62 
+++--
 hw/xfree86/modes/xf86EdidModes.c|4 
 hw/xfree86/modes/xf86RandR12.c  |   10 
 hw/xfree86/modes/xf86Rotate.c   |2 
 hw/xfree86/os-support/hurd/hurd_mmap.c  |   12 -
 hw/xfree86/os-support/hurd/hurd_video.c |   27 +-
 hw/xfree86/os-support/linux/lnx_video.c |2 
 hw/xfree86/x86emu/ops.c |   20 +
 hw/xquartz/bundle/Makefile.am   |4 
 hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib   |   52 ++--
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/ar.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib|   44 +--
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/da.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib|   21 +
 hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/pl.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib|   23 +-
 hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/pt.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/pt.lproj/main.nib/designable.nib|   97 
+---
 hw/xquartz/bundle/Resources/pt.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/sv.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/sv.lproj/main.nib/designable.nib|   42 +--
 hw/xquartz/bundle/Resources/sv.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/designable.nib |2 
 hw/xquartz/bundle/Resources/zh_CN.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/mk_bundke.sh  |3 
 hw/xquartz/mach-startup/bundle-main.c   |2 
 hw/xquartz/quartz.c |   37 +++
 hw/xquartz/quartzRandR.c|   23 +-
 hw/xquartz/xpr/dri.c|  112 
--
 include/eventstr.h  |2 
 include/inputstr.h  |2 
 mi/miwideline.c |2 
 miext/shadow/shpacked.c |4 
 os/io.c |   19 +
 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 configure.ac  |6 +++---
 miext/damage/damage.c |6 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit e3769c20d5f656f76e2c475a722db97c58089260
Author: Jeremy Huddleston jerem...@apple.com
Date:   Sat Oct 30 19:49:42 2010 -0700

Bump version to 1.9.2

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff --git a/configure.ac b/configure.ac
index b1f6282..77cad54 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.9.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2010-10-22
+AC_INIT([xorg-server], 1.9.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2010-10-30
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit e0ab016d85f828a78cb53ee9bcb171535de6032e
Author: Jeremy Huddleston jerem...@apple.com
Date:   Sat Oct 30 19:48:22 2010 -0700

Revert rootless: Remove ROOTLESS_WORKAROUND

Christof Wolf has reported a regression that seems to be caused by
this change, so reverting the change in the 1.9 branch.  We'll
investigate a proper fix in master for 1.10.

This reverts commit c89f0521044083a11d538ebfeaabee6fc7fb9a03.

diff --git a/configure.ac b/configure.ac
index a3843dc..b1f6282 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1926,7 +1926,7 @@ if test x$XQUARTZ = xyes; then
 
AC_CHECK_LIB([Xplugin],[xp_init],[:])
 
-   CFLAGS=${CFLAGS} -DROOTLESS_SAFEALPHA -DNO_ALLOCA
+   CFLAGS=${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA 
-DNO_ALLOCA
 
PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11)
 
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index e0e96f2..1cf0513 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -89,7 +89,11 @@ getDrawableDamageRef (DrawablePtr pDrawable)
ScreenPtr   pScreen = pDrawable-pScreen;
 
pPixmap = 0;
-   if (pScreen-GetWindowPixmap)
+   if (pScreen-GetWindowPixmap
+#ifdef ROOTLESS_WORKAROUND
+((WindowPtr)pDrawable)-viewable
+#endif
+   )
pPixmap = (*pScreen-GetWindowPixmap) ((WindowPtr)pDrawable);
 
if (!pPixmap)

commit 6e1f78bddfb854933206f9f5fd8d1dfc66ba8820
Author: Jeremy Huddleston jerem...@apple.com
Date:   Fri Oct 22 20:18:38 2010 -0700

Bump version to 1.9.1

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff --git a/configure.ac b/configure.ac
index fd533a5..a3843dc 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.9.0.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2010-10-15
+AC_INIT([xorg-server], 1.9.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2010-10-22
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pfy4r-00028o...@alioth.debian.org

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 configure.ac |4 +--
 dix/eventconvert.c   |9 --
 hw/xfree86/vbe/vbe.c |   66 ++-
 mi/mieq.c|4 +++
 4 files changed, 9 insertions(+), 74 deletions(-)

New commits:
commit 4dd316f25261707620cd4c52e2987b93627ff260
Author: Jeremy Huddleston jerem...@apple.com
Date:   Fri Oct 15 11:08:42 2010 -0700

Bump version to 1.9.0.902 (1.9.1 rc2)

Signed-off-by: Jeremy Huddleston jerem...@apple.com

diff --git a/configure.ac b/configure.ac
index 407a058..fd533a5 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.9.0.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2010-10-01
+AC_INIT([xorg-server], 1.9.0.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2010-10-15
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 712853fbcbc644575d791fa48fbd5757cd850f1d
Author: Jon TURNEY jon.tur...@dronecode.org.uk
Date:   Wed Oct 13 17:34:31 2010 +0100

event_size is currently never assigned to in mieqProcessInputEvents().

event_size is never assigned to in mieqProcessInputEvents(), so realloc()
is always called.  This is benign, but I'm guessing not intended.

Signed-off-by: Jon TURNEY jon.tur...@dronecode.org.uk
Reviewed-by: Keith Packard kei...@keithp.com
Signed-off-by: Keith Packard kei...@keithp.com
(cherry picked from commit da4eebe58ec81e2297cc1773af1fb622fb392bbd)

diff --git a/mi/mieq.c b/mi/mieq.c
index fa60b40..d1441e2 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -439,7 +439,11 @@ mieqProcessInputEvents(void)
 
 evlen   = e-events-evlen;
 if(evlen  event_size)
+  {
 event = realloc(event, evlen);
+event_size = evlen;
+  }
+
 
 if (!event)
 FatalError([mi] No memory left for event processing.\n);

commit efeb2ebd7e307224a735469ff89a3a6af4cf143b
Author: Adam Jackson a...@redhat.com
Date:   Tue Oct 5 11:24:28 2010 -0400

vbe: Fix copying the mode info block

Just use memcpy, seriously.

Reviewed-by: Rémi Cardona r...@gentoo.org
Signed-off-by: Adam Jackson a...@redhat.com
Signed-off-by: Keith Packard kei...@keithp.com
(cherry picked from commit 853d7ebfa3e2d281d92890a39010ff5787a00ffd)

diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
index 0b34648..7a64a4a 100644
--- a/hw/xfree86/vbe/vbe.c
+++ b/hw/xfree86/vbe/vbe.c
@@ -527,69 +527,9 @@ VBEGetModeInfo(vbeInfoPtr pVbe, int mode)
 if (R16(pVbe-pInt10-ax) != 0x4f)
return NULL;
 
-block = calloc(sizeof(VbeModeInfoBlock), 1);
-
-block-ModeAttributes = *(CARD16*)pVbe-memory;
-block-WinAAttributes = ((char*)pVbe-memory)[2];
-block-WinBAttributes = ((char*)pVbe-memory)[3];
-block-WinGranularity = *(CARD16*)(((char*)pVbe-memory) + 4);
-block-WinSize = *(CARD16*)(((char*)pVbe-memory) + 6);
-block-WinASegment = *(CARD16*)(((char*)pVbe-memory) + 8);
-block-WinBSegment = *(CARD16*)(((char*)pVbe-memory) + 10);
-block-WinFuncPtr = *(CARD32*)(((char*)pVbe-memory) + 12);
-block-BytesPerScanline = *(CARD16*)(((char*)pVbe-memory) + 16);
-
-/* mandatory information for VBE 1.2 and above */
-block-XResolution = *(CARD16*)(((char*)pVbe-memory) + 18);
-block-YResolution = *(CARD16*)(((char*)pVbe-memory) + 20);
-block-XCharSize = ((char*)pVbe-memory)[22];
-block-YCharSize = ((char*)pVbe-memory)[23];
-block-NumberOfPlanes = ((char*)pVbe-memory)[24];
-block-BitsPerPixel = ((char*)pVbe-memory)[25];
-block-NumberOfBanks = ((char*)pVbe-memory)[26];
-block-MemoryModel = ((char*)pVbe-memory)[27];
-block-BankSize = ((char*)pVbe-memory)[28];
-block-NumberOfImages = ((char*)pVbe-memory)[29];
-block-Reserved = ((char*)pVbe-memory)[30];
-
-/* Direct color fields (required for direct/6 and YUV/7 memory models) */
-block-RedMaskSize = ((char*)pVbe-memory)[31];
-block-RedFieldPosition = ((char*)pVbe-memory)[32];
-block-GreenMaskSize = ((char*)pVbe-memory)[33];
-block-GreenFieldPosition = ((char*)pVbe-memory)[34];
-block-BlueMaskSize = ((char*)pVbe-memory)[35];
-block-BlueFieldPosition = ((char*)pVbe-memory)[36];
-block-RsvdMaskSize = ((char*)pVbe-memory)[37];
-block-RsvdFieldPosition = ((char*)pVbe-memory)[38];
-block-DirectColorModeInfo = ((char*)pVbe-memory)[39];
-
-/* Mandatory information for VBE 2.0 and above */
-if (pVbe-version = 0x200) {
-   block-PhysBasePtr = *(CARD32*)(((char*)pVbe-memory) + 40);
-   block-Reserved32 = *(CARD32*)(((char*)pVbe-memory) + 44);
-   block-Reserved16 = *(CARD16*)(((char*)pVbe-memory) + 48);
-
-   /* Mandatory information for VBE 3.0 and above */
-   if (pVbe-version = 0x300) {
-   block-LinBytesPerScanLine = 

xorg-server: Changes to 'upstream-experimental'

[Cyril Brulebois]

 config/udev.c|   26 
 configure.ac |6 
 dix/devices.c|4 
 dix/eventconvert.c   |9 
 dix/privates.c   |1 
 dix/property.c   |1 
 dix/selection.c  |3 
 glx/glxext.c |   11 
 hw/xfree86/common/compiler.h |  416 +
 hw/xfree86/common/xf86DGA.c  |2 
 hw/xfree86/common/xf86Helper.c   |3 
 hw/xfree86/common/xf86Xinput.c   |1 
 hw/xfree86/doc/man/Xorg.man.pre  |   10 
 hw/xfree86/modes/xf86RandR12.c   |3 
 hw/xfree86/os-support/linux/lnx_init.c   |5 
 hw/xfree86/parser/scan.c |2 
 hw/xfree86/vgahw/vgaHW.h |2 
 hw/xquartz/Makefile.am   |2 
 hw/xquartz/X11Application.h  |3 
 hw/xquartz/X11Application.m  |   44 
 hw/xquartz/X11Controller.m   |   42 
 hw/xquartz/bundle/Resources/Dutch.lproj/locversion.plist |4 
 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/designable.nib  | 1591 
++
 hw/xquartz/bundle/Resources/Dutch.lproj/main.nib/keyedobjects.nib|binary
 hw/xquartz/bundle/Resources/French.lproj/Localizable.strings |binary
 hw/xquartz/bundle/Resources/French.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib | 1720 
++-
 hw/xquartz/bundle/Resources/French.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/German.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib | 1598 
++
 hw/xquartz/bundle/Resources/German.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/Italian.lproj/Localizable.strings|binary
 hw/xquartz/bundle/Resources/Italian.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/designable.nib| 1543 
++
 hw/xquartz/bundle/Resources/Italian.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist  |4 
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib   | 1618 
++
 hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/keyedobjects.nib |binary
 hw/xquartz/bundle/Resources/Spanish.lproj/Localizable.strings|binary
 hw/xquartz/bundle/Resources/Spanish.lproj/locversion.plist   |4 
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/designable.nib| 1586 
++
 hw/xquartz/bundle/Resources/Spanish.lproj/main.nib/keyedobjects.nib  |binary
 hw/xquartz/bundle/Resources/ar.lproj/InfoPlist.strings   |binary
 hw/xquartz/bundle/Resources/ar.lproj/Localizable.strings |binary
 hw/xquartz/bundle/Resources/ar.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/designable.nib | 2413 
--
 hw/xquartz/bundle/Resources/ar.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/da.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/da.lproj/main.nib/designable.nib | 1530 
++
 hw/xquartz/bundle/Resources/da.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/fi.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/designable.nib | 1678 
++
 hw/xquartz/bundle/Resources/fi.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/ko.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/ko.lproj/main.nib/designable.nib | 1544 
++
 hw/xquartz/bundle/Resources/ko.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/no.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/no.lproj/main.nib/designable.nib | 1588 
++
 hw/xquartz/bundle/Resources/no.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/pl.lproj/locversion.plist|4 
 hw/xquartz/bundle/Resources/pl.lproj/main.nib/designable.nib | 1554 
++
 hw/xquartz/bundle/Resources/pl.lproj/main.nib/keyedobjects.nib   |binary
 hw/xquartz/bundle/Resources/pt.lproj/locversion.plist|  

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Xi/exevents.c  |   27 +---
 configure.ac   |4 +--
 dbe/midbe.c|6 
 dbe/midbestr.h |   16 
 dix/devices.c  |2 -
 dix/events.c   |   12 ++---
 dix/getevents.c|   49 ++---
 exa/exa.c  |   23 +
 exa/exa_classic.c  |4 ---
 exa/exa_driver.c   |4 ---
 exa/exa_mixed.c|4 ---
 exa/exa_priv.h |3 ++
 glx/glxdri.c   |   17 +++-
 glx/glxdri2.c  |   17 +++-
 hw/dmx/input/atKeynames.h  |2 -
 hw/kdrive/ephyr/ephyr.c|8 --
 hw/xfree86/common/xf86Events.c |4 ---
 hw/xfree86/common/xf86VGAarbiter.c |   10 ++-
 hw/xfree86/common/xf86cmap.c   |8 +-
 hw/xfree86/common/xf86xv.c |8 ++
 hw/xfree86/dri2/dri2.c |   19 +-
 hw/xfree86/ramdac/xf86Cursor.c |   12 +++--
 hw/xfree86/shadowfb/shadow.c   |   11 +++-
 hw/xfree86/xaa/xaaInit.c   |   12 -
 hw/xnest/Keyboard.c|8 --
 hw/xquartz/bundle/Info.plist.cpp   |4 +--
 hw/xquartz/quartz.c|4 ---
 hw/xquartz/quartzCocoa.m   |   11 
 hw/xquartz/quartzCommon.h  |   15 ---
 hw/xquartz/xpr/xprCursor.c |6 +++-
 hw/xwin/winkeynames.h  |1 
 include/input.h|9 +-
 include/privates.h |2 -
 include/protocol-versions.h|2 -
 include/xkbsrv.h   |6 
 mi/mipointer.c |   40 +++---
 mi/mipointer.h |5 +++
 mi/miscrinit.c |2 -
 xkb/xkbAccessX.c   |   39 +++--
 xkb/xkbActions.c   |   19 +-
 40 files changed, 258 insertions(+), 197 deletions(-)

New commits:
commit a2c13f0d6548310e3cd115cf486d3e43edf23dcc
Author: Keith Packard kei...@keithp.com
Date:   Wed Jul 14 12:57:29 2010 -0700

Bump to version 1.8.99.905 (1.9 RC5)

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index b3b752c..baa0b5c 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.8.99.904, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2010-07-01
+AC_INIT([xorg-server], 1.8.99.905, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2010-07-14
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 0540c46066f938ad5611c56081cfcd8457a9b718
Author: Michel Dänzer daen...@vmware.com
Date:   Tue Jul 13 14:56:53 2010 +0200

EXA: Finish access to pixmap if it's prepared at destruction time.

Previously we assumed every pixmap destroyed during a software fallback was
also created during a software fallback and had access prepared, but that's
not always true.

Fixes a server abort
Reported-by: 邓逸昕 bupt.dengyi...@gmail.com

Signed-off-by: Michel Dänzer daen...@vmware.com
Acked-by: Maarten Maathuis madman2...@gmail.com
Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/exa/exa.c b/exa/exa.c
index 118a110..fc15c24 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -435,6 +435,29 @@ exaFinishAccess(DrawablePtr pDrawable, int index)
 (*pExaScr-info-FinishAccess) (pPixmap, i);
 }
 
+
+/**
+ * Helper for things common to all schemes when a pixmap is destroyed
+ */
+void
+exaDestroyPixmap(PixmapPtr pPixmap)
+{
+ExaScreenPriv(pPixmap-drawable.pScreen);
+int i;
+
+/* Finish access if it was prepared (e.g. pixmap created during
+ * software fallback)
+ */
+for (i = 0; i  EXA_NUM_PREPARE_INDICES; i++) {
+   if (pExaScr-access[i].pixmap == pPixmap) {
+   exaFinishAccess(pPixmap-drawable, i);
+   pExaScr-access[i].pixmap = NULL;
+   break;
+   }
+}
+}
+
+
 /**
  * Here begins EXA's GC code.
  * Do not ever access the fb/mi layer directly.
diff --git a/exa/exa_classic.c b/exa/exa_classic.c
index 2cfeda5..169ce3a 100644
--- a/exa/exa_classic.c
+++ b/exa/exa_classic.c
@@ -221,9 +221,7 @@ exaDestroyPixmap_classic (PixmapPtr pPixmap)
 {
ExaPixmapPriv (pPixmap);
 
-   /* During a fallback we must finish access, but we don't know the 
index. */
-   if (pExaScr-fallback_counter)
-   exaFinishAccess(pPixmap-drawable, -1);
+   exaDestroyPixmap(pPixmap);
 
if (pExaPixmap-area)
{
diff --git a/exa/exa_driver.c b/exa/exa_driver.c
index abe79ba..a913cfb 100644
--- 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit a71dbc03e65cf7b0654a6eca93ce0bf6a1711ffa
Author: Keith Packard kei...@keithp.com
Date:   Thu Jul 1 08:27:05 2010 -0400

Bump to version 1.8.99.904 (1.9 RC4)

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index 5c18a12..b3b752c 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.8.99.903, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2010-06-22
+AC_INIT([xorg-server], 1.8.99.904, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2010-07-01
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 5ea497fc32202ff19c2b7d8ef4eba08889108a87
Author: Tiago Vignatti tiago.vigna...@nokia.com
Date:   Tue Jun 29 16:08:02 2010 +0300

xfree86: configure: remove vendor and card name matching rules

Although vendor and board naming are used to create the configure file, the
server doesn't actually use it when fetching such file and probing devices.

Reported-by: Richard Barnette jrbarne...@chromium.org
Signed-off-by: Tiago Vignatti tiago.vigna...@nokia.com
Reviewed-by: Mikhail Gusarov dotted...@dottedmag.net
Reviewed-by: Alex Deucher alexdeuc...@gmail.com
Tested-by: Richard Barnette jrbarne...@chromium.org
Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/hw/xfree86/common/xf86Configure.c 
b/hw/xfree86/common/xf86Configure.c
index 822d767..da654f0 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -107,8 +107,6 @@ bus_sbus_configure(void *busData)
 static void
 bus_pci_newdev_configure(void *busData, int i, int *chipset)
 {
-   const char *VendorName;
-   const char *CardName;
char busnum[8];
 struct pci_device * pVideo = NULL;
 
@@ -116,26 +114,6 @@ bus_pci_newdev_configure(void *busData, int i, int 
*chipset)
 
DevToConfig[i].pVideo = pVideo;
 
-   VendorName = pci_device_get_vendor_name( pVideo );
-   CardName = pci_device_get_device_name( pVideo );
-
-   if (!VendorName) {
-   VendorName = xnfalloc(15);
-   sprintf((char*)VendorName, Unknown Vendor);
-   }
-
-   if (!CardName) {
-   CardName = xnfalloc(14);
-   sprintf((char*)CardName, Unknown Board);
-   }
-
-   DevToConfig[i].GDev.identifier =
-   xnfalloc(strlen(VendorName) + strlen(CardName) + 2);
-   sprintf(DevToConfig[i].GDev.identifier, %s %s, VendorName, CardName);
-
-   DevToConfig[i].GDev.vendor = (char *)VendorName;
-   DevToConfig[i].GDev.board = (char *)CardName;
-
DevToConfig[i].GDev.busID = xnfalloc(16);
xf86FormatPciBusNumber(pVideo-bus, busnum);
sprintf(DevToConfig[i].GDev.busID, PCI:%s:%d:%d,
@@ -357,9 +335,6 @@ configureDeviceSection (int screennum)
 /* Move device info to parser structure */
 sprintf(identifier, Card%d, screennum);
 ptr-dev_identifier = strdup(identifier);
-/*ptr-dev_identifier = DevToConfig[screennum].GDev.identifier;*/
-ptr-dev_vendor = DevToConfig[screennum].GDev.vendor;
-ptr-dev_board = DevToConfig[screennum].GDev.board;
 ptr-dev_chipset = DevToConfig[screennum].GDev.chipset;
 ptr-dev_busid = DevToConfig[screennum].GDev.busID;
 ptr-dev_driver = DevToConfig[screennum].GDev.driver;

commit 90fd9e40b59e69333d250a795998f44dc3a5dc0c
Author: Tiago Vignatti tiago.vigna...@nokia.com
Date:   Tue Jun 29 16:08:01 2010 +0300

xfree86: pci: remove superfluous vendor and card name logging

X server suffers in startup time when relying on the pciaccess's linear 
search
to fetch vendor and video device name from PCI ID file (when existent). Such
names are only used to write the log, which may be superfluous. This
information often is provided by the drivers or likewise users can get the 
it
using external tools like lspci or scanpci.

This patch remove the references of those functions from X start up.

Reported-by: Richard Barnette jrbarne...@chromium.org
Signed-off-by: Tiago Vignatti tiago.vigna...@nokia.com
Tested-by: Richard Barnette jrbarne...@chromium.org
Reviewed-by: James Cloos cl...@jhcloos.com
Reviewed-by: Mikhail Gusarov dotted...@dottedmag.net
Reviewed-by: Alex Deucher alexdeuc...@gmail.com
Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 1517951..74016af 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -151,18 +151,13 @@ xf86PciProbe(void)
 
 /* Print a summary of the video devices found */
 for (k = 0; k  num; k++) {
-   const char *vendorname = NULL, *chipname = NULL;
const char *prim =  ;
Bool memdone = FALSE, iodone 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Xext/sync.c  |   19 +--
 Xi/extinit.c |1 
 Xi/xiproperty.c  |9 +
 Xi/xiproperty.h  |3 
 configure.ac |2 
 dix/devices.c|9 -
 dix/events.c |   20 ++-
 doc/Xserver.man.pre  |   26 +---
 glx/glxdri2.c|   23 +---
 hw/dmx/dmxextension.c|2 
 hw/xfree86/common/xf86DGA.c  |4 
 hw/xfree86/common/xf86Xinput.c   |6 -
 hw/xfree86/doc/Makefile.am   |1 
 hw/xfree86/dri2/dri2.c   |  174 +--
 hw/xfree86/dri2/dri2.h   |6 +
 hw/xfree86/dri2/dri2ext.c|   11 +
 hw/xfree86/modes/xf86Cursors.c   |2 
 hw/xfree86/os-support/solaris/sun_init.c |  102 ++
 hw/xfree86/ramdac/xf86Cursor.c   |2 
 hw/xquartz/X11Application.m  |   28 +++-
 hw/xquartz/mach-startup/bundle-main.c|5 
 include/eventstr.h   |4 
 include/protocol-versions.h  |4 
 mi/miarc.c   |2 
 mi/midispcur.c   |2 
 mi/mipolypnt.c   |5 
 os/access.c  |9 -
 os/log.c |7 +
 render/render.c  |7 +
 test/xi2/protocol-common.c   |1 
 xfixes/cursor.c  |   23 ++--
 31 files changed, 347 insertions(+), 172 deletions(-)

New commits:
commit b65c5be170835db2282192381ef411997e61a6f1
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Wed Jun 2 09:27:33 2010 +1000

xserver 1.8.1.901

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 637e610..73a7b62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.8.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.8.1.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 RELEASE_DATE=2010-05-11
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])

commit 1b71e0a8b9e915c806f6c3596b6ee5913d62fdc3
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon May 24 12:25:15 2010 +1000

xfree86: fix multiple InputAttributes tag matching.

attr-tags is an array of strings (null-terminated). When matching, match
against each string instead of each [i,end] substring in the first tag.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Jamey Sharp ja...@minilop.net
Signed-off-by: Keith Packard kei...@keithp.com
(cherry picked from commit b5e0f6d8f45c5b24eb50b305c66fa80c783ef488)

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index a1a5527..bfa8dc0 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -551,9 +551,9 @@ InputClassMatches(XF86ConfInputClassPtr iclass, 
InputAttributes *attrs)
 return FALSE;
 
 for (cur = iclass-match_tag, match = FALSE; *cur  !match; cur++) {
-const char *tag;
-for(tag = *attrs-tags; *tag; tag++) {
-if (!strcmp(tag, *cur)) {
+char * const *tag;
+for(tag = attrs-tags; *tag; tag++) {
+if (!strcmp(*tag, *cur)) {
 match = TRUE;
 break;
 }

commit 354e4ce3774d6b7f0c571f426bd2db1c8ab272ea
Author: Alan Coopersmith alan.coopersm...@oracle.com
Date:   Sat May 22 10:29:00 2010 -0700

Add RandR 1.2 README.modes doc to EXTRA_DIST

Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
Reviewed-by: Julien Cristau jcris...@debian.org
(cherry picked from commit 1805c74d9b0ed46802481bcd6beea5feeb60212c)

diff --git a/hw/xfree86/doc/Makefile.am b/hw/xfree86/doc/Makefile.am
index 5809fa0..72bc5d9 100644
--- a/hw/xfree86/doc/Makefile.am
+++ b/hw/xfree86/doc/Makefile.am
@@ -6,4 +6,5 @@ endif
 
 EXTRA_DIST = \
README.DRI \
+   README.modes \
README.rapidaccess

commit 9a71d21cc27c7b0d35bae9d6dc4eed591dea99a4
Author: Aaron Zang aaron.z...@sun.com
Date:   Thu May 20 17:56:28 2010 -0700

Solaris: Use VT_SET_CONSUSER ioctl to set Console User rights profile

When Xorg is started on display :0, this ioctl is called to grant the
user the rights traditionally associated with /dev/console (before VT
support was added), such as access to local peripheral devices.

Also adds a Solaris-specific -C flag to force starting on /dev/console
instead of /dev/vt*, allowing programs like xterm -C to access the
console device.

   

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit afd730f57fa1cd3e10ac47666bd6739016d60d55
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue May 11 13:55:55 2010 +1000

xserver 1.8.1

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 0d66ce4..637e610 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.8.0.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2010-05-04
+AC_INIT([xorg-server], 1.8.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2010-05-11
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit 3ffde1e403666b8c84ce34d46caef6e19b87cf51
Author: Adam Tkac at...@redhat.com
Date:   Fri May 7 17:02:03 2010 +1000

Export XkbCopyDeviceKeymap from Xorg, it is needed by VNC.

Signed-off-by: Adam Tkac at...@redhat.com
Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Keith Packard kei...@keithp.com
(cherry picked from commit 626f97688a89dbc5da80390d822d21b1a737de0e)

diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 239b7a1..c0cd501 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -919,7 +919,7 @@ extern Bool XkbCopyKeymap(
 XkbDescPtr  /* dst */,
 XkbDescPtr  /* src */);
 
-extern Bool XkbCopyDeviceKeymap(
+extern _X_EXPORT Bool XkbCopyDeviceKeymap(
 DeviceIntPtr/* dst */,
 DeviceIntPtr/* src */);
 

commit 7e1f1ed5e99917f65b998eae0202c6c0a51e6819
Author: Julien Cristau jcris...@debian.org
Date:   Tue May 4 15:15:02 2010 +0200

XQuartz: add new localization files to EXTRA_DIST

commit 206531f75cd41c034e89fdfbc75ab0910682eef8 added localization files
for ar, add them to the Makefile.

Signed-off-by: Julien Cristau jcris...@debian.org
Reviewed-by: Jeremy Huddleston jerem...@apple.com
(cherry picked from commit 72758287f79a4f1aa8fa388f20947042e3e14693)

diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index f8b96d8..c4d77c0 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -28,6 +28,10 @@ EXTRA_DIST = \
Info.plist.cpp \
PkgInfo \
$(resource_DATA) \
+   Resources/ar.lproj/InfoPlist.strings \
+   Resources/ar.lproj/Localizable.strings \
+   Resources/ar.lproj/main.nib/designable.nib \
+   Resources/ar.lproj/main.nib/keyedobjects.nib \
Resources/da.lproj/InfoPlist.strings \
Resources/da.lproj/Localizable.strings \
Resources/da.lproj/main.nib/keyedobjects.nib \

commit 7af94a816cd89eaf2777b6c38ba8b1d2a8965d65
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue May 4 08:16:21 2010 +1000

xserver 1.8.0.902

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 0b6a965..0d66ce4 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.8.0.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2010-04-27
+AC_INIT([xorg-server], 1.8.0.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2010-05-04
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

commit d57d14d039ecbdbe1c960e0b0b5d029f6dfa4000
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Tue May 4 08:14:39 2010 +1000

mi: don't thrash resources when displaying the software cursor across 
screens

This changes the DC layer to maintain a persistent set of 
GCs/pixmaps/pictures
for each pScreen instead of failing to thrash between them when changing
screens.

Signed-off-by: Pierre-Loup A. Griffais pgriff...@nvidia.com
Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Tested-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit 518f3b189b6c8aa28b62837d14309fd06163ccbb)

Conflicts:

mi/midispcur.c

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/mi/midispcur.c b/mi/midispcur.c
index 55d65d5..9041630 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -59,9 +59,9 @@ static DevPrivateKey miDCScreenKey = miDCScreenKeyIndex;
 
 static BoolmiDCCloseScreen(int index, ScreenPtr pScreen);
 
-/* per device private data */
-static int miDCSpriteKeyIndex;
-static DevPrivateKey miDCSpriteKey = miDCSpriteKeyIndex;
+/* per device per-screen private data */
+static int miDCSpriteKeyIndex[MAXSCREENS];
+static DevPrivateKey miDCSpriteKey = miDCSpriteKeyIndex;
 
 typedef struct {
 GCPtr  pSourceGC, 

xorg-server: Changes to 'upstream-experimental'

[Brice Goglin]

 configure.ac   |4 ++--
 dix/devices.c  |3 +++
 dix/events.c   |9 +++--
 exa/exa_migration_mixed.c  |3 ++-
 exa/exa_offscreen.c|   25 +
 hw/xfree86/common/xf86Config.c |2 +-
 hw/xfree86/common/xf86xv.c |4 ++--
 xkb/xkbAccessX.c   |2 ++
 8 files changed, 16 insertions(+), 36 deletions(-)

New commits:
commit 601db11ffc49343807cf562175c2fe51eb6ec056
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Dec 11 15:34:05 2009 +1000

xserver 1.7.3.901

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 0c98bf2..e501a37 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.3, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2009-12-3
+AC_INIT([xorg-server], 1.7.3.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2009-12-11
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit 7ef49cbe702ab00913cb5c55d35b110cd81481aa
Author: Luc Verhaegen l...@skynet.be
Date:   Wed Nov 11 15:52:39 2009 +0100

[PATCH] Xv: Fix AdjustFrame when driver implements ReputImage.

Finally fixes fd.o #4653, filed more than 4 years ago.

Patch can be happily applied to all modular Xorg versions.

Signed-off-by: Luc Verhaegen l...@skynet.be
Reviewed-by: Keith Packard kei...@keithp.com
Signed-off-by: Keith Packard kei...@keithp.com
(cherry picked from commit 0e084d8c71e697a5cf5d5d7c749455ae14bd6eb7)

diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
index abbe033..8221659 100644
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
@@ -1297,7 +1297,7 @@ xf86XVAdjustFrame(int index, int x, int y, int flags)
   for(i = pa-nPorts; i  0; i--, pPort++) {
pPriv = (XvPortRecPrivatePtr)pPort-devPriv.ptr;
 
-   if(!pPriv-type  (pPriv-isOn == XV_ON)) { /* overlaid still/image */
+   if(!pPriv-type  (pPriv-isOn != XV_OFF)) { /* overlaid still/image */
 
  if(pPriv-pCompositeClip  pPriv-FreeCompositeClip)
 REGION_DESTROY(pScreen, pPriv-pCompositeClip);
@@ -1311,7 +1311,7 @@ xf86XVAdjustFrame(int index, int x, int y, int flags)
  (pWin-visibility == VisibilityPartiallyObscured)))
  {
  xf86XVReputImage(pPriv);
- } else {
+ } else if (pPriv-isOn == XV_ON) {
 (*pPriv-AdaptorRec-StopVideo)(
 pPriv-pScrn, pPriv-DevPriv.ptr, FALSE);
 xf86XVRemovePortFromWindow(pWin, pPriv);

commit 21bf1de28c7f10bcee1b199cc976d58319dc9ecd
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Nov 27 16:01:53 2009 +1000

dix: fix memory leak, free event list on shutdown. (#25028)

X.Org Bug 25028 http://bugs.freedesktop.org/show_bug.cgi?id=25028

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Keith Packard kei...@keithp.com
(cherry picked from commit c20c8897272427cb3f755a3e28e80a9ad46f08a1)

diff --git a/dix/events.c b/dix/events.c
index 3e23262..1d7ceef 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -5086,12 +5086,9 @@ InitEvents(void)
 void
 CloseDownEvents(void)
 {
-int len;
-EventListPtr list;
-
-len = GetEventList(list);
-while(len--)
-xfree(list[len].event);
+FreeEventList(InputEventList, InputEventListLen);
+InputEventListLen = 0;
+InputEventList = NULL;
 }
 
 /**

commit e840999ffc93ecb2d870dfed334e093ca1e5e65b
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Nov 27 16:20:13 2009 +1000

dix: remove core devices when shutting down. (#25028)

NewInputDeviceRequest (and RemoveDevice) have checks in place to not allow
removal of the VCP/VCK. When shutting down, they need to be cleaned up
nonetheless to free the memory associated.

X.Org Bug 25028 http://bugs.freedesktop.org/show_bug.cgi?id=25028

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Keith Packard kei...@keithp.com
(cherry picked from commit 66bb8c6fbdfc0fc0d971aac4ec6f949bb9288c1b)

diff --git a/dix/devices.c b/dix/devices.c
index 395e19a..e3fd456 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -908,6 +908,9 @@ CloseDownDevices(void)
 DeleteInputDeviceRequest(dev);
 }
 
+CloseDevice(inputInfo.pointer);
+CloseDevice(inputInfo.keyboard);
+
 inputInfo.devices = NULL;
 inputInfo.off_devices = NULL;
 inputInfo.keyboard = NULL;

commit 51aad8bebca938a41837ad73c98a0039665fa22f
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Oct 30 12:11:41 2009 +1000

Set the source and deviceid for key repeat events (#24785)

X.Org Bug 24785 

xorg-server: Changes to 'upstream-experimental'

[Timo Aaltonen]

 configure.ac |   18 +++---
 fb/fb.h  |3 ++-
 fb/fbpict.c  |   11 ++-
 fb/fbtrap.c  |4 ++--
 4 files changed, 21 insertions(+), 15 deletions(-)

New commits:
commit aea5ace1ee331fab0b72885ce0d5d3fc235e0708
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Thu Dec 3 11:57:16 2009 +1000

xserver 1.7.3

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 1038734..0c98bf2 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.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2009-11-27
+AC_INIT([xorg-server], 1.7.3, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2009-12-3
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit f41e87f32e7525e7425d7b300699dccd994b5002
Author: Gaetan Nadon mems...@videotron.ca
Date:   Sat Nov 28 21:32:47 2009 -0500

configure.ac: error while checking for XDMXCONFIG_DEP

Introduced in commit 9998105a387e0294054502331a56e1e020cd93e4
The replacement third parameters to PKG_CHECK_MODULES([DMXMODULES]
was not quoted.

Signed-off-by: Gaetan Nadon mems...@videotron.ca
Reviewed-by: Dan Nicholson dbn.li...@gmail.com
Tested-by: Julien Cristau jcris...@debian.org
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit 91c1bd78f7240c92702828f8e5a6b6ce944b9e36)
(cherry picked from commit b8623569a3acff31cb18a9f6046e60d0637cc0e0)

diff --git a/configure.ac b/configure.ac
index 8500db4..1038734 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1808,11 +1808,15 @@ AM_CONDITIONAL(XQUARTZ_SPARKLE, [test 
x$XQUARTZ_SPARKLE != xno])
 AM_CONDITIONAL(STANDALONE_XPBPROXY, [test x$STANDALONE_XPBPROXY = xyes])
 
 dnl DMX DDX
-PKG_CHECK_MODULES([DMXMODULES],
-[xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau 
$XDMCP_MODULES],
-PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11], [have_dmx=yes],
-  [have_dmx=no]),
-[have_dmx=no])
+PKG_CHECK_MODULES(
+   [DMXMODULES],
+   [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau 
$XDMCP_MODULES],
+   [PKG_CHECK_MODULES(
+   [XDMXCONFIG_DEP],
+   [xaw7 xmu xt xpm x11],
+   [have_dmx=yes],
+   [have_dmx=no])],
+   [have_dmx=no])
 AC_MSG_CHECKING([whether to build Xdmx DDX])
 if test x$DMX = xauto; then
DMX=$have_dmx

commit c0de621b42bd69e883e15082c7fd35709d545d55
Author: Aaron Plattner aplatt...@nvidia.com
Date:   Sun Nov 29 12:06:26 2009 -0800

Restore ABI by reintroducing the is_src paramter to image_from_pict.

Restores old ABI after 196aff9b18381d700fb28027186cce6e68ad587c.

Signed-off-by: Aaron Plattner aplatt...@nvidia.com
Tested-by: Julien Cristau jcris...@debian.org
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit 155e61a9f0429bf28ce493c0fe7a2d076cb7e137)

diff --git a/fb/fb.h b/fb/fb.h
index 6c9f8a1..37de71e 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -2080,7 +2080,8 @@ fbFillRegionSolid (DrawablePtrpDrawable,
 
 extern _X_EXPORT pixman_image_t *
 image_from_pict (PicturePtr pict,
-Bool   has_clip);
+Bool   has_clip,
+Bool   is_src);
 extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
 
 #endif /* _FB_H_ */
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 8057e90..8fdaa58 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -163,9 +163,9 @@ fbComposite (CARD8  op,
 if (pMask)
miCompositeSourceValidate (pMask, xMask, yMask, width, height);
 
-src = image_from_pict (pSrc, TRUE);
-mask = image_from_pict (pMask, TRUE);
-dest = image_from_pict (pDst, TRUE);
+src = image_from_pict (pSrc, TRUE, TRUE);
+mask = image_from_pict (pMask, TRUE, TRUE);
+dest = image_from_pict (pDst, TRUE, FALSE);
 
 if (src  dest  !(pMask  !mask))
 {
@@ -361,7 +361,7 @@ set_image_properties (pixman_image_t *image, PicturePtr 
pict)
 
 if (pict-alphaMap)
 {
-   pixman_image_t *alpha_map = image_from_pict (pict-alphaMap, TRUE);
+   pixman_image_t *alpha_map = image_from_pict (pict-alphaMap, TRUE, 
TRUE);

pixman_image_set_alpha_map (
image, alpha_map, pict-alphaOrigin.x, pict-alphaOrigin.y);
@@ -395,7 +395,8 @@ set_image_properties (pixman_image_t *image, PicturePtr 
pict)
 
 pixman_image_t *
 image_from_pict (PicturePtr pict,
-Bool has_clip)
+Bool has_clip,
+Bool is_src)
 {
 pixman_image_t *image = NULL;
 
diff --git a/fb/fbtrap.c b/fb/fbtrap.c
index 830603a..b1e1eff 100644
--- a/fb/fbtrap.c
+++ b/fb/fbtrap.c
@@ -40,7 +40,7 @@ fbAddTraps (PicturePtrpPicture,
 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Xext/geext.c  |9 --
 Xi/xiproperty.c   |5 +
 configure.ac  |   10 +-
 fb/fb.h   |3 
 fb/fbpict.c   |  118 +-
 fb/fbtrap.c   |4 -
 hw/xfree86/modes/xf86EdidModes.c  |   15 ++--
 hw/xquartz/mach-startup/bundle-main.c |   36 ++
 hw/xquartz/mach-startup/stub.c|1 
 test/input.c  |   54 +++
 10 files changed, 123 insertions(+), 132 deletions(-)

New commits:
commit 1fff1b37a91c989c046d96d961862d592a307496
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Nov 27 14:58:57 2009 +1000

xserver 1.7.2

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 5579795..8500db4 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.1.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2009-11-20
+AC_INIT([xorg-server], 1.7.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2009-11-27
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit 196aff9b18381d700fb28027186cce6e68ad587c
Author: Aaron Plattner aplatt...@nvidia.com
Date:   Tue Nov 24 10:21:28 2009 -0800

Bug #25136: Revert Fix clipping when windows are used as sources

That change causes lib(w)fb to make accelerated driver calls after the 
driver
has entered a software fallback.  Most drivers don't expect this, which 
leads to
corruption or crashes.  A change to make this code do the copy in software 
is
unacceptably slow.

This reverts commit e9aa61e9f0d663d5b34a397b943b4d1df44e873d.

Conflicts:

configure.ac
fb/fbpict.c

Signed-off-by: Aaron Plattner aplatt...@nvidia.com
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/fb/fb.h b/fb/fb.h
index c35e765..6c9f8a1 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -2080,8 +2080,7 @@ fbFillRegionSolid (DrawablePtrpDrawable,
 
 extern _X_EXPORT pixman_image_t *
 image_from_pict (PicturePtr pict,
-Bool   has_clip,
-Bool   is_src);
+Bool   has_clip);
 extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
 
 #endif /* _FB_H_ */
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 2fbef15..8057e90 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -163,9 +163,9 @@ fbComposite (CARD8  op,
 if (pMask)
miCompositeSourceValidate (pMask, xMask, yMask, width, height);
 
-src = image_from_pict (pSrc, TRUE, TRUE);
-mask = image_from_pict (pMask, TRUE, TRUE);
-dest = image_from_pict (pDst, TRUE, FALSE);
+src = image_from_pict (pSrc, TRUE);
+mask = image_from_pict (pMask, TRUE);
+dest = image_from_pict (pDst, TRUE);
 
 if (src  dest  !(pMask  !mask))
 {
@@ -268,80 +268,24 @@ create_conical_gradient_image (PictGradient *gradient)
gradient-nstops);
 }
 
-static DrawablePtr 
-copy_drawable (DrawablePtr pDraw)
-{
-ScreenPtr pScreen = pDraw-pScreen;
-PixmapPtr pPixmap;
-GCPtr pGC;
-int width, height;
-ChangeGCVal gcv[2];
-
-width = pDraw-width;
-height = pDraw-height;
-
-pPixmap = (*pScreen-CreatePixmap) (pScreen, width, height, pDraw-depth, 
0);
-
-if (!pPixmap)
-   return NULL;
-
-pGC = GetScratchGC (pDraw-depth, pScreen);
-
-if (!pGC)
-{
-   (*pScreen-DestroyPixmap) (pPixmap);
-   return NULL;
-}
-
-/* First fill the pixmap with zeros */
-gcv[0].val = 0x;
-gcv[1].val = IncludeInferiors;
-dixChangeGC (NullClient, pGC, GCBackground | GCSubwindowMode, NULL, gcv);
-ValidateGC ((DrawablePtr)pPixmap, pGC);
-miClearDrawable ((DrawablePtr)pPixmap, pGC);
-
-/* Then copy the window there */
-ValidateGC(pPixmap-drawable, pGC);
-(* pGC-ops-CopyArea) (pDraw, pPixmap-drawable, pGC, 0, 0, width, 
height, 0, 0);
-
-FreeScratchGC (pGC);
-
-return pPixmap-drawable;
-}
-
-static void
-destroy_drawable (pixman_image_t *image, void *data)
-{
-DrawablePtr pDrawable = data;
-ScreenPtr pScreen = pDrawable-pScreen;
-
-pScreen-DestroyPixmap ((PixmapPtr)pDrawable);
-}
-
 static pixman_image_t *
 create_bits_picture (PicturePtr pict,
-Bool   has_clip,
-Bool   is_src)
+Bool   has_clip)
 {
 FbBits *bits;
 FbStride stride;
 int bpp, xoff, yoff;
 pixman_image_t *image;
-DrawablePtr drawable;
-
-if (is_src  pict-pDrawable-type == DRAWABLE_WINDOW)
-   drawable = copy_drawable (pict-pDrawable);
-else
-   drawable = pict-pDrawable;
 
-

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Makefile.am|7 +
 Xext/xselinux.c|   22 +--
 Xext/xselinux.h|   45 ++-
 Xi/queryst.c   |   14 +-
 Xi/xiquerydevice.c |   41 ---
 Xi/xiquerydevice.h |8 -
 composite/compinit.c   |4 
 configure.ac   |   56 +++--
 dev/null   |binary
 dix/Makefile.am|9 -
 dix/colormap.c |3 
 dix/cursor.c   |3 
 dix/devices.c  |   15 +-
 dix/dixfonts.c |2 
 dix/events.c   |   73 +++-
 exa/exa_driver.c   |4 
 exa/exa_mixed.c|4 
 exa/exa_render.c   |   71 +++-
 glx/glapi.c|7 +
 glx/unpack.h   |2 
 hw/dmx/dmx.c   |3 
 hw/dmx/dmxwindow.c |3 
 hw/dmx/input/dmxinputinit.c|   22 +--
 hw/kdrive/fake/Makefile.am |3 
 hw/kdrive/fake/kbd.c   |  137 ---
 hw/kdrive/linux/evdev.c|   15 ++
 hw/kdrive/linux/tslib.c|4 
 hw/xfree86/Makefile.am |5 
 hw/xfree86/common/xf86Events.c |5 
 hw/xfree86/common/xf86Init.c   |4 
 hw/xfree86/common/xf86Mode.c   |   29 ++--
 hw/xfree86/common/xf86Xinput.c |   26 +---
 hw/xfree86/common/xf86cmap.c   |2 
 hw/xfree86/dri2/dri2ext.c  |2 
 hw/xfree86/i2c/fi1236.c|   10 -
 hw/xfree86/loader/loadmod.c|7 -
 hw/xfree86/loader/sdksyms.sh   |1 
 hw/xfree86/modes/xf86Crtc.c|   31 -
 hw/xfree86/modes/xf86EdidModes.c   |   51 
 hw/xfree86/modes/xf86Modes.c   |   34 +
 hw/xfree86/modes/xf86Modes.h   |3 
 hw/xfree86/os-support/linux/lnx_axp.c  |   16 +-
 hw/xfree86/os-support/linux/lnx_ev56.c |   18 ++-
 hw/xfree86/os-support/misc/SlowBcopy.c |   62 ++
 hw/xfree86/parser/Flags.c  |2 
 hw/xquartz/X11Application.h|1 
 hw/xquartz/X11Application.m|   15 ++
 hw/xquartz/X11Controller.h |5 
 hw/xquartz/X11Controller.m |   20 +--
 hw/xquartz/applewm.c   |   20 +--
 hw/xquartz/bundle/Info.plist.cpp   |4 
 hw/xquartz/mach-startup/bundle-main.c  |   83 +++---
 hw/xquartz/mach-startup/stub.c |2 
 hw/xquartz/pbproxy/app-main.m  |4 
 hw/xquartz/pbproxy/main.m  |   16 ++
 hw/xquartz/quartzKeyboard.c|  193 +
 hw/xquartz/xpr/xprFrame.c  |   47 +++-
 hw/xwin/InitOutput.c   |2 
 hw/xwin/Makefile.am|1 
 hw/xwin/XWin.rc|   11 -
 hw/xwin/winmouse.c |2 
 hw/xwin/winprocarg.c   |4 
 hw/xwin/winresource.h  |1 
 hw/xwin/winscrinit.c   |6 -
 include/dix.h  |4 
 m4/dolt.m4 |3 
 mi/miinitext.c |   28 +++-
 miext/rootless/rootless.h  |9 +
 miext/rootless/rootlessCommon.c|3 
 miext/rootless/rootlessCommon.h|4 
 miext/rootless/rootlessScreen.c|4 
 miext/rootless/rootlessWindow.c|   76 ++--
 miext/rootless/rootlessWindow.h|2 
 os/Makefile.am |4 
 os/access.c|3 
 randr/randrstr.h   |   12 +-
 render/mipict.c|8 -
 test/Makefile.am   |4 
 test/xi2/Makefile.am   |4 
 xkb/ddxLoad.c  |5 
 xkb/xkb.c  |2 
 81 files changed, 845 insertions(+), 652 deletions(-)

New commits:
commit 19b24f014f4dad1cc73e2454d15c64ae05ac8ef2
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Nov 20 15:29:05 2009 +1000

xserver 1.7.1.902

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 29e7da8..cfe8e59 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.1.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2009-11-6
+AC_INIT([xorg-server], 1.7.1.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2009-11-20
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Xext/shm.c   |   43 +
 composite/compinit.c |   59 +--
 configure.ac |7 ++
 dix/colormap.c   |   64 +
 dix/getevents.c  |   13 +
 exa/exa_migration_classic.c  |   10 ++--
 glx/glxscreens.c |   58 +--
 hw/kdrive/ephyr/Xephyr.man.pre   |5 ++
 hw/kdrive/ephyr/ephyrinit.c  |   16 ++
 hw/xfree86/common/xf86DGA.c  |   29 ++-
 hw/xfree86/modes/xf86Crtc.c  |4 -
 hw/xfree86/modes/xf86Crtc.h  |8 +++
 hw/xfree86/modes/xf86DiDGA.c |   15 --
 hw/xfree86/modes/xf86EdidModes.c |2 
 hw/xfree86/modes/xf86Rotate.c|   10 +---
 include/colormap.h   |5 ++
 render/glyph.c   |   97 ---
 render/render.c  |6 ++
 18 files changed, 251 insertions(+), 200 deletions(-)

New commits:
commit 4257023c1e40387aff096d5f00d746d3f7a521b4
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Oct 2 14:05:43 2009 +1000

xserver 1.7.0

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index 8145c64..9425bc9 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.6.99.903, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2009-9-28
+AC_INIT([xorg-server], 1.7.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2009-10-2
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit 15b4faff281ad8abce6b32fe2fc855eb6da42476
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Thu Oct 1 21:19:11 2009 +1000

dix: force a minimum of 0 for screen coordinates.

Currently the root coordinates may fall into ]-1..0] if the subpixel
remainder is less than 0. Screen coordinates mustn't go below 0, so use
miPointerSetPosition to cap off the remainder if the coordinates are below
0.

This is cheating a bit, a more comprehensive solution to deal with subpixels
correctly when crossing screens is needed. For now, this'll do.

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Acked-by: Simon Thum simon.t...@gmx.de
(cherry picked from commit 45f447dafded5adfe11b7df3325c2d8f6ae0639b)

diff --git a/dix/getevents.c b/dix/getevents.c
index 5224d31..2df32e8 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -781,6 +781,19 @@ positionSprite(DeviceIntPtr dev, int *x, int *y, float 
x_frac, float y_frac,
 *screeny_frac = dev-last.remainder[1];
 }
 
+/* Hit the left screen edge? */
+if (*screenx = 0  *screenx_frac  0.0f)
+{
+*screenx_frac = 0.0f;
+x_frac = 0.0f;
+}
+if (*screeny = 0  *screeny_frac  0.0f)
+{
+*screeny_frac = 0.0f;
+y_frac = 0.0f;
+}
+
+
 old_screenx = *screenx;
 old_screeny = *screeny;
 /* This takes care of crossing screens for us, as well as clipping

commit 3788113618977bdc83e3ec1e7ca3160bad9a0d13
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Fri Oct 2 09:34:24 2009 +1000

configure: if xnest was requested but modules weren't found, fail.

Tested-by: Xavier Chantry shinin...@gmail.com
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Acked-by: Julien Cristau jcris...@debian.org
(cherry picked from commit 64fe5784b49347e1fd27b0c463be5c16557594c9)

diff --git a/configure.ac b/configure.ac
index 9517595..8145c64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1373,6 +1373,9 @@ AC_MSG_RESULT([$XNEST])
 AM_CONDITIONAL(XNEST, [test x$XNEST = xyes])
 
 if test x$XNEST = xyes; then
+   if test x$have_xnest = xno; then
+   AC_MSG_ERROR([Xnest build explicitly requested, but required 
modules not found.])
+   fi
XNEST_LIBS=$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB 
$GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB 
$MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB 
$MAIN_LIB $OS_LIB $CONFIG_LIB
XNEST_SYS_LIBS=$XNESTMODULES_LIBS $GLX_SYS_LIBS
AC_SUBST([XNEST_LIBS])

commit c3034dc3af450802dda156136d9fabbc1cc58836
Author: Dave Airlie airl...@redhat.com
Date:   Thu Oct 1 15:25:55 2009 +1000

rotate: drop unwrapping inside block handler.

Keith has shown half the block handlers wrappers are wrong, also
dynamic wrapping/unwrapping from what I can see will happen after
the drivers, so its really accidental ABI, that we can't change
now without modifing drivers. So be safe for 1.7.

Signed-off-by: Dave Airlie airl...@redhat.com
Declared-as-sane-by: Keith Packard kei...@keithp.com
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit 290a9639db3e420ec4caf0e6aee9f7386724c765
Author: Peter Hutterer peter.hutte...@who-t.net
Date:   Mon Sep 28 21:05:11 2009 +1000

xserver 1.6.99.903 (xserver 1.7 RC3)

Signed-off-by: Peter Hutterer peter.hutte...@who-t.net

diff --git a/configure.ac b/configure.ac
index a7f5510..9517595 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.6.99.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2009-9-22
+AC_INIT([xorg-server], 1.6.99.903, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2009-9-28
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit 6af44db315121ea24cec390d144514bf56908b2c
Author: Tilman Sauerbeck til...@code-monkey.de
Date:   Thu Sep 24 12:57:02 2009 +0200

configure: make XNEST default to auto.

When we're checking whether to build Xnest, we're comparing the
variable to auto but before it never was assigned that.

Signed-off-by: Tilman Sauerbeck til...@code-monkey.de

[Xnest was enabled to yes to increase build exposure and catch compiler
errors early. The requirements to Xnest are quite low and I expect most
developers have them, so Xnext will be enabled on most boxes. Anyone
missing those requires probably doesn't want to build Xnest anyway.]
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit 3db28f92b0c810b452506abbed299a204c90ba0b)

diff --git a/configure.ac b/configure.ac
index 422ef0b..91d87af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -604,7 +604,7 @@ dnl DDXes.
 AC_ARG_ENABLE(xorg,  AS_HELP_STRING([--enable-xorg], [Build 
Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
 AC_ARG_ENABLE(dmx,   AS_HELP_STRING([--enable-dmx], [Build DMX server 
(default: auto)]), [DMX=$enableval], [DMX=auto])
 AC_ARG_ENABLE(xvfb,  AS_HELP_STRING([--enable-xvfb], [Build 
Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes])
-AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest], [Build 
Xnest server (default: yes)]), [XNEST=$enableval], [XNEST=yes])
+AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest], [Build 
Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])
 AC_ARG_ENABLE(xquartz,AS_HELP_STRING([--enable-xquartz], [Build 
Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])
 AC_ARG_ENABLE(standalone-xpbproxy, 
AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in 
addition to the one integrated into Xquartz as a separate thread) (default: 
no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no])
 AC_ARG_ENABLE(xwin,  AS_HELP_STRING([--enable-xwin], [Build 
XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])

commit b49dba33f94b51ba9a14803f0d81ccde2cb778f8
Author: Ben Byer bb...@freedesktop.org
Date:   Sun Sep 27 10:35:53 2009 -0700

Add (ok, fix) support for DTrace under OS X
(cherry picked from commit 8428a57184f542941d2c8c90e97d18e111a69dd2)

diff --git a/.gitignore b/.gitignore
index 3fb73f0..3a8fe50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,7 @@ xorg-server.pc
 xorg-server-*.tar.bz2
 xorg-server-*.tar.gz
 stamp-h?
+dix/Xserver-dtrace.h
 do-not-use-config.h
 do-not-use-config.h.in
 dix/dix.c
diff --git a/configure.ac b/configure.ac
index 422ef0b..7d0abca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,12 +85,6 @@ dnl ISDN trace program named dtrace
 AC_ARG_WITH(dtrace, AS_HELP_STRING([--with-dtrace=PATH],
 [Enable dtrace probes (default: enabled if dtrace found)]),
 [WDTRACE=$withval], [WDTRACE=auto])
-dnl Darwin 9 has dtrace, but it doesn't support compilation into ELF...
-if test x$WDTRACE = xauto; then
-   case $host_os in
-   darwin*) WDTRACE=no ;;
-   esac
-fi
 if test x$WDTRACE = xyes -o x$WDTRACE = xauto ; then
AC_PATH_PROG(DTRACE, [dtrace], [not_found], [$PATH:/usr/sbin])
if test x$DTRACE = xnot_found ; then
@@ -1250,7 +1244,7 @@ AC_DEFINE(XSYNC, 1, [Support XSync extension])
 AC_DEFINE(XCMISC, 1, [Support XCMisc extension])
 AC_DEFINE(BIGREQS, 1, [Support BigRequests extension])
 
-if test x$WDTRACE != xno ; then
+if test x$WDTRACE != xno  test x$XQUARTZ = xno; then
   DIX_LIB='$(top_builddir)/dix/dix.O'
   OS_LIB='$(top_builddir)/os/os.O'
 else
diff --git a/dix/Makefile.am b/dix/Makefile.am
index 13e5ded..23fe460 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -54,6 +54,7 @@ Xserver-dtrace.h: $(srcdir)/Xserver.d
$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d \
|| cp Xserver-dtrace.h.in $@
 
+if !XQUARTZ
 # Generate dtrace object code for probes in libdix
 dtrace-dix.o: 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Xext/panoramiX.h  |3 
 config/hal.c  |  111 +++-
 config/x11-input.fdi  |   14 +
 configure.ac  |   14 -
 dix/dixfonts.c|3 
 exa/exa_accel.c   |  135 --
 glx/glxdri.c  |   10 -
 glx/glxscreens.c  |  235 -
 glx/glxserver.h   |2 
 hw/xfree86/common/xf86Bus.c   |   22 +-
 hw/xfree86/common/xf86Config.c|  144 ++-
 hw/xfree86/common/xf86Configure.c |   12 +
 hw/xfree86/common/xf86Globals.c   |1 
 hw/xfree86/common/xf86Init.c  |7 
 hw/xfree86/common/xf86Priv.h  |1 
 hw/xfree86/common/xf86pciBus.c|6 
 hw/xfree86/dixmods/glxmodule.c|   15 -
 hw/xfree86/doc/man/xorg.conf.man.pre  |   29 +++
 hw/xfree86/dri/dri.c  |2 
 hw/xfree86/loader/loaderProcs.h   |1 
 hw/xfree86/modes/xf86Crtc.c   |  128 +
 hw/xfree86/modes/xf86Crtc.h   |   10 -
 hw/xfree86/modes/xf86RandR12.c|  275 +++---
 hw/xfree86/modes/xf86Rotate.c |   76 +++-
 hw/xfree86/os-support/linux/int10/linux.c |3 
 hw/xfree86/os-support/linux/lnx_init.c|   60 ++
 hw/xfree86/parser/Files.c |   15 +
 hw/xfree86/parser/xf86Parser.h|1 
 hw/xfree86/parser/xf86tokens.h|2 
 hw/xquartz/GL/indirect.c  |4 
 hw/xquartz/darwin.c   |   11 -
 hw/xquartz/darwinEvents.c |3 
 hw/xquartz/quartzKeyboard.h   |1 
 include/dixfont.h |   43 
 include/xkbfile.h |   29 ---
 mi/mieq.c |4 
 mi/mipointer.c|9 
 randr/rrcrtc.c|   41 ++--
 randr/rrscreen.c  |2 
 randr/rrtransform.c   |   67 +--
 40 files changed, 888 insertions(+), 663 deletions(-)

New commits:
commit 60c161545af80eb78eb790a05bde79409dfdf16e
Author: Keith Packard kei...@keithp.com
Date:   Wed Feb 25 12:05:44 2009 -0800

X server version 1.6.0

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/configure.ac b/configure.ac
index b4d18dd..f2718b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,12 +26,12 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.5.99.903, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.6.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
 
-RELEASE_DATE=2009-2-17
+RELEASE_DATE=2009-2-25
 
 dnl this gets generated by autoheader, and thus contains all the defines.  we
 dnl don't ever actually use it, internally.

commit e9a9f807971b8fb62b957c9d54b4aea7fb0f96ca
Author: Maarten Maathuis madman2...@gmail.com
Date:   Fri Jan 30 19:32:33 2009 +0100

exa: kill of exaImageGlyphBlt

- It serves no obvious purpose, yet it directly accesses many fb
symbols.
(cherry picked from commit 5cc67ae94c066dcac78072ad8a819c3b602d8bab)

diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index f72a08a..453431e 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -856,139 +856,6 @@ out:
 REGION_DESTROY(pScreen, pReg);
 }
 
-static void
-exaImageGlyphBlt (DrawablePtr  pDrawable,
- GCPtr pGC,
- int   x,
- int   y,
- unsigned int  nglyph,
- CharInfoPtr   *ppciInit,
- pointer   pglyphBase)
-{
-FbGCPrivPtrpPriv = fbGetGCPrivate(pGC);
-CharInfoPtr*ppci;
-CharInfoPtrpci;
-unsigned char   *pglyph;   /* pointer bits in glyph */
-intgWidth, gHeight;/* width and height of glyph */
-FbStride   gStride;/* stride of glyph */
-Bool   opaque;
-intgx, gy;
-void   (*glyph) (FbBits *,
- FbStride,
- int,
- FbStip *,
- FbBits,
- int,
- int);
-FbBits *dst;
-FbStride   dstStride;
-intdstBpp;
-intdstXoff, dstYoff;
-FbBits depthMask;
-PixmapPtr  pPixmap = exaGetDrawablePixmap(pDrawable);
-ExaPixmapPriv(pPixmap);
-RegionPtr  pending_damage = NULL;
-BoxRec extents;
-int   

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Xext/xtest.c|2 
 Xi/exevents.c   |   20 
 Xi/queryst.c|3 
 configure.ac|5 
 dix/devices.c   |   32 -
 dix/events.c|   29 
 dix/getevents.c |   14 
 dix/main.c  |   14 
 exa/exa_glyphs.c|9 
 hw/xfree86/modes/xf86Rotate.c   |8 
 hw/xquartz/GL/indirect.c| 1122 +---
 hw/xquartz/X11Application.m |   12 
 hw/xquartz/X11Controller.m  |   17 
 hw/xquartz/bundle/Makefile.am   |5 
 hw/xquartz/bundle/mk_bundke.sh  |   16 
 hw/xquartz/darwinEvents.c   |4 
 hw/xquartz/darwinEvents.h   |3 
 hw/xquartz/mach-startup/Makefile.am |4 
 hw/xquartz/xpr/dri.c|  207 --
 include/Makefile.am |2 
 include/dix-config-apple-verbatim.h |8 
 include/dix-config.h.in |6 
 include/input.h |1 
 include/inputstr.h  |9 
 mi/mi.h |4 
 mi/mieq.c   |   51 +
 mi/mipointer.c  |2 
 randr/randr.c   |2 
 randr/randrstr.h|2 
 randr/rrcrtc.c  |   23 
 randr/rrinfo.c  |   10 
 randr/rroutput.c|5 
 randr/rrscreen.c|   21 
 randr/rrxinerama.c  |   50 +
 xkb/ddxDevBtn.c |2 
 xkb/xkbActions.c|4 
 36 files changed, 669 insertions(+), 1059 deletions(-)

New commits:
commit 1f729b42d567ae9533ac0e467afc9fbc83390776
Author: Keith Packard kei...@keithp.com
Date:   Fri Jan 30 21:12:17 2009 -0800

Version to 1.5.99.902

diff --git a/configure.ac b/configure.ac
index da5f488..61b8b12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,11 +26,13 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.5.99.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.5.99.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
 
+RELEASE_DATE=2009-1-30
+
 dnl this gets generated by autoheader, and thus contains all the defines.  we
 dnl don't ever actually use it, internally.
 AC_CONFIG_HEADERS(include/do-not-use-config.h)
@@ -417,7 +419,6 @@ VENDOR_MAN_VERSION=Version ${PACKAGE_VERSION}
 
 VENDOR_NAME=The X.Org Foundation
 VENDOR_NAME_SHORT=X.Org
-RELEASE_DATE=(unreleased)
 VENDOR_WEB=http://wiki.x.org;
 
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], 
m4_defn([AC_HELP_STRING]))])

commit 56f6fb8c8652c85e522e42557f8969987069076b
Author: Eric Anholt e...@anholt.net
Date:   Fri Jan 30 19:06:17 2009 -0800

randr: Avoid re-querying the configuration on everything but 
GetScreenResources.

The new path should only re-query on the other requests when we haven't
gathered the information from the DDX yet (such as with a non-RandR 1.2 
DDX).

Bug #19037.
(cherry picked from commit 317f2b4a9fe4b606975711bc332166a82db5087d)

diff --git a/randr/randrstr.h b/randr/randrstr.h
index b5cebdc..9c9b7c0 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -468,7 +468,7 @@ RRTellChanged (ScreenPtr pScreen);
  * Poll the driver for changed information
  */
 Bool
-RRGetInfo (ScreenPtr pScreen);
+RRGetInfo (ScreenPtr pScreen, Bool force_query);
 
 Bool RRInit (void);
 
diff --git a/randr/rrinfo.c b/randr/rrinfo.c
index 38314de..12b9a4a 100644
--- a/randr/rrinfo.c
+++ b/randr/rrinfo.c
@@ -178,12 +178,20 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
  * Poll the driver for changed information
  */
 Bool
-RRGetInfo (ScreenPtr pScreen)
+RRGetInfo (ScreenPtr pScreen, Bool force_query)
 {
 rrScrPriv (pScreen);
 Rotation   rotations;
 inti;
 
+/* Return immediately if we don't need to re-query and we already have the
+ * information.
+ */
+if (!force_query) {
+   if (pScrPriv-numCrtcs != 0 || pScrPriv-numOutputs != 0)
+   return TRUE;
+}
+
 for (i = 0; i  pScrPriv-numOutputs; i++)
pScrPriv-outputs[i]-changed = FALSE;
 for (i = 0; i  pScrPriv-numCrtcs; i++)
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index 95662c9..da633b2 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -224,7 +224,7 @@ ProcRRGetScreenSizeRange (ClientPtr client)
 
 if (pScrPriv) 
 {
-   if (!RRGetInfo (pScreen))
+   if (!RRGetInfo (pScreen, FALSE))
return BadAlloc;
rep.minWidth  = pScrPriv-minWidth;
rep.minHeight = pScrPriv-minHeight;
@@ -340,7 +340,7 @@ rrGetScreenResources(ClientPtr client, Bool query)
 rep.pad = 0;
 
 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit 251d0d8090322b2c9dc0c8b7bef001f338d19433
Author: Keith Packard kei...@keithp.com
Date:   Mon Jan 12 13:03:30 2009 -0800

Update version to 1.5.99.901 (1.6 RC1)

diff --git a/configure.ac b/configure.ac
index cd53288..da5f488 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.5.99.3, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.5.99.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit 71628cabc9dddf5c9fe12d555ae0c47d5902b2f7
Author: Keith Packard kei...@keithp.com
Date:   Mon Jan 12 11:51:28 2009 -0800

Merge include/dix-config-post-verbatim.h into include/dix-config.h.in

No sense having an extra include file here; it makes building stuff harder.

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/include/dix-config-post-verbatim.h 
b/include/dix-config-post-verbatim.h
deleted file mode 100644
index 4bbb9b0..000
--- a/include/dix-config-post-verbatim.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Do not include this file directly.  It is included at the end of 
dix-config.h */
-
-/* Correctly set _XSERVER64 for OSX fat binaries */
-#ifdef __APPLE__
-#if defined(__LP64__)  !defined(_XSERVER64)
-#define _XSERVER64 1
-#elif !defined(__LP64__)  defined(_XSERVER64)
-#undef _XSERVER64
-#endif
-#endif
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 977bff3..8e047c4 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -429,6 +429,13 @@
 /* Define to 1 if you have the `ffs' function. */
 #undef HAVE_FFS
 
-#include dix-config-post-verbatim.h
+/* Correctly set _XSERVER64 for OSX fat binaries */
+#ifdef __APPLE__
+#if defined(__LP64__)  !defined(_XSERVER64)
+#define _XSERVER64 1
+#elif !defined(__LP64__)  defined(_XSERVER64)
+#undef _XSERVER64
+#endif
+#endif
 
 #endif /* _DIX_CONFIG_H_ */

commit cbd977cc15cf22a3e42b10942d5657cb8b9ac335
Author: Alban Browaeys pra...@yahoo.com
Date:   Mon Jan 12 10:57:11 2009 -0800

Fix dmx compile on 1.6 branch.


http://www.mail-archive.com/pld-cvs-com...@lists.pld-linux.org/msg166742.html
contains a patch from arekm which I build upon to make up this one.

Mostly fixes for Xcalloc which I previously tried to fix the same way but
without finding the right spot.

I cannot tell if dmx works though. Only that it at least compile.

Signed-off-by: Keith Packard kei...@keithp.com

diff --git a/hw/dmx/dmxcb.c b/hw/dmx/dmxcb.c
index 4e7279a..ae6eb6f 100644
--- a/hw/dmx/dmxcb.c
+++ b/hw/dmx/dmxcb.c
@@ -43,6 +43,12 @@
 #include dmxinput.h
 #include dmxlog.h
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 extern int connBlockScreenStart;
 
 #ifdef PANORAMIX
diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c
index d20c844..91479e7 100644
--- a/hw/dmx/dmxextension.c
+++ b/hw/dmx/dmxextension.c
@@ -64,6 +64,12 @@
 #include X11/extensions/dmxproto.h  /* For DMX_BAD_* */
 #include cursorstr.h
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 /* The default font is declared in dix/globals.c, but is not included in
  * _any_ header files. */
 extern FontPtr  defaultFont;
diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c
index b70f7d2..c739159 100644
--- a/hw/dmx/dmxfont.c
+++ b/hw/dmx/dmxfont.c
@@ -49,6 +49,12 @@
 #include dixfont.h
 #include dixstruct.h
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 static int (*dmxSaveProcVector[256])(ClientPtr);
 static int   dmxFontLastError;
 
diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c
index 37dfa10..8bce689 100644
--- a/hw/dmx/dmxpict.c
+++ b/hw/dmx/dmxpict.c
@@ -56,6 +56,12 @@
 #include mipict.h
 #include fbpict.h
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 
 extern int RenderErrBase;
 extern int (*ProcRenderVector[RenderNumberRequests])(ClientPtr);
diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c
index 7360750..28c8b01 100644
--- a/hw/dmx/dmxscrinit.c
+++ b/hw/dmx/dmxscrinit.c
@@ -61,6 +61,12 @@
 #include mipointer.h
 #include micmap.h
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 extern Bool dmxCloseScreen(int idx, ScreenPtr pScreen);
 static Bool dmxSaveScreen(ScreenPtr pScreen, int what);
 
diff --git a/hw/dmx/glxProxy/glxutil.c b/hw/dmx/glxProxy/glxutil.c
index 080992e..e3056bb 100644
--- a/hw/dmx/glxProxy/glxutil.c
+++ b/hw/dmx/glxProxy/glxutil.c
@@ -36,6 +36,12 @@
 #include windowstr.h
 #include glxutil.h
 
+#undef Xmalloc
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+
+
 //
 
 void __glXNop(void) {}
diff --git a/hw/dmx/glxProxy/glxvisuals.c b/hw/dmx/glxProxy/glxvisuals.c
index 

xorg-server: Changes to 'upstream-experimental'

[Timo Aaltonen]

Rebased ref, commits from common ancestor:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 config/hal.c   |   27 ++
 configure.ac   |5 
 exa/exa.h  |4 
 exa/exa_migration.c|6 
 exa/exa_priv.h |3 
 glx/glxdri.c   |2 
 glx/glxscreens.c   |2 
 hw/kdrive/src/kinput.c |2 
 hw/kdrive/vesa/vm86.h  |7 
 hw/xfree86/common/Makefile.am  |3 
 hw/xfree86/common/xf86.h   |1 
 hw/xfree86/common/xf86Config.c |   39 +++
 hw/xfree86/common/xf86Events.c |  173 ---
 hw/xfree86/common/xf86Globals.c|1 
 hw/xfree86/common/xf86Helper.c |2 
 hw/xfree86/common/xf86Init.c   |  359 -
 hw/xfree86/ddc/interpret_edid.c|   10 
 hw/xfree86/doc/man/xorg.conf.man.pre   |1 
 hw/xfree86/dri/dri.c   |2 
 hw/xfree86/os-support/linux/lnx_init.c |   52 
 include/dix-config.h.in|6 
 include/os.h   |2 
 mi/mieq.c  |6 
 os/Makefile.am |1 
 os/backtrace.c |  201 ++
 os/log.c   |1 
 randr/rrproperty.c |   44 +++-
 27 files changed, 630 insertions(+), 332 deletions(-)

New commits:
commit 4c6a89ee783d62fb75a738339351830c35b19a38
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Wed Nov 5 15:39:01 2008 -0500

xserver 1.5.3

diff --git a/configure.ac b/configure.ac
index 88749a5..de932f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.5.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=10 October 2008
+AC_INIT([xorg-server], 1.5.3, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=5 November 2008
+REMEMBER_REMEMBER=The Fifth of November
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit b0c2d009852972f1b085ab5ce2271692dface27f
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Sun Oct 26 13:13:21 2008 +0100

xfree86: fix compiler warnings in DoModalias()

The precedence of == is higher than that of , so that code was
probably buggy.

xf86Init.c: In function 'DoModalias':
xf86Init.c:300: warning: suggest parentheses around comparison in operand 
of 
xf86Init.c:304: warning: suggest parentheses around comparison in operand 
of 
xf86Init.c:308: warning: suggest parentheses around comparison in operand 
of 
(cherry picked from commit ffaaa1a198a77eb6800c08d4613ee1cc0b068ba0)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 8b41d81..fc50caf 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -307,15 +307,15 @@ DoModalias()
  ErrorF(sd%08X, match-subdevice_id);
 
  /* Class */
- if (match-device_class_mask  16  0xFF == 0xFF)
+ if ((match-device_class_mask  16  0xFF) == 0xFF)
  ErrorF(bc%02X, match-device_class  16  0xFF);
  else
  ErrorF(bc*);
- if (match-device_class_mask  8  0xFF == 0xFF)
+ if ((match-device_class_mask  8  0xFF) == 0xFF)
  ErrorF(sc%02X, match-device_class  8  0xFF);
  else
  ErrorF(sc*);
- if (match-device_class_mask  0xFF == 0xFF)
+ if ((match-device_class_mask  0xFF) == 0xFF)
  ErrorF(i%02X*, match-device_class  0xFF);
  else
  ErrorF(i*);

commit a311fdc04013c678eb506458d6a5d3376f107bf7
Author: Nathaniel McCallum [EMAIL PROTECTED]
Date:   Tue Oct 14 09:50:29 2008 -0400

Xorg: add -modalias option

This scans the installed video drivers and prints a Linux-style modalias
listing of the devices each driver claims to support.

diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 065102f..e915217 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -56,6 +56,7 @@
 
 /* General parameters */
 extern int xf86DoConfigure;
+extern Bool xf86DoModalias;
 extern Bool xf86DoConfigurePass1;
 extern DevPrivateKey xf86ScreenKey;
 extern DevPrivateKey xf86CreateRootWindowKey;
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index 0dc42c6..f5babbc 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -149,6 +149,7 @@ Bool xf86Resetting = FALSE;
 Bool xf86Initialising = FALSE;
 Bool xf86DoProbe = FALSE;
 Bool xf86DoConfigure = FALSE;
+Bool xf86DoModalias = FALSE;
 DriverPtr *xf86DriverList = NULL;
 int xf86NumDrivers = 0;
 InputDriverPtr *xf86InputDriverList = NULL;
diff --git 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 configure.ac|4 +--
 dix/getevents.c |6 ++---
 glx/Makefile.am |6 -
 hw/xfree86/ddc/interpret_edid.c |   41 
 hw/xfree86/dixmods/extmod/xf86dga.c |7 --
 hw/xfree86/int10/helper_exec.c  |   15 +
 hw/xfree86/modes/xf86Crtc.c |3 +-
 mfb/mfbscrinit.c|1 
 xkb/XKBMisc.c   |   13 ---
 xkb/xkb.c   |   17 --
 xkb/xkbUtils.c  |   39 +-
 11 files changed, 109 insertions(+), 43 deletions(-)

New commits:
commit 6dcfa994b0777bf0cabeb71672f13e650b340817
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Fri Oct 10 15:26:32 2008 -0400

xserver 1.5.2

diff --git a/configure.ac b/configure.ac
index ef276cc..88749a5 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.5.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=23 September 2008
+AC_INIT([xorg-server], 1.5.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=10 October 2008
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit 75504517a30f1bdd593c2a32af81084b59b398a5
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Fri Oct 10 13:41:50 2008 -0400

EDID: Catch monitors that encode aspect ratio for physical size.

This is not legal in either EDID 1.3 or 1.4, but hey, when did a little
thing like legality stop anyone.
(cherry picked from commit 0660dd9d7009147c395b9ea904539f76f55b9a7f)

diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index 21391dd..958247c 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -85,6 +85,47 @@ handle_edid_quirks(xf86MonPtr m)
}
}
 }
+
+/*
+ * some monitors encode the aspect ratio instead of the physical size.
+ * try to find the largest detailed timing that matches that aspect
+ * ratio and use that to fill in the feature section.
+ */
+if ((m-features.hsize == 16  m-features.vsize == 9) ||
+   (m-features.hsize == 16  m-features.vsize == 10) ||
+   (m-features.hsize == 4  m-features.vsize == 3) ||
+   (m-features.hsize == 5  m-features.vsize == 4)) {
+   int real_hsize = 0, real_vsize = 0;
+   float target_aspect, timing_aspect;
+   
+   target_aspect = (float)m-features.hsize / (float)m-features.vsize;
+   for (i = 0; i  4; i++) {
+   if (m-det_mon[i].type == DT) {
+   struct detailed_timings *timing;
+   timing = m-det_mon[i].section.d_timings;
+
+   if (!timing-v_size)
+   continue;
+
+   timing_aspect = (float)timing-h_size / (float)timing-v_size;
+   if (fabs(1 - (timing_aspect / target_aspect))  0.05) {
+   real_hsize = max(real_hsize, timing-h_size);
+   real_vsize = max(real_vsize, timing-v_size);
+   }
+   }
+   }
+
+   if (real_hsize  real_vsize) {
+   /* convert mm to cm */
+   m-features.hsize = (real_hsize + 5) / 10;
+   m-features.vsize = (real_vsize + 5) / 10;
+   } else {
+   m-features.hsize = m-features.vsize = 0;
+   }
+   
+   xf86Msg(X_INFO, Quirked EDID physical size to %dx%d cm\n,
+   m-features.hsize, m-features.vsize);
+}
 }
 
 xf86MonPtr

commit b595b65e54b1e15fbce872fe3719da14cfae5b92
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Thu Oct 9 14:53:29 2008 -0400

Revert Array-index based devPrivates implementation.

This reverts commit 8ef37c194fa08d3911095299413a42a01162b078.

diff --git a/dix/privates.c b/dix/privates.c
index ca03317..efb3204 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -40,8 +40,9 @@ from The Open Group.
 #include inputstr.h
 
 struct _Private {
-int state;
-pointer value;
+DevPrivateKey  key;
+pointervalue;
+struct _Private*next;
 };
 
 typedef struct _PrivateDesc {
@@ -49,36 +50,22 @@ typedef struct _PrivateDesc {
 unsigned size;
 CallbackListPtr initfuncs;
 CallbackListPtr deletefuncs;
+struct _PrivateDesc *next;
 } PrivateDescRec;
 
-#define PRIV_MAX 256
-#define PRIV_STEP 16
-
 /* list of all allocated privates */
-static PrivateDescRec items[PRIV_MAX];
-static int nextPriv;
+static PrivateDescRec *items = NULL;
 
-static PrivateDescRec *
+static _X_INLINE PrivateDescRec *
 findItem(const DevPrivateKey key)
 {
-if (!*key) {
-   if (nextPriv = PRIV_MAX)
-   return NULL;
-
-   items[nextPriv].key = key;
-   *key = nextPriv;
-   nextPriv++;
+PrivateDescRec *item = items;
+while (item) {
+  

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Xext/panoramiX.c |   17 +
 composite/compinit.c |3 ++-
 configure.ac |4 ++--
 exa/exa.c|   10 ++
 randr/rrxinerama.c   |   18 ++
 5 files changed, 41 insertions(+), 11 deletions(-)

New commits:
commit 97f688f2b4b8ebfba77be00db68c4e6a555a5d62
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Tue Sep 23 14:51:33 2008 -0400

xserver 1.5.1

diff --git a/configure.ac b/configure.ac
index 51d8b14..ef276cc 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.5.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=3 September 2008
+AC_INIT([xorg-server], 1.5.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=23 September 2008
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit 68c575cb73fd6ff6c9c0ce29a3d8105da44abfcc
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Tue Sep 23 11:05:44 2008 -0400

Move RELEASE_DATE below AC_INIT.

Doing it the other way around clobbers the setting, which means you get
a null release date string in the log.  Thanks autoconf!

diff --git a/configure.ac b/configure.ac
index 0262274..51d8b14 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)
-RELEASE_DATE=3 September 2008
 AC_INIT([xorg-server], 1.5.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=3 September 2008
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit dba26368e5dbdd35df97d38ed517d1248503ab51
Author: Peter Harris [EMAIL PROTECTED]
Date:   Thu Dec 20 15:58:01 2007 -0500

Fix panoramiX request and reply swapping

 Fix panoramiX request and reply swapping
 Set window and screen values in panoramix replies
 Prevent buffer overrun in ProcPanoramiXGetScreenSize
(cherry picked from commit 2b266eda6e23d16116f8a8e258192df353970279)

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 2792dc7..8bc5c42 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -936,10 +936,11 @@ ProcPanoramiXGetState(ClientPtr client)
rep.length = 0;
rep.sequenceNumber = client-sequence;
rep.state = !noPanoramiXExtension;
+   rep.window = stuff-window;
if (client-swapped) {
swaps (rep.sequenceNumber, n);
swapl (rep.length, n);
-   swaps (rep.state, n);
+   swapl (rep.window, n);
}   
WriteToClient (client, sizeof (xPanoramiXGetStateReply), (char *) rep);
return client-noClientException;
@@ -963,10 +964,11 @@ ProcPanoramiXGetScreenCount(ClientPtr client)
rep.length = 0;
rep.sequenceNumber = client-sequence;
rep.ScreenCount = PanoramiXNumScreens;
+   rep.window = stuff-window;
if (client-swapped) {
swaps (rep.sequenceNumber, n);
swapl (rep.length, n);
-   swaps (rep.ScreenCount, n);
+   swapl (rep.window, n);
}   
WriteToClient (client, sizeof (xPanoramiXGetScreenCountReply), (char *) 
rep);
return client-noClientException;
@@ -980,6 +982,9 @@ ProcPanoramiXGetScreenSize(ClientPtr client)
xPanoramiXGetScreenSizeReplyrep;
register intn, rc;

+   if (stuff-screen = PanoramiXNumScreens)
+   return BadMatch;
+
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
rc = dixLookupWindow(pWin, stuff-window, client, DixGetAttrAccess);
if (rc != Success)
@@ -991,11 +996,15 @@ ProcPanoramiXGetScreenSize(ClientPtr client)
/* screen dimensions */
rep.width  = panoramiXdataPtr[stuff-screen].width; 
rep.height = panoramiXdataPtr[stuff-screen].height; 
+   rep.window = stuff-window;
+   rep.screen = stuff-screen;
if (client-swapped) {
swaps (rep.sequenceNumber, n);
swapl (rep.length, n);
-   swaps (rep.width, n);
-   swaps (rep.height, n);
+   swapl (rep.width, n);
+   swapl (rep.height, n);
+   swapl (rep.window, n);
+   swapl (rep.screen, n);
}   
WriteToClient (client, sizeof (xPanoramiXGetScreenSizeReply), (char *) 
rep);
return client-noClientException;
diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
index 240fca2..e6acd5e 100644
--- a/randr/rrxinerama.c
+++ b/randr/rrxinerama.c
@@ -138,10 +138,11 @@ ProcRRXineramaGetState(ClientPtr client)
 rep.length = 0;
 rep.sequenceNumber = client-sequence;
 rep.state = active;
+rep.window = stuff-window;
 if(client-swapped) {
swaps (rep.sequenceNumber, n);
swapl (rep.length, n);
-   swaps (rep.state, n);
+   swapl 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Xext/shm.c  |   94 -
 Xext/shmint.h   |3 
 Xext/xevie.c|   31 +
 Xext/xselinux.c |   21 +--
 configure.ac|8 -
 dix/dispatch.c  |2 
 doc/Xserver.man.pre |2 
 exa/exa.c   |7 -
 exa/exa_accel.c |   92 -
 exa/exa_priv.h  |9 -
 glx/glxdriswrast.c  |2 
 glx/glxext.c|   37 --
 hw/xfree86/ddc/print_edid.c |3 
 hw/xfree86/doc/man/Xorg.man.pre |2 
 hw/xfree86/modes/xf86Crtc.c |2 
 hw/xfree86/xaa/xaaFillPoly.c|8 -
 mi/miexpose.c   |4 
 randr/rrcrtc.c  |   11 +-
 randr/rrproperty.c  |   58 +-
 randr/rrsdispatch.c |  215 
 20 files changed, 322 insertions(+), 289 deletions(-)

New commits:
commit 05fb2f9e1249d0b91bf4318cec4fb309217adff4
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Wed Sep 3 19:14:22 2008 -0400

xserver 1.5.0

Drinkin' island is inside each of us, my son.

diff --git a/configure.ac b/configure.ac
index 6a0876b..0262274 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)
-RELEASE_DATE=23 July 2008
-AC_INIT([xorg-server], 1.4.99.906, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=3 September 2008
+AC_INIT([xorg-server], 1.5.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit f385303cd0242e3a7fded15f8b5c3d610c13ee41
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Tue Sep 2 15:43:15 2008 -0400

Fix strict-aliasing silliness in XAA.
(cherry picked from commit 613ce0955032fb032de0a3940752828d314f057a)

diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c
index 23c2781..6f11e35 100644
--- a/hw/xfree86/xaa/xaaFillPoly.c
+++ b/hw/xfree86/xaa/xaaFillPoly.c
@@ -131,8 +131,8 @@ XAAIsEasyPolygon(
 *bottomY = 0;
 
 origin -= (origin  0x8000)  1;
-vertex1 = *((int *) extents-x1) - origin;
-vertex2 = *((int *) extents-x2) - origin /* - 0x00010001 */;
+vertex1 = extents-x1 - origin;
+vertex2 = extents-x2 - origin /* - 0x00010001 */;
  /* I think this was an error in cfb ^ */
 
 if (shape == Convex) {
@@ -714,7 +714,7 @@ XAAFillPolygonStippled(
return;
 }
 
-origin = *((int *)pDraw-x);
+origin = pDraw-x;
 
 switch( XAAIsEasyPolygon(ptsIn, count, pGC-pCompositeClip-extents,
 origin, topPoint, y, maxy, shape) ) {
@@ -867,7 +867,7 @@ XAAFillPolygonTiled(
return;
 }
 
-origin = *((int *)pDraw-x);
+origin = pDraw-x;
 
 switch( XAAIsEasyPolygon(ptsIn, count, pGC-pCompositeClip-extents,
 origin, topPoint, y, maxy, shape) ) {

commit 6cb7f595b97e9442a79660bc639b2fc91842e19a
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Wed Sep 3 14:59:24 2008 -0400

Disable DRI2 by default.

diff --git a/configure.ac b/configure.ac
index d324bd5..6a0876b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -536,7 +536,7 @@ AC_ARG_ENABLE(xdmcp,  
AS_HELP_STRING([--disable-xdmcp], [Build XDMCP ext
 AC_ARG_ENABLE(xdm-auth-1, AS_HELP_STRING([--disable-xdm-auth-1], [Build 
XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval], [XDMAUTH=auto])
 AC_ARG_ENABLE(glx,AS_HELP_STRING([--disable-glx], [Build GLX 
extension (default: enabled)]), [GLX=$enableval], [GLX=yes])
 AC_ARG_ENABLE(dri,AS_HELP_STRING([--enable-dri], [Build DRI 
extension (default: auto)]), [DRI=$enableval])
-AC_ARG_ENABLE(dri2,   AS_HELP_STRING([--enable-dri2], [Build DRI2 
extension (default: auto)]), [DRI2=$enableval])
+AC_ARG_ENABLE(dri2,   AS_HELP_STRING([--enable-dri2], [Build DRI2 
extension (default: no)]), [DRI2=$enableval], [DRI2=no])
 AC_ARG_ENABLE(xinerama,  AS_HELP_STRING([--disable-xinerama], 
[Build Xinerama extension (default: enabled)]), [XINERAMA=$enableval], 
[XINERAMA=yes])
 AC_ARG_ENABLE(xf86vidmode,AS_HELP_STRING([--disable-xf86vidmode], [Build 
XF86VidMode extension (default: auto)]), [XF86VIDMODE=$enableval], 
[XF86VIDMODE=auto])
 AC_ARG_ENABLE(xf86misc,   AS_HELP_STRING([--disable-xf86misc], [Build 
XF86Misc extension (default: auto)]), [XF86MISC=$enableval], [XF86MISC=auto])

commit ed2248f673ed8993e678818c388203346a3614e0
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Wed Sep 3 14:58:43 2008 -0400

Disable XTrap build by default.

diff --git a/configure.ac b/configure.ac
index efef454..d324bd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -526,7 +526,7 @@ AC_ARG_ENABLE(registry,   
AS_HELP_STRING([--disable-registry], [Build string
 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Xi/chgdctl.c   |2 
 Xi/exevents.c  |   11 
 config/hal.c   |   62 -
 configure.ac   |6 
 dix/Makefile.am|3 
 dix/strcasecmp.c   |   74 +
 dix/strcasestr.c   |   64 +
 exa/exa.c  |2 
 glx/glxcmds.c  |8 
 glx/glxdricommon.c |   12 
 glx/glxscreens.h   |7 
 hw/xfree86/common/xf86Config.c |   69 +
 include/dix-config.h.in|   12 
 include/dix.h  |   12 
 xkb/xkb.c  | 1862 ++---
 15 files changed, 1428 insertions(+), 778 deletions(-)

New commits:
commit 78f50cd5758d778a5b01aa607c04919b69a5a47f
Author: Kristian Høgsberg [EMAIL PROTECTED]
Date:   Tue Aug 26 10:58:35 2008 -0400

Fix driGetConfigAttribIndex unaligned access to GLboolean.

We don't actually send the float mode so just drop it.  Drop a couple of
other unused or redundant fields from GLXconfig.

diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 0831135..95221a7 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -907,7 +907,7 @@ int __glXDisp_GetVisualConfigs(__GLXclientState *cl, GLbyte 
*pc)
p = 0;
buf[p++] = modes-visualID;
buf[p++] = glxConvertToXVisualType( modes-visualType );
-   buf[p++] = modes-rgbMode;
+   buf[p++] = (modes-renderType  GLX_RGBA_BIT) ? GL_TRUE : GL_FALSE;
 
buf[p++] = modes-redBits;
buf[p++] = modes-greenBits;
@@ -959,7 +959,7 @@ int __glXDisp_GetVisualConfigs(__GLXclientState *cl, GLbyte 
*pc)
 return Success;
 }
 
-#define __GLX_TOTAL_FBCONFIG_ATTRIBS (35)
+#define __GLX_TOTAL_FBCONFIG_ATTRIBS (36)
 #define __GLX_FBCONFIG_ATTRIBS_LENGTH (__GLX_TOTAL_FBCONFIG_ATTRIBS * 2)
 /**
  * Send the set of GLXFBConfigs to the client.  There is not currently
@@ -1011,7 +1011,9 @@ DoGetFBConfigs(__GLXclientState *cl, unsigned screen)
WRITE_PAIR( GLX_FBCONFIG_ID,  modes-fbconfigID );
WRITE_PAIR( GLX_X_RENDERABLE, GL_TRUE );
 
-   WRITE_PAIR( GLX_RGBA, modes-rgbMode );
+   WRITE_PAIR( GLX_RGBA,
+   (modes-renderType  GLX_RGBA_BIT) ? GL_TRUE : GL_FALSE );
+   WRITE_PAIR( GLX_RENDER_TYPE,  modes-renderType );
WRITE_PAIR( GLX_DOUBLEBUFFER, modes-doubleBufferMode );
WRITE_PAIR( GLX_STEREO,   modes-stereoMode );
 
diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
index 3285835..faaa3b7 100644
--- a/glx/glxdricommon.c
+++ b/glx/glxdricommon.c
@@ -88,7 +88,6 @@ static const struct { unsigned int attrib, offset; } 
attribMap[] = {
 __ATTRIB(__DRI_ATTRIB_TRANSPARENT_GREEN_VALUE, transparentGreen),
 __ATTRIB(__DRI_ATTRIB_TRANSPARENT_BLUE_VALUE,  transparentBlue),
 __ATTRIB(__DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE, transparentAlpha),
-__ATTRIB(__DRI_ATTRIB_FLOAT_MODE,  floatMode),
 __ATTRIB(__DRI_ATTRIB_RED_MASK,redMask),
 __ATTRIB(__DRI_ATTRIB_GREEN_MASK,  greenMask),
 __ATTRIB(__DRI_ATTRIB_BLUE_MASK,   blueMask),
@@ -136,16 +135,11 @@ createModeFromConfig(const __DRIcoreExtension *core,
 while (core-indexConfigAttrib(driConfig, i++, attrib, value)) {
switch (attrib) {
case __DRI_ATTRIB_RENDER_TYPE:
-   if (value  __DRI_ATTRIB_RGBA_BIT) {
+   config-config.renderType = 0;
+   if (value  __DRI_ATTRIB_RGBA_BIT)
config-config.renderType |= GLX_RGBA_BIT;
-   config-config.rgbMode = GL_TRUE;
-   } else if (value  __DRI_ATTRIB_COLOR_INDEX_BIT) {
+   if (value  __DRI_ATTRIB_COLOR_INDEX_BIT)
config-config.renderType |= GLX_COLOR_INDEX_BIT;
-   config-config.rgbMode = GL_FALSE;
-   } else {
-   config-config.renderType = 0;
-   config-config.rgbMode = GL_FALSE;
-   }
break;
case __DRI_ATTRIB_CONFIG_CAVEAT:
if (value  __DRI_ATTRIB_NON_CONFORMANT_CONFIG)
@@ -164,10 +158,6 @@ createModeFromConfig(const __DRIcoreExtension *core,
if (value  __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT)
config-config.bindToTextureTargets |= 
GLX_TEXTURE_RECTANGLE_BIT_EXT;
break;  
-   case __DRI_ATTRIB_FLOAT_MODE:
-   config-config.floatMode = (value ? GL_TRUE : GL_FALSE);
-   break;
-
default:
setScalar(config-config, attrib, value);
break;
diff --git a/glx/glxscreens.h b/glx/glxscreens.h
index 39d162d..ea47db4 100644
--- a/glx/glxscreens.h
+++ b/glx/glxscreens.h
@@ -58,16 +58,9 @@ void __glXSwapBarrierInit(int screen, 
__GLXSwapBarrierExtensionFuncs *funcs);
 typedef struct __GLXconfig __GLXconfig;
 struct __GLXconfig {
 __GLXconfig *next;
-GLboolean rgbMode;
-GLboolean floatMode;
-GLboolean colorIndexMode;
 GLuint doubleBufferMode;
 GLuint stereoMode;
 
-

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Xi/exevents.c|2 
 configure.ac |6 -
 dix/getevents.c  |5 -
 dix/main.c   |3 
 exa/exa.c|   14 +--
 glx/glxcmds.c|   19 ++--
 glx/glxext.c |9 ++
 hw/kdrive/ephyr/Makefile.am  |2 
 hw/kdrive/ephyr/XF86dri.c|   10 ++
 hw/kdrive/ephyr/ephyrhostglx.c   |   11 ++
 hw/kdrive/ephyr/ephyrhostvideo.c |   10 ++
 hw/kdrive/ephyr/hostx.c  |   12 ++
 hw/kdrive/fake/Makefile.am   |2 
 hw/kdrive/fbdev/Makefile.am  |2 
 hw/kdrive/sdl/Makefile.am|2 
 hw/kdrive/src/kinput.c   |   16 ++-
 hw/kdrive/vesa/Makefile.am   |2 
 hw/vfb/Makefile.am   |1 
 hw/xfree86/common/xf86AutoConfig.c   |  141 +--
 hw/xfree86/common/xf86Config.c   |   14 +--
 hw/xfree86/common/xf86Helper.c   |   14 ++-
 hw/xfree86/common/xf86Init.c |   60 +++---
 hw/xfree86/common/xf86RandR.c|   21 +
 hw/xfree86/common/xf86Xinput.c   |   18 +++-
 hw/xfree86/doc/man/xorg.conf.man.pre |3 
 hw/xfree86/modes/xf86Crtc.c  |   59 +-
 hw/xfree86/modes/xf86Cursors.c   |   10 +-
 include/Makefile.am  |3 
 include/inputstr.h   |2 
 render/filter.c  |2 
 xkb/xkbAccessX.c |4 
 31 files changed, 323 insertions(+), 156 deletions(-)

New commits:
commit c0c73e9236cffece7c8049515b03facb41f12f0e
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Wed Jul 23 14:16:47 2008 -0400

xserver 1.4.99.906

You know, Mesa 7.1 could release any day now and that'd be just fine.

diff --git a/configure.ac b/configure.ac
index a9b1651..2a8ef8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.99.905, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=23 July 2008
+AC_INIT([xorg-server], 1.4.99.906, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
@@ -418,7 +419,6 @@ VENDOR_MAN_VERSION=Version ${PACKAGE_VERSION}
 
 VENDOR_NAME=The X.Org Foundation
 VENDOR_NAME_SHORT=X.Org
-RELEASE_DATE=5 September 2007
 VENDOR_WEB=http://wiki.x.org;
 
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], 
m4_defn([AC_HELP_STRING]))])

commit e909a396194e64119d04fc6ecb68ddc4265a3e49
Author: Pierre-Loup A. Griffais [EMAIL PROTECTED]
Date:   Tue Jul 22 17:34:37 2008 -0700

Don't return BadAlloc when trying to set a PictureFilter with no parameters 
when a filter with parameters was previously set.

Signed-off-by: Aaron Plattner [EMAIL PROTECTED]
(cherry picked from commit bc3c03a3f3c091026310f0e8d55321cec570a0c5)

diff --git a/render/filter.c b/render/filter.c
index 092313f..aa3eb1a 100644
--- a/render/filter.c
+++ b/render/filter.c
@@ -301,7 +301,7 @@ SetPictureFilter (PicturePtr pPicture, char *name, int len, 
xFixed *params, int
 if (nparams != pPicture-filter_nparams)
 {
new_params = xalloc (nparams * sizeof (xFixed));
-   if (!new_params)
+   if (!new_params  nparams)
return BadAlloc;
xfree (pPicture-filter_params);
pPicture-filter_params = new_params;

commit c217cb96dccb39ffd689086b6d833a1963dfb661
Author: Dodji Seketeli [EMAIL PROTECTED]
Date:   Wed Jul 23 01:00:26 2008 +0200

[Xephyr] Fix #15839

Make sure the _XSERVER64 macro is not defined in Xlib client code.
That macro is meant to be define only on pure server code, when necessary.
(cherry picked from commit 5de1867fbb0a336ff3fdc92cbf734849f6111b1b)

diff --git a/hw/kdrive/ephyr/XF86dri.c b/hw/kdrive/ephyr/XF86dri.c
index e656ff5..63e630c 100644
--- a/hw/kdrive/ephyr/XF86dri.c
+++ b/hw/kdrive/ephyr/XF86dri.c
@@ -45,6 +45,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifdef HAVE_CONFIG_H
 #include kdrive-config.h
 #endif
+/*
+ * including some server headers (like kdrive-config.h)
+ * might define the macro _XSERVER64
+ * on 64 bits machines. That macro must _NOT_ be defined for Xlib
+ * client code, otherwise bad things happen.
+ * So let's undef that macro if necessary.
+ */
+#ifdef _XSERVER64
+#undef _XSERVER64
+#endif
 
 #ifdef XEPHYR_DRI
 
diff --git a/hw/kdrive/ephyr/ephyrhostglx.c b/hw/kdrive/ephyr/ephyrhostglx.c
index f5db5be..1eec4e0 100644
--- a/hw/kdrive/ephyr/ephyrhostglx.c
+++ b/hw/kdrive/ephyr/ephyrhostglx.c
@@ -31,6 +31,17 @@
 #include kdrive-config.h
 #endif
 
+/*
+ * including some server headers (like kdrive-config.h)
+ * might define the macro _XSERVER64
+ * on 64 bits machines. That macro must _NOT_ be defined for Xlib
+ * client code, otherwise bad 

xorg-server: Changes to 'upstream-experimental'

[Timo Aaltonen]

 GL/Makefile.am|   14 
 GL/apple/Makefile.am  |   24 
 GL/apple/aglGlx.c | 1354 --
 GL/apple/indirect.c   | 1938 
 GL/glx/.gitignore |   13 
 GL/glx/Makefile.am|   83 
 GL/glx/extension_string.c |  165 
 GL/glx/extension_string.h |   63 
 GL/glx/g_disptab.h|   51 
 GL/glx/glxbyteorder.h |   61 
 GL/glx/glxcmds.c  | 2383 --
 GL/glx/glxcmdsswap.c  |  778 ---
 GL/glx/glxcontext.h   |  150 
 GL/glx/glxdrawable.h  |  101 
 GL/glx/glxdri.c   | 1183 -
 GL/glx/glxdri2.c  |  762 ---
 GL/glx/glxext.c   |  501 --
 GL/glx/glxext.h   |   92 
 GL/glx/glxglcore.c|  451 --
 GL/glx/glxscreens.c   |  601 --
 GL/glx/glxscreens.h   |  184 
 GL/glx/glxserver.h|  266 -
 GL/glx/glxutil.c  |  154 
 GL/glx/glxutil.h  |   63 
 GL/glx/indirect_program.c |  150 
 GL/glx/indirect_table.h   |  106 
 GL/glx/indirect_texture_compression.c |  120 
 GL/glx/indirect_util.c|  310 -
 GL/glx/indirect_util.h|   53 
 GL/glx/render2.c  |  264 -
 GL/glx/render2swap.c  |  375 -
 GL/glx/renderpix.c|   75 
 GL/glx/renderpixswap.c|   93 
 GL/glx/rensize.c  |  423 -
 GL/glx/single2.c  |  394 -
 GL/glx/single2swap.c  |  272 -
 GL/glx/singlepix.c|  533 --
 GL/glx/singlepixswap.c|  584 --
 GL/glx/singlesize.c   |  198 
 GL/glx/singlesize.h   |   59 
 GL/glx/swap_interval.c|   92 
 GL/glx/unpack.h   |  239 -
 GL/glx/xfont.c|  201 
 GL/mesa/.gitignore|   32 
 GL/mesa/Makefile.am   |   18 
 GL/mesa/X/Makefile.am |   27 
 GL/mesa/glapi/Makefile.am |   20 
 GL/mesa/main/Makefile.am  |   86 
 GL/mesa/math/Makefile.am  |   27 
 GL/mesa/shader/Makefile.am|   39 
 GL/mesa/shader/grammar/Makefile.am|   20 
 GL/mesa/shader/slang/Makefile.am  |   41 
 GL/mesa/swrast/Makefile.am|   50 
 GL/mesa/swrast_setup/Makefile.am  |   20 
 GL/mesa/tnl/Makefile.am   |   37 
 GL/mesa/vbo/Makefile.am   |   35 
 GL/symlink-mesa.sh|  342 -
 GL/windows/ChangeLog  |   64 
 GL/windows/glwindows.h|   64 
 GL/windows/glwrap.c   |  583 --
 GL/windows/indirect.c | 1605 ---
 Makefile.am   |4 
 XTrap/xtrapdi.c   |2 
 Xext/security.c   |   10 
 Xext/shm.c|   13 
 Xext/xselinux.c   |2 
 Xi/exevents.c |   11 
 composite/compalloc.c |3 
 config/hal.c  |  275 -
 config/x11-input.fdi  |   62 
 configure.ac  |   71 
 dbe/dbe.c |   53 
 dix/Makefile.am   |   14 
 dix/privates.c|   65 
 dix/protocol.txt  |   28 
 dix/registry.c|   44 
 dix/window.c  |1 
 exa/exa.c |   79 
 exa/exa.h |2 
 exa/exa_accel.c   |   66 
 exa/exa_migration.c   |2 
 exa/exa_offscreen.c   |   49 
 exa/exa_priv.h|9 
 exa/exa_unaccel.c |   18 
 fb/fb24_32.c  |   10 
 glx/Makefile.am   |   91 
 glx/dispatch.h| 3829 +
 glx/extension_string.c|  165 
 glx/extension_string.h|   63 
 glx/g_disptab.h   |   51 
 glx/glapi.c   | 1064 
 glx/glapi.h   |  160 
 glx/glapioffsets.h| 1174 +
 glx/glapitable.h  |  816 +++
 glx/glapitemp.h   | 6655 ++
 glx/glprocs.h 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 .gitignore  |3 
 GL/glx/Makefile.am  |2 
 GL/glx/glxcmds.c|   58 ++--
 GL/glx/glxcontext.h |6 
 GL/glx/glxdrawable.h|2 
 GL/glx/glxdri.c |  259 +--
 GL/glx/glxdri2.c|  423 +---
 GL/glx/glxglcore.c  |   55 ++--
 GL/glx/glxscreens.c |   66 +++-
 GL/glx/glxscreens.h |   88 ++
 GL/glx/glxutil.c|   63 ++--
 GL/glx/glxutil.h|2 
 GL/symlink-mesa.sh  |2 
 Makefile.am |6 
 Xext/dpms.c |7 
 Xext/panoramiX.c|   33 +-
 Xext/panoramiXsrv.h |   10 
 Xext/xevie.c|  122 +
 Xext/xres.c |2 
 Xext/xselinux.c |   64 
 Xext/xselinux.h |1 
 composite/compwindow.c  |4 
 config/hal.c|8 
 configure.ac|   47 ++-
 dix/devices.c   |4 
 dix/getevents.c |2 
 exa/exa.c   |   53 ++--
 exa/exa.h   |2 
 exa/exa_offscreen.c |  132 +
 exa/exa_priv.h  |1 
 exa/exa_render.c|   13 
 fb/fb.h |2 
 hw/kdrive/ephyr/Makefile.am |1 
 hw/kdrive/ephyr/XF86dri.c   |   37 ++
 hw/kdrive/ephyr/ephyr.c |   34 ++
 hw/kdrive/ephyr/ephyr.h |1 
 hw/kdrive/ephyr/ephyrinit.c |   19 +
 hw/kdrive/ephyr/hostx.c |   31 ++
 hw/kdrive/ephyr/hostx.h |4 
 hw/kdrive/src/kdrive.c  |6 
 hw/xfree86/common/compiler.h|2 
 hw/xfree86/common/xf86.h|1 
 hw/xfree86/common/xf86AutoConfig.c  |   13 
 hw/xfree86/common/xf86Config.c  |   40 ++-
 hw/xfree86/common/xf86Privstr.h |3 
 hw/xfree86/common/xf86Xinput.c  |   12 
 hw/xfree86/dixmods/Makefile.am  |6 
 hw/xfree86/dixmods/extmod/modinit.c |   23 +
 hw/xfree86/dri/Makefile.am  |2 
 hw/xfree86/dri2/Makefile.am |5 
 hw/xfree86/dri2/dri2.c  |  107 +---
 hw/xfree86/dri2/dri2.h  |   16 -
 hw/xfree86/dri2/dri2ext.c   |  361 +++
 hw/xfree86/exa/examodule.c  |   13 
 hw/xfree86/fbdevhw/fbdevhw.c|4 
 hw/xfree86/int10/helper_exec.c  |2 
 hw/xfree86/loader/dixsym.c  |3 
 hw/xfree86/loader/loader.c  |2 
 hw/xfree86/loader/xf86sym.c |2 
 hw/xfree86/modes/xf86Crtc.c |  276 +++-
 hw/xfree86/modes/xf86Cursors.c  |3 
 hw/xfree86/modes/xf86EdidModes.c|   25 +
 hw/xfree86/modes/xf86Modes.c|   22 +
 hw/xfree86/modes/xf86Modes.h|3 
 hw/xfree86/modes/xf86RandR12.c  |7 
 hw/xfree86/os-support/bsd/bsdResource.c |2 
 hw/xfree86/os-support/bsd/i386_video.c  |   10 
 hw/xfree86/os-support/bus/Pci.h |2 
 hw/xfree86/utils/xorgcfg/loadmod.c  |4 
 hw/xfree86/x86emu/prim_ops.c|2 
 hw/xfree86/x86emu/x86emu/prim_x86_gcc.h |2 
 hw/xfree86/x86emu/x86emu/types.h|2 
 hw/xfree86/xaa/xaaInit.c|4 
 hw/xfree86/xaa/xaaInitAccel.c   |   57 ++--
 hw/xfree86/xaa/xaaPict.c|  144 --
 hw/xprint/ps/psout.h|2 
 include/globals.h   |   10 
 include/servermd.h  |2 
 include/xkbsrv.h|   16 -
 include/xorg-config.h.in|3 
 mi/micoord.h|2 
 mi/miinitext.c  |8 
 mi/mivaltree.c  |4 
 os/WaitFor.c|6 
 os/utils.c  |7 
 xkb/ddxLoad.c   |   54 ++--
 xkb/xkbActions.c|9 
 xkb/xkbUtils.c  |8 
 88 files changed, 2030 insertions(+), 958 deletions(-)

New commits:
commit 9211a10b981008fb96f09d6933345e41a0872f2a
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Wed May 21 17:52:23 2008 -0400

xserver 1.4.99.902

diff --git a/configure.ac b/configure.ac
index 4d841f6..07df3db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.99.901, 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 GL/glx/glxcmds.c|6 +++
 GL/glx/glxdri.c |2 -
 GL/glx/glxdri2.c|   26 +++---
 Xext/xselinux.c |   32 +++--
 hw/xfree86/common/modeline2c.awk|3 +
 hw/xfree86/common/xf86AutoConfig.c  |5 +-
 hw/xfree86/common/xf86Config.c  |   30 +---
 hw/xfree86/common/xf86Priv.h|1 
 hw/xfree86/dri2/dri2.c  |   16 +++-
 hw/xfree86/dri2/dri2.h  |5 ++
 hw/xfree86/int10/helper_exec.c  |   57 
 hw/xfree86/modes/xf86Crtc.c |   52 -
 hw/xfree86/modes/xf86Modes.c|   28 ++-
 hw/xfree86/modes/xf86RandR12.c  |   21 +--
 hw/xfree86/os-support/bsd/i386_video.c  |3 +
 hw/xfree86/os-support/bus/Makefile.am   |   12 --
 hw/xfree86/os-support/bus/Pci.h |3 -
 hw/xfree86/os-support/bus/bsd_pci.c |2 +
 hw/xfree86/os-support/linux/Makefile.am |2 -
 hw/xfree86/os-support/shared/ia64Pci.c  |   55 --
 hw/xfree86/utils/ioport/Makefile.am |2 -
 hw/xfree86/xf4bpp/ppcSpMcro.h   |6 +--
 xkb/xkbUtils.c  |7 ++-
 23 files changed, 176 insertions(+), 200 deletions(-)

New commits:
commit 98249dfa98b53a238b7d881beb5ec8b85f28ecd0
Author: Eamon Walsh [EMAIL PROTECTED]
Date:   Thu Mar 20 20:03:02 2008 -0400

XSELinux: Do a check for whether background None is allowed.
(cherry picked from commit 3bbd77ff98478153afe3251de9ba11d757218213)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 3035898..17ce7af 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1026,6 +1026,13 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, 
pointer calldata)
 rc = SELinuxDoCheck(subj, obj, class, access_mode, auditdata);
 if (rc != Success)
rec-status = rc;
+
+/* Perform the background none check on windows */
+if (access_mode  DixCreateAccess  rec-rtype == RT_WINDOW) {
+   rc = SELinuxDoCheck(subj, obj, class, DixBlendAccess, auditdata);
+   if (rc != Success)
+   ((WindowPtr)rec-res)-forcedBG = TRUE;
+}
 }
 
 static void

commit d08bb7040cd5ba2d438dec614ff1b4dd0f9b33d5
Author: Eamon Walsh [EMAIL PROTECTED]
Date:   Thu Mar 20 19:42:09 2008 -0400

XSELinux: Correctly handle some permission bits that are used more than 
once.
(cherry picked from commit e323bb426ce8a072d119cb2720b773241259c137)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 18c6526..3035898 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -152,6 +152,12 @@ static struct security_class_mapping map[] = {
 { NULL }
 };
 
+/* x_resource read bits from the list above */
+#define SELinuxReadMask (DixReadAccess|DixGetAttrAccess|DixListPropAccess| \
+DixGetPropAccess|DixGetFocusAccess|DixListAccess| \
+DixShowAccess|DixBlendAccess|DixReceiveAccess| \
+DixUseAccess|DixDebugAccess)
+
 /* forward declarations */
 static void SELinuxScreen(CallbackListPtr *, pointer, pointer);
 
@@ -853,6 +859,7 @@ SELinuxSelection(CallbackListPtr *pcbl, pointer unused, 
pointer calldata)
 SELinuxObjectRec *obj, *data;
 Selection *pSel = *rec-ppSel;
 Atom name = pSel-selection;
+Mask access_mode = rec-access_mode;
 SELinuxAuditRec auditdata = { .client = rec-client, .selection = name };
 security_id_t tsid;
 int rc;
@@ -861,11 +868,12 @@ SELinuxSelection(CallbackListPtr *pcbl, pointer unused, 
pointer calldata)
 obj = dixLookupPrivate(pSel-devPrivates, objectKey);
 
 /* If this is a new object that needs labeling, do it now */
-if (rec-access_mode  DixCreateAccess) {
+if (access_mode  DixCreateAccess) {
sidput(obj-sid);
rc = SELinuxSelectionToSID(name, subj, obj-sid, obj-poly);
if (rc != Success)
obj-sid = unlabeled_sid;
+   access_mode = DixSetAttrAccess;
 }
 /* If this is a polyinstantiated object, find the right instance */
 else if (obj-poly) {
@@ -890,13 +898,13 @@ SELinuxSelection(CallbackListPtr *pcbl, pointer unused, 
pointer calldata)
 }
 
 /* Perform the security check */
-rc = SELinuxDoCheck(subj, obj, SECCLASS_X_SELECTION, rec-access_mode,
+rc = SELinuxDoCheck(subj, obj, SECCLASS_X_SELECTION, access_mode,
auditdata);
 if (rc != Success)
rec-status = rc;
 
 /* Label the content (advisory only) */
-if (rec-access_mode  DixSetAttrAccess) {
+if (access_mode  DixSetAttrAccess) {
data = dixLookupPrivate(pSel-devPrivates, dataKey);
sidput(data-sid);
if (subj-sel_create_sid)
@@ -976,6 +984,7 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, 
pointer calldata)
 SELinuxSubjectRec *subj;
 SELinuxObjectRec *obj;
 SELinuxAuditRec auditdata = { 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit 375908557fd11e37e8d686f1ff6a372aa2c239de
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Thu Mar 6 00:19:09 2008 -0500

xserver 1.4.99.901

diff --git a/configure.ac b/configure.ac
index 0f58f32..f3b238a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.99.900, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.99.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit 2a47accff8dccded4dfe031f9366c028ba927824
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Wed Mar 5 23:56:49 2008 -0500

Fix distcheck.

diff --git a/GL/apple/Makefile.am b/GL/apple/Makefile.am
index 33ad157..c064c03 100644
--- a/GL/apple/Makefile.am
+++ b/GL/apple/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
 if HAVE_AGL_FRAMEWORK
 noinst_LIBRARIES = libAGLcore.a 
 libAGLcore_a_SOURCES = aglGlx.c \
-  $(top_srcdir)/hw/darwin/quartz/xpr/x-list.c \
-  $(top_srcdir)/hw/darwin/quartz/xpr/x-list.h \
-  $(top_srcdir)/hw/darwin/quartz/xpr/x-hash.c \
-  $(top_srcdir)/hw/darwin/quartz/xpr/x-hash.h \
+  $(top_srcdir)/hw/xquartz/xpr/x-list.c \
+  $(top_srcdir)/hw/xquartz/xpr/x-list.h \
+  $(top_srcdir)/hw/xquartz/xpr/x-hash.c \
+  $(top_srcdir)/hw/xquartz/xpr/x-hash.h \
   $(top_srcdir)/hw/dmx/glxProxy/compsize.c
 endif
 
diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am
index 9f9c87f..acd249c 100644
--- a/hw/xfree86/x86emu/Makefile.am
+++ b/hw/xfree86/x86emu/Makefile.am
@@ -21,6 +21,7 @@ EXTRA_DIST = validate.c \
  x86emu/ops.h \
  x86emu/prim_asm.h \
  x86emu/prim_ops.h \
+x86emu/prim_x86_gcc.h \
  x86emu/regs.h \
  x86emu/types.h \
  x86emu/x86emui.h
diff --git a/include/Makefile.am b/include/Makefile.am
index 0654b57..673a976 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -50,10 +50,10 @@ sdk_HEADERS =   \
validate.h  \
window.h\
windowstr.h \
-   xkbsrv.h\
xorg-server.h
 endif
 
 AM_CFLAGS = $(DIX_CFLAGS)
 
-EXTRA_DIST = $(sdk_HEADERS) do-not-use-config.h dix-config.h xorg-config.h
+EXTRA_DIST = $(sdk_HEADERS) do-not-use-config.h dix-config.h xorg-config.h \
+   xkb-config.h xkbfile.h xkbsrv.h xkbstr.h
diff --git a/xkb/Makefile.am b/xkb/Makefile.am
index e750d60..5b594c1 100644
--- a/xkb/Makefile.am
+++ b/xkb/Makefile.am
@@ -47,7 +47,7 @@ libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) 
$(XKBFILE_SRCS) \
 $(X11_SRCS)
 libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c
 
-EXTRA_DIST = xkb.h xkbDflts.h
+EXTRA_DIST = xkbDflts.h xkbgeom.h xkb.h
 
 xkbcompileddir = $(XKB_COMPILED_DIR)
 dist_xkbcompiled_DATA = README.compiled

commit 9de621afee4c9ad0d58d71968ec2c32a7fcc7753
Author: Eamon Walsh [EMAIL PROTECTED]
Date:   Tue Mar 4 22:39:41 2008 -0500

xselinux: Implement polyinstantiation support and related protocol.

(cherry picked from commit d4101140f4e569f18554cf0cbf43138d08bd1277)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index a7d3999..18c6526 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -60,31 +60,36 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
IN THE SOFTWARE.
  * Globals
  */
 
-/* private state record */
+/* private state keys */
 static DevPrivateKey subjectKey = subjectKey;
 static DevPrivateKey objectKey = objectKey;
+static DevPrivateKey dataKey = dataKey;
 
-/* This is what we store for security state */
+/* subject state (clients and devices only) */
 typedef struct {
 security_id_t sid;
+security_id_t dev_create_sid;
+security_id_t win_create_sid;
+security_id_t sel_create_sid;
+security_id_t prp_create_sid;
+security_id_t sel_use_sid;
+security_id_t prp_use_sid;
 struct avc_entry_ref aeref;
 char *command;
 int privileged;
 } SELinuxSubjectRec;
 
+/* object state */
 typedef struct {
 security_id_t sid;
 int poly;
 } SELinuxObjectRec;
 
-/* selection manager */
+/* selection and property atom cache */
 typedef struct {
-Atom selection;
-security_id_t sid;
-} SELinuxSelectionRec;
-
-static ClientPtr securityManager;
-static Window securityWindow;
+SELinuxObjectRec prp;
+SELinuxObjectRec sel;
+} SELinuxAtomRec;
 
 /* audit file descriptor */
 static int audit_fd;
@@ -123,9 +128,9 @@ static unsigned numKnownTypes;
 static security_id_t *knownEvents;
 static unsigned numKnownEvents;
 
-/* Array of selection SID structures */
-static SELinuxSelectionRec *knownSelections;
-static 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 GL/glx/glxglcore.c   |   13 
 Xext/sync.c  |5 
 config/hal.c |   35 
 config/x11-input.fdi |   10 
 configure.ac |   39 
 dix/getevents.c  |2 
 exa/exa.c|4 
 exa/exa_priv.h   |6 
 exa/exa_render.c |  126 
 exa/exa_unaccel.c|   24 
 fb/fb.h  |3 
 fb/fbcopy.c  |4 
 fb/fbpict.c  |   30 
 fb/fbtrap.c  |8 
 fb/wfbrename.h   |1 
 hw/kdrive/Makefile.am|2 
 hw/kdrive/ephyr/ephyrinit.c  |   35 
 hw/kdrive/linux/evdev.c  |  309 +
 hw/kdrive/linux/linux.c  |2 
 hw/kdrive/linux/tslib.c  |2 
 hw/kdrive/neomagic/Makefile.am   |2 
 hw/kdrive/neomagic/backend.c |   86 
 hw/kdrive/neomagic/backend.h |   70 
 hw/kdrive/src/kdrive.c   |7 
 hw/kdrive/src/kdrive.h   |8 
 hw/kdrive/src/kinput.c   |  161 
 hw/xfree86/int10/helper_exec.c   |4 
 hw/xfree86/loader/xf86sym.c  |   13 
 hw/xfree86/modes/xf86Crtc.c  |  174 -
 hw/xfree86/modes/xf86Crtc.h  |   19 
 hw/xfree86/modes/xf86Cursors.c   |   21 
 hw/xfree86/modes/xf86DiDGA.c |4 
 hw/xfree86/modes/xf86EdidModes.c |   57 
 hw/xfree86/modes/xf86Modes.c |   38 
 hw/xfree86/modes/xf86RandR12.c   |   18 
 hw/xfree86/modes/xf86Rotate.c|4 
 hw/xfree86/os-support/hurd/hurd_mouse.c  |   24 
 hw/xfree86/os-support/linux/Makefile.am  |2 
 hw/xfree86/os-support/misc/SlowBcopy.c   |   30 
 hw/xfree86/os-support/xf86_OSproc.h  |1 
 hw/xfree86/scanpci/extrapci.ids  |   17 
 hw/xfree86/scanpci/pci.ids   |  652 +++
 hw/xfree86/scanpci/xf86PciStdIds.h   | 5315 ++-
 hw/xfree86/utils/xorgconfig/xorgconfig.c |2 
 include/miscstruct.h |2 
 mi/miregion.c|2 
 os/io.c  |4 
 os/osdep.h   |3 
 randr/rrinfo.c   |9 
 randr/rroutput.c |1 
 render/picture.h |2 
 render/picturestr.h  |2 
 xorg-server.pc.in|2 
 53 files changed, 6712 insertions(+), 704 deletions(-)

New commits:
commit ec56c5e958248ea0161dda885fa59752b20f5d7c
Author: Eric Anholt [EMAIL PROTECTED]
Date:   Fri Aug 31 20:02:52 2007 -0700

Bump version to 1.3.99.2.

diff --git a/configure.ac b/configure.ac
index da90ede..60f34c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl Process this file with autoconf to create configure.
 AC_PREREQ(2.57)
 dnl This is the not the Xorg version number, it's the server version number.
 dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.3.99.1, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.3.99.2, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

commit 5efc4bd7d0e2020242127d8ed83efb8d2d76a151
Author: Eric Anholt [EMAIL PROTECTED]
Date:   Fri Aug 31 18:27:41 2007 -0700

Remove backend.[ch] from neomagic to fix distcheck.
(cherry picked from commit 917e3bb83a48da7618fce463cf6283be36cd9084)

diff --git a/hw/kdrive/neomagic/Makefile.am b/hw/kdrive/neomagic/Makefile.am
index 4686547..95f0e1e 100644
--- a/hw/kdrive/neomagic/Makefile.am
+++ b/hw/kdrive/neomagic/Makefile.am
@@ -19,8 +19,6 @@ bin_PROGRAMS = Xneomagic
 noinst_LIBRARIES = libneomagic.a
 
 libneomagic_a_SOURCES = \
-   backend.h   \
-   backend.c   \
neomagic.c  \
neomagic.h  \
neo_draw.c

commit 1a125b521434da7ba3a41b6398c7f094867908e0
Author: Eric Anholt [EMAIL PROTECTED]
Date:   Fri Aug 31 15:16:01 2007 -0700

Bug #7364: Require renderproto 0.9.3 on 64-bit, and fix build with it.

(cherry picked from commit 07630d897ef37cad8b79d073d9edc891d5a7bddd)

diff --git a/configure.ac b/configure.ac
index ad6ae4b..da90ede 100644
--- a/configure.ac
+++ b/configure.ac
@@ -628,7 +628,13 @@ PKG_CHECK_MODULES(PIXMAN, $PIXMAN)
 AC_SUBST(PIXMAN_CFLAGS)
 
 dnl Core modules for most extensions, et al.
-REQUIRED_MODULES=[randrproto = 1.2] renderproto [fixesproto = 4.0] 
[damageproto = 1.1] xcmiscproto xextproto [xproto = 7.0.9] xtrans 
[scrnsaverproto = 1.1] bigreqsproto resourceproto fontsproto [inputproto = 
1.4.2] [kbproto = 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 .gitignore|1 
 COPYING   | 2717 
 GL/glx/Makefile.am|1 
 GL/glx/glxcmds.c  |   53 
 GL/glx/glxcmdsswap.c  |9 
 GL/glx/glxdrawable.h  |1 
 GL/glx/glxdri.c   |   44 
 GL/glx/glxext.c   |9 
 GL/glx/glxext.h   |3 
 GL/glx/glxserver.h|2 
 Makefile.am   |   12 
 Xi/opendev.c  |4 
 acinclude.m4  |   33 
 composite/compalloc.c |1 
 composite/compinit.c  |  202 
 composite/compwindow.c|2 
 config/Makefile.am|   18 
 config/config-backends.h  |   59 
 config/config.c   |  542 -
 config/dbus-api   |   19 
 config/dbus-core.c|  243 
 config/dbus.c |  441 +
 config/hal.c  |  371 +
 config/x11-input.fdi  |   31 
 configure.ac  |  112 
 dix/Makefile.am   |5 
 dix/cursor.c  |   22 
 dix/devices.c |1 
 dix/getevents.c   |   94 
 dix/main.c|   28 
 dix/property.c|   64 
 exa/exa.c |   39 
 exa/exa_unaccel.c |   37 
 fb/fb.h   |   34 
 fb/fballpriv.c|4 
 fb/fboverlay.c|6 
 fb/fbpict.c   |2 
 fb/fbscreen.c |   33 
 hw/darwin/Makefile.am |1 
 hw/kdrive/ati/Makefile.am |4 
 hw/kdrive/chips/Makefile.am   |4 
 hw/kdrive/ephyr/Makefile.am   |5 
 hw/kdrive/epson/Makefile.am   |4 
 hw/kdrive/fake/Makefile.am|4 
 hw/kdrive/fbdev/Makefile.am   |4 
 hw/kdrive/i810/Makefile.am|4 
 hw/kdrive/mach64/Makefile.am  |4 
 hw/kdrive/mga/Makefile.am |4 
 hw/kdrive/neomagic/Makefile.am|4 
 hw/kdrive/nvidia/Makefile.am  |4 
 hw/kdrive/pm2/Makefile.am |4 
 hw/kdrive/r128/Makefile.am|4 
 hw/kdrive/savage/s3curs.c |8 
 hw/kdrive/sdl/Makefile.am |2 
 hw/kdrive/sis300/Makefile.am  |4 
 hw/kdrive/smi/Makefile.am |4 
 hw/kdrive/src/kasync.c|5 
 hw/kdrive/src/kdrive.c|   14 
 hw/kdrive/src/kdrive.h|3 
 hw/kdrive/src/kinput.c|   19 
 hw/kdrive/trio/s3curs.c   |8 
 hw/kdrive/vesa/Makefile.am|4 
 hw/kdrive/via/Makefile.am |4 
 hw/xfree86/Makefile.am|8 
 hw/xfree86/common/xf86.h  |   16 
 hw/xfree86/common/xf86Config.c|   44 
 hw/xfree86/common/xf86Configure.c |   65 
 hw/xfree86/common/xf86Cursor.c|   10 
 hw/xfree86/common/xf86Debug.c |  117 
 hw/xfree86/common/xf86Events.c|   10 
 hw/xfree86/common/xf86Helper.c|   14 
 hw/xfree86/common/xf86Init.c  |   91 
 hw/xfree86/common/xf86Mode.c  |6 
 hw/xfree86/common/xf86Module.h|2 
 hw/xfree86/common/xf86Priv.h  |3 
 hw/xfree86/common/xf86Privstr.h   |3 
 hw/xfree86/common/xf86Xinput.c|   34 
 hw/xfree86/common/xf86pciBus.c|   24 
 hw/xfree86/ddc/ddcProperty.c  |4 
 hw/xfree86/doc/man/xorg.conf.man.pre  |7 
 hw/xfree86/dri/dri.c  |  209 
 hw/xfree86/dri/dri.h  |   14 
 hw/xfree86/dri/dristruct.h|2 
 hw/xfree86/dri/xf86dri.c  |   11 
 hw/xfree86/int10/generic.c|   62 
 hw/xfree86/int10/helper_mem.c |  127 
 hw/xfree86/int10/xf86int10.h  |   20 
 hw/xfree86/loader/xf86sym.c   |   21 
 hw/xfree86/modes/xf86Crtc.c   |   10 
 hw/xfree86/modes/xf86Crtc.h   |   12 
 hw/xfree86/modes/xf86Cursors.c|  116 
 hw/xfree86/modes/xf86EdidModes.c  |5 
 hw/xfree86/modes/xf86RandR12.c|5 
 hw/xfree86/modes/xf86Rotate.c |  378 -
 hw/xfree86/os-support/bus/altixPCI.c  |  142 
 hw/xfree86/os-support/bus/linuxPci.c  |   60 
 hw/xfree86/os-support/hurd/hurd_bell.c|   30 
 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 GL/glx/glxdri.c |   39 
 GL/glx/renderpix.c  |1 
 GL/glx/renderpixswap.c  |1 
 GL/glx/singlepix.c  |1 
 GL/glx/singlesize.h |1 
 GL/glx/xfont.c  |1 
 XTrap/xtrapdiswp.c  |1 
 XTrap/xtrapditbl.c  |1 
 Xext/fontcache.c|2 
 Xext/panoramiX.h|1 
 Xext/sampleEVI.c|1 
 Xext/security.c |8 
 Xext/shmint.h   |2 
 Xext/xcalibrate.c   |2 
 Xext/xvdisp.h   |2 
 Xi/exevents.c   |6 
 afb/afbbres.c   |1 
 afb/afbbresd.c  |1 
 afb/afbbstore.c |1 
 afb/afbfont.c   |1 
 afb/afbmisc.c   |1 
 afb/afbpntwin.c |1 
 cfb/cfbcppl.c   |2 
 cfb/cfbtab.h|2 
 composite/compalloc.c   |   16 
 composite/compext.c |   16 
 composite/compinit.c|2 
 composite/compint.h |2 
 composite/compwindow.c  |   35 
 configure.ac|   42 
 damageext/damageext.c   |2 
 damageext/damageext.h   |2 
 damageext/damageextint.h|2 
 dbe/dbestruct.h |1 
 dbe/midbe.h |3 
 dix/devices.c   |   77 
 dix/dispatch.c  |   10 
 dix/dixutils.c  |2 
 dix/events.c|   32 
 dix/getevents.c |1 
 dix/grabs.c |   47 
 dix/main.c  |2 
 dix/resource.c  |2 
 dix/tables.c|   15 
 dix/window.c|   14 
 dix/xpstubs.c   |1 
 exa/exa_accel.c |   27 
 exa/exa_offscreen.c |2 
 fb/Makefile.am  |   21 
 fb/fb.h |3 
 fb/fb24_32.h|2 
 fb/fballpriv.c  |2 
 fb/fbarc.c  |2 
 fb/fbbits.c |2 
 fb/fbbits.h |2 
 fb/fbblt.c  |2 
 fb/fbbltone.c   |2 
 fb/fbbstore.c   |2 
 fb/fbcopy.c |   27 
 fb/fbfill.c |   58 
 fb/fbfillrect.c |2 
 fb/fbfillsp.c   |2 
 fb/fbgc.c   |2 
 fb/fbgetsp.c|2 
 fb/fbimage.c|2 
 fb/fbline.c |2 
 fb/fbmmx.c  | 2898 
 fb/fbmmx.h  |  294 --
 fb/fbpict.c |  474 ---
 fb/fbpixmap.c   |2 
 fb/fbpoint.c|2 
 fb/fbpush.c |2 
 fb/fbrop.h  |2 
 fb/fbseg.c  |2 
 fb/fbsetsp.c|2 
 fb/fbsolid.c|2 
 fb/fbstipple.c  |2 
 fb/fbtile.c |   14 
 fb/fbtrap.c |4 
 fb/fbutil.c |2 
 fb/fbwindow.c   |   45 
 fb/wfbrename.h  

xorg-server: Changes to 'upstream-experimental'

[Drew Parsons]

 configure.ac  |2 +-
 hw/xprint/Makefile.am |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2f13b7c113c17239e382dd3640e9c29201d8ab1f
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Wed May 30 02:13:36 2007 +1000

Update Xprint build for pixman.

Xprt links libfb, which now uses pixman.  Update configure.ac to
require module $PIXMAN for XPRINT.
Also, use $(top_builddir) to reference libfb.la and other local
libraries, rather than using the relative reference ../..

diff --git a/configure.ac b/configure.ac
index 7ff712f..350245e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1600,7 +1600,7 @@ AC_MSG_CHECKING([whether to build Xprint DDX])
 AC_MSG_RESULT([$XPRINT])
 
 if test x$XPRINT = xyes; then
-   PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau])
+   PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau 
$PIXMAN])
XPRINT_EXTENSIONS=$XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB 
$RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB 
$GLX_LIBS
XPRINT_LIBS=$DIX_LIB $CONFIG_LIB $XKB_LIB $XKB_STUB_LIB 
$XPRINT_EXTENSIONS $MI_LIB $MIEXT_DAMAGE_LIB $CWRAP_LIB $OS_LIB $LIBS 
$XPRINT_LIBS
AC_SUBST([XPRINT_CFLAGS])
diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am
index 45168b1..dc8764a 100644
--- a/hw/xprint/Makefile.am
+++ b/hw/xprint/Makefile.am
@@ -10,9 +10,9 @@ Xprt_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
 
 Xprt_LDFLAGS = -L$(top_srcdir)
 Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la  \
-   pcl/libpcl.la pcl-mono/libpcl.la ../../fb/libfb.la \
-   ../../render/librender.la ../../mi/libmi.la ../../Xext/libXext.la \
-   @FREETYPE_LIBS@
+   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@
 
 miinitext-wrapper.c:
echo #include \$(top_srcdir)/mi/miinitext.c\  $@


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xorg-server: Changes to 'upstream-experimental'

[David Nusinow]

 hw/xfree86/common/xf86Events.c  |   28 -
 hw/xfree86/loader/xf86sym.c |   51 
 hw/xfree86/os-support/bsd/bsd_bell.c|4 +-
 hw/xfree86/os-support/hurd/hurd_video.c |   44 +++
 4 files changed, 65 insertions(+), 62 deletions(-)

New commits:
commit 99eae8bea6724a24477375ad5b2d31cc4883cf6b
Author: Samuel Thibault [EMAIL PROTECTED]
Date:   Tue May 29 22:04:36 2007 -0400

I/O enable/disable update for the Hurd

diff --git a/hw/xfree86/os-support/hurd/hurd_video.c 
b/hw/xfree86/os-support/hurd/hurd_video.c
index 45e9a09..b889283 100644
--- a/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/hw/xfree86/os-support/hurd/hurd_video.c
@@ -117,49 +117,29 @@ xf86LinearVidMem()
 /**
  * I/O Permissions section 
  ***/
-mach_port_t io_port;
+
+/*
+ * Due to conflicts with compiler.h, don't rely on sys/io.h to declare
+ * this.
+ */
+extern int ioperm(unsigned long __from, unsigned long __num, int __turn_on);
 
 Bool
 xf86EnableIO()
 {
-mach_port_t device;
-kern_return_t err;
-
-err = get_privileged_ports(NULL, device);
-if( err )
-{
-   errno = err;
-   FatalError(xf86EnableIO() can't get_privileged_ports. 
(%s)\n,strerror(errno));
-}
-err = device_open(device,D_READ|D_WRITE,io,io_port);
-mach_port_deallocate(mach_task_self(), device);
-if( err )
-{
-   errno = err;
-   FatalError(xf86EnableIO() can't device_open. (%s)\n,strerror(errno));
-}
-
-err = i386_io_port_add(mach_thread_self (), io_port);
-if( err )
-{
-   errno = err;
-   FatalError(xf86EnableIO() can't i386_io_port_add.(io_port) 
(%s)\n,strerror(errno));
+if (ioperm(0, 0x, 1)) {
+   FatalError(xf86EnableIO: ioperm() failed (%s)\n, strerror(errno));
+   return FALSE;
 }
+ioperm(0x40,4,0); /* trap access to the timer chip */
+ioperm(0x60,4,0); /* trap access to the keyboard controller */
 return TRUE;
 }

 void
 xf86DisableIO()
 {
-kern_return_t err;
-
-err = i386_io_port_remove(mach_thread_self (), io_port);
-if( err )
-{
-   errno = err;
-   FatalError(xf86DisableIO() can't i386_io_port_remove.(io_port) 
(%s)\n,strerror(errno));
-}
-mach_port_deallocate(mach_task_self(), io_port);
+ioperm(0,0x,0);
 return;
 }
 

commit 3c6f1428489c1f71acd41066ea73ef4ae7c60f17
Author: Julien Cristau [EMAIL PROTECTED]
Date:   Tue May 29 22:01:30 2007 -0400

Make sure that the ramdac symbols are present in the server

The former ramdac module is now built into the server, so its symbols need 
to
be explicitly exported to drivers (Debian #423129).

diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index 5175f01..6535e4c 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -96,6 +96,11 @@
 #endif
 #include xf86DDC.h
 #include edid.h
+#include xf86Cursor.h
+#include xf86RamDac.h
+#include BT.h
+#include IBM.h
+#include TI.h
 
 #ifndef HAS_GLIBC_SIGSETJMP
 #if defined(setjmp)  defined(__GNU_LIBRARY__)  \
@@ -1255,4 +1260,50 @@ _X_HIDDEN void *xfree86LookupTab[] = {
 SYMFUNC(xf86I2CWriteRead)
 SYMFUNC(xf86I2CWriteVec)
 SYMFUNC(xf86I2CWriteWord)
+
+/* ramdac/xf86RamDac.c */
+SYMFUNC(RamDacCreateInfoRec)
+SYMFUNC(RamDacHelperCreateInfoRec)
+SYMFUNC(RamDacDestroyInfoRec)
+SYMFUNC(RamDacHelperDestroyInfoRec)
+SYMFUNC(RamDacInit)
+SYMFUNC(RamDacHandleColormaps)
+SYMFUNC(RamDacFreeRec)
+SYMFUNC(RamDacGetHWIndex)
+SYMVAR(RamDacHWPrivateIndex)
+SYMVAR(RamDacScreenPrivateIndex)
+
+/* ramdac/xf86Cursor.c */
+SYMFUNC(xf86InitCursor)
+SYMFUNC(xf86CreateCursorInfoRec)
+SYMFUNC(xf86DestroyCursorInfoRec)
+SYMFUNC(xf86ForceHWCursor)
+
+/* ramdac/BT.c */
+SYMFUNC(BTramdacProbe)
+SYMFUNC(BTramdacSave)
+SYMFUNC(BTramdacRestore)
+SYMFUNC(BTramdacSetBpp)
+
+/* ramdac/IBM.c */
+SYMFUNC(IBMramdacProbe)
+SYMFUNC(IBMramdacSave)
+SYMFUNC(IBMramdacRestore)
+SYMFUNC(IBMramdac526SetBpp)
+SYMFUNC(IBMramdac640SetBpp)
+SYMFUNC(IBMramdac526CalculateMNPCForClock)
+SYMFUNC(IBMramdac640CalculateMNPCForClock)
+SYMFUNC(IBMramdac526HWCursorInit)
+SYMFUNC(IBMramdac640HWCursorInit)
+SYMFUNC(IBMramdac526SetBppWeak)
+
+/* ramdac/TI.c */
+SYMFUNC(TIramdacCalculateMNPForClock)
+SYMFUNC(TIramdacProbe)
+SYMFUNC(TIramdacSave)
+SYMFUNC(TIramdacRestore)
+SYMFUNC(TIramdac3026SetBpp)
+SYMFUNC(TIramdac3030SetBpp)
+SYMFUNC(TIramdacHWCursorInit)
+SYMFUNC(TIramdacLoadPalette)
 };

commit ee20c481eede0954f4a8bef5113979b101863c32
Author: Matthieu Herrb [EMAIL PROTECTED]
Date:   Tue May 29 14:54:27 2007 -0600

Remove wscons keyboard handling stuff that 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit cc648e609d472472bac4a2e568eb3598b3690ba3
Author: Michel Dänzer [EMAIL PROTECTED]
Date:   Tue May 22 10:51:56 2007 +0200

EXA: Export ExaOffscreenMarkUsed.

Can be used to inform EXA that an offscreen area is used outside of EXA.

diff --git a/exa/exa.h b/exa/exa.h
index cd90bbc..9ea5933 100644
--- a/exa/exa.h
+++ b/exa/exa.h
@@ -721,6 +721,9 @@ exaOffscreenAlloc(ScreenPtr pScreen, int size, int align,
 ExaOffscreenArea *
 exaOffscreenFree(ScreenPtr pScreen, ExaOffscreenArea *area);
 
+void
+ExaOffscreenMarkUsed (PixmapPtr pPixmap);
+
 unsigned long
 exaGetPixmapOffset(PixmapPtr pPix);
 
diff --git a/exa/exa_priv.h b/exa/exa_priv.h
index ece5898..a6d98cd 100644
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -323,9 +323,6 @@ ExaCheckComposite (CARD8  op,
 
 /* exa_offscreen.c */
 void
-ExaOffscreenMarkUsed (PixmapPtr pPixmap);
-
-void
 ExaOffscreenSwapOut (ScreenPtr pScreen);
 
 void

commit e6a7198e7cd96f1fe0654cc6811a977821579258
Author: Adam Jackson [EMAIL PROTECTED]
Date:   Tue May 22 10:51:55 2007 +0200

Bug #8991: Add glXGetDrawableAttributes dispatch; fix texture format 
therein.

Adapted to master branch by Michel Dänzer [EMAIL PROTECTED].

diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index 932878f..ed5c138 100644
--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@@ -1679,6 +1679,7 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID drawId)
 xGLXGetDrawableAttributesReply reply;
 CARD32 attributes[4];
 int numAttribs;
+PixmapPtr  pixmap;
 
 glxPixmap = (__GLXpixmap *)LookupIDByType(drawId, __glXPixmapRes);
 if (!glxPixmap) {
@@ -1693,10 +1694,19 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID 
drawId)
 reply.numAttribs = numAttribs;
 
 attributes[0] = GLX_TEXTURE_TARGET_EXT;
-attributes[1] = GLX_TEXTURE_RECTANGLE_EXT;
 attributes[2] = GLX_Y_INVERTED_EXT;
 attributes[3] = GL_FALSE;
 
+/* XXX this is merely less wrong, see fdo bug #8991 */
+pixmap = (PixmapPtr) glxPixmap-pDraw;
+if ((pixmap-drawable.width  (pixmap-drawable.width - 1)) ||
+   (pixmap-drawable.height  (pixmap-drawable.height - 1))
+   /* || strstr(CALL_GetString(GL_EXTENSIONS,
+GL_ARB_texture_non_power_of_two)) */)
+   attributes[1] = GLX_TEXTURE_RECTANGLE_EXT;
+else
+   attributes[1] = GLX_TEXTURE_2D_EXT;
+
 if (client-swapped) {
__glXSwapGetDrawableAttributesReply(client, reply, attributes);
 } else {
diff --git a/GL/glx/indirect_dispatch.h b/GL/glx/indirect_dispatch.h
index 17a372f..24f4bed 100644
--- a/GL/glx/indirect_dispatch.h
+++ b/GL/glx/indirect_dispatch.h
@@ -211,8 +211,6 @@ extern HIDDEN int __glXDisp_ReadPixels(struct 
__GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_ReadPixels(struct __GLXclientStateRec *, 
GLbyte *);
 extern HIDDEN void __glXDisp_EdgeFlagv(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_EdgeFlagv(GLbyte * pc);
-extern HIDDEN void __glXDisp_Rotatef(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Rotatef(GLbyte * pc);
 extern HIDDEN void __glXDisp_TexParameterf(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_TexParameterf(GLbyte * pc);
 extern HIDDEN void __glXDisp_TexParameteri(GLbyte * pc);
@@ -519,6 +517,8 @@ extern HIDDEN void __glXDisp_SecondaryColor3ivEXT(GLbyte * 
pc);
 extern HIDDEN void __glXDispSwap_SecondaryColor3ivEXT(GLbyte * pc);
 extern HIDDEN void __glXDisp_TexCoord4iv(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_TexCoord4iv(GLbyte * pc);
+extern HIDDEN int __glXDisp_GetDrawableAttributesSGIX(struct 
__GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_GetDrawableAttributesSGIX(struct 
__GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_SampleMaskSGIS(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_SampleMaskSGIS(GLbyte * pc);
 extern HIDDEN void __glXDisp_ColorTableParameteriv(GLbyte * pc);
@@ -849,10 +849,8 @@ extern HIDDEN int __glXDisp_GetHistogramParameteriv(struct 
__GLXclientStateRec *
 extern HIDDEN int __glXDispSwap_GetHistogramParameteriv(struct 
__GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_GetHistogramParameterivEXT(struct 
__GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetHistogramParameterivEXT(struct 
__GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetConvolutionFilter(struct __GLXclientStateRec *, 
GLbyte *);
-extern HIDDEN int __glXDispSwap_GetConvolutionFilter(struct 
__GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetConvolutionFilterEXT(struct __GLXclientStateRec 
*, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetConvolutionFilterEXT(struct 
__GLXclientStateRec *, GLbyte *);
+extern HIDDEN void __glXDisp_Rotatef(GLbyte * pc);
+extern HIDDEN void __glXDispSwap_Rotatef(GLbyte * pc);
 extern HIDDEN int __glXDisp_GetProgramivARB(struct __GLXclientStateRec *, 
GLbyte *);
 extern HIDDEN int __glXDispSwap_GetProgramivARB(struct __GLXclientStateRec *, 
GLbyte *);
 extern 

xorg-server: Changes to 'upstream-experimental'

[David Nusinow]

 Xext/Makefile.am|1 
 composite/compext.c |2 
 configure.ac|   10 
 dix/devices.c   |1 
 dix/events.c|7 
 fb/Makefile.am  |4 
 fb/fb.h |4 
 fb/fbedge.c |  314 ---
 fb/fbedgeimp.h  |  145 ---
 fb/fbpict.c |  243 +++---
 fb/fbpict.h |   12 
 fb/fbtrap.c |  105 --
 hw/kdrive/linux/agp.c   |2 
 hw/xfree86/common/compiler.h|2 
 hw/xfree86/common/xf86xv.c  |   42 -
 hw/xfree86/doc/man/xorg.conf.man.pre| 1290 ++--
 hw/xfree86/os-support/bsd/i386_video.c  |5 
 hw/xfree86/os-support/bus/linuxPci.c|4 
 hw/xfree86/os-support/linux/lnx_video.c |2 
 hw/xnest/Xnest.man.pre  |  596 +-
 hw/xwin/winmultiwindowclass.c   |2 
 include/servermd.h  |   10 
 os/utils.c  |   14 
 randr/Makefile.am   |   10 
 randr/randr.c   |3 
 render/renderedge.c |  119 --
 render/renderedge.h |   15 
 27 files changed, 1356 insertions(+), 1608 deletions(-)

New commits:
commit ba0b7d47ab0c24d5a29228f8af583044060464bd
Author: David Nusinow [EMAIL PROTECTED]
Date:   Mon May 28 21:57:04 2007 -0400

Fix for GNU/kFreeBSD

diff --git a/hw/kdrive/linux/agp.c b/hw/kdrive/linux/agp.c
index c2ae625..4fb0cb3 100644
--- a/hw/kdrive/linux/agp.c
+++ b/hw/kdrive/linux/agp.c
@@ -65,7 +65,7 @@ of the copyright holder.
 
 #include linux/agpgart.h
 
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include sys/ioctl.h
 #include sys/agpio.h
 #endif

commit 2267bf48b385c93243e26c3bb84ebb04c7fdb39f
Author: Bastian Blank [EMAIL PROTECTED]
Date:   Mon May 28 21:55:05 2007 -0400

Fixes for s390

diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index ea995ed..becd3da 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -1365,7 +1365,7 @@ do {  
\
 #define write_mem_barrier()   /* NOP */
 
 #if !defined(__SUNPRO_C)
-#if !defined(FAKEIT)  !defined(__mc68000__)  !defined(__arm__)  
!defined(__sh__)  !defined(__hppa__)
+#if !defined(FAKEIT)  !defined(__mc68000__)  !defined(__arm__)  
!defined(__sh__)  !defined(__hppa__)  !defined(__s390__)
 # ifdef GCCUSESGAS
 
 /*
diff --git a/hw/xfree86/os-support/linux/lnx_video.c 
b/hw/xfree86/os-support/linux/lnx_video.c
index 4b58046..02a1310 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -567,7 +567,7 @@ xf86EnableIO(void)
 #endif
}
close(fd);
-#elif !defined(__mc68000__)  !defined(__sparc__)  !defined(__mips__)  
!defined(__sh__)  !defined(__hppa__)
+#elif !defined(__mc68000__)  !defined(__sparc__)  !defined(__mips__)  
!defined(__sh__)  !defined(__hppa__)  !defined(__s390__)
 if (ioperm(0, 1024, 1) || iopl(3)) {
 if (errno == ENODEV)
 ErrorF(xf86EnableIOPorts: no I/O ports found\n);

commit 857ddbb660a21cad1c16f4fb2dc8a904d6655304
Author: Eugene Konev [EMAIL PROTECTED]
Date:   Mon May 28 21:53:02 2007 -0400

Allow configurable serverconfigdir for security policy location
Allow the location of the SERVERCONFIGdir variable to be defined at
compile-time. This allows us to specify where the security policy will be
located (Debian uses this to put it in /etc). The default is to the
previous location.

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 6ea3d74..d0d23b7 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -34,7 +34,6 @@ MODULE_SRCS = \
xcmisc.c
 
 # Extra configuration files ship with some extensions
-SERVERCONFIGdir = $(libdir)/xserver
 SERVERCONFIG_DATA =
 
 # Optional sources included if extension enabled by configure.ac rules
diff --git a/configure.ac b/configure.ac
index 37199cf..7ff712f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -465,6 +465,9 @@ AC_ARG_WITH(xkb-output,   
AS_HELP_STRING([--with-xkb-output=PATH], [Path to
 AC_ARG_WITH(rgb-path, AS_HELP_STRING([--with-rgb-path=PATH], [Path to 
RGB database (default: ${datadir}/X11/rgb)]),
[ RGBPATH=$withval ],
[ RGBPATH=${datadir}/X11/rgb ])
+AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH], 
[Path to server config (default: ${libdir}/xserver)]),
+   [ SERVERCONFIG=$withval ],
+   [ SERVERCONFIG=${libdir}/xserver ])
 

xorg-server: Changes to 'upstream-experimental'

[David Nusinow]

 GL/glx/glxdri.c  |6 ++
 configure.ac |   10 ++--
 hw/xfree86/loader/loadmod.c  |2 
 hw/xfree86/modes/xf86Crtc.c  |   86 +--
 hw/xfree86/modes/xf86Crtc.h  |   12 -
 hw/xfree86/modes/xf86EdidModes.c |   10 
 hw/xfree86/modes/xf86RandR12.c   |   22 +
 hw/xfree86/modes/xf86RandR12.h   |1 
 hw/xfree86/modes/xf86Rotate.c|   20 +++--
 randr/rrcrtc.c   |6 +-
 randr/rrscreen.c |   13 -
 11 files changed, 156 insertions(+), 32 deletions(-)

New commits:
commit f9a0b936600cd2665a90e6ddcd5a6bfe7a88f6e9
Author: Keith Packard [EMAIL PROTECTED]
Date:   Thu Apr 19 19:09:43 2007 -0700

Update version to 1.3.0.0

diff --git a/configure.ac b/configure.ac
index 360419c..9e3c0a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl Process this file with autoconf to create configure.
 AC_PREREQ(2.57)
 dnl This is the not the Xorg version number, it's the server version number.
 dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.2.99.905, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.3.0.0, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
@@ -38,10 +38,10 @@ dnl
 DEFAULT_VENDOR_NAME=The X.Org Foundation
 DEFAULT_VENDOR_NAME_SHORT=X.Org
 DEFAULT_VERSION_MAJOR=1
-DEFAULT_VERSION_MINOR=2
-DEFAULT_VERSION_PATCH=99
-DEFAULT_VERSION_SNAP=905
-DEFAULT_RELEASE_DATE=05 April 2007
+DEFAULT_VERSION_MINOR=3
+DEFAULT_VERSION_PATCH=0
+DEFAULT_VERSION_SNAP=0
+DEFAULT_RELEASE_DATE=19 April 2007
 DEFAULT_VENDOR_WEB=http://wiki.x.org;
 
 dnl this gets generated by autoheader, and thus contains all the defines.  we

commit 05e1c45ade9c558820685bfd2541617a2e8de816
Author: Keith Packard [EMAIL PROTECTED]
Date:   Thu Apr 19 17:39:51 2007 -0700

Disable SourceValidate in rotation to capture cursor.

SourceValidate is used exclusively by the software cursor code to pull the
cursor off of the screen before using the screen as a source operand. This
eliminates the software cursor from the frame buffer while painting the
rotated image though. Disabling this function by temporarily setting the
screen function pointer to NULL causes the cursor image to be captured.

diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
index 94f95a0..359501e 100644
--- a/hw/xfree86/modes/xf86Rotate.c
+++ b/hw/xfree86/modes/xf86Rotate.c
@@ -278,8 +278,18 @@ xf86RotateRedisplay(ScreenPtr pScreen)
 region = DamageRegion(damage);
 if (REGION_NOTEMPTY(pScreen, region)) 
 {
-   int c;
-   
+   int c;
+   SourceValidateProcPtr   SourceValidate;
+
+   /*
+* SourceValidate is used by the software cursor code
+* to pull the cursor off of the screen when reading
+* bits from the frame buffer. Bypassing this function
+* leaves the software cursor in place
+*/
+   SourceValidate = pScreen-SourceValidate;
+   pScreen-SourceValidate = NULL;
+
for (c = 0; c  xf86_config-num_crtc; c++)
{
xf86CrtcPtr crtc = xf86_config-crtc[c];
@@ -304,6 +314,7 @@ xf86RotateRedisplay(ScreenPtr pScreen)
REGION_UNINIT (pScreen, crtc_damage);
}
}
+   pScreen-SourceValidate = SourceValidate;
DamageEmpty(damage);
 }
 }

commit 8b217dee3a6c46b13fc9571a4a9a95bc55686cdb
Author: Keith Packard [EMAIL PROTECTED]
Date:   Thu Apr 19 17:37:18 2007 -0700

Was accidentally disabling rotation updates in mode set.

Setting a mode on an unrotated CRTC was causing all of the rotation updates
to be disabled; the loop looking for active rotation wasn't actually looking
at each crtc, it was looking at the modified crtc many times.

diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
index e8fafd0..94f95a0 100644
--- a/hw/xfree86/modes/xf86Rotate.c
+++ b/hw/xfree86/modes/xf86Rotate.c
@@ -284,7 +284,7 @@ xf86RotateRedisplay(ScreenPtr pScreen)
{
xf86CrtcPtr crtc = xf86_config-crtc[c];
 
-   if (crtc-rotation != RR_Rotate_0)
+   if (crtc-rotation != RR_Rotate_0  crtc-enabled)
{
BoxRec  box;
RegionRec   crtc_damage;
@@ -338,7 +338,8 @@ xf86RotateDestroy (xf86CrtcPtr crtc)
 }
 
 for (c = 0; c  xf86_config-num_crtc; c++)
-   if (crtc-rotatedPixmap || crtc-rotatedData)
+   if (xf86_config-crtc[c]-rotatedPixmap ||
+   xf86_config-crtc[c]-rotatedData)
return;
 
 /*

commit a63704f14a1d97b9a00fef6fa290e74e51b9732b
Author: Erik Andrén [EMAIL PROTECTED]
Date:   Tue Apr 17 21:34:47 2007 -0700

Syncmaster 226 monitor needs 60Hz refresh (#10545).

I've managed to solve my own bug 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 Xext/xcmisc.c   |   13 +++--
 configure.ac|6 +++---
 hw/xfree86/modes/xf86Crtc.c |1 -
 os/WaitFor.c|9 ++---
 4 files changed, 20 insertions(+), 9 deletions(-)

New commits:
commit 970cacb264a597573e0927410dde5a3d3aa6549b
Author: Keith Packard [EMAIL PROTECTED]
Date:   Thu Apr 5 23:48:40 2007 -0700

Bump to version 1.2.99.905 (1.3 RC5)

diff --git a/configure.ac b/configure.ac
index 2c69c30..360419c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl Process this file with autoconf to create configure.
 AC_PREREQ(2.57)
 dnl This is the not the Xorg version number, it's the server version number.
 dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.2.99.904, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.2.99.905, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
@@ -40,7 +40,7 @@ DEFAULT_VENDOR_NAME_SHORT=X.Org
 DEFAULT_VERSION_MAJOR=1
 DEFAULT_VERSION_MINOR=2
 DEFAULT_VERSION_PATCH=99
-DEFAULT_VERSION_SNAP=904
+DEFAULT_VERSION_SNAP=905
 DEFAULT_RELEASE_DATE=05 April 2007
 DEFAULT_VENDOR_WEB=http://wiki.x.org;
 

commit 44c4bd5df3aae191be9fc836be26f91497d02901
Author: Matthieu Herrb [EMAIL PROTECTED](none)
Date:   Tue Apr 3 15:47:18 2007 +0200

CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() Memory Corruption

(cherry picked from commit 645d87cf8ef724d4591614f9994cdc4d7549a7a8)

diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index f26218e..8c7a86e 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -42,6 +42,12 @@ from The Open Group.
 #include X11/extensions/xcmiscstr.h
 #include modinit.h
 
+#if HAVE_STDINT_H
+#include stdint.h
+#elif !defined(UINT32_MAX)
+#define UINT32_MAX 0xU
+#endif
+
 #if 0
 static unsigned char XCMiscCode;
 #endif
@@ -143,7 +149,10 @@ ProcXCMiscGetXIDList(client)
 
 REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
 
-pids = (XID *)ALLOCATE_LOCAL(stuff-count * sizeof(XID));
+if (stuff-count  UINT32_MAX / sizeof(XID))
+   return BadAlloc;
+
+pids = (XID *)Xalloc(stuff-count * sizeof(XID));
 if (!pids)
 {
return BadAlloc;
@@ -164,7 +173,7 @@ ProcXCMiscGetXIDList(client)
client-pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
WriteSwappedDataToClient(client, count * sizeof(XID), pids);
 }
-DEALLOCATE_LOCAL(pids);
+Xfree(pids);
 return(client-noClientException);
 }
 

commit 44ea7a3e0d8fa636f4e5dd392caf618120d98413
Author: Tomas Janousek [EMAIL PROTECTED]
Date:   Wed Mar 28 14:46:30 2007 -0400

Bug #10296: Fix timer rescheduling.

(cherry picked from commit 8c7f56d92d8471ee059c14d322af5f7f555dd5c6)

diff --git a/os/WaitFor.c b/os/WaitFor.c
index ba227a3..d0f9f62 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -125,7 +125,7 @@ struct _OsTimerRec {
 };
 
 static void DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev);
-static void CheckAllTimers(CARD32 now);
+static void CheckAllTimers(void);
 static OsTimerPtr timers = NULL;
 
 /*
@@ -204,7 +204,7 @@ WaitForSomething(int *pClientsReady)
timeout = timers-expires - now;
 if (timeout  0  timeout  timers-delta + 250) {
 /* time has rewound.  reset the timers. */
-CheckAllTimers(now);
+CheckAllTimers();
 }
 
if (timers) {
@@ -439,11 +439,14 @@ ANYSET(FdMask *src)
 /* If time has rewound, re-run every affected timer.
  * Timers might drop out of the list, so we have to restart every time. */
 static void
-CheckAllTimers(CARD32 now)
+CheckAllTimers(void)
 {
 OsTimerPtr timer;
+CARD32 now;
 
 start:
+now = GetTimeInMillis();
+
 for (timer = timers; timer; timer = timer-next) {
 if (timer-expires - now  timer-delta + 250) {
 TimerForce(timer);

commit 042ef1f573d6e98756cc98c296bddd1aa9e4c8ca
Author: Keith Packard [EMAIL PROTECTED]
Date:   Thu Apr 5 23:21:19 2007 -0700

Bump version to 1.2.99.904 (1.3 RC4)

diff --git a/configure.ac b/configure.ac
index 6ba4d03..2c69c30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl Process this file with autoconf to create configure.
 AC_PREREQ(2.57)
 dnl This is the not the Xorg version number, it's the server version number.
 dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.2.99.903, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.2.99.904, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
@@ -40,8 +40,8 @@ DEFAULT_VENDOR_NAME_SHORT=X.Org
 DEFAULT_VERSION_MAJOR=1
 DEFAULT_VERSION_MINOR=2
 DEFAULT_VERSION_PATCH=99
-DEFAULT_VERSION_SNAP=903
-DEFAULT_RELEASE_DATE=26 March 2007
+DEFAULT_VERSION_SNAP=904
+DEFAULT_RELEASE_DATE=05 April 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit f8636dd4a2b6efedaf98e5bf3d27389b673dc38a
Author: Keith Packard [EMAIL PROTECTED]
Date:   Wed Mar 14 12:00:06 2007 -0700

Revert Xext: Update device's lastx/lasty when sending a motion event with 
XTest.

This reverts commit 4c5837c940024cffc8990b602a97ef6ece08e875.
There is no lastx/lasty in a valuator on this branch.

diff --git a/Xext/xtest.c b/Xext/xtest.c
index 922dfce..83f8b8c 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -442,8 +442,6 @@ #endif
(root-drawable.pScreen,
 ev-u.keyButtonPointer.rootX,
 ev-u.keyButtonPointer.rootY, FALSE);
-dev-valuator-lastx = ev-u.keyButtonPointer.rootX;
-dev-valuator-lasty = ev-u.keyButtonPointer.rootY;
break;
 case ButtonPress:
 case ButtonRelease:

commit 4c5837c940024cffc8990b602a97ef6ece08e875
Author: Peter Hutterer [EMAIL PROTECTED]
Date:   Thu Mar 1 09:51:20 2007 +1030

Xext: Update device's lastx/lasty when sending a motion event with XTest.
(cherry picked from commit 68c64ad7b1eea79c786b5a7f3459076780163a47)

diff --git a/Xext/xtest.c b/Xext/xtest.c
index 83f8b8c..922dfce 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -442,6 +442,8 @@ #endif
(root-drawable.pScreen,
 ev-u.keyButtonPointer.rootX,
 ev-u.keyButtonPointer.rootY, FALSE);
+dev-valuator-lastx = ev-u.keyButtonPointer.rootX;
+dev-valuator-lasty = ev-u.keyButtonPointer.rootY;
break;
 case ButtonPress:
 case ButtonRelease:

commit d3c3d31782c233cd32db04ea08f5d9a6f7dbc6c7
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Tue Mar 6 23:53:23 2007 +1100

Xprint: shorten font filename to fit in tar length limit

The length of the Xprint font file NewCenturySchlbk-BoldItalic.pmf
pushes the full path over the traditional 100 character limit for
tarballs (when module version number is included).  Shorten it to
NewCentSchlbk-BoldItal.pmf to get back below the limit and rename
other font files in that family to match.
(cherry picked from commit d5aba03feff41722c72b4c6193f09d141cbf1678)

diff --git a/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am 
b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
index c574c5c..7a7ecc3 100644
--- a/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
@@ -19,10 +19,10 @@ XPFONTS = \
 LubalinGraph-BookOblique.pmf \
 LubalinGraph-Demi.pmf \
 LubalinGraph-DemiOblique.pmf \
-NewCenturySchlbk-Bold.pmf \
-NewCenturySchlbk-BoldItalic.pmf \
-NewCenturySchlbk-Italic.pmf \
-NewCenturySchlbk-Roman.pmf \
+NewCentSchlbk-Bold.pmf \
+NewCentSchlbk-BoldItal.pmf \
+NewCentSchlbk-Ital.pmf \
+NewCentSchlbk-Roman.pmf \
 Souvenir-Demi.pmf \
 Souvenir-DemiItalic.pmf \
 Souvenir-Light.pmf \
diff --git a/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am 
b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
index 634db1f..f4f4243 100644
--- a/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
@@ -19,10 +19,10 @@ XPFONTS = \
 LubalinGraph-BookOblique.pmf \
 LubalinGraph-Demi.pmf \
 LubalinGraph-DemiOblique.pmf \
-NewCenturySchlbk-Bold.pmf \
-NewCenturySchlbk-BoldItalic.pmf \
-NewCenturySchlbk-Italic.pmf \
-NewCenturySchlbk-Roman.pmf \
+NewCentSchlbk-Bold.pmf \
+NewCentSchlbk-BoldItal.pmf \
+NewCentSchlbk-Ital.pmf \
+NewCentSchlbk-Roman.pmf \
 Souvenir-Demi.pmf \
 Souvenir-DemiItalic.pmf \
 Souvenir-Light.pmf \
diff --git a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am 
b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
index 1e8c8a7..40f1e3d 100644
--- a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
@@ -17,10 +17,10 @@ dist_xpc_DATA = \
LubalinGraph-Book.pmf   \
LubalinGraph-DemiOblique.pmf\
LubalinGraph-Demi.pmf   \
-   NewCenturySchlbk-Bold.pmf   \
-   NewCenturySchlbk-BoldItalic.pmf \
-   NewCenturySchlbk-Italic.pmf \
-   NewCenturySchlbk-Roman.pmf  \
+   NewCentSchlbk-Bold.pmf  \
+   NewCentSchlbk-BoldItal.pmf  \
+   NewCentSchlbk-Ital.pmf  \
+   NewCentSchlbk-Roman.pmf \
Souvenir-DemiItalic.pmf \
Souvenir-Demi.pmf   \
Souvenir-LightItalic.pmf\
diff --git 
a/hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-Bold.pmf 
b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-Bold.pmf
new file mode 100644
index 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

 configure.ac |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0ebe537983a46361ec0fb7d7bf57268792264007
Author: Keith Packard [EMAIL PROTECTED]
Date:   Wed Mar 14 16:36:13 2007 -0700

Update to version 1.2.99.902

diff --git a/configure.ac b/configure.ac
index c290926..ed2c631 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl Process this file with autoconf to c
 AC_PREREQ(2.57)
 dnl This is the not the Xorg version number, it's the server version number.
 dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.2.99.901, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.2.99.902, 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
@@ -40,8 +40,8 @@ DEFAULT_VENDOR_NAME_SHORT=X.Org
 DEFAULT_VERSION_MAJOR=1
 DEFAULT_VERSION_MINOR=2
 DEFAULT_VERSION_PATCH=99
-DEFAULT_VERSION_SNAP=901
-DEFAULT_RELEASE_DATE=4 March 2007
+DEFAULT_VERSION_SNAP=902
+DEFAULT_RELEASE_DATE=14 March 2007
 DEFAULT_VENDOR_WEB=http://wiki.x.org;
 
 dnl this gets generated by autoheader, and thus contains all the defines.  we


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xorg-server: Changes to 'upstream-experimental'

[Drew Parsons]

 dev/null   
 |binary
 hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
 |8 
 hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am  
 |8 
 hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
 |7 ---
 hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-Bold.pmf 
 |binary
 hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-BoldItal.pmf 
 |binary
 hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-Ital.pmf 
 |binary
 hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-Roman.pmf
 |binary
 hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf  
 |0 
 
hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf 
|0 
 hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf
 |0 
 hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf 
 |0 
 12 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit de4fe38d13b698014ba897eca02edaba11651d66
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Tue Mar 6 23:53:23 2007 +1100

Xprint: shorten font filename to fit in tar length limit

The length of the Xprint font file NewCenturySchlbk-BoldItalic.pmf
pushes the full path over the traditional 100 character limit for
tarballs (when module version number is included).  Shorten it to
NewCentSchlbk-BoldItal.pmf to get back below the limit and rename
other font files in that family to match.

diff --git a/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am 
b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
index c574c5c..7a7ecc3 100644
--- a/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
@@ -19,10 +19,10 @@ XPFONTS = \
 LubalinGraph-BookOblique.pmf \
 LubalinGraph-Demi.pmf \
 LubalinGraph-DemiOblique.pmf \
-NewCenturySchlbk-Bold.pmf \
-NewCenturySchlbk-BoldItalic.pmf \
-NewCenturySchlbk-Italic.pmf \
-NewCenturySchlbk-Roman.pmf \
+NewCentSchlbk-Bold.pmf \
+NewCentSchlbk-BoldItal.pmf \
+NewCentSchlbk-Ital.pmf \
+NewCentSchlbk-Roman.pmf \
 Souvenir-Demi.pmf \
 Souvenir-DemiItalic.pmf \
 Souvenir-Light.pmf \
diff --git a/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am 
b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
index 634db1f..f4f4243 100644
--- a/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
@@ -19,10 +19,10 @@ XPFONTS = \
 LubalinGraph-BookOblique.pmf \
 LubalinGraph-Demi.pmf \
 LubalinGraph-DemiOblique.pmf \
-NewCenturySchlbk-Bold.pmf \
-NewCenturySchlbk-BoldItalic.pmf \
-NewCenturySchlbk-Italic.pmf \
-NewCenturySchlbk-Roman.pmf \
+NewCentSchlbk-Bold.pmf \
+NewCentSchlbk-BoldItal.pmf \
+NewCentSchlbk-Ital.pmf \
+NewCentSchlbk-Roman.pmf \
 Souvenir-Demi.pmf \
 Souvenir-DemiItalic.pmf \
 Souvenir-Light.pmf \
diff --git a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am 
b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
index 1e8c8a7..40f1e3d 100644
--- a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
@@ -17,10 +17,10 @@ dist_xpc_DATA = \
LubalinGraph-Book.pmf   \
LubalinGraph-DemiOblique.pmf\
LubalinGraph-Demi.pmf   \
-   NewCenturySchlbk-Bold.pmf   \
-   NewCenturySchlbk-BoldItalic.pmf \
-   NewCenturySchlbk-Italic.pmf \
-   NewCenturySchlbk-Roman.pmf  \
+   NewCentSchlbk-Bold.pmf  \
+   NewCentSchlbk-BoldItal.pmf  \
+   NewCentSchlbk-Ital.pmf  \
+   NewCentSchlbk-Roman.pmf \
Souvenir-DemiItalic.pmf \
Souvenir-Demi.pmf   \
Souvenir-LightItalic.pmf\
diff --git 
a/hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-Bold.pmf 
b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-Bold.pmf
new file mode 100644
index 000..ab22aab
Binary files /dev/null and 
b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-Bold.pmf differ
diff --git 
a/hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-BoldItal.pmf 
b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-BoldItal.pmf
new file mode 100644
index 000..e68811e
Binary files /dev/null and 
b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-BoldItal.pmf 
differ
diff --git 

xorg-server: Changes to 'upstream-experimental'

[Julien Cristau]

Rebased ref, commits from common ancestor:
commit 3f5cedf00a82f08a433c95ffbb7f8ac69dcf6a50
Author: Keith Packard [EMAIL PROTECTED]
Date:   Mon Mar 5 23:49:35 2007 -0800

Allow relative positions to use output names or monitor identifiers.

Previous version used monitor identifiers if present, otherwise output
names. That caused existing working configurations to break when additional
information was added to the configuration file.

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index c38da62..46515fd 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -879,13 +879,17 @@ xf86InitialOutputPositions (ScrnInfoPtr 
{
xf86OutputPtr   out_rel = config-output[or];
XF86ConfMonitorPtr  rel_mon = out_rel-conf_monitor;
-   char*name;
 
if (rel_mon)
-   name = rel_mon-mon_identifier;
-   else
-   name = out_rel-name;
-   if (!strcmp (relative_name, name))
+   {
+   if (xf86nameCompare (rel_mon-mon_identifier,
+ relative_name) == 0)
+   {
+   relative = config-output[or];
+   break;
+   }
+   }
+   if (strcmp (out_rel-name, relative_name) == 0)
{
relative = config-output[or];
break;

commit 843077f23a1b49bd712d931421753e3a09d4008c
Author: Keith Packard [EMAIL PROTECTED]
Date:   Mon Mar 5 23:36:00 2007 -0800

Use EDID data to set screen physical size at server startup.

Screen physical size is set to a random value before the RandR code gets
control, override that and reset it to a value based on the compat_output
physical size (if available). If that output has no physical size, just use
96dpi as the default resolution and set the physical size as appropriate.

diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 1a349ef..4213fea 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -422,8 +422,28 @@ #endif
}
else
{
-   mmWidth = pScreen-mmWidth;
-   mmHeight = pScreen-mmHeight;
+   xf86OutputPtr   output = config-output[config-compat_output];
+   xf86CrtcPtr crtc = output-crtc;
+
+   if (crtc  crtc-mode.HDisplay 
+   output-mm_width  output-mm_height)
+   {
+   /*
+* If the output has a mode and a declared size, use that
+* to scale the screen size
+*/
+   DisplayModePtr  mode = crtc-mode;
+   mmWidth = output-mm_width * width / mode-HDisplay;
+   mmHeight = output-mm_height * height / mode-VDisplay;
+   }
+   else
+   {
+   /*
+* Otherwise, just set the screen to 96dpi
+*/
+   mmWidth = width * 25.4 / 96;
+   mmHeight = height * 25.4 / 96;
+   }
}
xf86DrvMsg(pScrn-scrnIndex, X_INFO,
   Setting screen physical size to %d x %d\n,

commit bcade98ccaa18298d844a606cb44271f0254c185
Author: Keith Packard [EMAIL PROTECTED]
Date:   Mon Mar 5 22:07:01 2007 -0800

Add xf86SetDesiredModes to apply desired modes to crtcs.

xf86SetDesiredModes applies the desired modes to each crtc (as selected by
xf86InitialConfiguration initially and modified by successful mode settings
afterwards). For crtcs without a desired mode, pScrn-currentMode is used to
select something workable.

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 3d28293..c38da62 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1542,6 +1542,63 @@ xf86InitialConfiguration (ScrnInfoPtr sc
 return TRUE;
 }
 
+/*
+ * Using the desired mode information in each crtc, set
+ * modes (used in EnterVT functions, or at server startup)
+ */
+
+Bool
+xf86SetDesiredModes (ScrnInfoPtr scrn)
+{
+xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(scrn);
+intc;
+
+for (c = 0; c  config-num_crtc; c++)
+{
+   xf86CrtcPtr crtc = config-crtc[c];
+   xf86OutputPtr   output = NULL;
+   int o;
+
+   if (config-output[config-compat_output]-crtc == crtc)
+   output = config-output[config-compat_output];
+   else
+   {
+   for (o = 0; o  config-num_output; o++)
+   if (config-output[o]-crtc == crtc)
+   {
+   output = config-output[o];
+   break;
+   }
+   }
+   /*
+* Skip disabled crtcs
+*/
+   if (!output)
+   

xorg-server: Changes to 'upstream-experimental'

[Drew Parsons]

 dev/null   
 |binary
 hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
 |8 
 hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am  
 |8 
 hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
 |8 
 hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-Bold.pmf 
 |binary
 hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-BoldItal.pmf 
 |binary
 hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-Ital.pmf 
 |binary
 hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-Roman.pmf
 |binary
 hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf  
 |0 
 
hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf 
|0 
 hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf
 |0 
 hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf 
 |0 
 12 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 08112d1f76c96b3a7e69c1b936db5556903fe597
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Tue Mar 6 23:53:23 2007 +1100

Xprint: shorten font filename to fit in tar length limit

The length of the Xprint font file NewCenturySchlbk-BoldItalic.pmf
pushes the full path over the traditional 100 character limit for
tarballs (when module version number is included).  Shorten it to
NewCentSchlbk-BoldItal.pmf to get back below the limit and rename
other font files in that family to match.

diff --git a/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am 
b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
index c574c5c..7a7ecc3 100644
--- a/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
@@ -19,10 +19,10 @@ XPFONTS = \
 LubalinGraph-BookOblique.pmf \
 LubalinGraph-Demi.pmf \
 LubalinGraph-DemiOblique.pmf \
-NewCenturySchlbk-Bold.pmf \
-NewCenturySchlbk-BoldItalic.pmf \
-NewCenturySchlbk-Italic.pmf \
-NewCenturySchlbk-Roman.pmf \
+NewCentSchlbk-Bold.pmf \
+NewCentSchlbk-BoldItal.pmf \
+NewCentSchlbk-Ital.pmf \
+NewCentSchlbk-Roman.pmf \
 Souvenir-Demi.pmf \
 Souvenir-DemiItalic.pmf \
 Souvenir-Light.pmf \
diff --git a/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am 
b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
index 634db1f..f4f4243 100644
--- a/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
@@ -19,10 +19,10 @@ XPFONTS = \
 LubalinGraph-BookOblique.pmf \
 LubalinGraph-Demi.pmf \
 LubalinGraph-DemiOblique.pmf \
-NewCenturySchlbk-Bold.pmf \
-NewCenturySchlbk-BoldItalic.pmf \
-NewCenturySchlbk-Italic.pmf \
-NewCenturySchlbk-Roman.pmf \
+NewCentSchlbk-Bold.pmf \
+NewCentSchlbk-BoldItal.pmf \
+NewCentSchlbk-Ital.pmf \
+NewCentSchlbk-Roman.pmf \
 Souvenir-Demi.pmf \
 Souvenir-DemiItalic.pmf \
 Souvenir-Light.pmf \
diff --git a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am 
b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
index 1e8c8a7..40f1e3d 100644
--- a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
@@ -17,10 +17,10 @@ dist_xpc_DATA = \
LubalinGraph-Book.pmf   \
LubalinGraph-DemiOblique.pmf\
LubalinGraph-Demi.pmf   \
-   NewCenturySchlbk-Bold.pmf   \
-   NewCenturySchlbk-BoldItalic.pmf \
-   NewCenturySchlbk-Italic.pmf \
-   NewCenturySchlbk-Roman.pmf  \
+   NewCentSchlbk-Bold.pmf  \
+   NewCentSchlbk-BoldItal.pmf  \
+   NewCentSchlbk-Ital.pmf  \
+   NewCentSchlbk-Roman.pmf \
Souvenir-DemiItalic.pmf \
Souvenir-Demi.pmf   \
Souvenir-LightItalic.pmf\
diff --git 
a/hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-Bold.pmf 
b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-Bold.pmf
new file mode 100644
index 000..ab22aab
Binary files /dev/null and 
b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-Bold.pmf differ
diff --git 
a/hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-BoldItal.pmf 
b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-BoldItal.pmf
new file mode 100644
index 000..e68811e
Binary files /dev/null and 
b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCentSchlbk-BoldItal.pmf 
differ
diff --git 

xorg-server: Changes to 'upstream-experimental'

[Drew Parsons]

 hw/xfree86/modes/xf86Crtc.c|   84 -
 hw/xfree86/modes/xf86Crtc.h|   26 +++-
 hw/xfree86/modes/xf86RandR12.c |   24 +++
 randr/rrcrtc.c |   30 ++
 4 files changed, 128 insertions(+), 36 deletions(-)

New commits:
commit 629515a159d49dfc11004bac32e9da747e595099
Author: Aaron Plattner [EMAIL PROTECTED]
Date:   Wed Feb 28 14:26:47 2007 -0800

Add a canGrow argument to xf86InitialConfiguration.

canGrow indicates to the DDX that the driver can enlarge the desktop via the
xf86_config-funcs-resize hook.  If so, xf86InitialConfiguration will set
virtual[XY] to match the configuration it chooses and will leave the crtc 
config
size ranges alone.  If FALSE, it will bloat the screen to fit the largest 
probed
mode and also set the crtc config max size to limit the desktop to the 
initial
virtual[XY] size.

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index ebc0f8f..c53d2a8 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -734,12 +734,16 @@ xf86PickCrtcs (ScrnInfoPtrscrn,
 
 /*
  * Compute the virtual size necessary to place all of the available
- * crtcs in the specified configuration and also large enough to
- * resize any crtc to the largest available mode
+ * crtcs in the specified configuration.
+ *
+ * canGrow indicates that the driver can make the screen larger than its 
initial
+ * configuration.  If FALSE, this function will enlarge the screen to include
+ * the largest available mode.
  */
 
 static void
-xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp)
+xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
+Bool canGrow)
 {
 xf86CrtcConfigPtr  config = XF86_CRTC_CONFIG_PTR(scrn);
 intwidth = 0, height = 0;
@@ -757,26 +761,28 @@ xf86DefaultScreenLimits (ScrnInfoPtr scr
crtc_width = crtc-x + xf86ModeWidth (crtc-desiredMode, 
crtc-desiredRotation);
crtc_height = crtc-y + xf86ModeHeight (crtc-desiredMode, 
crtc-desiredRotation);
}
-   for (o = 0; o  config-num_output; o++) 
-   {
-   xf86OutputPtr   output = config-output[o];
+   if (!canGrow) {
+   for (o = 0; o  config-num_output; o++)
+   {
+   xf86OutputPtr   output = config-output[o];
 
-   for (s = 0; s  config-num_crtc; s++)
-   if (output-possible_crtcs  (1  s))
-   {
-   DisplayModePtr  mode;
-   for (mode = output-probed_modes; mode; mode = mode-next)
+   for (s = 0; s  config-num_crtc; s++)
+   if (output-possible_crtcs  (1  s))
{
-   if (mode-HDisplay  crtc_width)
-   crtc_width = mode-HDisplay;
-   if (mode-VDisplay  crtc_width)
-   crtc_width = mode-VDisplay;
-   if (mode-VDisplay  crtc_height)
-   crtc_height = mode-VDisplay;
-   if (mode-HDisplay  crtc_height)
-   crtc_height = mode-HDisplay;
+   DisplayModePtr  mode;
+   for (mode = output-probed_modes; mode; mode = 
mode-next)
+   {
+   if (mode-HDisplay  crtc_width)
+   crtc_width = mode-HDisplay;
+   if (mode-VDisplay  crtc_width)
+   crtc_width = mode-VDisplay;
+   if (mode-VDisplay  crtc_height)
+   crtc_height = mode-VDisplay;
+   if (mode-HDisplay  crtc_height)
+   crtc_height = mode-HDisplay;
+   }
}
-   }
+   }
}
if (crtc_width  width)
width = crtc_width;
@@ -1350,10 +1356,17 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn)
  *
  * Given auto-detected (and, eventually, configured) values,
  * construct a usable configuration for the system
+ *
+ * canGrow indicates that the driver can resize the screen to larger than its
+ * initially configured size via the config-funcs-resize hook.  If TRUE, this
+ * function will set virtualX and virtualY to match the initial configuration
+ * and leave config-max{Width,Height} alone.  If FALSE, it will bloat
+ * virtual[XY] to include the largest modes and set config-max{Width,Height}
+ * accordingly.
  */
 
 Bool
-xf86InitialConfiguration (ScrnInfoPtr  scrn)
+xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
 {
 xf86CrtcConfigPtr  config = XF86_CRTC_CONFIG_PTR(scrn);
 into, c;
@@ -1491,9 +1504,10 @@ xf86InitialConfiguration (ScrnInfoPtr  
 if (scrn-display-virtualX == 0)
 {
/*
-* Expand virtual size to cover 

xorg-server: Changes to 'upstream-experimental'

[Drew Parsons]

 GL/glx/indirect_dispatch_swap.c   |2 +-
 GL/glx/indirect_program.c |2 +-
 GL/glx/indirect_texture_compression.c |2 +-
 GL/glx/swap_interval.c|2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ee3000f97d7561b2137e247495468a17e6e3b4c3
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Sun Mar 4 16:00:52 2007 +1100

Support for Hurd and other non-linux GNU systems.

Non-linux GNU systems such as Hurd will define __GLIBC__ or __GNU__
rather than __linux__.  This must be tested for in order to get byteswap.h
included.  See commit 594d180fe4f5d508569f9b263799da5af5a97087 (24 Dec
2006) and other related patches (fixed in upstream HEAD then, why was
the patch not brought across to the 1.3 branch?).

diff --git a/GL/glx/indirect_dispatch_swap.c b/GL/glx/indirect_dispatch_swap.c
index 9c58ef1..136f0d0 100644
--- a/GL/glx/indirect_dispatch_swap.c
+++ b/GL/glx/indirect_dispatch_swap.c
@@ -28,7 +28,7 @@
 #include X11/Xmd.h
 #include GL/gl.h
 #include GL/glxproto.h
-#ifdef __linux__
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
 #include byteswap.h
 #elif defined(__OpenBSD__)
 #include sys/endian.h
diff --git a/GL/glx/indirect_program.c b/GL/glx/indirect_program.c
index d0fd3d1..eae128a 100644
--- a/GL/glx/indirect_program.c
+++ b/GL/glx/indirect_program.c
@@ -46,7 +46,7 @@ #include glthread.h
 #include dispatch.h
 #include glapioffsets.h
 
-#ifdef __linux__
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
 #include byteswap.h
 #elif defined(__OpenBSD__)
 #include sys/endian.h
diff --git a/GL/glx/indirect_texture_compression.c 
b/GL/glx/indirect_texture_compression.c
index 0c42ea0..11f63c2 100644
--- a/GL/glx/indirect_texture_compression.c
+++ b/GL/glx/indirect_texture_compression.c
@@ -39,7 +39,7 @@ #include glapi.h
 #include glthread.h
 #include dispatch.h
 
-#ifdef __linux__
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
 #include byteswap.h
 #elif defined(__OpenBSD__)
 #include sys/endian.h
diff --git a/GL/glx/swap_interval.c b/GL/glx/swap_interval.c
index bcc1c47..f049ce5 100644
--- a/GL/glx/swap_interval.c
+++ b/GL/glx/swap_interval.c
@@ -40,7 +40,7 @@ #include glthread.h
 #include dispatch.h
 #include glapioffsets.h
 
-#ifdef __linux__
+#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
 #include byteswap.h
 #elif defined(__OpenBSD__)
 #include sys/endian.h


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

xorg-server: Changes to 'upstream-experimental'

[Drew Parsons]

 hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am |2 +-
 hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am   |2 +-
 hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am |1 +
 hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am  |2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit aeabf2a1f873f884b8a8c33b1517c3f3cab4c7f5
Author: Drew Parsons [EMAIL PROTECTED]
Date:   Sun Mar 4 16:28:54 2007 +1100

Xprint: fix font symlinks

Change symlinks to Xprint base fonts in model/PSdefault using local
relative links.  This facilitates moving the Xprint config files, for
instance for FHS compliance placing data files in /usr/share rather
than /usr/lib.  Also ensures NewCenturySchlbk-BoldItalic.pmf is
installed.

diff --git a/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am 
b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
index 5be5419..c574c5c 100644
--- a/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
@@ -1,6 +1,6 @@
 xpcdir = @xpconfigdir@/C/print/models/CANONC3200-PS/fonts
 
-parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+parentdir = ../../PSdefault/fonts
 
 XPFONTS = \
 AvantGarde-Book.pmf \
diff --git a/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am 
b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
index 2ff9ab7..634db1f 100644
--- a/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
@@ -1,6 +1,6 @@
 xpcdir = @xpconfigdir@/C/print/models/HPLJ4050-PS/fonts
 
-parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+parentdir = ../../PSdefault/fonts
 
 XPFONTS = \
 AvantGarde-Book.pmf \
diff --git a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am 
b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
index e7ddb6c..1e8c8a7 100644
--- a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
@@ -18,6 +18,7 @@ dist_xpc_DATA =   \
LubalinGraph-DemiOblique.pmf\
LubalinGraph-Demi.pmf   \
NewCenturySchlbk-Bold.pmf   \
+   NewCenturySchlbk-BoldItalic.pmf \
NewCenturySchlbk-Italic.pmf \
NewCenturySchlbk-Roman.pmf  \
Souvenir-DemiItalic.pmf \
diff --git a/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am 
b/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am
index 8cc2694..d1ee6cf 100644
--- a/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am
@@ -1,6 +1,6 @@
 xpcdir = @xpconfigdir@/C/print/models/SPSPARC2/fonts
 
-parentdir = @xpconfigdir@/C/print/models/PSdefault/fonts
+parentdir = ../../PSdefault/fonts
 
 XPFONTS = \
 Courier-Bold.pmf \


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]