summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-03-01 07:56:11 -0700
committerBrian <brian@yutani.localnet.net>2007-03-01 07:56:11 -0700
commitd592eaeb8321d1e408050fe07bff2bf234615b4c (patch)
tree45cbcb59c69ba7eb025e1d8ecb39e25b619b2771 /progs
parent887d3c67cbe1f09ec5a816eca859936addb3d3ec (diff)
fix clipping, display name, warnings
Diffstat (limited to 'progs')
-rw-r--r--progs/tests/sharedtex.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/progs/tests/sharedtex.c b/progs/tests/sharedtex.c
index ebe73f19f42..7be90d67f55 100644
--- a/progs/tests/sharedtex.c
+++ b/progs/tests/sharedtex.c
@@ -368,7 +368,7 @@ Resize(const struct window *h, unsigned int width, unsigned int height)
glFrustum(-1, 1, -1, 1, 2, 10);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
- glTranslatef(0, 0, -3.5);
+ glTranslatef(0, 0, -4.5);
}
@@ -408,28 +408,30 @@ EventLoop(void)
}
-
+#if 0
static void
PrintInfo(const struct window *h)
{
printf("Name: %s\n", h->DisplayName);
- printf(" Display: 0x%x\n", h->Dpy);
- printf(" Window: 0x%x\n", h->Win);
- printf(" Context: 0x%x\n", h->Context);
+ printf(" Display: %p\n", (void *) h->Dpy);
+ printf(" Window: 0x%x\n", (int) h->Win);
+ printf(" Context: 0x%x\n", (int) h->Context);
}
+#endif
int
main(int argc, char *argv[])
{
- int i;
+ const char *dpyName = XDisplayName(NULL);
+
struct window *h0, *h1, *h2, *h3;
/* four windows and contexts sharing display lists and texture objects */
- h0 = AddWindow(":0", 10, 10, NULL);
- h1 = AddWindow(":0", 330, 10, h0);
- h2 = AddWindow(":0", 10, 350, h0);
- h3 = AddWindow(":0", 330, 350, h0);
+ h0 = AddWindow(dpyName, 10, 10, NULL);
+ h1 = AddWindow(dpyName, 330, 10, h0);
+ h2 = AddWindow(dpyName, 10, 350, h0);
+ h3 = AddWindow(dpyName, 330, 350, h0);
InitGLstuff(h0);