Commit c40bf536 authored by Kaleb Keithley Keithley's avatar Kaleb Keithley Keithley
Browse files

merge latest (4.3.99.16) from XFree86 (vendor) branch

parent 352df17f
......@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/ico/ico.c,v 1.9 2002/12/24 17:43:00 tsi Exp $ */
/* $XFree86: xc/programs/ico/ico.c,v 1.10 2003/05/27 22:26:56 tsi Exp $ */
/******************************************************************************
* Description
......@@ -459,7 +459,7 @@ icoClearArea(struct closure *closure, int x, int y, int w, int h)
/* Set up points, transforms, etc. */
static void
initPoly(struct closure *closure, const Polyinfo *poly, int icoW, int icoH)
initPoly(struct closure *closure, Polyinfo *poly, int icoW, int icoH)
{
Point3D *vertices = poly->v;
int NV = poly->numverts;
......@@ -713,7 +713,7 @@ static void
initDBufs(struct closure *closure, int fg, int bg, int planesperbuf)
{
int i,j,jj,j0,j1,k,m,t;
DBufInfo *b, *otherb;
DBufInfo *b;
XColor bgcolor, fgcolor;
closure->nplanesets = (dblbuf && !multibufext ? 2 : 1);
......@@ -755,8 +755,6 @@ initDBufs(struct closure *closure, int fg, int bg, int planesperbuf)
setBufColor(closure, 1,&fgcolor);
for (i=0; i<closure->nplanesets; i++) {
b = closure->bufs+i;
if (dblbuf)
otherb = closure->bufs+(1-i);
for (j0=0; j0<(dblbuf&&!multibufext?closure->pixelsperbuf:1); j0++) {
for (j1=0; j1<closure->pixelsperbuf; j1++) {
j = (j0<<closure->planesperbuf)|j1;
......
.\" $XConsortium: ico.man,v 1.14 94/04/17 20:45:16 gildea Exp $
.\" $XFree86: xc/programs/ico/ico.man,v 1.3 2001/01/27 18:21:03 dawes Exp $
.\" $XFree86: xc/programs/ico/ico.man,v 1.5 2003/05/29 21:48:10 herrb Exp $
.TH ICO 1 __xorgversion__
.SH NAME
ico \- animate an icosahedron or other polyhedron
......@@ -60,7 +60,7 @@ If less colors than faces are given, the colors are reused.
.LP
Pressing "q" will close a window. If compiled with threads support, the
program will stop only when all threads terminate. You can also close an
animation window using the ICCCM \fIdelete\fP message (deppending on your
animation window using the ICCCM \fIdelete\fP message (depending on your
window manager, you will have a decoration button or menu to send such
message).
.SH ADDING POLYHEDRA
......@@ -87,6 +87,6 @@ A separate color cell is allocated for each name in the -colors list, even
when the same name may be specified twice. Color allocation fails in
TrueColor displays and option \fI-faces\fP does not work well.
.SH COPYRIGHT
Copyright ([\d,\s]*) X Consortium
Copyright 1994 X Consortium
.br
See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment