Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 123 insertions, 0 deletions

diff --git a/xorg-server/Xext/sampleEVI.c b/xorg-server/Xext/sampleEVI.c
new file mode 100644
index 000000000..b871bfd74
--- /dev/null
+++ b/xorg-server/Xext/sampleEVI.c
@@ -0,0 +1,123 @@
+/************************************************************
+Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, 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 Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS 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.
+********************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "dixstruct.h"
+#include "extnsionst.h"
+#include "dix.h"
+#define _XEVI_SERVER_
+#include <X11/extensions/XEVIstr.h>
+#include "EVIstruct.h"
+#include "scrnintstr.h"
+
+#if HAVE_STDINT_H
+#include <stdint.h>
+#elif !defined(UINT32_MAX)
+#define UINT32_MAX 0xffffffffU
+#endif
+
+static int sampleGetVisualInfo(
+    VisualID32 *visual,
+    int n_visual,
+    xExtendedVisualInfo **evi_rn,
+    int *n_info_rn,
+    VisualID32 **conflict_rn,
+    int *n_conflict_rn)
+{
+    unsigned int max_sz_evi;
+    VisualID32 *temp_conflict;
+    xExtendedVisualInfo *evi;
+    unsigned int max_visuals = 0, max_sz_conflict, sz_conflict = 0;
+    register int visualI, scrI, sz_evi = 0, conflictI, n_conflict;
+
+    if (n_visual > UINT32_MAX/(sz_xExtendedVisualInfo * screenInfo.numScreens))
+	return BadAlloc;
+    max_sz_evi = n_visual * sz_xExtendedVisualInfo * screenInfo.numScreens;
+    
+    for (scrI = 0; scrI < screenInfo.numScreens; scrI++) {
+        if (screenInfo.screens[scrI]->numVisuals > max_visuals)
+            max_visuals = screenInfo.screens[scrI]->numVisuals;
+    }
+
+    if (n_visual > UINT32_MAX/(sz_VisualID32 * screenInfo.numScreens 
+			       * max_visuals)) 
+	return BadAlloc;
+    max_sz_conflict = n_visual * sz_VisualID32 * screenInfo.numScreens * max_visuals;
+
+    *evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi);
+    if (!*evi_rn)
+         return BadAlloc;
+
+    temp_conflict = (VisualID32 *)xalloc(max_sz_conflict);
+    if (!temp_conflict) {
+        xfree(*evi_rn);
+        return BadAlloc;
+    }
+
+    for (scrI = 0; scrI < screenInfo.numScreens; scrI++) {
+        for (visualI = 0; visualI < n_visual; visualI++) {
+	    evi[sz_evi].core_visual_id = visual[visualI];
+	    evi[sz_evi].screen = scrI;
+	    evi[sz_evi].level = 0;
+	    evi[sz_evi].transparency_type = XEVI_TRANSPARENCY_NONE;
+	    evi[sz_evi].transparency_value = 0;
+	    evi[sz_evi].min_hw_colormaps = 1;
+	    evi[sz_evi].max_hw_colormaps = 1;
+	    evi[sz_evi].num_colormap_conflicts = n_conflict = 0;
+	    for (conflictI = 0; conflictI < n_conflict; conflictI++)
+		temp_conflict[sz_conflict++] = visual[visualI];
+	    sz_evi++;
+	}
+    }
+    *conflict_rn = temp_conflict;
+    *n_conflict_rn = sz_conflict;
+    *n_info_rn = sz_evi;
+    return Success;
+}
+
+static void sampleFreeVisualInfo(
+    xExtendedVisualInfo *evi,
+    VisualID32 *conflict)
+{
+    if (evi)
+        xfree(evi);
+    if (conflict)
+    	xfree(conflict);
+}
+
+EviPrivPtr eviDDXInit(void)
+{
+    static EviPrivRec eviPriv;
+    eviPriv.getVisualInfo = sampleGetVisualInfo;
+    eviPriv.freeVisualInfo = sampleFreeVisualInfo;
+    return &eviPriv;
+}
+
+void eviDDXReset(void)
+{
+}