Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/configs/linux-dri
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitable.h
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mesa/drivers/dri/Makefile.template
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/state_tracker/st_format.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	xorg-server/configure.ac
	xorg-server/dix/main.c
	xorg-server/dix/window.c
	xorg-server/hw/xquartz/GL/indirect.c
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xquartz/darwin.h
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xquartz/pbproxy/app-main.m
	xorg-server/hw/xquartz/pbproxy/pbproxy.h
	xorg-server/hw/xquartz/pbproxy/x-selection.m
	xorg-server/hw/xquartz/xpr/xpr.h
	xorg-server/hw/xquartz/xpr/xprEvent.c
	xorg-server/hw/xquartz/xpr/xprScreen.c
	xorg-server/include/privates.h
	xorg-server/include/protocol-versions.h
	xorg-server/test/Makefile.am
	xorg-server/xfixes/cursor.c
	xorg-server/xfixes/xfixes.c
	xorg-server/xkeyboard-config/configure.in
	xorg-server/xkeyboard-config/rules/base.extras.xml.in
	xorg-server/xkeyboard-config/rules/base.xml.in
	xorg-server/xkeyboard-config/symbols/de
	xorg-server/xkeyboard-config/symbols/lk
	xorg-server/xkeyboard-config/symbols/ru

1 files changed, 15 insertions, 9 deletions

diff --git a/xorg-server/xfixes/xfixes.c b/xorg-server/xfixes/xfixes.c
index e164aa9d1..e433b6b39 100644
--- a/xorg-server/xfixes/xfixes.c
+++ b/xorg-server/xfixes/xfixes.c
@@ -1,5 +1,6 @@
 /*

  * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.

+ * Copyright 2010 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"),

@@ -47,10 +48,6 @@
 

 #include "xfixesint.h"

 #include "protocol-versions.h"

-/*

- * Must use these instead of the constants from xfixeswire.h.  They advertise

- * what we implement, not what the protocol headers define.

- */

 

 static unsigned char	XFixesReqCode;

 int		XFixesEventBase;

@@ -97,11 +94,12 @@ ProcXFixesQueryVersion(ClientPtr client)
 

 /* Major version controls available requests */

 static const int version_requests[] = {

-    X_XFixesQueryVersion,	/* before client sends QueryVersion */

-    X_XFixesGetCursorImage,	/* Version 1 */

-    X_XFixesChangeCursorByName,	/* Version 2 */

-    X_XFixesExpandRegion,	/* Version 3 */

-    X_XFixesShowCursor,	        /* Version 4 */

+    X_XFixesQueryVersion,	    /* before client sends QueryVersion */

+    X_XFixesGetCursorImage,	    /* Version 1 */

+    X_XFixesChangeCursorByName,	    /* Version 2 */

+    X_XFixesExpandRegion,	    /* Version 3 */

+    X_XFixesShowCursor,		    /* Version 4 */

+    X_XFixesDestroyPointerBarrier,  /* Version 5 */

 };

 

 #define NUM_VERSION_REQUESTS	(sizeof (version_requests) / sizeof (version_requests[0]))

@@ -142,6 +140,9 @@ int	(*ProcXFixesVector[XFixesNumberRequests])(ClientPtr) = {
 /*************** Version 4 ****************/

     ProcXFixesHideCursor,

     ProcXFixesShowCursor,

+/*************** Version 5 ****************/

+    ProcXFixesCreatePointerBarrier,

+    ProcXFixesDestroyPointerBarrier,

 };

 

 static int

@@ -205,6 +206,9 @@ static int (*SProcXFixesVector[XFixesNumberRequests])(ClientPtr) = {
 /*************** Version 4 ****************/

     SProcXFixesHideCursor,

     SProcXFixesShowCursor,

+/*************** Version 5 ****************/

+    SProcXFixesCreatePointerBarrier,

+    SProcXFixesDestroyPointerBarrier,

 };

 

 static int

@@ -260,6 +264,8 @@ XFixesExtensionInit(void)
 	EventSwapVector[XFixesEventBase + XFixesCursorNotify] =

 	    (EventSwapPtr) SXFixesCursorNotifyEvent;

 	SetResourceTypeErrorValue(RegionResType, XFixesErrorBase + BadRegion);

+	SetResourceTypeErrorValue(PointerBarrierType,

+				  XFixesErrorBase + BadBarrier);

     }

 }