Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/specs/libX11/CH08.xml
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/queryobj.c
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_readpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mkfontscale/list.h
	pixman/pixman/Makefile.win32
	xorg-server/dix/devices.c
	xorg-server/dix/events.c
	xorg-server/dix/inpututils.c
	xorg-server/fb/fbbltone.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/ephyrinit.c
	xorg-server/hw/xfree86/common/xf86Module.h
	xorg-server/hw/xfree86/common/xf86Xinput.c
	xorg-server/hw/xfree86/man/xorg.conf.man
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/include/input.h
	xorg-server/include/inputstr.h
	xorg-server/mi/mieq.c
	xorg-server/randr/rrscreen.c
	xorg-server/xkeyboard-config/rules/base.extras.xml.in
	xorg-server/xkeyboard-config/rules/base.xml.in

3 files changed, 5 insertions, 13 deletions

diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index 627badda6..803f28a15 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -1369,15 +1369,6 @@ InitPointerAccelerationScheme(DeviceIntPtr dev,
 }

 

 Bool

-InitAbsoluteClassDeviceStruct(DeviceIntPtr dev)

-{

-    /* This is an API-preserving noop. Instructions: Kill when no more drivers

-     * call it. The infrastructure behind hasn't really been used, so any calls

-     * are likely just a declaration that the device is absolute. */

-    return FALSE;

-}

-

-Bool

 InitFocusClassDeviceStruct(DeviceIntPtr dev)

 {

     FocusClassPtr focc;

diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index 20b35cdf1..1c8ec53a4 100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
@@ -112,6 +112,7 @@ Equipment Corporation.
 #include <X11/Xproto.h>

 #include "windowstr.h"

 #include "inputstr.h"

+#include "inpututils.h"

 #include "scrnintstr.h"

 #include "cursorstr.h"

 

@@ -2198,7 +2199,7 @@ DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent
          */

         if (!grab && ActivateImplicitGrab(pDev, client, pWin, pEvents, deliveryMask))

             /* grab activated */;

-        else if ((type == MotionNotify))

+        else if (type == MotionNotify)

             pDev->valuator->motionHintWindow = pWin;

         else if (type == DeviceMotionNotify || type == DeviceButtonPress)

                 CheckDeviceGrabAndHintWindow (pWin, type,

@@ -2835,7 +2836,7 @@ CheckMotion(DeviceEvent *ev, DeviceIntPtr pDev)
     WindowPtr prevSpriteWin, newSpriteWin;

     SpritePtr pSprite = pDev->spriteInfo->sprite;

 

-    verify_internal_event(ev);

+    verify_internal_event((InternalEvent *)ev);

 

     if (!pSprite)

       return FALSE;

@@ -5912,7 +5913,7 @@ PickPointer(ClientPtr client)
 

     if (!client->clientPtr)

     {

-        DeviceIntPtr it = inputInfo.devices;

+        it = inputInfo.devices;

         while (it)

         {

             if (IsMaster(it) && it->spriteInfo->spriteOwner)

diff --git a/xorg-server/dix/inpututils.c b/xorg-server/dix/inpututils.c
index 9d2bc3246..4565e6e68 100644
--- a/xorg-server/dix/inpututils.c
+++ b/xorg-server/dix/inpututils.c
@@ -574,7 +574,7 @@ void verify_internal_event(const InternalEvent *ev)
 

         for (i = 0; i < sizeof(xEvent); i++, data++)

         {

-            ErrorF("%02hx ", *data);

+            ErrorF("%02hhx ", *data);

 

             if ((i % 8) == 7)

                 ErrorF("\n");