static void
usage (void)
{
- fprintf (stderr,
- "usage: %s [--geom =WxH+X+Y | --fullscreen | --root] [--wire]\n",
+ fprintf (stderr, "usage: %s [--wire] [--geom G | --root | --window-id ID]\n",
progname);
exit (1);
}
int ix;
int fullscreen = 0;
int on_root = 0;
+ Window on_window = 0;
int undef = -65536;
int x = undef, y = undef;
XSizeHints hints;
GLXContext glx_context = 0;
+ progname = argv[0];
+
memset (&hints, 0, sizeof(hints));
for (ix=1; ix<*argc; ix++)
if (geom || fullscreen) usage();
on_root = 1;
}
+ else if (!strcmp(argv[ix], "-window-id") &&
+ *argc > ix+1)
+ {
+ unsigned long id;
+ char c;
+ if (1 != sscanf (argv[ix+1], "%lu %c", &id, &c) &&
+ 1 != sscanf (argv[ix+1], "0x%lx %c", &id, &c))
+ usage();
+ ix++;
+ on_window = (Window) id;
+ }
else if (!strcmp(argv[ix], "-fullscreen") ||
!strcmp(argv[ix], "-full"))
{
XA_WM_PROTOCOLS = XInternAtom (dpy, "WM_PROTOCOLS", False);
XA_WM_DELETE_WINDOW = XInternAtom (dpy, "WM_DELETE_WINDOW", False);
- if (on_root)
+ if (on_root || on_window)
{
- window = RootWindow (dpy, screen);
+ window = (on_window ? on_window : RootWindow (dpy, screen));
XGetWindowAttributes (dpy, window, &xgwa);
visual = xgwa.visual;
w = xgwa.width;
return 1;
}
-static void setup_window()
+static void setup_window(void)
{
glEnable(GL_CULL_FACE);
glEnable(GL_LIGHTING);
{
int ix;
static GLfloat white[] = { 1.0, 1.0, 1.0, 1.0 };
+ static GLfloat gray[] = { 0.6, 0.6, 0.6, 1.0 };
glDrawBuffer(GL_BACK);
glRotatef(view_roty, 0.0, 1.0, 0.0);
glRotatef(view_rotz, 0.0, 0.0, 1.0);
+ glShadeModel(GL_FLAT);
+
for (ix=0; ix<NUM_ELS; ix++) {
elem_t *el = &elist[ix];
- glPushMatrix();
-
- glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE,
- (wireframe ? white : el->col));
- glShadeModel(GL_FLAT);
- glBegin(wireframe ? GL_LINE_LOOP : GL_QUADS);
-
glNormal3f(0.0, 0.0, 1.0);
- glVertex3f(el->pos[0] - el->vervec[0], el->pos[1] - el->vervec[1],
- el->pos[2]);
- glVertex3f(el->pos[0] + el->vervec[1], el->pos[1] - el->vervec[0],
- el->pos[2]);
- glVertex3f(el->pos[0] + el->vervec[0], el->pos[1] + el->vervec[1],
- el->pos[2]);
- glVertex3f(el->pos[0] - el->vervec[1], el->pos[1] + el->vervec[0],
- el->pos[2]);
+ /* outline the square */
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, (wireframe ? white : gray));
+ glBegin(GL_LINE_LOOP);
+ glVertex3f(el->pos[0]-el->vervec[0], el->pos[1]-el->vervec[1], el->pos[2]);
+ glVertex3f(el->pos[0]+el->vervec[1], el->pos[1]-el->vervec[0], el->pos[2]);
+ glVertex3f(el->pos[0]+el->vervec[0], el->pos[1]+el->vervec[1], el->pos[2]);
+ glVertex3f(el->pos[0]-el->vervec[1], el->pos[1]+el->vervec[0], el->pos[2]);
glEnd();
- glPopMatrix();
+ if (wireframe) continue;
+
+ /* fill the square */
+ glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, el->col);
+ glBegin(GL_QUADS);
+ glVertex3f(el->pos[0]-el->vervec[0], el->pos[1]-el->vervec[1], el->pos[2]);
+ glVertex3f(el->pos[0]+el->vervec[1], el->pos[1]-el->vervec[0], el->pos[2]);
+ glVertex3f(el->pos[0]+el->vervec[0], el->pos[1]+el->vervec[1], el->pos[2]);
+ glVertex3f(el->pos[0]-el->vervec[1], el->pos[1]+el->vervec[0], el->pos[2]);
+ glEnd();
}
glPopMatrix();