From 8a6a63580685ae7167ebea072d476f6f614a5cbf Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Mon, 25 Jun 2001 11:23:47 +0000
Subject: *** empty log message ***

---
 debian/control   |  4 ++--
 generic/tkZinc.c | 60 +++++++++++++++++++++++++++++++++-----------------------
 patchlvl.h       |  4 ++--
 3 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/debian/control b/debian/control
index 3ad13ea..9858c54 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Standards-Version: 2.3.0.0
 
 Package: zinc-tk
 Architecture: i386
-Depends: tk8.0 (>= 8.0.4-2), libart2
+Depends: tk8.0 (>= 8.0.5)
 Provides: zinc-tk
 Conflicts: xradar3-tk
 Description: The Tk Zinc widget.
@@ -19,7 +19,7 @@ Description: The Tk Zinc widget.
 
 Package: zinc-perl
 Architecture: i386
-Depends: perl-tk (>= 800.011), zinc-tk (= ${Source-Version})
+Depends: perl-tk (>= 800.015), zinc-tk (= ${Source-Version})
 Provides: zinc-perl
 Conflicts: xradar3-perl
 Description: perl-tk variant of the Tk Zinc widget.
diff --git a/generic/tkZinc.c b/generic/tkZinc.c
index bf2a5ad..793d2a9 100644
--- a/generic/tkZinc.c
+++ b/generic/tkZinc.c
@@ -662,38 +662,48 @@ ZincObjCmd(ClientData		client_data,	/* Main window associated with
 #ifdef GLX
     if (wi->has_glx) {
       int	val;
-      int	attribs[] = { GLX_RGBA, GLX_DOUBLEBUFFER,
+      int	attribs[] = { GLX_RGBA,
+			      GLX_DOUBLEBUFFER,
 			      GLX_BUFFER_SIZE, 16,
-			      GLX_STENCIL_SIZE, 1, None };
+			      GLX_STENCIL_SIZE, 1,
+			      None };
       
       wi->gl_visual = glXChooseVisual(wi->dpy, XScreenNumberOfScreen(wi->screen), attribs);
       if (!wi->gl_visual) {
+	printf("No glx visual\n");
 	wi->render = False;
       }
-      printf("Visual is 0x%x, ", (int) wi->gl_visual->visualid);      
-      glXGetConfig(wi->dpy, wi->gl_visual, GLX_RGBA, &val);
-      printf("RGBA %d, ", val);
-      glXGetConfig(wi->dpy, wi->gl_visual, GLX_DOUBLEBUFFER, &val);
-      printf("Double Buffer %d, ", val);
-      glXGetConfig(wi->dpy, wi->gl_visual, GLX_STENCIL_SIZE, &val);
-      printf("Stencil %d, ", val);
-      glXGetConfig(wi->dpy, wi->gl_visual, GLX_BUFFER_SIZE, &val);
-      printf("depth %d, ", val);
-      glXGetConfig(wi->dpy, wi->gl_visual, GLX_RED_SIZE, &val);
-      printf("red %d, ", val);
-      glXGetConfig(wi->dpy, wi->gl_visual, GLX_GREEN_SIZE, &val);
-      printf("green %d, ", val);
-      glXGetConfig(wi->dpy, wi->gl_visual, GLX_BLUE_SIZE, &val);
-      printf("blue %d, ", val);
-      glXGetConfig(wi->dpy, wi->gl_visual, GLX_ALPHA_SIZE, &val);
-      printf("alpha %d\n", val);
-      wi->gl_context = glXCreateContext(wi->dpy, wi->gl_visual, NULL, True);
-      if (!wi->gl_context) {
-	wi->render = False;
+      else {
+	printf("Visual is 0x%x, ", (int) wi->gl_visual->visualid);      
+	glXGetConfig(wi->dpy, wi->gl_visual, GLX_RGBA, &val);
+	printf("RGBA %d, ", val);
+	glXGetConfig(wi->dpy, wi->gl_visual, GLX_DOUBLEBUFFER, &val);
+	printf("Double Buffer %d, ", val);
+	glXGetConfig(wi->dpy, wi->gl_visual, GLX_STENCIL_SIZE, &val);
+	printf("Stencil %d, ", val);
+	glXGetConfig(wi->dpy, wi->gl_visual, GLX_BUFFER_SIZE, &val);
+	printf("depth %d, ", val);
+	glXGetConfig(wi->dpy, wi->gl_visual, GLX_RED_SIZE, &val);
+	printf("red %d, ", val);
+	glXGetConfig(wi->dpy, wi->gl_visual, GLX_GREEN_SIZE, &val);
+	printf("green %d, ", val);
+	glXGetConfig(wi->dpy, wi->gl_visual, GLX_BLUE_SIZE, &val);
+	printf("blue %d, ", val);
+	glXGetConfig(wi->dpy, wi->gl_visual, GLX_ALPHA_SIZE, &val);
+	printf("alpha %d\n", val);
+	wi->gl_context = glXCreateContext(wi->dpy, wi->gl_visual, NULL, True);
+	if (!wi->gl_context) {
+	  printf("No glx context\n");
+	  wi->render = False;
+	}
+	else {
+	  printf("Context: %d\n", glXIsDirect(wi->dpy, wi->gl_context));
+	  Tk_SetWindowVisual(wi->win, wi->gl_visual->visual,
+			     16,
+			     XCreateColormap(wi->dpy, RootWindowOfScreen(wi->screen),
+					     wi->gl_visual->visual, AllocNone));
+	}
       }
-      printf("Context: %d\n", glXIsDirect(wi->dpy, wi->gl_context));
-      Tk_SetWindowVisual(wi->win, wi->gl_visual->visual,
-			 Tk_Depth(wi->win), Tk_Colormap(wi->win));
     }
 #endif
   }
diff --git a/patchlvl.h b/patchlvl.h
index 56c999e..567dfd8 100644
--- a/patchlvl.h
+++ b/patchlvl.h
@@ -11,6 +11,6 @@
 #ifndef ZINCVERSION
 #define ZINCVER		3
 #define ZINCREV		1
-#define ZINCPLVL	26
-#define ZINCVERSION	"zinc-version-3126"
+#define ZINCPLVL	27
+#define ZINCVERSION	"zinc-version-3127"
 #endif
-- 
cgit v1.1